Commit Graph
229 Commits
Author SHA1 Message Date
Andrew Zeneski 11bcb7d52e reverted previous commit since it breaks SUN (oracle) JDK, ick.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1211088 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 20:25:52 +00:00
Andrew Zeneski 15228ae88b few minor changes to fix compiling with openjdk icetea6 1.7.9
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1211073 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 19:51:28 +00:00
Jacques Le Roux 6d839bb4a5 A patch from Leon "add datetimepicker language file for zh-CN, zh-HK, zh-TW, and an en one in order to avoid "jquery-ui-timepicker-en.js" not found error" https://issues.apache.org/jira/browse/OFBIZ-4555
1. add datetimepicker language file to system: jquery-ui-timepicker-zh-CN.js, jquery-ui-timepicker-zh-HK.js and jquery-ui-timepicker-zh-TW.js.
2. also add a "jquery-ui-timepicker-en.js" file, it's the default datetimepicker language file but not exist now.
3. run service "createJsLanguageFileMapping" to update sLanguageFileMapping.java accordingly.

jleroux: not sure "jquery-ui-timepicker-en.js" is really needed, but cleaner for sure

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1201229 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 09:31:49 +00:00
Hans Bakker 1fc8c427f5 find service did not work properly on the selection end date
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1195354 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 06:48:10 +00:00
Jacques Le Roux d10ff1719f JQuery team does not care about plugins consistency, so we have to be careful. For instance, for more fun: in validate plugin we have also ptpt and ptbr...
Just found by chance while looking for consistency in JsLanguageFileMappingCreator class after refactoring

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1182858 13f79535-47bb-0310-9956-ffa450edef68
2011-10-13 13:51:37 +00:00
Jacques Le Roux 690a5dd02e Fix a bug reported by Chatree "JavaScript location is empty causes a double requests problem" https://issues.apache.org/jira/browse/OFBIZ-4477
In r1178199, I missed to use the default DateTime file (jquery.ui.datepicker-en.js) being still with the idea that it was handled internally.

I have also refactored/simplified JsLanguageFileMappingCreator class and put comments to better explain how all that works






git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1182731 13f79535-47bb-0310-9956-ffa450edef68
2011-10-13 09:07:12 +00:00
Jacques Le Roux 399b52a033 Closes "The time part (cursors) of the Date Time picker is not internationalized" https://issues.apache.org/jira/browse/OFBIZ-4015
Fixes the problem by:
* Updating datetimepicker from 0.9.3 to 0.9.6 (where a localization folder exists)
* Use the fantastic createJsLanguageFileMapping service Sascha introduced (I just removed the confusing wrong comment about JsLanguageFilesMapping.ftl being generated and added a block for datetimepicker, also in JsLanguageFileMappingCreator.java). A very good dynamic+static tool, kudos Sascha!

Should work also in eCommerce though I did not found any uses

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1178199 13f79535-47bb-0310-9956-ffa450edef68
2011-10-02 15:59:12 +00:00
Jacques Le Roux 480435601f A slightly modified patch from Dimitri Unruh "Minor code style improvement" https://issues.apache.org/jira/browse/OFBIZ-4400
In the createJsLanguageFileMapping service, the catch blocks have assigns to a local variable in a return statement.

Simplified further on Adrian's advice.

jleroux: I have also organized imports

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1172342 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 20:48:27 +00:00
Jacques Le Roux 00afa0c283 A patch from Dimitri Unruh "Some dead variable assignments " https://issues.apache.org/jira/browse/OFBIZ-4426
Some value assignments to local variables without reading or using it.

