Author: jleroux
Date: Thu Jan 1 15:09:46 2009
New Revision: 730633
URL:
http://svn.apache.org/viewvc?rev=730633&view=revLog:
<clear-field field="(.*)" map-name="(.*)"/> => <clear-field field="$2.$1"/>
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=730633&r1=730632&r2=730633&view=diff==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Thu Jan 1 15:09:46 2009
@@ -571,8 +571,8 @@
<set field="updateInvoiceCtx.invoiceTypeId" value="PURCHASE_INVOICE"/>
</if-compare>
<clear-field field="invoice"/>
- <clear-field field="invoiceIdToCopyFrom" map-name="parameters"/>
- <clear-field field="recurrenceInfoId" map-name="updateInvoiceCtx"/>
+ <clear-field field="parameters.invoiceIdToCopyFrom"/>
+ <clear-field field="updateInvoiceCtx.recurrenceInfoId"/>
<call-service service-name="updateInvoice" in-map-name="updateInvoiceCtx"/>
</iterate>
</simple-method>
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=730633&r1=730632&r2=730633&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 Thu Jan 1 15:09:46 2009
@@ -916,7 +916,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-compare value="New" operator="equals" field="newEntity.shipmentPackageSeqId">
- <clear-field field="shipmentPackageSeqId" map-name="newEntity"/>
+ <clear-field field="newEntity.shipmentPackageSeqId"/>
</if-compare>
<!-- if no shipmentPackageSeqId, generate one based on existing items, ie one greater than the current higher number -->