Bruno Busco
e20f900808
Changed several ecommerce ftl files rendering screenlets so that the HTML is the same as the one that is rendered by the screenlet widget.
...
Added screenlet styles to the ecommain.css
Added several missin screenlet-body tags.
This allows better and more omogeneus rendering when mixing together FTL and screenlet widgets.
To be continued...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1042133 13f79535-47bb-0310-9956-ffa450edef68
2010-12-04 10:34:47 +00:00
Jacques Le Roux
183850ba5c
Fix a typo (bad formatting) reported by Adam on dev ML
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1041135 13f79535-47bb-0310-9956-ffa450edef68
2010-12-01 19:12:52 +00:00
Hans Bakker
6cab58f905
change all @yahoo.com to @example.com Suggestion from Scott
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1040914 13f79535-47bb-0310-9956-ffa450edef68
2010-12-01 09:38:00 +00:00
Hans Bakker
4a9ea51f54
allow single pieces and boxes with a numkber of pieces share the same inventory location but can however be sold at optionally different prices. More explanation will be given in the new feature list of december 2010. Contribution of tukkata.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1040908 13f79535-47bb-0310-9956-ffa450edef68
2010-12-01 09:26:47 +00:00
Jacques Le Roux
9b75d04f7e
A patch from Felice Romano "NPE when calling org.ofbiz.entity.model.ModelEntity.getTableName(null)" ( https://issues.apache.org/jira/browse/OFBIZ-4040 ) - OFBIZ-4040
...
When "table name" is required to a "model entity" object, it throws a NPE if "datasource info" object is null.
JLR: I'm not quite sure in which occasions this fix is needed OOTB, but anyway it's safer indeed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1040890 13f79535-47bb-0310-9956-ffa450edef68
2010-12-01 08:29:21 +00:00
Adam Heath
d241a1049a
Fix several xml files that had DOS line endings; converted them to UNIX,
...
so that on fresh checkouts they will be auto-converted to native.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1040833 13f79535-47bb-0310-9956-ffa450edef68
2010-12-01 00:15:17 +00:00
Adam Heath
192418385b
Several utility methods for copying streams and
...
readers/writers/appendable.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1040798 13f79535-47bb-0310-9956-ffa450edef68
2010-11-30 22:03:40 +00:00
David E. Jones
f2dff15007
Undo part of the changes from Hans in rev 1037624 which caused the system to reset the delegator to the base delegator and ignore the user's specified tenant
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1040651 13f79535-47bb-0310-9956-ffa450edef68
2010-11-30 17:35:05 +00:00
Jacques Le Roux
f517be11ef
revert r1037521 "Preselect default country into drop down" ( https://issues.apache.org/jira/browse/OFBIZ-4013 ) - OFBIZ-4013
...
This is not how it should be done. For instance when you update a postal address from a party profile you always get selected the default country. OFBiz records correctly the change underneath but it's confusing as you don't see the right information on screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1040426 13f79535-47bb-0310-9956-ffa450edef68
2010-11-30 07:45:53 +00:00
Ashish Vijaywargiya
468b6ec109
Bug fix.
...
Removed hard coded viewSize value from FindGeneric.groovy file. If viewSize is not available in parameters then read defaultViewSize from widget.properties and set it as a viewSize. Hard coded view size create inconsistency in pagination. i.e If result contains 15 items then view size displayed in dropdown is 20 and only (1 - 10 of 15 ) items displayed as a search result.
Thanks Deepak & Rishi for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1040091 13f79535-47bb-0310-9956-ffa450edef68
2010-11-29 12:46:58 +00:00
Jacques Le Roux
600bac5ad9
A patch from Sascha Rodekamp "Redirect from Http to Https causes double service call" ( https://issues.apache.org/jira/browse/OFBIZ-3988 ) - OFBIZ-3988
...
The problem is, when you call a request over http, but the controller wants an https request, the RequestHandler make an redirect to https (which is indeed pretty cool). But this redirect causes that Events/ Services will be called twice. This can be avoided when we return from the Service/ Event directly after doing the redirect.
Example: http://localhost:8080/ecommerce/control/setdistributor?distributor=4711
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1040044 13f79535-47bb-0310-9956-ffa450edef68
2010-11-29 09:33:39 +00:00
Jacques Le Roux
d555ce6c36
Fix duplicates in labels
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039858 13f79535-47bb-0310-9956-ffa450edef68
2010-11-28 09:56:44 +00:00
Scott Gray
a0771ae85d
Remove method that was a duplicate of the superclass method
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039772 13f79535-47bb-0310-9956-ffa450edef68
2010-11-27 22:14:35 +00:00
Scott Gray
4ec14a82cb
Remove redundant null check
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039771 13f79535-47bb-0310-9956-ffa450edef68
2010-11-27 22:14:25 +00:00
Scott Gray
5d3699e21b
Formatting cleanup, no functional changes
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039770 13f79535-47bb-0310-9956-ffa450edef68
2010-11-27 22:14:16 +00:00
Scott Gray
3f34e1fdef
Deprecated the ContainerField's id field and getter/setter, this sort of thing is already handled by ModelFormField
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039769 13f79535-47bb-0310-9956-ffa450edef68
2010-11-27 22:14:07 +00:00
Scott Gray
8391f99d84
[OFBIZ-4036] Form widget display field descriptions were still being encoded when encode-output was set to false. Bug reported by Bruno Busco.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039767 13f79535-47bb-0310-9956-ffa450edef68
2010-11-27 21:51:01 +00:00
Jacques Le Roux
66c5dd10a0
A patch from Dukian "Add Traditional Chinese translation for applications, ecommerce, and ofbizsetup" ( https://issues.apache.org/jira/browse/OFBIZ-4031 ) - OFBIZ-4031
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039574 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 21:56:14 +00:00
Hans Bakker
19b0d3bcf8
soap session not closed after transfer, corrected
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039262 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 07:53:51 +00:00
David E. Jones
872a21e20a
Improved error message when map-name for field isn't a Map
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1038893 13f79535-47bb-0310-9956-ffa450edef68
2010-11-25 02:04:30 +00:00
Hans Bakker
350dc3c0ed
add root condition for initial path and add multi tenant condition in the login screen of myportal
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1038543 13f79535-47bb-0310-9956-ffa450edef68
2010-11-24 09:55:16 +00:00
David E. Jones
524525fa00
Fixed bug with new group-columns attribute when set to false the hidden fields were not rendering
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1038487 13f79535-47bb-0310-9956-ffa450edef68
2010-11-24 05:51:12 +00:00
Jacques Le Roux
b8689d9e7a
A patch from Sascha Rodekamp "Security Update for forgotten passwords " ( https://issues.apache.org/jira/browse/OFBIZ-3842 ) - OFBIZ-3842
...
Improve the a random Password generation when the "require new password" function is called. In the current Trunk it's a kind of hard coded password that will be send to the user. After generating a new pass the "requireNewPassword" flag will be set to true (configurable).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1038209 13f79535-47bb-0310-9956-ffa450edef68
2010-11-23 17:13:53 +00:00
Ashish Vijaywargiya
68c43b3d69
Bug fix. Code should not read all the message from the Inbox. Code will only fetch the newly received message. Currently it is generating log message for all the Inbox message that is of no use and unnecessarily keeps system busy.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1037883 13f79535-47bb-0310-9956-ffa450edef68
2010-11-22 20:56:07 +00:00
Hans Bakker
ef76d5387d
small adjustment fo multitenant, redirecting url in jsp did not work properly
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1037624 13f79535-47bb-0310-9956-ffa450edef68
2010-11-22 07:55:56 +00:00
Jacques Le Roux
03515798f6
A patch from Eric de Maulde "Service Engine can't display sendMail service" ( https://issues.apache.org/jira/browse/OFBIZ-4019 ) - OFBIZ-4019
...
There's an error into file AvailableServices.groovy to open sendMail service
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1037560 13f79535-47bb-0310-9956-ffa450edef68
2010-11-21 21:12:43 +00:00
Jacques Le Roux
ac2e687b61
A modified patch from Anne Jessel "title-property should be titleProperty" ( https://issues.apache.org/jira/browse/OFBIZ-4018 ) - OFBIZ-4018
...
Anne: some screen widgets set the field title-property instead of titleProperty. This causes errors in the logs, and means that the page title is not being set.
While preparing this patch, I discovered the labels referred to by some of these titleProperties were not available in Order component. However the missing ones were in Ecommerce. So I copied the missing ones to OrderUiLabels.xml.
JLR: instead of copying labels in OrderUiLabels.xml, I moved them to CommonUiLabels.xml: less and more consistent changes in the future.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1037559 13f79535-47bb-0310-9956-ffa450edef68
2010-11-21 21:07:19 +00:00
Jacques Le Roux
afeee2c250
A patch from Eric de Maulde "Preselect default country into drop down" ( https://issues.apache.org/jira/browse/OFBIZ-4013 ) - OFBIZ-4013
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1037521 13f79535-47bb-0310-9956-ffa450edef68
2010-11-21 18:33:41 +00:00
David E. Jones
b720b413a1
Added new group-columns attribute to form element to not group input/other columns if not desired, defaults to true which is the old/original behavior
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1037146 13f79535-47bb-0310-9956-ffa450edef68
2010-11-20 09:32:30 +00:00
Jacques Le Roux
c233358a63
A patch from Shi Yusen "Improve the Chinese translation of word 'Review' " ( https://issues.apache.org/jira/browse/OFBIZ-4028 ) - OFBIZ-4028
...
Improve the Chinese translation of word 'Review' to make it same as the term used by local ecommerce suites.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1036483 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18 15:16:29 +00:00
Hans Bakker
1a7456f191
Correction because of Scott's comment that it should not expected that the root path is /control/main. So now the root path is checked by looking at the 'requestPath' and 'contextUri' variables having the same value. If it is the same value then it is the root path
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1034278 13f79535-47bb-0310-9956-ffa450edef68
2010-11-12 06:25:10 +00:00
Jacques Le Roux
4bf70deef8
Fixes "Changing the locale (language) from the 1st screen of Order Entry is faulty" ( https://issues.apache.org/jira/browse/OFBIZ-4016 ) - OFBIZ-4016
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1034179 13f79535-47bb-0310-9956-ffa450edef68
2010-11-11 22:19:54 +00:00
Hans Bakker
3b172e8c72
removing the tenant servlet because that gave a problem with the root mountpoint defined twice in systems which already use the root mount point
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1032896 13f79535-47bb-0310-9956-ffa450edef68
2010-11-09 09:14:33 +00:00
Hans Bakker
eaa8f6b5d4
next to setting of the tenent id, now also the initial mountpoint if entered also refactoring:
...
- set delegator, dispatcher and security from session, servlet context or request's attribute to app context of birt engine before render and send email
- add the initialPath field to Tenant entity
- create the tenant context which as a default servlet using org.ofbiz.webapp.control.TenantServlet in the catalina container and check the multitenant property for initial the tenant context with root mount /
- move the changing a multi tenant delegator statement from ControlServlet to ContextFilter that could apply to every servlets
(implementation by Chattree Richard)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1032472 13f79535-47bb-0310-9956-ffa450edef68
2010-11-08 06:54:17 +00:00
Hans Bakker
6abf950e9d
Optionally alow the setting of the multitenant id from the incoming domainname which is also stored in the tenant entity
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1032444 13f79535-47bb-0310-9956-ffa450edef68
2010-11-08 02:04:27 +00:00
Andrew Zeneski
efc325973f
small change to call the onchange event when updating the autocomplete fields after the description is set
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1031655 13f79535-47bb-0310-9956-ffa450edef68
2010-11-05 16:13:00 +00:00
Erwan de Ferrieres
9b012a1cb9
Replacing the quickadd table with a CSS layout. Works nicely in ecommerce, a bit less in order application
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1031068 13f79535-47bb-0310-9956-ffa450edef68
2010-11-04 16:37:04 +00:00
Jacques Le Roux
1a5cc0bffa
A patch from Sascha Rodekamp "NPE in Control Event listener when visits are disabled" ( https://issues.apache.org/jira/browse/OFBIZ-3998 ) - OFBIZ-3998
...
When the visits are disabled the ControlEventListener throws a NPE.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1030597 13f79535-47bb-0310-9956-ffa450edef68
2010-11-03 18:30:33 +00:00
Bruno Busco
f5b9ee91e0
Better Italian labels
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1030271 13f79535-47bb-0310-9956-ffa450edef68
2010-11-02 22:52:35 +00:00
Hans Bakker
f5800d1731
html wysiwyg editor now showing '?' and slightly improved ecommerce login screen
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1029589 13f79535-47bb-0310-9956-ffa450edef68
2010-11-01 09:58:50 +00:00
Bruno Busco
8fa35dff06
Added proper menu button styles
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1029281 13f79535-47bb-0310-9956-ffa450edef68
2010-10-31 09:19:30 +00:00
Bruno Busco
bdb46d6206
Better Italian labels
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1029280 13f79535-47bb-0310-9956-ffa450edef68
2010-10-31 09:17:59 +00:00
Andrew Zeneski
1a48bad49c
socketFactory and port parameters were missing from the service definition even though they were being checked in the implementations; this addresses this oversight so that all settings can override general.properties when necessary by sending them directly to the service.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1028747 13f79535-47bb-0310-9956-ffa450edef68
2010-10-29 13:57:18 +00:00
David E. Jones
af7a120fcd
Fixed bug where if the only redirect-parameter elements only had value attributes they would be ignored (for request-redirect responses in requests)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1028499 13f79535-47bb-0310-9956-ffa450edef68
2010-10-28 21:32:56 +00:00
Jacques Le Roux
46035ac2f9
Fix sort-field names
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1028228 13f79535-47bb-0310-9956-ffa450edef68
2010-10-28 08:52:25 +00:00
Hans Bakker
f254de6344
allow the usage of double quotes in the dropdown text
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1027400 13f79535-47bb-0310-9956-ffa450edef68
2010-10-26 08:29:09 +00:00
Jacques Le Roux
c70f60fe3f
Better French labels
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1026258 13f79535-47bb-0310-9956-ffa450edef68
2010-10-22 09:06:44 +00:00
David E. Jones
1ff809476c
Added a handy view-entity to complement the existing GeoAssocAndGeoTo
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1025909 13f79535-47bb-0310-9956-ffa450edef68
2010-10-21 09:37:23 +00:00
David E. Jones
6683ce38e5
Changed rateProductTaxCalc service to expand Geos differently, using a Map so there is only one geoId for each geoTypeId and when the IDs are expanded by regions it prioritizes current values over new ones, especially values from the original PostalAddress have priority over expanded regions like a countyGeoId on the PostalAddress will be used instead of one (or more) expanded based on the zip code
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1025874 13f79535-47bb-0310-9956-ffa450edef68
2010-10-21 08:05:19 +00:00
Jacques Le Roux
bc19e0b850
Oops, not even better but right :/ (I'm a bit weary it seems, fun sometimes...)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1025521 13f79535-47bb-0310-9956-ffa450edef68
2010-10-20 12:01:05 +00:00