svn commit: r835313 - /ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml

[lektran]

Author: lektran
Date: Thu Nov 12 09:25:52 2009
New Revision: 835313

URL: http://svn.apache.org/viewvc?rev=835313&view=rev
Log:
Removed a stack of unnecessary currency formatting

Modified:
    ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml

Modified: ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml?rev=835313&r1=835312&r2=835313&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml Thu Nov 12 09:25:52 2009
@@ -101,9 +101,7 @@
     <form name="invoiceHeader" type="single" title="Invoice header information" default-map-name="invoice"
         header-row-style="header-row" default-table-style="basic-table">
         <actions>
-            <set field="total" value="${bsh:
-                import java.text.NumberFormat;
-                return(NumberFormat.getNumberInstance(context.get(&quot;locale&quot;)).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)));}"/>
+            <set field="total" value="${bsh:return(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice));}"/>
             <service service-name="getPartyNameForDate" result-map="partyNameResultFrom">
                 <field-map field-name="partyId" from-field="invoice.partyIdFrom"/>
                 <field-map field-name="compareDate" from-field="invoice.invoiceDate"/>
@@ -134,7 +132,7 @@
         <field position="2" name="billingAccountId"><display/></field>
         <field position="1" name="invoiceDate"><display description="${bsh:if(invoice.get(&quot;invoiceDate&quot;)!=null)return(invoice.getString(&quot;invoiceDate&quot;).substring(0,10));}"/></field>
         <field position="2" name="dueDate"><display description="${bsh:if(invoice.get(&quot;dueDate&quot;)!=null)return(invoice.getString(&quot;dueDate&quot;).substring(0,10));}"/></field>
-        <field position="1" name="total" entry-name="description"><display description="${total}" type="currency" currency="${invoice.currencyUomId}"/></field>
+        <field position="1" name="total"><display description="${total}" type="currency" currency="${invoice.currencyUomId}"/></field>
         <field position="2" name="paidDate"><display description="${bsh:if(invoice.get(&quot;paidDate&quot;)!=null)return(invoice.getString(&quot;paidDate&quot;).substring(0,10));}"/></field>
         <field name="currencyUomId"><hidden/></field>
     </form>
@@ -143,11 +141,10 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <row-actions>
             <set field="total" value="${bsh:
-                import java.text.NumberFormat;
                 import java.math.BigDecimal;
                 if(quantity==null) quantity = BigDecimal.ONE;
                 if(amount==null) amount = BigDecimal.ZERO;
-                return(NumberFormat.getNumberInstance(context.get(&quot;locale&quot;)).format(quantity.multiply(amount)));}"/>
+                return (quantity.multiply(amount));}"/>
         </row-actions>
         <auto-fields-entity entity-name="InvoiceItem" default-field-type="display"/>
         <field name="invoiceId"><hidden/></field>
@@ -351,10 +348,9 @@
        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
        <row-actions>
            <set field="total" value="${bsh:
-               import java.text.NumberFormat;
                import java.math.BigDecimal;
                if(quantity == null || quantity.compareTo(BigDecimal.ZERO) == 0) quantity = BigDecimal.ONE;
-               return(NumberFormat.getNumberInstance(context.get(&quot;locale&quot;)).format(quantity.multiply(amount)));}"/>
+               return(quantity.multiply(amount));}"/>
        </row-actions>
        <field name="invoiceId"><hidden/></field>
        <field name="invoiceItemSeqId" widget-style="buttontext">