svn commit: r730644 - in /ofbiz/trunk: applications/order/script/org/ofbiz/order/order/ applications/product/script/org/ofbiz/shipment/picklist/ applications/product/script/org/ofbiz/shipment/shipment/ specialpurpose/webpos/script/org/ofbiz/webpos/event/

Author: jleroux
Date: Thu Jan  1 15:36:25 2009
New Revision: 730644

URL: http://svn.apache.org/viewvc?rev=730644&view=rev
Log:
<string-append(.*)field-name= => <string-append$1field=

Modified:
    ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
    ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml?rev=730644&r1=730643&r2=730644&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml Thu Jan  1 15:36:25 2009
@@ -110,7 +110,7 @@
         <!-- set subject, contentType, templateName, templateData -->
         <set field="sendEmailMap.subject" value="Delivery Information Updated for Order #${orderDeliverySchedule.orderId}"/>
         <if-compare field="orderDeliverySchedule.orderItemSeqId" operator="not-equals" value="_NA_">
-            <string-append string=" Item #${orderDeliverySchedule.orderItemSeqId}" field-name="subject" map-name="sendEmailMap"/>
+            <string-append string=" Item #${orderDeliverySchedule.orderItemSeqId}" field="subject" map-name="sendEmailMap"/>
         </if-compare>
         <set field="sendEmailMap.contentType" value="text/html"/>
         <set field="sendEmailMap.templateName" value="default/OrderDeliveryUpdatedNotice.ftl"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=730644&r1=730643&r2=730644&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Thu Jan  1 15:36:25 2009
@@ -944,7 +944,7 @@
                     <if-compare-field field="facilityLocationInfo.product.productId" to-field="picklistItemInfo.product.productId" operator="not-equals">
                         <!-- Uh oh, have different products in the same location... what to do about this? -->
                         <log level="error" message="When creating picklist report found in the same location [${facilityLocation.locationSeqId}] two different products: ${facilityLocationInfo.product.productId} and ${picklistItemInfo.product.productId}"/>
-                        <string-append string=" WARNING: products with different IDs are sharing the same bin location, you must check products and quantities required against orders : ${facilityLocationInfo.product.productId} and ${picklistItemInfo.product.productId}" field-name="facilityLocationInfo.message"/>
+                        <string-append string=" WARNING: products with different IDs are sharing the same bin location, you must check products and quantities required against orders : ${facilityLocationInfo.product.productId} and ${picklistItemInfo.product.productId}" field="facilityLocationInfo.message"/>
                     </if-compare-field>
                 </else>
                 </if-empty>

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=730644&r1=730643&r2=730644&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:36:25 2009
@@ -724,7 +724,7 @@
         <!-- set subject, contentType, templateName, templateData -->
         <set value="Scheduled Notification for Shipment ${shipment.shipmentId}" field="sendEmailMap.subject"/>
         <if-not-empty field="shipment.primaryOrderId">
-            <string-append string=" for Primary Order ${shipment.primaryOrderId}" field-name="sendEmailMap.subject"/>
+            <string-append string=" for Primary Order ${shipment.primaryOrderId}" field="sendEmailMap.subject"/>
         </if-not-empty>
         <set value="text/html" field="sendEmailMap.contentType"/>
         <set value="org/ofbiz/shipment/shipment/ShipmentScheduledNotice.ftl" field="sendEmailMap.templateName"/>

Modified: ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml?rev=730644&r1=730643&r2=730644&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml Thu Jan  1 15:36:25 2009
@@ -291,7 +291,7 @@
                                 <!-- test expiration date -->
                                 <if-not-empty field="parameters.expMonth">
                                     <set field="cardExp" from-field="parameters.expMonth"/>
-                                    <string-append string="${parameters.expYear}" field-name="cardExp"/>
+                                    <string-append string="${parameters.expYear}" field="cardExp"/>
                                     <call-object-method obj-field-name="cardExp" method-name="length" ret-field="length"/>
                                     <if-compare field="length" operator="not-equals" value="6">
                                         <add-error><fail-property resource="WebPosUiLabels" property="WebPosPaymentCredictCardInvalidExpiringDate"/></add-error>