Adrian Crum
f418cd00a4
Oops, forgot to remove debugging code (again).
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@618942 13f79535-47bb-0310-9956-ffa450edef68
2008-02-06 09:52:38 +00:00
Adrian Crum
845593b452
Bug fix for the ResourceBundleMapWrapper - eliminate redundant Map Stack entries. Duplicate copies of ResourceBundles were being added to the MapStack.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@618941 13f79535-47bb-0310-9956-ffa450edef68
2008-02-06 09:49:55 +00:00
Adrian Crum
0280a3a7fb
Simplified the ResourceBundleMapWrapper.java code by using inheritance. Also cleaned up and improved the Javadoc comments.
...
This code could be reduced further by converting InternalRbmWrapper references to Map references, and using the ResourceBundleMapWrapper class more like a plain MapStack. That will require refactoring peripheral code - a project for another day.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@618892 13f79535-47bb-0310-9956-ffa450edef68
2008-02-06 04:59:57 +00:00
Adrian Crum
c15629ac64
Fixed "resource not found" exception that occurred when switching over to new XML properties file format - https://issues.apache.org/jira/browse/OFBIZ-1612 .
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@618490 13f79535-47bb-0310-9956-ffa450edef68
2008-02-04 23:23:35 +00:00
Hans Bakker
f7ed512429
it seems that de port definition of the beanshell container is moved to the ofbiz-containers.xml file however not deleted from the rmi-containers.xml file, deleted with this revision to remove confusion
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@616193 13f79535-47bb-0310-9956-ffa450edef68
2008-01-29 07:46:04 +00:00
Jacques Le Roux
bc356caaa6
From a slightly modified Chris Lombardi's patch "XUI update to x3.2rc2b" (see comments in https://issues.apache.org/jira/browse/OFBIZ-1580 ) - OFBIZ-1580
...
I will remove the old XUI jar later
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@615262 13f79535-47bb-0310-9956-ffa450edef68
2008-01-25 16:45:21 +00:00
Jacques Le Roux
5ac9e1bd1d
Oops... Reverted trunk in place of release
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@611280 13f79535-47bb-0310-9956-ffa450edef68
2008-01-11 19:53:20 +00:00
Jacques Le Roux
ddb461f3cb
Reverted from previous commit merged automatically from trunk to merge changes by hand now...
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@611275 13f79535-47bb-0310-9956-ffa450edef68
2008-01-11 19:45:36 +00:00
Scott Gray
11e8f68718
Workaround a problem where DateFormat parses 00:00:00.2 to 00:00:00.002
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@611102 13f79535-47bb-0310-9956-ffa450edef68
2008-01-11 08:20:03 +00:00
Adrian Crum
43e7c199dd
Properties file resolver fix.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@609173 13f79535-47bb-0310-9956-ffa450edef68
2008-01-05 16:44:09 +00:00
Adrian Crum
6dcaa603bd
More refinements to properties file resolving. Many thanks to Scott Gray for his feedback.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@608571 13f79535-47bb-0310-9956-ffa450edef68
2008-01-03 17:45:43 +00:00
Adrian Crum
aff0cffce9
Fixed properties file resolver in new UtilProperties code.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@608315 13f79535-47bb-0310-9956-ffa450edef68
2008-01-03 02:50:58 +00:00
Adrian Crum
987b444bdf
Fix for r607823. The OFBiz custom xml properties file format requires the file extension in the resource name. Detailed explanation in the dev mailing list.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@608156 13f79535-47bb-0310-9956-ffa450edef68
2008-01-02 17:41:16 +00:00
Scott Gray
e73aafe89a
Fixed a problem when a property isn't found in the bundle, the bundle throws an exception which wasn't being caught. Reported by Chris Lombardi in the user list
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@607848 13f79535-47bb-0310-9956-ffa450edef68
2008-01-01 14:08:07 +00:00
Scott Gray
996202bf95
Finally got around to getting rid of those annoying xml validation errors, should resolve OFBIZ-244 although I didn't test specifically for that error
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@607833 13f79535-47bb-0310-9956-ffa450edef68
2008-01-01 12:53:58 +00:00
Scott Gray
9883a45efe
Fixed a small problem with the new xml uiLabels, fail-property in minilang wasn't able to retrieve any xml properties.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@607823 13f79535-47bb-0310-9956-ffa450edef68
2008-01-01 10:50:01 +00:00
Adrian Crum
708c353436
New methods for UtilDateTime - get period end Timestamps. The new methods are needed for the forthcoming <set-calendar> simple method operation.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@607776 13f79535-47bb-0310-9956-ffa450edef68
2007-12-31 21:02:41 +00:00
Adrian Crum
a1e21d498e
Final change to UtilProperties.java, based on work in https://issues.apache.org/jira/browse/OFBIZ-1485 .
...
The ResourceBundle cache is now managed by the custom ResourceBundle class - which reduces memory used and also allows for better properties file cache clearing. Clearing the "properties.UtilPropertiesBundleCache" cache works as expected now.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@607574 13f79535-47bb-0310-9956-ffa450edef68
2007-12-30 18:35:23 +00:00
Jacques Le Roux
d10d6edda3
A patch from Joe Eckard "Adding new string utility methods to collapse characters" ( https://issues.apache.org/jira/browse/OFBIZ-658 ) - OFBIZ-658
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@606035 13f79535-47bb-0310-9956-ffa450edef68
2007-12-20 21:49:42 +00:00
David E. Jones
f96673b421
Based on new comments in an old issue (OFBIZ-1116) setting this to false and commenting about want; I meant to do this a few months agoout want; I meant to do this a few months ago but obviously never got around to it
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@605129 13f79535-47bb-0310-9956-ffa450edef68
2007-12-18 08:17:36 +00:00
Jacopo Cappellato
d28cfcb26a
First step in the implementation of past due date invoices: created a service that computes the due date(s) and outstanding amount(s) based on the Invoice terms; added initial support for multiple payment terms per invoice (e.g. 'pay after 30 days the 50% of the invoice, pay after 60 days the 40%, pay after 90 the 10%').
...
Part of issue OFBIZ-1530
Modified the getDayEnd util method to be usable in Minilang.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@604922 13f79535-47bb-0310-9956-ffa450edef68
2007-12-17 16:40:35 +00:00
Hans Bakker
389359d36c
another small day calculation class to be used in minilanguage
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@604898 13f79535-47bb-0310-9956-ffa450edef68
2007-12-17 15:24:46 +00:00
Adrian Crum
2562f6a713
Created a fop log4j logger because the root logger setting of "all" was bogging down fop rendering.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@603107 13f79535-47bb-0310-9956-ffa450edef68
2007-12-11 00:57:15 +00:00
Adrian Crum
24b9ab8268
Small fixups for last commit.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@603059 13f79535-47bb-0310-9956-ffa450edef68
2007-12-10 21:44:30 +00:00
Adrian Crum
b91ca87911
UtilProperties bug fix and enhancements.
...
This commit fixes the bug reported in https://issues.apache.org/jira/browse/OFBIZ-1488 and it includes a few of the improvements mentioned in https://issues.apache.org/jira/browse/OFBIZ-1485 . This commit also lays the groundwork for improved properties file support in the future.
This commit contains a new xsd file - it needs to be included on the apache ofbiz website. XML properties files will generate console error messages until it is.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@603024 13f79535-47bb-0310-9956-ffa450edef68
2007-12-10 20:04:01 +00:00
Hans Bakker
7451815b62
show number of days between timestamps and add a day to a timestamp. I realize this is perhaps not the best method, but it works. If somebody has suggestions to do it better, pleae let me now, i will change it....
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@602650 13f79535-47bb-0310-9956-ffa450edef68
2007-12-09 07:58:41 +00:00
David E. Jones
26e7099538
Applied patch from Adrian Crum in Jira OFBIZ-1442 to support a new format for localization in XML files
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@599356 13f79535-47bb-0310-9956-ffa450edef68
2007-11-29 09:37:10 +00:00
Jacques Le Roux
ac9c5853ae
A patch from Michael Brohl "StringUtil.htmlSpecialChars: ampersand replaced with "&s;" instead of "&"" ( https://issues.apache.org/jira/browse/OFBIZ-1431 ) - OFBIZ-1431
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@598679 13f79535-47bb-0310-9956-ffa450edef68
2007-11-27 15:51:01 +00:00
Jacques Le Roux
7c8310a68a
A slightly modified patch from Adrian Crum "Enable HTML whitespace removal through debug.properties element" ( https://issues.apache.org/jira/browse/OFBIZ-1420 ) - OFBIZ-1420
...
I finally uncommented the line widget.verbose=true in widget.properties and put an help in http://docs.ofbiz.org/display/OFBTECH/Apache+OFBiz+Technical+Production+Setup+Guide#ApacheOFBizTechnicalProductionSetupGuide-Widgetssetting
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@598362 13f79535-47bb-0310-9956-ffa450edef68
2007-11-26 17:58:54 +00:00
Hans Bakker
473745822e
make the form input field:<date-time type=date/> working
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@597818 13f79535-47bb-0310-9956-ffa450edef68
2007-11-24 06:43:50 +00:00
Jacopo Cappellato
9be11dc39d
Implemented new signature (that accepts a parameters Map instead of an HttpServletRequest) for the util method: makeParamMapWithPrefix.
...
Added code to the ShoppingCartHelper..addToCart method to prepare a map of additiona features for the cart (if additional features are selected during order entry).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@597166 13f79535-47bb-0310-9956-ffa450edef68
2007-11-21 18:10:04 +00:00
Jacques Le Roux
899869b867
Addition in .classpath file from Yin T's and Marco Risaliti's suggestions "Change /ofbiz/.classpath for clean compile in Eclipse" ( https://issues.apache.org/jira/browse/OFBIZ-1412 ) - OFBIZ-1412
...
I renumbered the ant-junit.jar lib (it's 1.7.0) and I added it in http://docs.ofbiz.org/display/OFBADMIN/Libraries+Included+in+OFBiz
I saw that also some other Apache libs are not numbered, did not take the time to do it...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@596597 13f79535-47bb-0310-9956-ffa450edef68
2007-11-20 10:09:36 +00:00
Jacques Le Roux
0dbf1e9425
A patch from Paulo Cristo "ramework/base and framework/common translation to portuguese" ( https://issues.apache.org/jira/browse/OFBIZ-1390 ) - OFBIZ-1390
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@596576 13f79535-47bb-0310-9956-ffa450edef68
2007-11-20 08:54:29 +00:00
Jacques Le Roux
76d9f6bfc2
A patch from Adrian Crum "Improved UtilDateTime.java, Framework Default TimeZone Suppor, with getMonthNames also" ( https://issues.apache.org/jira/browse/OFBIZ-1377 ) - OFBIZ-1377
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@594088 13f79535-47bb-0310-9956-ffa450edef68
2007-11-12 11:50:09 +00:00
Jacques Le Roux
b6b7c017c8
A patch from Adrian Crum "Screen widget show where code came from in html" ( https://issues.apache.org/jira/browse/OFBIZ-1318 ) - OFBIZ-1318
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@594042 13f79535-47bb-0310-9956-ffa450edef68
2007-11-12 08:06:40 +00:00
Adam Heath
ddb8b14adb
Allow null keys/values in collections/maps.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@591093 13f79535-47bb-0310-9956-ffa450edef68
2007-11-01 17:24:41 +00:00
Andrew Zeneski
69b57d8123
reverted last change
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@590266 13f79535-47bb-0310-9956-ffa450edef68
2007-10-30 18:51:27 +00:00
Andrew Zeneski
fef329eeaf
added code to display inventory across all facilities as well as the inventory associated with just the facility from the store
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@590265 13f79535-47bb-0310-9956-ffa450edef68
2007-10-30 18:47:51 +00:00
Jacopo Cappellato
a46ab27016
Removed jar file because a different version of the same jar is in the entity component.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@589993 13f79535-47bb-0310-9956-ffa450edef68
2007-10-30 09:01:31 +00:00
David E. Jones
eb773c62c0
Small change to not add null values to lists, will always throw an NPE
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@589967 13f79535-47bb-0310-9956-ffa450edef68
2007-10-30 05:57:02 +00:00
Jacques Le Roux
eef8c120dc
A patch from Markus Stude "UtilDateTime.toDate(int, int, int, int, int, int) does not initialise milisecond part of created date" ( https://issues.apache.org/jira/browse/OFBIZ-1363 ) - OFBIZ-1363
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@589862 13f79535-47bb-0310-9956-ffa450edef68
2007-10-29 21:22:40 +00:00
Adam Heath
1f1173aab3
Improve the generics markup in the collectionToSet method.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@588307 13f79535-47bb-0310-9956-ffa450edef68
2007-10-25 18:32:54 +00:00
David E. Jones
4347e4d0dc
A handy little method to facilitate some GenericDelegator new/enhanced methods that are now using Set instead of Collection as they should be
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@588206 13f79535-47bb-0310-9956-ffa450edef68
2007-10-25 12:04:23 +00:00
Andrew Zeneski
1a9a856053
small change to allow ofbiz to compile again
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@587109 13f79535-47bb-0310-9956-ffa450edef68
2007-10-22 14:23:48 +00:00
Jacques Le Roux
ae76370a04
Replace all www.ofbiz.org by ofbiz.apache.org (mostly links to dtds). Note that there are 2 void links :
...
http://ofbiz.apache.org/service/
http://ofbiz.apache.org/cgi-bin/http_test.pl
Those links were useless before also
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@586802 13f79535-47bb-0310-9956-ffa450edef68
2007-10-20 21:17:45 +00:00
Adam Heath
56e222afb0
Javolution is buggy; it doesn't support structural changes on sub
...
lists, as is required by the api.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@586639 13f79535-47bb-0310-9956-ffa450edef68
2007-10-19 23:09:08 +00:00
Andrew Zeneski
590116e96c
changed method so it can be called through FTL static calls
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@586597 13f79535-47bb-0310-9956-ffa450edef68
2007-10-19 20:28:21 +00:00
Andrew Zeneski
1a5f5d69c2
added adjustTimestamp method which doesn't require timezone or locale
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@586582 13f79535-47bb-0310-9956-ffa450edef68
2007-10-19 19:09:27 +00:00
Adam Heath
b29e308c88
Fix for javac's broken type inferring. If an array with length one
...
is passed to toMap, and the single value is an instance of a Map,
then try to cast it to a map.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@586041 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 17:35:07 +00:00
Jacopo Cappellato
989624f0f5
Applied patch from Adrian Crum (OFBIZ-1349) to remove a redundant security check (recently added to the app bar) and documentation for the base-permissions attribute.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@585879 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 06:03:06 +00:00