Commit Graph
10472 Commits
Author SHA1 Message Date
Jacques Le Roux fdbb084a63 Completes commit r1583427
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1583428 13f79535-47bb-0310-9956-ffa450edef68
2014-03-31 20:06:21 +00:00
Jacques Le Roux 59cc1c8bf5 A patch from Christian Carlow for "Include Malaysia GeoData OOTB" https://issues.apache.org/jira/browse/OFBIZ-5606
I determined that Malaysia GeoData does not exist OOTB while importing customer records from a legacy system so OFBiz should be improved to include it.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1583427 13f79535-47bb-0310-9956-ffa450edef68
2014-03-31 20:03:21 +00:00
Jacques Le Roux c045d83fa0 A patch from Deepak Dixit for "ofbizCurrency transform does not honor the rounding passed in ofbizCurrency macro." https://issues.apache.org/jira/browse/OFBIZ-5591
ofbizCurrency transform does not honor the rounding passed in ofbizCurrency macro. OfbizCurrency transform always used the default rounding set in general.properties file.

jleroux:I apply Deepak's patch,  seems good to me. If someone thinks there might be a better solution, please reopen

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1583040 13f79535-47bb-0310-9956-ffa450edef68
2014-03-29 18:42:06 +00:00
Jacques Le Roux f23822cdca A patch from Rong Nguyen for "Focus input(dropdown list) when click on label in widget form" https://issues.apache.org/jira/browse/OFBIZ-5594
The current widget form does not focus input(dropdown list) when a label is clicked on.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1583026 13f79535-47bb-0310-9956-ffa450edef68
2014-03-29 16:49:02 +00:00
Christian Geisert c41847c829 Removed Frisian language (just three labels), see OFBIZ-5177
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1582122 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 23:38:24 +00:00
Jacques Le Roux 489877a44d Removes useless empty folders, adds README files with explanations in useful empty folders
This to facilitate the creation of Git repositories where empty folders needs a file in or must be ignored
Especially when you want to keep the OFBiz Subversion repository inside the Git repository (useful for committers)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1580865 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 14:42:52 +00:00
Scott Gray b463bdd84b Fix bug that causes a service to keep retrying after a deadlock occurs until lockRetriesRemaining reached zero
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1580620 13f79535-47bb-0310-9956-ffa450edef68
2014-03-23 21:41:57 +00:00
Jacques Le Roux f753f6f322 A patch from Pierre Smits for "israeli currency apear twice" https://issues.apache.org/jira/browse/OFBIZ-5586 (reported by Amit Cahanovich)
In the file ./framework/common/data/CurrencyData.xml there are two records for israeli currency ILS (israeli sheckel) and NIS (new israeli Shekel).
ILS record need to be removed, its was replaced by NIS 30 years a go.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1579309 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 17:41:40 +00:00
Jacques Le Roux 849bbb3c29 A patch from Antoine Vittecoq for "Form widget/ FTL pagination, Last does not take to last page" https://issues.apache.org/jira/browse/OFBIZ-5575
This issue in pagination can be tested in https://localhost:8443/partymgr/control/findparty (FTL) & https://localhost:8443/webtools/control/FindUtilCache?VIEW_SIZE_1=2&VIEW_INDEX_1=0 (XML Form).


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1579277 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 16:15:22 +00:00
Jacopo Cappellato f537b94481 Minor change to avoid adding to the logs the empty error/failure lists (in case of no errors/failures).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1579240 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 14:34:03 +00:00
Jacques Le Roux 8860a9459d Fixes a bug introduced with r1574404 (forgot that shutdown and status historicaly have a prefixing dash), thanks to Youseek Khaye who spotted it and sent me a mail (the stop target was no longer working). I tested them only with a portoffset, my bad.
While working on this I spotted another error introduced earlier with r1533839. Now, status and stop work again as before. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1577744 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 22:20:34 +00:00
Jacques Le Roux ba28208c2f A patch from simon maskell for "Paginate in screen fails" https://issues.apache.org/jira/browse/OFBIZ-5574
When you use the paginate = true in a screen and the total number of rows returned is greater than 999 the string is formatted with a coma and an exception is thrown when trying to convert it to an Integer.

