svn commit: r569467 - /ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml

[sichen]

Author: sichen
Date: Fri Aug 24 10:59:04 2007
New Revision: 569467

URL: http://svn.apache.org/viewvc?rev=569467&view=rev
Log:
comment out workefforts related to shpiment schedule/arrival ofbiz-1207

Modified:
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=569467&r1=569466&r2=569467&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Fri Aug 24 10:59:04 2007
@@ -46,6 +46,7 @@
         <!-- always create the WorkEfforts, even if dates aren't specified yet; when they are they will be set in the update service... -->
 
         <!-- the Ship WorkEffort entity -->
+        <!-- SC 20070816 I am commenting out the shipment work efforts because there seems to be no code
         <set value="Shipment #${newEntity.shipmentId} Ship" field="shipWorkEffortMap.workEffortName"/>
         <set value="EVENT" field="shipWorkEffortMap.workEffortTypeId"/>
         <set value="CAL_TENTATIVE" field="shipWorkEffortMap.currentStatusId"/>
@@ -63,8 +64,9 @@
             <set value="CAL_SENT" field="assignPartyToWorkEffortShip.statusId"/>
             <call-service service-name="assignPartyToWorkEffort" in-map-name="assignPartyToWorkEffortShip"/>
         </if-not-empty>
-
+        -->
         <!-- the Arrival WorkEffort entity -->
+        <!--
         <set value="Shipment #${newEntity.shipmentId} Arrival" field="arrivalWorkEffortMap.workEffortName"/>
         <set value="EVENT" field="arrivalWorkEffortMap.workEffortTypeId"/>
         <set value="CAL_TENTATIVE" field="arrivalWorkEffortMap.currentStatusId"/>
@@ -82,6 +84,7 @@
             <set value="CAL_SENT" field="assignPartyToWorkEffortArrival.statusId"/>
             <call-service service-name="assignPartyToWorkEffort" in-map-name="assignPartyToWorkEffortArrival"/>
         </if-not-empty>
+        -->
 
         <create-value value-name="newEntity"/>
 
@@ -131,6 +134,7 @@
         <check-errors/>
 
         <!-- Check the pickup and delivery dates for changes and update the corresponding WorkEfforts -->
+        <!--
         <if>
             <condition>
                 <or>
@@ -178,7 +182,8 @@
                 <call-service service-name="updateWorkEffort" in-map-name="estimatedArrivalWorkEffortUpdMap"/>
             </then>
         </if>
-
+        -->
+        
         <!-- if the partyIdTo or partyIdFrom has changed, add WEPAs -->
         <if>
             <condition>

[David E Jones-2]

I thought this was supposed to be configurable (with an option on the Facility if I remember the discussion right)?

-David


[hidden email] wrote:

> Author: sichen
> Date: Fri Aug 24 10:59:04 2007
> New Revision: 569467
>
> URL: http://svn.apache.org/viewvc?rev=569467&view=rev
> Log:
> comment out workefforts related to shpiment schedule/arrival ofbiz-1207
>
> Modified:
>     ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
>
> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=569467&r1=569466&r2=569467&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
> +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Fri Aug 24 10:59:04 2007
> @@ -46,6 +46,7 @@
>          <!-- always create the WorkEfforts, even if dates aren't specified yet; when they are they will be set in the update service... -->
>  
>          <!-- the Ship WorkEffort entity -->
> +        <!-- SC 20070816 I am commenting out the shipment work efforts because there seems to be no code
>          <set value="Shipment #${newEntity.shipmentId} Ship" field="shipWorkEffortMap.workEffortName"/>
>          <set value="EVENT" field="shipWorkEffortMap.workEffortTypeId"/>
>          <set value="CAL_TENTATIVE" field="shipWorkEffortMap.currentStatusId"/>
> @@ -63,8 +64,9 @@
>              <set value="CAL_SENT" field="assignPartyToWorkEffortShip.statusId"/>
>              <call-service service-name="assignPartyToWorkEffort" in-map-name="assignPartyToWorkEffortShip"/>
>          </if-not-empty>
> -
> +        -->
>          <!-- the Arrival WorkEffort entity -->
> +        <!--
>          <set value="Shipment #${newEntity.shipmentId} Arrival" field="arrivalWorkEffortMap.workEffortName"/>
>          <set value="EVENT" field="arrivalWorkEffortMap.workEffortTypeId"/>
>          <set value="CAL_TENTATIVE" field="arrivalWorkEffortMap.currentStatusId"/>
> @@ -82,6 +84,7 @@
>              <set value="CAL_SENT" field="assignPartyToWorkEffortArrival.statusId"/>
>              <call-service service-name="assignPartyToWorkEffort" in-map-name="assignPartyToWorkEffortArrival"/>
>          </if-not-empty>
> +        -->
>  
>          <create-value value-name="newEntity"/>
>  
> @@ -131,6 +134,7 @@
>          <check-errors/>
>  
>          <!-- Check the pickup and delivery dates for changes and update the corresponding WorkEfforts -->
> +        <!--
>          <if>
>              <condition>
>                  <or>
> @@ -178,7 +182,8 @@
>                  <call-service service-name="updateWorkEffort" in-map-name="estimatedArrivalWorkEffortUpdMap"/>
>              </then>
>          </if>
> -
> +        -->
> +        
>          <!-- if the partyIdTo or partyIdFrom has changed, add WEPAs -->
>          <if>
>              <condition>
>
>

