Author: jleroux
Date: Fri Jun 27 20:59:48 2014
New Revision: 1606225
URL:
http://svn.apache.org/r1606225Log:
Fixes a bug I introduced with r1547719, simplifies another case
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=1606225&r1=1606224&r2=1606225&view=diff==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml Fri Jun 27 20:59:48 2014
@@ -143,7 +143,7 @@ under the License.
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
<set field="quantity" value="${groovy: quantity ?: 1}" type="BigDecimal"/>
- <set field="total" value="${quantity * amount ?: 0}" type="BigDecimal"/>
+ <set field="total" value="${quantity * amount}" type="BigDecimal"/>
</row-actions>
<auto-fields-entity entity-name="InvoiceItem" default-field-type="display"/>
<field name="invoiceId"><hidden/></field>
@@ -348,7 +348,7 @@ under the License.
<form name="EditInvoiceItems" type="multi" list-name="invoiceItems" default-entity-name="InvoiceItem" target="updateInvoiceItem?invoiceId=${invoiceId}&viewSize=${viewSize}&viewIndex=${viewIndex}" title="Edit Invoice Items" paginate-target="listInvoiceItems"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
- <set field="total" value="${groovy: (quantity ?: 1) * (amount ?: 0)}" type="BigDecimal"/>
+ <set field="total" value="${groovy: (quantity ?: 1) * amount}" type="BigDecimal"/>
</row-actions>
<field name="viewSize"><hidden value="${viewSize}"/></field>
<field name="viewIndex"><hidden value="${viewIndex}"/></field>