Commit Graph
97 Commits
Author SHA1 Message Date
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
Hans Bakker 966b32d5af The 'new' help system
A new help system is implemented which is compatible with the current system which uses the ofboz.docs.org site to store the data.

The new help system has a number of advantages over the old version:
1. complete multilanguage without config xml files, using the locale.
2. Having an automatic multilevel index of all help pages using the ContentAssoc entity
3. Using the content manager for retrieval.
4. Template driven, aware of the different visual themes.
5. A first step towards the storage of OFBiz documentation within the OFBiz system itself.
6. Easy update via normal svn in seed data.
7. Aware of portlets on (userdefined) Portal pages.
8. Create awareness of the capabilities of the content component

The reason of this development was the requirement to provide user documents to the customers of Antwebsystems Co.Ltd

Some of the possible extensions could be:
1. a search function
2. print all or specific help files in PDF format
3. make the help screens work better with the business theme
4. Explain how help can be extended
5. In the help screen be able to send a message to the local support team
6. But most of all, create more help content!


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804546 13f79535-47bb-0310-9956-ffa450edef68
2009-08-16 02:04:17 +00:00
Hans Bakker 63a818ab65 extended the help system so that help pages can also be used from within the content component when available. If not found, the page within ofbiz.apache.org will be displayed. as is the case now. See the my portal component for an example. Still need to extend the <content tag so that an override template can be specified.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@803416 13f79535-47bb-0310-9956-ffa450edef68
2009-08-12 08:48:19 +00:00
Hans Bakker d238f16043 change of currency definition, should start with country
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798033 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 06:15:50 +00:00
Hans Bakker 7d03e179fc set the default theme to the new updated smooth feather theme
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@772091 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 07:59:19 +00:00
Hans Bakker 68a72ef803 revert revision 771074 because this theme: BIZZNESS_TIME does not exist
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771170 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 03:56:07 +00:00
Jacques Le Roux 47a6553d40 Putting new BizznessTime theme as default theme in trunk. This should help to strengthen it (hoping reports from users)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771074 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 16:23:08 +00:00
David E. Jones 5bbcd23a1c Too many issues with smoothfeather, for now bluelight looks like a good default theme
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@765906 13f79535-47bb-0310-9956-ffa450edef68
2009-04-17 08:48:48 +00:00
David E. Jones 32e673754a Moved old default theme data and files to new flatgrey theme; small corrections for use of messages.ftl; added setting in general.properties for the default theme ID; changed default theme to smoothfeather
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@765862 13f79535-47bb-0310-9956-ffa450edef68
2009-04-17 06:29:09 +00:00
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Jacques Le Roux a5042291f7 1st part of an effort to remove trailing spaces
" +/> => "/>
Should be easier when dealing with Eclipse S/R regexp

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762648 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 08:27:15 +00:00
Hans Bakker 68719639ee description error
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761180 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 06:26:55 +00:00
Hans Bakker 5d52a68701 add datasource for parties registred over myportal
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761179 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 06:21:51 +00:00
Hans Bakker 5f76cf86ca add missing permission
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761174 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 06:14:34 +00:00
Hans Bakker 1e1ed8fba9 move all examples from the common to the example component, edit parameters of portlet in the general managePortalPage screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@752401 13f79535-47bb-0310-9956-ffa450edef68
2009-03-11 08:05:34 +00:00
Jacques Le Roux eff308b37a A patch from Bruno Busco "Now the VisualTheme is changeable from the Webtools also." (https://issues.apache.org/jira/browse/OFBIZ-2229) - OFBIZ-2229
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750799 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 07:53:21 +00:00
Jacques Le Roux 97d52c1458 Oops forgot a file in previous commit :
betterSolution.patch from Bruno Busco "Theme component should be loaded after applications component" 



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748333 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 22:17:35 +00:00
Hans Bakker 8d417276ac The MyPortal component has now at least the functionality of the old mypage component with the portal functions included. Mypage is now taken off the menu and will be removed the coming weeks when no big problems arise
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743245 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 06:22:53 +00:00
David E. Jones b8707a26f8 Applied patch from Bruno Busco in Jira #OFBIZ-2172 with basics for VisualThemeSet; still not possible to change themes in ecommerce (should probably be supported on the back end instead of the front end, ie in the catalog manager and not by a customer in ecommerce, or perhaps only allowed in ecommerce if a flag on the ProductStore says its okay; also does not yet filter selectable themes in the back-end/manager applications
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743202 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 03:19:19 +00:00
Hans Bakker 08ba67420f cleanup of the portal pages, reduced number of screens, changed employee myportal, new user without securitygroups now also have his portal page with a profile portlet. only thing is missing is the usage of the sequence number in the portal page and portalpageportlet entity, probably completed next week
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742018 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 08:33:36 +00:00