Commit Graph
131 Commits
Author SHA1 Message Date
Adrian Crum 359e19722c Move geo-related seed data to the GeoData.xml file. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1526296 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 20:46:40 +00:00
Jacques Le Roux 2df6fadcbe I made a wrong C/P for Åland islands, I checked no others
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1518950 13f79535-47bb-0310-9956-ffa450edef68
2013-08-30 12:19:56 +00:00
Jacques Le Roux 3c172fda31 This completes r1517629 for one missing "country". Though not independent, and so (I guess) not in http://www.iso.org/iso/home/standards/country_codes/country_names_and_code_elements.htm the Isle of Man exists as an entity https://www.iso.org/obp/ui/#iso:code:3166:IM. It can be crossed coming from other systems, so here it is added (not as part of Great Britain (GBR), like for instance Guernsey and Jersey)
I wonder about the codes of the other parts of GBR. They don't exist in 3166. But they were already in GeoData.xml before the Apache era. Anyway they can't hurt and are not a problem, so far...

This also adds 3166 links to CountryCodeData.xml

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1517947 13f79535-47bb-0310-9956-ffa450edef68
2013-08-27 19:32:20 +00:00
Jacques Le Roux dd8ba13afd This completes r1517629 for missing Geos. Also updates the links to ISO 3166
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1517702 13f79535-47bb-0310-9956-ffa450edef68
2013-08-26 21:28:09 +00:00
Jacques Le Roux 5749286109 This updates the CountryCode entity data only. I did not find, nor needed, the CountryCapital and CountryTeleCode data. Updating those can be done later...
Note: I used https://www.iso.org/obp/ui/#search and http://www.iso.org/iso/home/standards/country_codes/country_names_and_code_elements.htm. I also subscribed to 3166 Newsletters for continued update...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1517629 13f79535-47bb-0310-9956-ffa450edef68
2013-08-26 18:21:32 +00:00
Jacques Le Roux c943b51124 A patch from Pierre Smits for "UnitData.xml is missing some liquid volume measures" https://issues.apache.org/jira/browse/OFBIZ-5277
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1512307 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 13:58:31 +00:00
Jacques Le Roux 739e937988 A patch from Pierre Smits for "Currency names of CZK and HRK are wrong" https://issues.apache.org/jira/browse/OFBIZ-5264
In CurrencyData.xml the names of the currencies of the Czech Republic and of Croatia are wrong.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1502946 13f79535-47bb-0310-9956-ffa450edef68
2013-07-14 07:39:16 +00:00
Jacques Le Roux 66a77f5864 A patch from Pierre Smits for "Enhance GeoData.xml with Croatia as a member of the European Union" https://issues.apache.org/jira/browse/OFBIZ-5263
Per July 1st, 2013 Croatia joined the European Union.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1502944 13f79535-47bb-0310-9956-ffa450edef68
2013-07-14 06:50:19 +00:00
Jacques Le Roux efbe0f3fa6 Du bon usage du français
http://www.etudes-litteraires.com/forum/topic9238-je-suis-francais-un-francais-majuscule-ou-minuscule.html
http://fr.wikipedia.org/wiki/Usage_des_majuscules_en_fran%C3%A7ais


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1426604 13f79535-47bb-0310-9956-ffa450edef68
2012-12-28 18:26:50 +00:00
Jacques Le Roux b46c7a2c06 A patch from Naofumi Fukue "Japanese patch" https://issues.apache.org/jira/browse/OFBIZ-5061
Got an issue merging GeoData_JP.xml with Subclipse, using Toirtoise solved it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1403746 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 15:48:42 +00:00
Hans Bakker bd16dfb598 split up securitypermissions as seed data and securitygroups as demo data with a single exception: the creation of a super security group which has general access to the system and which is used with the 'ant create-admin-user-login' command.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352431 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 07:21:49 +00:00
Jacques Le Roux e3e7491611 I just learned today that now for regions to be associated with a state a country needs a CountryAddressFormat. I guess this is related Sascha's changes for GBR (he introduced the GROUP_MEMBER notion), but I could be wrong
This fixes Swiss cantons wich now appears at https://localhost:8443/example/control/FormWidgetExamples#DropDownFieldsExampleForm_stateProvinceGeoId_title

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1342874 13f79535-47bb-0310-9956-ffa450edef68
2012-05-26 10:03:04 +00:00
Jacques Le Roux 5f732182bd Forgot to save pending change in Eclipse, thanks to Adrian who noticed it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1342871 13f79535-47bb-0310-9956-ffa450edef68
2012-05-26 09:35:02 +00:00
Adrian Crum 19870304f9 Added a missing license header.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1342850 13f79535-47bb-0310-9956-ffa450edef68
2012-05-26 04:11:41 +00:00
Jacques Le Roux 463be6851d Thanks to Martin Kaiser report on dev ML, cleans geo data a bit
Use Swiss geo data. To be consistent I have also renamed GeoData_CHE.xml to GeoData_CH.xml. 

While at it I also renamed GeoData_IRL.xml to GeoData_IE.xml , renamed things internally, and extracted the  North Ireland geo data from it to GeoData_UK.xml where it actually belongs


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1342846 13f79535-47bb-0310-9956-ffa450edef68
2012-05-26 03:56:52 +00:00
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