Hans Bakker
9de0762a42
make it possible that the applicable system settings in general properties can be overridded by settings in the database.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1240016 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 07:17:00 +00:00
Hans Bakker
57d7af2a63
update of system properties via entity:
...
- by default leave the values in the entity null
- use findOne method to get SystemProperty by primary key
- add check whether system property's value empty before using properties file
This change to make sure current users of a non tenant installation are not affected.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1239451 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 03:02:55 +00:00
Adrian Crum
13ff4e3f4c
Fixed a recent change that caused tests to fail.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1239119 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 13:15:17 +00:00
Hans Bakker
c690a5aba5
some missing files in -r1238993
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1238998 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 08:24:36 +00:00
Hans Bakker
f484f7b9d0
revert r1238954 some local changes were added
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1238991 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 08:13:21 +00:00
Hans Bakker
204b9eb01a
Wrong commit reverted in r1238991
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1238954 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 07:22:12 +00:00
Hans Bakker
91d206a71d
add the possibility of adding tags to products next to having keywords to products, can also optionally approve/reject via a status field
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1222544 13f79535-47bb-0310-9956-ffa450edef68
2011-12-23 03:49:11 +00:00
Joseph Eckard
f2b2bbaa63
Added two missing countries, Guernsey and Jersey
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1189961 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 19:33:21 +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
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
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
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
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
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
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
Erwan de Ferrieres
3db3ebd0a1
A patch from Seweryn Niemiec, GeoData for Poland OFBIZ-4253
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1092320 13f79535-47bb-0310-9956-ffa450edef68
2011-04-14 15:01:00 +00:00
Hans Bakker
e7692574ec
More and extended geo data for china
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1086881 13f79535-47bb-0310-9956-ffa450edef68
2011-03-30 09:32:08 +00:00
Erwan de Ferrieres
28cda607e3
Missing geoAssoc for Corse FR-20
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1070911 13f79535-47bb-0310-9956-ffa450edef68
2011-02-15 14:12:04 +00:00
Adrian Crum
652c0b8e4a
Moved some ServerHitBin seed data from application/content to framework/common. This change will accommodate a framework-only installation.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1050457 13f79535-47bb-0310-9956-ffa450edef68
2010-12-17 17:55:36 +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
Bruno Busco
e34baf6c08
Added new PORTALPAGE_ADMIN permission (this will replace the existing PORTALPAGE_MAINT in next commits)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023202 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 07:40:21 +00:00
Erwan de Ferrieres
be976edc82
missing data for French overseas departments
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1004408 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 20:33:25 +00:00
Jacques Le Roux
07f9cdda68
A patch from Amit Sharma "Missing states of Mexico country" ( https://issues.apache.org/jira/browse/OFBIZ-3975 ) - OFBIZ-3975
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1003597 13f79535-47bb-0310-9956-ffa450edef68
2010-10-01 17:59:47 +00:00
David E. Jones
5c5149bf11
Small change to short ton description as it seems more people are familiar with the term US ton than short ton
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@991279 13f79535-47bb-0310-9956-ffa450edef68
2010-08-31 18:14:39 +00:00
Ashish Vijaywargiya
e90d83e6af
Applied patch from jira issue OFBIZ-3909 - Bug in showing online estimate rate on UPS services.
...
UPS Online shipping rates are showing wrong values when product weight having different weightUomId. It doesn't support UOM Conversion as it is working in USPS services.
So fixing this bug, following work is done.
1) Calling generic methods "getPackageSplit", "getProductItemInfo" & "calcPackageWeight" methods from ShipmentWorker.java
2) Removed duplicate methods from UpsServices.java
Thanks Amit for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990751 13f79535-47bb-0310-9956-ffa450edef68
2010-08-30 09:55:02 +00:00
Ashish Vijaywargiya
2c06dd8e5e
Added gram into pound support.
...
Thanks Vivek for the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960495 13f79535-47bb-0310-9956-ffa450edef68
2010-07-05 09:21:59 +00:00
Erwan de Ferrieres
da8510e3f1
Adding new geoAssocTypes, one for a town in a county, the other one for a postal code for a geoType
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@958569 13f79535-47bb-0310-9956-ffa450edef68
2010-06-28 13:16:14 +00:00
Erwan de Ferrieres
143b01827a
Adding missing French departments (counties)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@958567 13f79535-47bb-0310-9956-ffa450edef68
2010-06-28 13:15:00 +00:00
Adam Heath
cfef088acf
Associate to the correct geo; DE=Delaware, in the United States. A full
...
clean detected this error, as GeoData_US.xml wasn't imported yet, so I
got an exception when DE didn't exist. The patch in OFBIZ-3800 was
*not* correct, and was not verified.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@951062 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 16:42:01 +00:00
Jacques Le Roux
bdd925bcc7
A patch from Atul Vani for an issue reported by R.S."States of th country Germany shows zero results from both webtools and using services." ( https://issues.apache.org/jira/browse/OFBIZ-3799 ) - OFBIZ-3799
...
Data to associate the country with states isn't present. This issue is with reference to discussion started by R.S. on user-mailing list subjected as "StateList"
R.S., thanks for reporting the issue.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950893 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 07:12:39 +00:00
Erwan de Ferrieres
6b488ede18
Corrections on the new set of portlets, the wrong file was called
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936818 13f79535-47bb-0310-9956-ffa450edef68
2010-04-22 12:57:50 +00:00
Erwan de Ferrieres
6f2642a5dd
Adding a whole set of generic portlets. Those are more designed to be customised
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935923 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 13:57:26 +00:00
Scott Gray
6109808c8a
Tabs to spaces
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@924378 13f79535-47bb-0310-9956-ffa450edef68
2010-03-17 17:28:01 +00:00
Marco Risaliti
b6b0a0c770
Some changes to the seed data for the new Italian provinces introduced recently (OFBIZ-3361)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@891928 13f79535-47bb-0310-9956-ffa450edef68
2009-12-17 21:38:03 +00:00
Jacques Le Roux
b675c31a3a
Close "duplicated countries listed in currency selection" ( https://issues.apache.org/jira/browse/OFBIZ-3246 )
...
As explained in OFBIZ-3246, RMB is not ISO, CNY is. I kept the lines (only commented out)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@889666 13f79535-47bb-0310-9956-ffa450edef68
2009-12-11 15:46:03 +00:00
Jacques Le Roux
207ce8cb79
Sort countries data by GeoName
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884298 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 22:17:16 +00:00
Jacques Le Roux
ff15fe93e5
A patch from Carsten Schinzer "Seed data (GEO) for Gemany contains bugs." ( https://issues.apache.org/jira/browse/OFBIZ-2759 ) - OFBIZ-2759
...
Commited in CTR mode...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882918 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 14:45:40 +00:00
Jacques Le Roux
523763730f
A patch from Pierre Smits "Remove old currencies of EURO countries." ( https://issues.apache.org/jira/browse/OFBIZ-3034 ) - OFBIZ-3034
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825182 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 16:36:56 +00:00
Hans Bakker
0b7fe13bb1
On request of adrian, put the VISUAL_THEME default record back in the database, however added the function that values in general properties can override this value. Combined the implementation with the definition of the defaultOrganizationPartyId
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820178 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 05:16:17 +00:00
Hans Bakker
4002288c13
default visualthemeId already defined in general properties
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@819845 13f79535-47bb-0310-9956-ffa450edef68
2009-09-29 07:07:51 +00:00
Jacques Le Roux
29722f9a96
A patch from Bruno Busco "Bluelight theme does not support the new help system." ( https://issues.apache.org/jira/browse/OFBIZ-2972 ) - OFBIZ-2972
...
The attached patch adds all the required files to the Bluelight theme to be compatible with the new help system.
Few styles have also been changed to get Bluelight theme better.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@819400 13f79535-47bb-0310-9956-ffa450edef68
2009-09-27 20:41:40 +00:00
Jacques Le Roux
cd3969f7dc
Lost in previous revert for r819274
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@819278 13f79535-47bb-0310-9956-ffa450edef68
2009-09-27 09:18:20 +00:00
Jacques Le Roux
932849b7ed
Fix wrong file in r819274 (Chinese Geo data)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@819277 13f79535-47bb-0310-9956-ffa450edef68
2009-09-27 09:10:03 +00:00
Jacques Le Roux
f12f0f263a
Add GeoData_CN and geoTypeId="MUNICIPALITY" from Terence NG ( https://issues.apache.org/jira/browse/OFBIZ-2970 ) - OFBIZ-2970
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@819274 13f79535-47bb-0310-9956-ffa450edef68
2009-09-27 08:55:38 +00:00
Hans Bakker
4533720a3e
docbook files now converted to html using a first (simple) visual scheme dependent css stylesheet. This css is now also used for the display of the help files
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818780 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 09:16:26 +00:00