jleroux: this depends on language (French would be space) but Simon's fix works for all (we are only dealing with integers there)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1577268 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 18:23:47 +00:00
Jacques Le Roux bd6c3c7dad A slightly modified patch from Rong Nguyen for "Render multiMenu problem when linktype="hidden-form"" https://issues.apache.org/jira/browse/OFBIZ-5557
Scenario:
1. Go to Content webapp
2. Go to CompDoc menuitem
3. Search
4. Go to 'Tree' view
5. We can not use 'Up' and 'Down' function

When menu with linktype="hidden-form" was render for each menu, they has the same name for form element, so it cause error.
My solution is add extra attribute(extra-index) for Menu, and then in menu definition we provide this attribute and the forms with different name will be rendered.
My implement was tested in this bug for Content webapp

jleroux: I have simply amended the up and down labels to have them more legible. I'd have preferred to not have all uppercased, but ran out of time for such a trivial change


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1576891 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 20:37:56 +00:00
Jacques Le Roux c74c991639 Thanks to Jacopo's comment on dev ML, reverts r1576331 to avoid injecting the web world in the form model, rather calls MacroFormRenderer.renderDateTimeField() method.
In my opinion a better solution would be to rewrite EditCalendarExceptionWeek and EditCalendarExceptionDay screens to replace the call to EditCalendarExceptionWeek.ftl by direct accesses to the form widgets called by it. 
But this means a lot more analysis and delicate work (here the replacement is safe), so this will be it for now.

This is for "View Calendar broken in Manufacturing" https://issues.apache.org/jira/browse/OFBIZ-5558 reported by Rong Nguyen 
Url: https://demo-trunk.ofbiz.apache.org:8443/manufacturing/control/EditCalendarExceptionDay?calendarId=SUPPLIER Calendar broken
And is related with https://issues.apache.org/jira/browse/OFBIZ-4739 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1576506 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 21:25:25 +00:00
Adrian Crum ca759cf170 Fixed a bug in Mini-language where numeric constants were localized and converted wrong - https://issues.apache.org/jira/browse/OFBIZ-5281
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1576430 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 17:04:35 +00:00
Jacques Le Roux e762ad9e0e A slightly modified patch from Rong Nguyen for "View Calendar broken in Manufacturing" https://issues.apache.org/jira/browse/OFBIZ-5558
Url: https://demo-trunk.ofbiz.apache.org:8443/manufacturing/control/EditCalendarExceptionDay?calendarId=SUPPLIER
Calendar broken

Related with https://issues.apache.org/jira/browse/OFBIZ-4739

jleroux: formatting and some other slight issues fixed in patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1576331 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 13:26:10 +00:00
Jacques Le Roux d16055c9cc With https://issues.apache.org/jira/browse/OFBIZ-64 the default option for text-find fields was like (aka begins with, don't ask why)
Then with https://issues.apache.org/jira/browse/OFBIZ-3128 contains became the default
But this was working only when defining a text-field. When auto-fields-entity (and I guess auto-fields-service, not tested) was used then like/begins-with was still the default.

This commit changes that and makes things consistent: contains is now always used and set as default everywhere (no longer need to specify the text-field when using auto-fields-* to have contains as default)

Note: I'm not quite sure why like/begins-with was still used as default, since it was no longer the default in widget-form.xsd, but anyway making contains default there works. Also in ModelFormField.java to have things consistent

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1576276 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 10:49:31 +00:00
Adrian Crum c63f91c75b GenericEntity.java bug fix, updated the unit tests.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1575589 13f79535-47bb-0310-9956-ffa450edef68
2014-03-08 18:48:35 +00:00
Jacques Le Roux 4d71caff21 Fixes a bug reported by Rong Nguyen "Error when first login and change password" https://issues.apache.org/jira/browse/OFBIZ-5564
Scenario:
 1. Load-seed
 2. Create-admin-user
 3. Access: /catalog/control/main
 4. Login
 5. Change password for the first use
 
After password change, web browser redirect user to /catalog/control/main with an error

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1575508 13f79535-47bb-0310-9956-ffa450edef68
2014-03-08 10:55:39 +00:00
Jacques Le Roux 1e99cffcb1 Completes descriptions of ant targets which have portoffset parameter
Completes code in Config.java for start-debug only (adds "start-debug" to pick start.properties when portoffset is used). 
The rest of the changes is only refactoring to have the replacement to pick start.properties only in getInstance()

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1574404 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 09:46:26 +00:00
Jacques Le Roux ae2d3dedf3 Running OFBiz with start-batch, stopping it then or checking its status was missing, this completes these aspects.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1574201 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 21:02:13 +00:00
Jacques Le Roux 0f80353735 A patch from Leila Mekika for "Problems in single form when use-when and position are used together" https://issues.apache.org/jira/browse/OFBIZ-5552
The service "renderSingleFormString" check the previous field position to see if the current field must be displayed after the previous field or on a new line. 

