svn commit: r1641062 - in /ofbiz/branches/release12.04: ./ applications/order/config/OrderErrorUiLabels.xml applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml

[jleroux]

Author: jleroux
Date: Sat Nov 22 13:36:57 2014
New Revision: 1641062

URL: http://svn.apache.org/r1641062
Log:
"Applied fix from trunk for revision: 1618411" 
------------------------------------------------------------------------
r1618411 | apatel | 2014-08-16 22:40:20 +0200 (sam. 16 août 2014) | 1 ligne

[OFBIZ-4459] call to Quickshipdrop should be make on approved orders. Thanks to 
Kiran Gawde and ofbiz.us team for contributions.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/applications/order/config/OrderErrorUiLabels.xml
    
ofbiz/branches/release12.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1618411

Modified: 
ofbiz/branches/release12.04/applications/order/config/OrderErrorUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/config/OrderErrorUiLabels.xml?rev=1641062&r1=1641061&r2=1641062&view=diff
==============================================================================
--- 
ofbiz/branches/release12.04/applications/order/config/OrderErrorUiLabels.xml 
(original)
+++ 
ofbiz/branches/release12.04/applications/order/config/OrderErrorUiLabels.xml 
Sat Nov 22 13:36:57 2014
@@ -33,6 +33,9 @@
         <value xml:lang="zh">必须为销售订单选择一个产品店铺。 
</value>
         <value xml:lang="zh_TW">必é 
ˆç‚ºéŠ·å”®è¨‚單選擇一個產品店鋪。 </value>
     </property>
+    <property key="OrderApproveOrderBeforeQuickDropShip">
+        <value xml:lang="en">Order must be approved before complete drop 
shipment.</value>
+    </property>
     <property 
key="OrderAnAlternateGwpProductIdWasInPlaceButWasEitherNotValidOrIsNoLongerInStockForId">
         <value xml:lang="de">Ein alternative Gratisbeigabe ist vorhanden, aber 
entweder nicht mehr gültig oder nicht mehr auf Lager : 
${alternateGwpProductId}</value>
         <value xml:lang="en">An alternateGwpProductId was in place, but was 
either not valid or is no longer in stock for ID : 
${alternateGwpProductId}</value>

Modified: 
ofbiz/branches/release12.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=1641062&r1=1641061&r2=1641062&view=diff
==============================================================================
--- 
ofbiz/branches/release12.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
 (original)
+++ 
ofbiz/branches/release12.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
 Sat Nov 22 13:36:57 2014
@@ -1339,6 +1339,13 @@ under the License.
     </simple-method>
 
     <simple-method method-name="quickDropShipOrder" short-description="Create 
and complete a drop shipment for a ship group">
+        <entity-one entity-name="OrderHeader" value-field="orderHeader"/>
+        <if-compare field="orderHeader.statusId" operator="equals" 
value="ORDER_CREATED">
+            <add-error>
+                <fail-property resource="OrderErrorUiLabels" 
property="OrderApproveOrderBeforeQuickDropShip"/>
+            </add-error>
+            <check-errors/>
+        </if-compare>
         <set from-field="parameters.orderId" 
field="shipmentContext.primaryOrderId"/>
         <set from-field="parameters.shipGroupSeqId" 
field="shipmentContext.primaryShipGroupSeqId"/>
         <set value="PURCH_SHIP_CREATED" field="shipmentContext.statusId"/>