[Si Chen-2]

I thought you were ok with commenting it out based on your comment on
jira, but if not I'll revert it.

David E Jones wrote:

>
> I thought this was supposed to be configurable (with an option on the
> Facility if I remember the discussion right)?
>
> -David
>
>
> [hidden email] wrote:
>> Author: sichen
>> Date: Fri Aug 24 10:59:04 2007
>> New Revision: 569467
>>
>> URL: http://svn.apache.org/viewvc?rev=569467&view=rev
>> Log:
>> comment out workefforts related to shpiment schedule/arrival ofbiz-1207
>>
>> Modified:
>>    
>> ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
>>
>>
>> Modified:
>> ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
>>
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=569467&r1=569466&r2=569467&view=diff 
>>
>> ==============================================================================
>>
>> ---
>> ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
>> (original)
>> +++
>> ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
>> Fri Aug 24 10:59:04 2007
>> @@ -46,6 +46,7 @@
>>          <!-- always create the WorkEfforts, even if dates aren't
>> specified yet; when they are they will be set in the update
>> service... -->
>>  
>>          <!-- the Ship WorkEffort entity -->
>> +        <!-- SC 20070816 I am commenting out the shipment work
>> efforts because there seems to be no code          <set
>> value="Shipment #${newEntity.shipmentId} Ship"
>> field="shipWorkEffortMap.workEffortName"/>
>>          <set value="EVENT" field="shipWorkEffortMap.workEffortTypeId"/>
>>          <set value="CAL_TENTATIVE"
>> field="shipWorkEffortMap.currentStatusId"/>
>> @@ -63,8 +64,9 @@
>>              <set value="CAL_SENT"
>> field="assignPartyToWorkEffortShip.statusId"/>
>>              <call-service service-name="assignPartyToWorkEffort"
>> in-map-name="assignPartyToWorkEffortShip"/>
>>          </if-not-empty>
>> -
>> +        -->
>>          <!-- the Arrival WorkEffort entity -->
>> +        <!--
>>          <set value="Shipment #${newEntity.shipmentId} Arrival"
>> field="arrivalWorkEffortMap.workEffortName"/>
>>          <set value="EVENT"
>> field="arrivalWorkEffortMap.workEffortTypeId"/>
>>          <set value="CAL_TENTATIVE"
>> field="arrivalWorkEffortMap.currentStatusId"/>
>> @@ -82,6 +84,7 @@
>>              <set value="CAL_SENT"
>> field="assignPartyToWorkEffortArrival.statusId"/>
>>              <call-service service-name="assignPartyToWorkEffort"
>> in-map-name="assignPartyToWorkEffortArrival"/>
>>          </if-not-empty>
>> +        -->
>>  
>>          <create-value value-name="newEntity"/>
>>  
>> @@ -131,6 +134,7 @@
>>          <check-errors/>
>>  
>>          <!-- Check the pickup and delivery dates for changes and
>> update the corresponding WorkEfforts -->
>> +        <!--
>>          <if>
>>              <condition>
>>                  <or>
>> @@ -178,7 +182,8 @@
>>                  <call-service service-name="updateWorkEffort"
>> in-map-name="estimatedArrivalWorkEffortUpdMap"/>
>>              </then>
>>          </if>
>> -
>> +        -->
>> +                 <!-- if the partyIdTo or partyIdFrom has changed,
>> add WEPAs -->
>>          <if>
>>              <condition>
>>
>>
>
>