When the previous field has a use-when condition that is not valid, it remains as the currentFormField and the next field is compared with this "not rendered" field. If the position of this previous field is the same as the current field, the current is displayed on the next line.


To reproduce, add in a single form the three fields below :

<field position="1" name="first"><display description="first"/></field>
<field position="2" name="second" use-when="true"><display description="second"/></field>
<field position="2" name="second" use-when="false"><display description="second"/></field>

The field second is rendered on a new line

jleroux: this second version works correctly

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1574019 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 10:37:01 +00:00
Jacques Le Roux 2f430df170 While at it (OFBIZ-4953), considering the current effort to remove Javolution use when possible, I have replaced few
FastList.<EntityExpr>newInstance(); 
by 
  new ArrayList<EntityExpr>();



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1573647 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 18:13:20 +00:00
Jacques Le Roux e28ab6bda6 Revert r1573161 (A patch from Leila Mekika for "Problems in single form when use-when and position are used together" https://issues.apache.org/jira/browse/OFBIZ-5552)
This had some side effects, like hiding the top part of the product edit screen

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1573498 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 09:49:34 +00:00
Jacques Le Roux d79ae78453 A patch from Leila Mekika for "Problems in single form when use-when and position are used together" https://issues.apache.org/jira/browse/OFBIZ-5552
The service "renderSingleFormString" check the previous field position to see if the current field must be displayed after the previous field or on a new line. 

When the previous field has a use-when condition that is not valid, it remains as the currentFormField and the next field is compared with this "not rendered" field. If the position of this previous field is the same as the current field, the current is displayed on the next line.


To reproduce, add in a single form the three fields below :

<field position="1" name="first"><display description="first"/></field>
<field position="2" name="second" use-when="true"><display description="second"/></field>
<field position="2" name="second" use-when="false"><display description="second"/></field>

The field second is rendered on a new line

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1573161 13f79535-47bb-0310-9956-ffa450edef68
2014-03-01 12:15:33 +00:00
Jacopo Cappellato 7d8d938a3b Performance optimization for UtilHttp.getFullRequestUrl method: instead of returning a StringBuffer object (synchronized) it now returns a String (immutable); internally it uses a StringBuilder (lighter because not synchronized) within a private context.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1570810 13f79535-47bb-0310-9956-ffa450edef68
2014-02-22 08:32:28 +00:00
Jacopo Cappellato 0bf26e2829 Upgraded code to avoid a warning for a deprecated Tomcat class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1570641 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 17:12:29 +00:00
Jacopo Cappellato db1d807f07 Upgrade to Tomcat 7.0.52 (latest bug fix release). I have used the standard release and not the "embedded" version after I have realized (from a conversation with Mark Thomas @ Tomcat and then directly checking the content of each jar) that the embedded jars contain also the J2ee apis that we already have in the OFBiz classpath.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1570639 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 17:09:19 +00:00
Jacopo Cappellato 0fcd1d38b1 Removed unnecessary jar.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1570622 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 16:29:53 +00:00
Jacopo Cappellato 52ee5728a4 Upgraded JUEL to 2.2.7 using EL specification 2.2.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1570611 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 15:48:26 +00:00
Jacopo Cappellato 34d36b583e Fixed MissingPropertyException happening when success method was called in the context of Groovy services: thanks to Paolo Piersant for the bug report and fix.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1569743 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 14:09:09 +00:00
Jacopo Cappellato 731518d2eb A series of cleanups, simplifications and improvements (to leverage some of the features of the recent Tomcat API) to the way that the CatalinaContainer sets up the embedded Tomcat instance.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1568269 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 13:13:29 +00:00
Adrian Crum b6818dd442 Some bug fixes in Mini-language:
1. Updated schema to indicate required attributes.
2. Fixed inconsistent implementation of the alternate delegator feature: https://issues.apache.org/jira/browse/OFBIZ-5531


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1566096 13f79535-47bb-0310-9956-ffa450edef68
2014-02-08 18:59:03 +00:00
Adrian Crum c5b041ed6b Update Commons File Upload to 1.3.1.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1565760 13f79535-47bb-0310-9956-ffa450edef68
2014-02-07 18:48:21 +00:00
Jacques Le Roux c1dd8efb6c Adds a link to the documentation in wiki
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1564775 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 13:46:09 +00:00
Jacques Le Roux 4b3a20ac92 Reverts r1564680, keeps geronimo-activation_1.0.2_spec-1.0.jar
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1564686 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 09:18:00 +00:00
Jacques Le Roux fcf3b36468 Updates geronimo-activation to 1.1_spec-1.1
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1564680 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 08:56:42 +00:00
Jacques Le Roux 9188f42b39 Reverts 1564543, SOAP tests fail with axis2 1.6.2, keep 1.5.2
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1564661 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 08:04:59 +00:00
Jacques Le Roux cad1df87cc Updates axis2-kernel, axis2-transport-http & axis2-transport-local to 1.6.2
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1564543 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 22:41:27 +00:00
Jacques Le Roux 89f92ff544 Updates geronimo-saaj to _1.3_spec-1.1
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1564493 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 21:09:43 +00:00
Jacques Le Roux a5c6ec5daa Updates geronimo-connector & geronimo-transaction to 3.1.1
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1564473 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 20:36:34 +00:00
Jacques Le Roux 44087a04f0 Update commons-fileupload to 1.3
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1564463 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 20:24:14 +00:00
Jacques Le Roux 3cf3e413c8 When last updating jQuery I forgot to commit the calling points changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1563806 13f79535-47bb-0310-9956-ffa450edef68
2014-02-03 09:08:01 +00:00
Jacques Le Roux caa8d340cd Updates jQuery to 1.11.0
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1563799 13f79535-47bb-0310-9956-ffa450edef68
2014-02-03 08:29:36 +00:00
Jacques Le Roux 7710b938d4 Workaround for "Lookups (layered mode) and dropdown menus overlap" (in BizznessTime Theme) https://issues.apache.org/jira/browse/OFBIZ-5519
A good example is in order creation page, open the customer lookup and then try to close it.

I think we should not fiddle with the theme, there is a faster and easier solution: center all lookups in the screen by default. It will not fix but hide the issue for now. Anyway the awful dropdown menu behaviour must be fixed and i will open another Jira for that.

You may ask why I'm concerned with a theme which is no longer bundled in future releases? It's because some custom projects still use it...


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1563238 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 20:06:42 +00:00
Jacques Le Roux daf4450f85 This can be removed, the same is done in renderLookupField macro in htmlFormMacroLibrary.ftl which is included above and called just below
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1562401 13f79535-47bb-0310-9956-ffa450edef68
2014-01-29 11:12:50 +00:00
Jacopo Cappellato 9f8bb29787 Some minor simplifications to ComponentContainer: removed some unnecessary overloaded methods.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1561757 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 17:19:52 +00:00
Jacopo Cappellato ccbec25bf1 Fixed typos.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1561750 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 17:01:10 +00:00
Jacques Le Roux 328ae4e946 A patch from Justen Walker for "Missing import in FindGeneric.groovy" https://issues.apache.org/jira/browse/OFBIZ-5504
Revision 1560176 introduces a change to FindGeneric.groovy that extracts some logic into UtilMisc. However, this class is not imported in the file and results in a MissingProperty exception.
This patch adds the import statement which resolves this bug.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1560699 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 14:35:20 +00:00
Jacques Le Roux 0757ed8a24 A patch from Gareth Carter for "last index for paging is not calculated correctly" https://issues.apache.org/jira/browse/OFBIZ-5497
The last index (used on the last button) is not calculated correctly in ftl or the renderer classes. It currently users floor which works only for list sizes that are not multiples of the view size. When you have a list size which is a multiple of the view size, it does not subtract 1 for zero based index and therefore the last button goes to the last page + 1

Examples

listSize = 1
viewSize = 10
listSize / viewSize = 0.1
floor(0.1) = 0
This one produces the correct value

listSize = 20
viewSize = 10
listSize / viewSize = 2
floor(2) = 2
Last index should be 1 because of zero based index but never occurs

To reproduce, enter a view with a list and paging functionality, the list size must be a multiple of the view size


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1560176 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 20:53:29 +00:00