jleroux: indeed I don't see any reasons to set the size of a byte array before feeding it with String.getBytes(), since NPE is handled above. I have even simplified it more using function composition style.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1172015 13f79535-47bb-0310-9956-ffa450edef68
2011-09-17 16:51:38 +00:00
Sascha Rodekamp d6c19a4ac8 A patch from Leon to get the correct "jquery.ui.datepicker-xx-XX.js" (https://issues.apache.org/jira/browse/OFBIZ-4377)
It uses "locale" (e.g. zh_TW) to form the jquery.ui.datepicker file name in method JsLanguageFileMappingCreator.createJsLanguageFileMapping, but jquery uses dash ("-") instead of underscore ("_") to concat the language code and country code, such as zh-TW vs. zh_TW.

A very trivial update to JsLanguageFileMappingCreator.java, and after that, update the JsLanguageFileMapping.java file by running service "createJsLanguageFileMapping". In attached, contains both of patches to these two files.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1163533 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 08:57:29 +00:00
Sascha Rodekamp 8ea4b86713 Improvement: OFBIZ-4270 - State dropdown only finds states and does not include county information
Reorganized and extend the Data structure, now it is possible to store additional country postal code regex data 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1153402 13f79535-47bb-0310-9956-ffa450edef68
2011-08-03 09:12:31 +00:00
Hans Bakker 53de1508c4 improve the alternative seo friendly content url: some url's where not recognized
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1153366 13f79535-47bb-0310-9956-ffa450edef68
2011-08-03 07:12:29 +00:00
Hans Bakker cb7b9a6471 currently it is pretty difficult to disable a userlogin by setting the deleted date to a date in the future and enable=N, further when disable a party tries to disable related userlogins but does not set that future date. This change will allow to nullify the deleted date so it is now clear the userlogin will never be enabled. The deleted date is still available in the last modified date.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1142908 13f79535-47bb-0310-9956-ffa450edef68
2011-07-05 07:18:54 +00:00
Hans Bakker 1749a6989f Add seo friendly url's for showing content. reorganize the same program snippets with seo friendly url for products. These content url's are demonstrated at the ecommerce frontend in the left bottom corner: Content Information
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1141878 13f79535-47bb-0310-9956-ffa450edef68
2011-07-01 09:03:32 +00:00
Sascha Rodekamp bb87a9eb87 State dropdown only finds states and does not include county information (https://issues.apache.org/jira/browse/OFBIZ-4270) - I added a separte Entity which defines all countries which should show their states in the drop down list. It also checks states recursivly, to list all states (i.e.) for GB.
Orig Msg: If you are on this page https://demo-trunk.ofbiz.apache.org:8443/ecommerce/control/newcustomer select USA from the country drop down and it will display all the USA states, similarly it works just fine for Spain but if you try once again with either United Kingdom or France it will show "No States/Provinces exist".

Both UK and France have Counties saved in the datamodel but the form does not lookup in the correct location as they are not defined as State.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1140103 13f79535-47bb-0310-9956-ffa450edef68
2011-06-27 11:01:06 +00:00
Marco Risaliti a153d0a34f Removed some javadoc warning (wrong param/return) into framework components no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1126708 13f79535-47bb-0310-9956-ffa450edef68
2011-05-23 20:11:12 +00:00
Marco Risaliti 77cc4d7ac7 Remove some unused variable into JsLanguageFileMappingCreator
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1125961 13f79535-47bb-0310-9956-ffa450edef68
2011-05-22 13:29:48 +00:00
Sascha Rodekamp 797e4caad6 localization for jQuery validate plugin is not working (https://issues.apache.org/jira/browse/OFBIZ-4275). This patch enabels the i18n file loading for the validation plugin.
Orig Msg.
the validate plugin is not using the localized files.
Everything needed seems to be there.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1102597 13f79535-47bb-0310-9956-ffa450edef68
2011-05-13 08:06:05 +00:00
Sascha Rodekamp 5081061679 Update - Added a new datejs language i18n file for danish date/time conversion.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1098578 13f79535-47bb-0310-9956-ffa450edef68
2011-05-02 14:03:56 +00:00
Jacques Le Roux 44c9cbd00a A patch from Leon "Add "MUNICIPALITY" to getStateList's search condition to make "municipality" of china visible in state list" https://issues.apache.org/jira/browse/OFBIZ-4258
In china, city like "Shanghai","Beijing", "Chongqin" and "Tianjin" is municipality which is equivalent to province, but there's no such municipality in the state list displayed in client end.
In Geo entity, these municipalities is stored with geoTypeId="MUNICIPALITY", So I add it as a new search condition to CommonWorkers.getStateList to fix this issue.

Fixes some problem in current GeoData_CN.xml

Also changes the geoTypeId from "REGIONS" to "MUNICIPALITY" for some "Autonomous regions" and "Special administrative Regions" and add some missing country-state associations.
It's better to add new geo types for "Autonomous regions" or "Special Administrative Regions", but I don't want to make the thing complex if there's no such strong demand.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1094505 13f79535-47bb-0310-9956-ffa450edef68
2011-04-18 12:02:47 +00:00
Bruno Busco 6603db6900 Added new parameter "requirePasswordChange" to the "updateUserLoginSecurity" service.
When resetting a user password it is now possible to force the password change again.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1090855 13f79535-47bb-0310-9956-ffa450edef68
2011-04-10 17:54:39 +00:00
Sascha Rodekamp fb880c80a1 Update - i18n from DateTime display fields (https://issues.apache.org/jira/browse/OFBIZ-4014). Ofbiz can now show and interprete i18n dates and times. The Patch uses the datejs library to i18n the displayd date and time fields from the datepicker this works vice versa.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1090231 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 13:05:42 +00:00
Hans Bakker 65d7832c14 patch provided by Eric de Maulde OFBIZ-4217: Scaling image for every size type from ImageProperties.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1085275 13f79535-47bb-0310-9956-ffa450edef68
2011-03-25 07:57:46 +00:00
Adrian Crum 67931c000a Removed a framework dependency on the Party component. Framework-only tests pass now.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1082146 13f79535-47bb-0310-9956-ffa450edef68
2011-03-16 13:40:22 +00:00
Marco Risaliti d0953abc06 Remove a reduntant cast warning in PreferenceServices (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1081065 13f79535-47bb-0310-9956-ffa450edef68
2011-03-13 09:31:40 +00:00
Marco Risaliti ba9e9c7deb Remove a warning in CommonEvents (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1078133 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 21:07:30 +00:00
Marco Risaliti 0c97ca1526 Remove some warning in PreferenceServices (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1075504 13f79535-47bb-0310-9956-ffa450edef68
2011-02-28 19:43:35 +00:00
Marco Risaliti f30fb103b4 Remove compilation warnings in CommonDimensionServices (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1068611 13f79535-47bb-0310-9956-ffa450edef68
2011-02-08 22:14:01 +00:00
Marco Risaliti 8e8ad9b2b0 Remove compilation warnings in PeriodWorker (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1068610 13f79535-47bb-0310-9956-ffa450edef68
2011-02-08 22:12:30 +00:00
Marco Risaliti 3eb7261c4d Remove compilation warnings in EmailServices (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1068599 13f79535-47bb-0310-9956-ffa450edef68
2011-02-08 21:59:07 +00:00
Marco Risaliti fad3f6b3bb Remove compilation warnings in FindServices (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1068595 13f79535-47bb-0310-9956-ffa450edef68
2011-02-08 21:47:40 +00:00
Marco Risaliti 5682344416 Remove an unused variable related to soap tests (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1068556 13f79535-47bb-0310-9956-ffa450edef68
2011-02-08 20:29:31 +00:00
Marco Risaliti d7794c475a Internationalization of return messages of java services of common component (OFBIZ-4091)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1066157 13f79535-47bb-0310-9956-ffa450edef68
2011-02-01 19:27:13 +00:00
Marco Risaliti c305cb0bee Internationalization of return messages of CommonServices.java (OFBIZ-4091)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1065776 13f79535-47bb-0310-9956-ffa450edef68
2011-01-31 20:52:14 +00:00
Ashish Vijaywargiya ebacecaf52 Bug fix. Returning communicationEventId from the service implementation which was defined OUT in service definition. Thanks Divesh!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1064953 13f79535-47bb-0310-9956-ffa450edef68
2011-01-29 05:29:55 +00:00
Marco Risaliti 80c7d141b8 Remove most of the java compilation warning (generics markup, unused code/import) (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1059659 13f79535-47bb-0310-9956-ffa450edef68
2011-01-16 20:51:22 +00:00
Hans Bakker 338a2456e3 service 'performFindItem' got sometimes unwanted output parameter 'listSize' from parent findList service: removed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1058041 13f79535-47bb-0310-9956-ffa450edef68
2011-01-12 10:06:19 +00:00
Jacques Le Roux 0a72fe8793 3 patches from Sascha Rodekamp "Localisation of labels in javascript" (https://issues.apache.org/jira/browse/OFBIZ-3964) - OFBIZ-3964
This cames from Adam's advice: http://markmail.org/message/kai5lfvlnsz7xwki

Sascha comes to this solution
The Idea is to have a method which takes a JSON Object with uiLabel Resources and label entries and returns the resolved labels in a JSON Object which can be used directly in the JS Code.
The advantage of this way, is that we have only one Ajax request which reads all labels. The alternative is an Ajax request for each label, which simplify the request (because you haven't to create a complex JSON Object) but is very expansive.

* Replaces all JS alerts with the new fancy error boxes
* Adds a few uiLabels

I simply fixed some typos. I did not test all cases but did a good review.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1056497 13f79535-47bb-0310-9956-ffa450edef68
2011-01-07 20:40:31 +00:00
Adrian Crum 38dea67fbc All find services return a list size.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1053771 13f79535-47bb-0310-9956-ffa450edef68
2010-12-29 23:32:26 +00:00
Ashish Vijaywargiya f0f5ff3898 Bug fix.
When there is failure in sending email from OFBiz we need to break the loop.

Thanks Pranay for the contribution. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1053289 13f79535-47bb-0310-9956-ffa450edef68
2010-12-28 09:44:17 +00:00
Scott Gray 47f43a302a Remove unnecessary casts
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044931 13f79535-47bb-0310-9956-ffa450edef68
2010-12-12 21:31:27 +00:00
Jacques Le Roux 9679d72618 A patch from Anne Jessel "Is Empty for text-find widget broken" (https://issues.apache.org/jira/browse/OFBIZ-4025) - OFBIZ-4025
To reproduce:
    * go to Facility, Inventory Items tab (or any form that uses text-find widget)
    * choose "Is Empty" from drop-down next to Product Id
    * click Find button

Expected behaviour: no matching items listed, as all items have a Product Id.
Observed behaviour: all items match.

Problem is caused by find code assuming that there is no entity condition to be created if the text field is empty, but of course Is Empty is
different to the other operators in that the text field is expected to be empty.

The attached patch adds a special check for the Is Empty operator.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1042396 13f79535-47bb-0310-9956-ffa450edef68
2010-12-05 18:43:44 +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
Hans Bakker c3f42f6e0b correction on commit 1022409
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1022412 13f79535-47bb-0310-9956-ffa450edef68
2010-10-14 08:24:16 +00:00
Hans Bakker 4fa8c6436a correction on commit 1000753 attachment name list is optional making send invoice fail
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1022409 13f79535-47bb-0310-9956-ffa450edef68
2010-10-14 08:04:48 +00:00
David E. Jones 9b940f0056 Changed sendMailFromScreen service to support a list of attachments instead of just one
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1000753 13f79535-47bb-0310-9956-ffa450edef68
2010-09-24 07:47:05 +00:00
Scott Gray 10a56ea013 Copied CommonWorkers.hasParentType(...) over to EntityTypeUtil and deprecated the method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981446 13f79535-47bb-0310-9956-ffa450edef68
2010-08-02 10:47:26 +00:00
Scott Gray 4448c4a866 No functional changes, just removing a whole bunch of unused imports and reorganizing them along the way.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981019 13f79535-47bb-0310-9956-ffa450edef68
2010-07-31 08:28:34 +00:00
Jacques Le Roux c16497a20c Revert r959673 on Scott's advice. There is already a getCategoryMembers. A bit different but it's ok, as it does not make much sense to sort categoryMembers with another field than sequenceNum
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959943 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 10:32:58 +00:00
Jacques Le Roux b89ca0e0ff Adds a getAssociatedProductsList method. I will certainly add the companions service and request later in the Product application.
I have also the vague desire to generalize this more, as I have been able to quickly use it in a widget form following the Freemarker way already used.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959673 13f79535-47bb-0310-9956-ffa450edef68
2010-07-01 14:05:21 +00:00