svn commit: r672348 - in /ofbiz/trunk/applications: accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml order/script/org/ofbiz/order/order/OrderServices.xml

[adrianc]

Author: adrianc
Date: Fri Jun 27 11:13:43 2008
New Revision: 672348

URL: http://svn.apache.org/viewvc?rev=672348&view=rev
Log:
Fixup for last commit.

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.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=672348&r1=672347&r2=672348&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 Fri Jun 27 11:13:43 2008
@@ -46,8 +46,6 @@
                 </if-not-empty>
                 <store-value value-name="partyAcctgPreference"/>
                 <set from-field="partyAcctgPreference.lastInvoiceNumber" field="invoiceIdTemp"/>
-                <!-- Bypass localization of Long->String conversion -->
-                <set field="invoiceIdTemp" value="${bsh:invoiceIdTemp.toString();}"/>
             </then>
             <else-if>
                 <condition>
@@ -120,7 +118,8 @@
         </if>
 
         <!-- use invoiceIdTemp along with the invoiceIdPrefix to create the real ID -->
-        <set field="invoiceId" value="${partyAcctgPreference.invoiceIdPrefix}${invoiceIdTemp}"/>
+        <!-- The ${bsh:invoiceIdTemp.toString();} bypasses localization of Long->String conversion -->
+        <set field="invoiceId" value="${partyAcctgPreference.invoiceIdPrefix}${bsh:invoiceIdTemp.toString();}"/>
         <field-to-result field-name="invoiceId" result-name="invoiceId"/>
     </simple-method>
 

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=672348&r1=672347&r2=672348&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Fri Jun 27 11:13:43 2008
@@ -492,8 +492,6 @@
                 </if-not-empty>
                 <store-value value-name="partyAcctgPreference"/>
                 <set from-field="partyAcctgPreference.lastOrderNumber" field="orderIdTemp"/>
-                <!-- Bypass localization of Long->String conversion -->
-                <set field="orderIdTemp" value="${bsh:orderIdTemp.toString();}"/>
             </then>
             <else>
                 <!-- <log level="info" message="In getNextOrderId sequence enum ODRSQ_STANDARD"/> -->
@@ -515,7 +513,8 @@
         </if-not-empty>
         
         <!-- use orderIdTemp along with the orderIdPrefix to create the real ID -->
-        <set field="orderId" value="${productStore.orderNumberPrefix}${partyAcctgPreference.orderIdPrefix}${orderIdTemp}"/>
+        <!-- The ${bsh:orderIdTemp.toString();} bypasses localization of Long->String conversion -->
+        <set field="orderId" value="${productStore.orderNumberPrefix}${partyAcctgPreference.orderIdPrefix}${bsh:orderIdTemp.toString();}"/>
         <field-to-result field-name="orderId" result-name="orderId"/>
     </simple-method>