Commit Graph
10472 Commits
Author SHA1 Message Date
Hans Bakker da13d2324a make dropshipment orders in the ecommerce frontend work which will create purchase orders for the different suppliers to be dropshipped. Also added some demo data and login Id's so the dropshippers can see the purchase orders sent to them. contribution from my employee Wisut.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@535589 13f79535-47bb-0310-9956-ffa450edef68
2007-05-06 09:37:10 +00:00
Jacopo Cappellato 123d1d4781 Formatting cleanups: tabs to spaces.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@535530 13f79535-47bb-0310-9956-ffa450edef68
2007-05-05 14:20:42 +00:00
Hans Bakker cbffc42c69 patch from Scott Gray to fix the xml dump problem of jira OFBIZ-960, thank you Scott
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@535463 13f79535-47bb-0310-9956-ffa450edef68
2007-05-05 06:49:20 +00:00
Andrew Zeneski 269c6ef0f8 turns out that only one trust manager is used; so to handle multiple trust stores, a new MultiTrustManager has been implemented; the system trust store now tries to load from all possible locations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@535056 13f79535-47bb-0310-9956-ffa450edef68
2007-05-04 01:50:13 +00:00
Jacopo Cappellato a5b813acf6 Russian label corrections from Oleg Andreyev: OFBIZ-948
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534997 13f79535-47bb-0310-9956-ffa450edef68
2007-05-03 22:10:24 +00:00
Andrew Zeneski cfb77fe246 set secure random
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534996 13f79535-47bb-0310-9956-ffa450edef68
2007-05-03 21:55:48 +00:00
Andrew Zeneski 0af1080c33 updated rmi keystore and disabled client auth
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534995 13f79535-47bb-0310-9956-ffa450edef68
2007-05-03 21:54:05 +00:00
Andrew Zeneski ad4915d17d added rmi trust store
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534994 13f79535-47bb-0310-9956-ffa450edef68
2007-05-03 21:53:41 +00:00
Andrew Zeneski 8497349aed turned off log4j debugging
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534965 13f79535-47bb-0310-9956-ffa450edef68
2007-05-03 19:19:13 +00:00
Andrew Zeneski 71c5f8ffb9 added more tracing to the minerva build
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534962 13f79535-47bb-0310-9956-ffa450edef68
2007-05-03 19:00:37 +00:00
Andrew Zeneski c6ec18dc5d enabled minerva tracing for development
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534959 13f79535-47bb-0310-9956-ffa450edef68
2007-05-03 18:54:05 +00:00
Andrew Zeneski b4b367763f checked in change to root category by mistake; changed back to 'all'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534940 13f79535-47bb-0310-9956-ffa450edef68
2007-05-03 17:28:53 +00:00
Andrew Zeneski d1ad79ad17 fixed order to follow XSD
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534939 13f79535-47bb-0310-9956-ffa450edef68
2007-05-03 17:27:19 +00:00
Andrew Zeneski 59766984cd changed some logging in minerva from info to debug
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534935 13f79535-47bb-0310-9956-ffa450edef68
2007-05-03 17:09:56 +00:00
Andrew Zeneski 8e5234d13c removed log4j settings from debug.properties; added new log4j.xml configuration; updated start.java to use the new path to base and the new log4j configuration
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534934 13f79535-47bb-0310-9956-ffa450edef68
2007-05-03 17:09:23 +00:00
David E. Jones 14400b9398 Fixed missing calls to eli.close, was leaving the EntityListIterator open for limit-view and limit-range
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534636 13f79535-47bb-0310-9956-ffa450edef68
2007-05-02 22:23:12 +00:00
David E. Jones 03facb7588 Changed default for paginate on iterate-section to be consistent with pretty much everything else, and to be consistent with the parsing code in IterateSectionWidget.java
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534635 13f79535-47bb-0310-9956-ffa450edef68
2007-05-02 22:22:19 +00:00
Jacopo Cappellato 05dbda99ed Upgraded velocity to latest stable release 1.5.
The runtime dependencies are: commons-collections, commons-lang, oro


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534359 13f79535-47bb-0310-9956-ffa450edef68
2007-05-02 09:01:38 +00:00
Jacopo Cappellato d7b17e1aaa Upgrade to the latest stable release of iText: 2.0.1
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534346 13f79535-47bb-0310-9956-ffa450edef68
2007-05-02 08:03:01 +00:00
Jacopo Cappellato 096dcdca11 Renamed Datavision jar file with revision number suffix.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534343 13f79535-47bb-0310-9956-ffa450edef68
2007-05-02 07:59:47 +00:00
David E. Jones 58ca7f6323 Changed to behave better after recent VisitHandler refactoring; now shows warning message when no visit is found in a session (which really shouldn't ever happen...)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534041 13f79535-47bb-0310-9956-ffa450edef68
2007-05-01 12:42:05 +00:00
David E. Jones 2ee70534a9 A number of fixes and restored a bunch of functionality that was in the ViewGeneric page before the JSP to FTL conversion; now all appears to be working properly
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534015 13f79535-47bb-0310-9956-ffa450edef68
2007-05-01 11:41:43 +00:00
Jacopo Cappellato cb45bf991b Upgrade to log4j 1.2.14 (latest stable release).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534007 13f79535-47bb-0310-9956-ffa450edef68
2007-05-01 11:06:19 +00:00
Jacopo Cappellato 389737ca72 Upgrade to javolution 4.2.8 (latest stable release).
Note that now java 1.5+ is required.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@534005 13f79535-47bb-0310-9956-ffa450edef68
2007-05-01 11:04:15 +00:00
David E. Jones ffe0cfec55 A few cleanups and enhanced to support wildcard (%) in string fields; would be nice in the future to add date ranges, etc but this is a helpful start
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533964 13f79535-47bb-0310-9956-ffa450edef68
2007-05-01 08:38:53 +00:00
David E. Jones 429097954e Small changes to use FastList/Map and to use a TreeSet to sort the entries rather than them appearing in random order
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533951 13f79535-47bb-0310-9956-ffa450edef68
2007-05-01 06:54:48 +00:00
Jacopo Cappellato f0e4bed828 Applied small css change from Adrian Crum OFBIZ-947
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533804 13f79535-47bb-0310-9956-ffa450edef68
2007-04-30 17:01:11 +00:00
Jacopo Cappellato 49c402969f Layout improvements from Adrian Crum (OFBIZ-947).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533790 13f79535-47bb-0310-9956-ffa450edef68
2007-04-30 16:35:15 +00:00
Jacopo Cappellato 3b4765893c Upgraded Derby jar to the latest stable release 10.2.2.0 (that is a bug fix release).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533605 13f79535-47bb-0310-9956-ffa450edef68
2007-04-30 06:48:23 +00:00
Jacopo Cappellato 18248c58ac Updated jakarta-regexp to the latest stable release: 1.5.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533601 13f79535-47bb-0310-9956-ffa450edef68
2007-04-30 06:22:49 +00:00
Jacopo Cappellato cd7e91ab0b Renamed jar to match the original jar name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533599 13f79535-47bb-0310-9956-ffa450edef68
2007-04-30 06:14:55 +00:00
Jacopo Cappellato 0dd6b12565 Updated jakarta oro from 2.0.7 to 2.0.8 (latest stable release).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533592 13f79535-47bb-0310-9956-ffa450edef68
2007-04-30 05:35:58 +00:00
Jacopo Cappellato b4ab7d2fdd Updated icu jar file to the latest stable release: 3.6
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533587 13f79535-47bb-0310-9956-ffa450edef68
2007-04-30 05:23:46 +00:00
Jacopo Cappellato dda7d6e354 Updated to the latest release a number of commons* jars:
commons-dbcp to 1.2.2
commons-cli to 1.0
commons-lang to 2.3
commons-validator to 1.3.1
commons-primitives to 1.0
commons-el to 1.0
commons-vfs to 1.0
commons-collections to 3.2
commons-pool to 1.3
commons-discovery to 0.4
commons-logging to 1.1
commons-beanutils to 1.7.0
commons-modeler to 2.0
commons-codec to 1.3
commons-digester to 1.8
commons-io to 1.3.1
commons-fileupload to 1.2


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533476 13f79535-47bb-0310-9956-ffa450edef68
2007-04-29 07:21:23 +00:00
David E. Jones 68e5c4344e Updated bsh to version 2.0b4, with additions needed by OFBiz for caching parsed scripts as an object; Jira issue #OFBIZ-528; thanks to Cameron Smith for the initial efforts and testing on this; see that issue for more details
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533448 13f79535-47bb-0310-9956-ffa450edef68
2007-04-29 00:10:27 +00:00
David E. Jones 5f5a712360 Small change of in-file name to remind more of what it is
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533398 13f79535-47bb-0310-9956-ffa450edef68
2007-04-28 17:25:03 +00:00
Jacopo Cappellato aaa243eb53 Applied patch from Scott Gray in OFBIZ-937:
setMaximumFractionDigits should be called after setCurrency, otherwise setCurrency changes it back to the default for that currency


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533347 13f79535-47bb-0310-9956-ffa450edef68
2007-04-28 14:19:59 +00:00
Jacopo Cappellato 479375c256 Commented some unnecessary texts in the main screen of some of the web applications.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533335 13f79535-47bb-0310-9956-ffa450edef68
2007-04-28 11:28:33 +00:00
David E. Jones 5e1d6ab6d9 Finished fixing a problem that I almost fixed yesterday, but I didn't quite do it right; now the login won't be called twice, avoiding the UserLoginHistory problem, which was reported for MySQL with the timestamp resolution problem
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533305 13f79535-47bb-0310-9956-ffa450edef68
2007-04-28 06:07:39 +00:00
David E. Jones 621d3d1d0e Some fair refactoring of the VisitHandler class to make it more resilient and centralize some of the data gathering in the ControlServlet; along with this are fixes for a couple of problems that caused the initial request data to be missing from the Visit especially on logout which cleared the session; this has been broken for a long time so is hopefully resolved now
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533037 13f79535-47bb-0310-9956-ffa450edef68
2007-04-27 09:39:09 +00:00
David E. Jones 5f4dbb56c9 Small change so that on login if previous request was login, logout, or checkLogin then it will null the request name so it goes to the default; this avoids a login/logout funny loop that resulted in ServerHit/UserLoginHistory entries with duplicate pks because they happen within one second
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@532993 13f79535-47bb-0310-9956-ffa450edef68
2007-04-27 07:18:20 +00:00
Andrew Zeneski 768f220859 fixed X500 converter to support commas in names (broken since it is split on comma)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@532595 13f79535-47bb-0310-9956-ffa450edef68
2007-04-26 03:45:40 +00:00
Andrew Zeneski 8a17059a76 removed no longer needed debugging
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@532591 13f79535-47bb-0310-9956-ffa450edef68
2007-04-26 03:29:50 +00:00
Andrew Zeneski d45f5643fd added getLocation method
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@532577 13f79535-47bb-0310-9956-ffa450edef68
2007-04-26 02:30:51 +00:00
Andrew Zeneski e8605a12d4 added UomWorker
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@532557 13f79535-47bb-0310-9956-ffa450edef68
2007-04-26 01:24:51 +00:00
Si Chen 843be8b0f8 Reverting changes made to the javascript function that disables form buttons. Fixes bug where submit buttons broke for IE and other browsers. Please be careful when making changes to these functions and test across browsers.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@532409 13f79535-47bb-0310-9956-ffa450edef68
2007-04-25 17:14:12 +00:00
Andrew Zeneski 5073124b68 made the pattern which finds the userLoginId from the common name (x500) configurable; also can disable cert login from security.properties
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@532403 13f79535-47bb-0310-9956-ffa450edef68
2007-04-25 16:45:18 +00:00
Andrew Zeneski 8cf17e8b49 now checking issuer serial number as well; one more layer of additional security
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@532069 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 20:14:43 +00:00
Andrew Zeneski a8eec804d5 added missing keystore element
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@532068 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 20:14:14 +00:00
Andrew Zeneski 85747a3ec2 fixed bugs in truststore loading; added method to load the keystore from the configuration
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@532041 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 18:51:59 +00:00