Commit Graph
2222 Commits
Author SHA1 Message Date
Jacques Le Roux 8c06f33d4b A patch from Kiran Gawde "Reference to datetimepicker is wrong in CommonScreens.xml" https://issues.apache.org/jira/browse/OFBIZ-4463
Need to replace
/images/jquery/plugins/datetimepicker-0.9.6/jquery-ui-timepicker-addon.css
with:
/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css

Note the reference is in two places.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1180398 13f79535-47bb-0310-9956-ffa450edef68
2011-10-08 16:09:32 +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 ad692bd0dc Removes trailing whites spaces just introduced
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1178169 13f79535-47bb-0310-9956-ffa450edef68
2011-10-02 09:59:03 +00:00
Jacques Le Roux 1daa37ff37 * Removes tabs in AccountingEntityLabels.xml
* Moves FormFieldTitle_isPublic from Order to Common, was also used in Content
* Improves French FormFieldTitle_isPublic label

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1178167 13f79535-47bb-0310-9956-ffa450edef68
2011-10-02 09:58:29 +00:00
Jacques Le Roux 1943d2cf4e A patch from Christian Fischer "Content HTML-safe, wasn't necessary for the autocomplete" https://issues.apache.org/jira/browse/OFBIZ-4434
Before the patch, the content was made HTML-safe, what wasn't necessary for the autocomplete. Also, it displayed things like "F&umlr", because it made the umlauts HTML-safe, too.
The patch uses the stringwrapper from the stringUtil.java to avoid the general HTML auto-encoding.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1175122 13f79535-47bb-0310-9956-ffa450edef68
2011-09-24 07:44:28 +00:00
Erwan de Ferrieres 42fea3f319 A patch from Charles STELTZLEN - OFBIZ-4442 - French translation missing in portal pages management
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1174274 13f79535-47bb-0310-9956-ffa450edef68
2011-09-22 17:34:27 +00:00
Sascha Rodekamp 841c09a114 FIX: A bug reported by Kiran Gawde: The dependent drop down list for countries and states didn't work. I fixed an error in the entitymodel definition for the GeoAssocAndGeoToWithState View-Entity (https://issues.apache.org/jira/browse/OFBIZ-4437)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1173996 13f79535-47bb-0310-9956-ffa450edef68
2011-09-22 08:52:34 +00:00
Hans Bakker b64da95ceb add 2 new tenant ant commands to load seed/demo data for a specific tenant only: './ant run-install-tenant -DtenantId' and './ant run-install-tenant-all' for all tenants in the tenant enttity
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1172989 13f79535-47bb-0310-9956-ffa450edef68
2011-09-20 06:23:02 +00:00
Jacques Le Roux 4711b7a1c5 A slightly modified patch from Dimitri Unruh "Minor code style improvement" https://issues.apache.org/jira/browse/OFBIZ-4400
I forgot the services.xml file in r1172342

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1172344 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 20:52:34 +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
Hans Bakker 0ee18aea7d internal help should be https otherwise not work within the backend, added a new request to be able to show the help screens without ssl and logging in
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1172175 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 02:58:13 +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
Hans Bakker f53cbf37f8 make the helpsystem public so the helpscreens can be referenced with a simple url
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1171443 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 08:32:22 +00:00
Sascha Rodekamp 9f5323c617 FIX: blockingTestScv Service is set to export="true" (https://issues.apache.org/jira/browse/OFBIZ-4417) A patch from Dimitri Unruh which sets the export flag to false: blockingTestScv Service is set to export="true" without any user authorisation. So it is possible to "crash" the whole system.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1171028 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15 10:03:51 +00:00
Jacques Le Roux af139395c4 For historical reason, revert recent geo data changes for USA and CAN.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1170061 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 06:45:13 +00:00
Jacques Le Roux 97ba35d771 Adds Swiss Geo data
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1169819 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 16:25:12 +00:00
Jacques Le Roux 8d9d3f9942 Normalizes
* Canada GeoId for Province prefixed with CA- as it should be (following ISO 3166-2:CA,  http://en.wikipedia.org/wiki/ISO_3166-2:CA)

* USA GeoId for Province prefixed with US- as it should be (following ISO 3166-2:US,  http://en.wikipedia.org/wiki/ISO_3166-2:US). I did not see any reasons to no use the same scheme for "US Armed Forces provinces"

No other countries had the same problem

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1169790 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 15:11:00 +00:00
Jacques Le Roux 76168a4d8a A patch from Leon "trivial update to "convertUom" script" https://issues.apache.org/jira/browse/OFBIZ-4402
If we setup the custom uom conversion method which is called by convertUom service, and then invoke convertUom service, the exception raised:

    Could not complete the Convert UOM values...blahblah...Unknown parameter found: [convertUomCustom.asOfDate]Unknown parameter found: [convertUomCustom.defaultDecimalScale]Unknown parameter found: [convertUomCustom.defaultRoundingMode]Unknown parameter found: [convertUomCustom.purposeEnumId].

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1167480 13f79535-47bb-0310-9956-ffa450edef68
2011-09-10 09:29:28 +00:00
Jacques Le Roux 60dc2a519a An effort has been made in r1163575. But it needed a bit more love. I simplified by renaming to geoAssocTypeId instead of uselessly complicated stateProvncGeoAssocTypeId
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1165124 13f79535-47bb-0310-9956-ffa450edef68
2011-09-04 22:33:17 +00:00
Adrian Crum 78106cefd6 Some minor en spelling fixes for CommonUiLabels.xml plus some en_GB additions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1165081 13f79535-47bb-0310-9956-ffa450edef68
2011-09-04 18:29:03 +00:00
Sascha Rodekamp 074a2498f3 Fix the CountryAddressFormat relation to make the StateDropDown fields work again. The field-name and rel-field name were twisted.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1163575 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 11:20:16 +00:00
Sascha Rodekamp 28eff53625 Update to the current jQuery Version 1.6.2
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1163547 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 09:26:56 +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
Jacques Le Roux 9cc20de930 Remove MEXCAN from US geo data file
Forgot to save before committing r1163475

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1163479 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 03:36:06 +00:00
Jacques Le Roux 0aed887dbd Splits USA , Mexico and Canada geo data. I let USCAN and USMEXCAN in US file, I put MEXCAN in MX file
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1163475 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 03:02:24 +00:00
Adrian Crum 14cc4128e2 XML formatting and some documentation for geo-related entities. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1162940 13f79535-47bb-0310-9956-ffa450edef68
2011-08-29 18:38:57 +00:00
Adrian Crum 22273d5391 Fixed some problems with geo data, patch contributed by Deepak Dixit (https://issues.apache.org/jira/browse/OFBIZ-4371).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1162693 13f79535-47bb-0310-9956-ffa450edef68
2011-08-29 09:26:52 +00:00
Hans Bakker 426d814c0c allow the listing of all preference groups in the partymanager user preferences
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1162312 13f79535-47bb-0310-9956-ffa450edef68
2011-08-27 08:21:01 +00:00
Hans Bakker 0a59303a34 remove the rest of the website definitions from seed data, the ones that are left are in the demo data
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1158099 13f79535-47bb-0310-9956-ffa450edef68
2011-08-16 03:43:06 +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
Jacques Le Roux 458fc97948 Update the comment about default VisualTheme
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1153069 13f79535-47bb-0310-9956-ffa450edef68
2011-08-02 08:55:03 +00:00
Hans Bakker bc8d33eec0 xml format error corrected
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1148129 13f79535-47bb-0310-9956-ffa450edef68
2011-07-19 02:41:24 +00:00
Erwan de Ferrieres 82124fd25f Changing the labels for entry date format in French
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1148023 13f79535-47bb-0310-9956-ffa450edef68
2011-07-18 19:50:54 +00:00
Jacques Le Roux 18434fafea Better comment on the cluster properties usage
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1144791 13f79535-47bb-0310-9956-ffa450edef68
2011-07-10 08:58:13 +00:00
Jacques Le Roux 43aa95aaa3 Closes "SequenceUtil may generate duplicate IDs in Load Balancing mode" https://issues.apache.org/jira/browse/OFBIZ-2353
Pb: If OFBiz is deployed on 2 servers in Load Balancing Mode, SequenceUtil will generate duplicate IDs because synchronization is done at JVM level instead of doing it in DB.

The OFBIZ-2353 SELECT FOR UPDATE solution.patch provides a simple mean to quickly resolve this issue. I did not remove the bank loop (useless since there is a DB contention). 
I created a cluster general property. But since, most of the time, when you use a cluster you use also a sole database with a delegator having distributed-cache-clear-enabled set to true, I retrieve this information to automatically use SELECT FOR UPDATE in this case

This has been tested on a cluster with JMeter. BTW I found that UserLoginHistory can throw errors because it does not use a SeqId in PK but only login+fromDate. I guess there are other cases like that but in reality it's unlikely that someone log on 2 diff machines with the  same login at the same time (ms), just a JMeter side effect...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1144537 13f79535-47bb-0310-9956-ffa450edef68
2011-07-08 22:58:35 +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
Adrian Crum 850cec4603 Minor Ajax code improvement: The defaultViewSize widget.properties setting can be overridden in a screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1142458 13f79535-47bb-0310-9956-ffa450edef68
2011-07-03 16:48:56 +00:00
Adrian Crum 1e7c1b5218 Minor Ajax code improvements:
1. LookupDecorator checks the value of the ajaxLookup parameter instead of checking if it exists.

2. The displayReturnField widget.properties setting can be overridden in a request.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1142358 13f79535-47bb-0310-9956-ffa450edef68
2011-07-03 01:49:35 +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 c72264c557 Update - added some countries to the GeoWithState Entity for the dependend state drop down list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1140710 13f79535-47bb-0310-9956-ffa450edef68
2011-06-28 16:26:05 +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
Erwan de Ferrieres 1b0f365f82 A patch from Stephane Ducas - OFBIZ-4324 - When creating a customer from the shopping cart the selected country has to be the default one
I slightly modified your patch and put the defaultCountryGeoId in CommonScreens.xml#countries so the geoId will always be filled


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139291 13f79535-47bb-0310-9956-ffa450edef68
2011-06-24 13:13:44 +00:00
Adrian Crum af5b6cfd1c Small fixup for my previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1138575 13f79535-47bb-0310-9956-ffa450edef68
2011-06-22 18:40:50 +00:00
Jacques Le Roux 742c554817 By moving formName and fieldFormName in parameters order r1138485 broke the current OOTB code which still uses htmlTemplate.lookupField
There is still an issue: the lookup button does not show

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1138569 13f79535-47bb-0310-9956-ffa450edef68
2011-06-22 18:01:52 +00:00
Erwan de Ferrieres 32b5ffb11f Better French translation for CommonPortalPagesForApplication
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1136854 13f79535-47bb-0310-9956-ffa450edef68
2011-06-17 12:10:14 +00:00
Hans Bakker 7a1dfe1464 update to the catalog/category tree: works now with IE and is using Ajax to update the middle section using the tree
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1130415 13f79535-47bb-0310-9956-ffa450edef68
2011-06-02 06:22:03 +00:00
Hans Bakker 66d25fea52 To be consistsent with product and the storage of alternative url, this function replaces the 'link' button on the category. We also improved the locale lookup with a search function
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1126904 13f79535-47bb-0310-9956-ffa450edef68
2011-05-24 07:30:42 +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
Hans Bakker 2227bee7bb update of rev1126364 after a comment from scott
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1126412 13f79535-47bb-0310-9956-ffa450edef68
2011-05-23 09:51:44 +00:00