Author: jleroux
Date: Fri Sep 21 11:57:25 2007
New Revision: 578228
URL: http://svn.apache.org/viewvc?rev=578228&view=rev
Log:
Applied fix from trunk for revision: 570067
Modified:
ofbiz/branches/release4.0/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
Modified:
ofbiz/branches/release4.0/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=578228&r1=578227&r2=578228&view=diff
==============================================================================
---
ofbiz/branches/release4.0/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
(original)
+++
ofbiz/branches/release4.0/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
Fri Sep 21 11:57:25 2007
@@ -185,16 +185,17 @@
<and>
<not><if-empty field-name="parameters.partyIdFrom"/></not>
<if-compare-field field-name="parameters.partyIdFrom"
operator="not-equals" to-field-name="lookedUpValue.partyIdFrom"/>
+ <not><if-empty
field-name="lookedUpValue.estimatedShipWorkEffId"/></not>
</and>
</condition>
<then>
- <set from-field="lookedUpValue.estimatedShipWorkEffId"
field="assignPartyToWorkEffortShip.workEffortId"/>
- <set from-field="parameters.partyIdFrom"
field="assignPartyToWorkEffortShip.partyId"/>
+ <set field="assignPartyToWorkEffortShip.workEffortId"
from-field="lookedUpValue.estimatedShipWorkEffId"/>
+ <set field="assignPartyToWorkEffortShip.partyId"
from-field="parameters.partyIdFrom"/>
<find-by-and entity-name="WorkEffortPartyAssignment"
list-name="existingShipWepas" map-name="assignPartyToWorkEffortShip"/>
<filter-list-by-date list-name="existingShipWepas"/>
<if-empty field-name="existingShipWepas">
- <set value="CAL_ATTENDEE"
field="assignPartyToWorkEffortShip.roleTypeId"/>
- <set value="CAL_SENT"
field="assignPartyToWorkEffortShip.statusId"/>
+ <set field="assignPartyToWorkEffortShip.roleTypeId"
value="CAL_ATTENDEE"/>
+ <set field="assignPartyToWorkEffortShip.statusId"
value="CAL_SENT"/>
<call-service service-name="assignPartyToWorkEffort"
in-map-name="assignPartyToWorkEffortShip"/>
</if-empty>
</then>
@@ -204,16 +205,17 @@
<and>
<not><if-empty field-name="parameters.partyIdTo"/></not>
<if-compare-field field-name="parameters.partyIdTo"
operator="not-equals" to-field-name="lookedUpValue.partyIdTo"/>
+ <not><if-empty
field-name="lookedUpValue.estimatedArrivalWorkEffId"/></not>
</and>
</condition>
<then>
- <set from-field="lookedUpValue.estimatedArrivalWorkEffId"
field="assignPartyToWorkEffortArrival.workEffortId"/>
- <set from-field="parameters.partyIdTo"
field="assignPartyToWorkEffortArrival.partyId"/>
+ <set field="assignPartyToWorkEffortArrival.workEffortId"
from-field="lookedUpValue.estimatedArrivalWorkEffId"/>
+ <set field="assignPartyToWorkEffortArrival.partyId"
from-field="parameters.partyIdTo"/>
<find-by-and entity-name="WorkEffortPartyAssignment"
list-name="existingArrivalWepas" map-name="assignPartyToWorkEffortArrival"/>
<filter-list-by-date list-name="existingArrivalWepas"/>
<if-empty field-name="existingArrivalWepas">
- <set value="CAL_ATTENDEE"
field="assignPartyToWorkEffortArrival.roleTypeId"/>
- <set value="CAL_SENT"
field="assignPartyToWorkEffortArrival.statusId"/>
+ <set field="assignPartyToWorkEffortArrival.roleTypeId"
value="CAL_ATTENDEE"/>
+ <set field="assignPartyToWorkEffortArrival.statusId"
value="CAL_SENT"/>
<call-service service-name="assignPartyToWorkEffort"
in-map-name="assignPartyToWorkEffortArrival"/>
</if-empty>
</then>
