You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2015/04/24 23:36:19 UTC
svn commit: r1675961 - in /ofbiz/branches/OFBIZ-6271: ./
applications/order/script/org/ofbiz/order/customer/
applications/order/src/org/ofbiz/order/finaccount/
applications/order/src/org/ofbiz/order/order/
applications/party/webapp/partymgr/WEB-INF/act...
Author: doogie
Date: Fri Apr 24 21:36:19 2015
New Revision: 1675961
URL: http://svn.apache.org/r1675961
Log:
Cherry-picked r1675958 from trunk(using raw svn, not git).
Modified:
ofbiz/branches/OFBIZ-6271/ (props changed)
ofbiz/branches/OFBIZ-6271/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed)
ofbiz/branches/OFBIZ-6271/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java (props changed)
ofbiz/branches/OFBIZ-6271/applications/order/src/org/ofbiz/order/order/OrderServices.java
ofbiz/branches/OFBIZ-6271/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed)
ofbiz/branches/OFBIZ-6271/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed)
ofbiz/branches/OFBIZ-6271/framework/common/widget/HelpScreens.xml (props changed)
ofbiz/branches/OFBIZ-6271/framework/security/data/PasswordSecurityData.xml (props changed)
ofbiz/branches/OFBIZ-6271/specialpurpose/ebaystore/lib/ (props changed)
ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed)
ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed)
ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed)
ofbiz/branches/OFBIZ-6271/tools/mergefromtrunk.bat (props changed)
ofbiz/branches/OFBIZ-6271/tools/mergefromtrunk.sh (props changed)
Propchange: ofbiz/branches/OFBIZ-6271/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 21:36:19 2015
@@ -9,3 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
+/ofbiz/trunk:1675958
Propchange: ofbiz/branches/OFBIZ-6271/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 21:36:19 2015
@@ -2,3 +2,4 @@
/ofbiz/branches/dojo1.4/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-952957
/ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:952958-1044489
/ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
+/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:1675958
Propchange: ofbiz/branches/OFBIZ-6271/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 21:36:19 2015
@@ -6,3 +6,4 @@
/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:952958-1044489
/ofbiz/branches/json-integration-refactoring/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:1634077-1635900
/ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:921280-927264
+/ofbiz/trunk/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java:1675958
Modified: ofbiz/branches/OFBIZ-6271/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1675961&r1=1675960&r2=1675961&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/branches/OFBIZ-6271/applications/order/src/org/ofbiz/order/order/OrderServices.java Fri Apr 24 21:36:19 2015
@@ -36,7 +36,6 @@ import java.util.concurrent.Callable;
import javax.transaction.Transaction;
-import org.apache.tools.ant.taskdefs.condition.HasMethod;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
import org.ofbiz.base.util.GeneralRuntimeException;
Propchange: ofbiz/branches/OFBIZ-6271/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 21:36:19 2015
@@ -2,3 +2,4 @@
/ofbiz/branches/dojo1.4/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-952957
/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:1675958
Propchange: ofbiz/branches/OFBIZ-6271/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 21:36:19 2015
@@ -2,3 +2,4 @@
/ofbiz/branches/dojo1.4/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-952957
/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:952958-1044489
/ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264
+/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:1675958
Propchange: ofbiz/branches/OFBIZ-6271/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 21:36:19 2015
@@ -2,3 +2,4 @@
/ofbiz/branches/dojo1.4/framework/common/widget/HelpScreens.xml:951708-952957
/ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml:952958-1044489
/ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264
+/ofbiz/trunk/framework/common/widget/HelpScreens.xml:1675958
Propchange: ofbiz/branches/OFBIZ-6271/framework/security/data/PasswordSecurityData.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 21:36:19 2015
@@ -2,3 +2,4 @@
/ofbiz/branches/dojo1.4/applications/securityext/data/PasswordSecurityData.xml:951708-952957
/ofbiz/branches/jquery/applications/securityext/data/PasswordSecurityData.xml:952958-1044489
/ofbiz/branches/multitenant20100310/applications/securityext/data/PasswordSecurityData.xml:921280-927264
+/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:1675958
Propchange: ofbiz/branches/OFBIZ-6271/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 21:36:19 2015
@@ -2,3 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/ebaystore/lib:951708-952957
/ofbiz/branches/jquery/specialpurpose/ebaystore/lib:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
+/ofbiz/trunk/specialpurpose/ebaystore/lib:1675958
Propchange: ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 21:36:19 2015
@@ -2,3 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:1675958
Propchange: ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 21:36:19 2015
@@ -2,3 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:1675958
Propchange: ofbiz/branches/OFBIZ-6271/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 21:36:19 2015
@@ -2,3 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:1675958
Propchange: ofbiz/branches/OFBIZ-6271/tools/mergefromtrunk.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 21:36:19 2015
@@ -4,3 +4,4 @@
/ofbiz/branches/jquery/mergefromtrunk.bat:952958-1044489
/ofbiz/branches/multitenant20100310/mergefromtrunk.bat:921280-927264
/ofbiz/trunk/mergefromtrunk.bat:1332097,1333885,1334201,1334336,1334483,1335343,1335347,1335351,1335946
+/ofbiz/trunk/tools/mergefromtrunk.bat:1675958
Propchange: ofbiz/branches/OFBIZ-6271/tools/mergefromtrunk.sh
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 21:36:19 2015
@@ -4,3 +4,4 @@
/ofbiz/branches/jquery/mergefromtrunk.sh:952958-1044489
/ofbiz/branches/multitenant20100310/mergefromtrunk.sh:921280-927264
/ofbiz/trunk/mergefromtrunk.sh:1332097,1333885,1334201,1334336,1334483,1335343,1335347,1335351,1335946
+/ofbiz/trunk/tools/mergefromtrunk.sh:1675958