svn commit: r541862 - in /ofbiz/trunk/applications: order/script/org/ofbiz/order/order/ order/webapp/ordermgr/WEB-INF/actions/order/ order/webapp/ordermgr/entry/cart/ order/webapp/ordermgr/order/ prod

2007-05-26 Thread jacopoc
Author: jacopoc Date: Fri May 25 23:16:12 2007 New Revision: 541862 URL: http://svn.apache.org/viewvc?view=revrev=541862 Log: Now the same inventory counting routine is shared by the MARKETING_PKG_AUTO and MARKETING_PKG_PICK products. Modified:

svn commit: r541871 - /ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl

2007-05-26 Thread jacopoc
Author: jacopoc Date: Sat May 26 01:05:55 2007 New Revision: 541871 URL: http://svn.apache.org/viewvc?view=revrev=541871 Log: Applied (slightly modified) patch from Marco Risaliti with misc ui improvement and support for mkt pkg to the 'picklist option' screen. Modified:

svn commit: r541875 - /ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml

2007-05-26 Thread jacopoc
Author: jacopoc Date: Sat May 26 02:00:28 2007 New Revision: 541875 URL: http://svn.apache.org/viewvc?view=revrev=541875 Log: This change is important to allow the correct information also for mkt pkg product (components). Modified:

svn commit: r541876 - /ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl

2007-05-26 Thread jacopoc
Author: jacopoc Date: Sat May 26 02:03:44 2007 New Revision: 541876 URL: http://svn.apache.org/viewvc?view=revrev=541876 Log: Improved mkt pkg information in the picking list. Modified: ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl Modified:

svn commit: r541891 - in /ofbiz/trunk/applications: order/entitydef/ product/servicedef/ product/src/org/ofbiz/shipment/packing/ product/webapp/facility/WEB-INF/actions/shipment/ product/webapp/facili

2007-05-26 Thread jacopoc
Author: jacopoc Date: Sat May 26 06:18:19 2007 New Revision: 541891 URL: http://svn.apache.org/viewvc?view=revrev=541891 Log: Refactored code related to the Packing screen to support mkt pkg. Thanks to Marco Risaliti for the initial patch (OFBIZ-1036) even if I have only partially applied it

svn commit: r541927 - /ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java

2007-05-26 Thread jaz
Author: jaz Date: Sat May 26 11:51:18 2007 New Revision: 541927 URL: http://svn.apache.org/viewvc?view=revrev=541927 Log: fixed to allow events to return 'null' Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java Modified:

svn commit: r541931 - /ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java

2007-05-26 Thread jaz
Author: jaz Date: Sat May 26 12:23:53 2007 New Revision: 541931 URL: http://svn.apache.org/viewvc?view=revrev=541931 Log: fixed a few possible NPE; stopped post-proc from looping Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Modified:

svn commit: r541948 - /ofbiz/branches/release4.0/mergefromtrunk.bat

2007-05-26 Thread jleroux
Author: jleroux Date: Sat May 26 16:16:14 2007 New Revision: 541948 URL: http://svn.apache.org/viewvc?view=revrev=541948 Log: DOS version of mergefromtrunk.sh. A bit clumsy but it works. If someone is able to do better I am taker Added: ofbiz/branches/release4.0/mergefromtrunk.bat (with