svn commit: r1613432 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: jacopoc
Date: Fri Jul 25 13:28:20 2014 New Revision: 1613432 URL: http://svn.apache.org/r1613432 Log: ${bsh: to ${groovy: scriptlet conversions. Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml ofbiz/trunk/applications/accounting/widget/PaymentForms.xml ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=1613432&r1=1613431&r2=1613432&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Fri Jul 25 13:28:20 2014 @@ -404,7 +404,7 @@ under the License. <menu name="PaymentSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" menu-container-style="button-bar button-style-2"> <actions> - <set field="isDisbursement" value="${bsh:if(payment!=void)return org.ofbiz.accounting.util.UtilAccounting.isDisbursement(payment)}"/> + <set field="isDisbursement" value="${groovy:if(payment!=void)return org.ofbiz.accounting.util.UtilAccounting.isDisbursement(payment)}"/> </actions> <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}" widget-style="buttontext create" > <condition> Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=1613432&r1=1613431&r2=1613432&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Fri Jul 25 13:28:20 2014 @@ -84,11 +84,11 @@ under the License. <field-map field-name="compareDate" from-field="invoiceDate"/> <field-map field-name="lastNameFirst" value="Y"/> </service> - <set field="paidInvoice" value="${bsh: org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId).compareTo(java.math.BigDecimal.ZERO)==0}" type="Boolean"/> - <set field="amountToApply" value="${bsh: + <set field="paidInvoice" value="${groovy: org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId).compareTo(java.math.BigDecimal.ZERO)==0}" type="Boolean"/> + <set field="amountToApply" value="${groovy: import java.text.NumberFormat; return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> - <set field="total" value="${bsh: + <set field="total" value="${groovy: import java.text.NumberFormat; return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)));}"/> </row-actions> @@ -104,22 +104,22 @@ under the License. <field name="description"><display/></field> <field name="partyIdFrom"><display description="${partyNameResultFrom.fullName} [${partyIdFrom}]"/></field> <field name="partyIdTo" parameter-name="partyId"><display description="${partyNameResultTo.fullName} [${partyId}]"/></field> - <field name="invoiceDate"><display description="${bsh:invoiceDate.toString().substring(0,10)}"/></field> + <field name="invoiceDate"><display description="${groovy:invoiceDate.toString().substring(0,10)}"/></field> <field name="total" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> <field name="amountToApply" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> - <field name="capture" use-when="${bsh:!paidInvoice}" widget-style="buttontext"> + <field name="capture" use-when="${groovy:!paidInvoice}" widget-style="buttontext"> <hyperlink target="capturePaymentsByInvoice" description="${uiLabelMap.AccountingCapture}"> <parameter param-name="invoiceId"/> <parameter param-name="billingAccountId"/> </hyperlink> </field> - <field name="capture" use-when="${bsh:paidInvoice}"><display/></field> + <field name="capture" use-when="${groovy:paidInvoice}"><display/></field> </form> <form name="EditBillingAccount" type="single" target="updateBillingAccount" title="" header-row-style="header-row" default-table-style="basic-table"> <actions> - <set field="availableBalance" value="${bsh:billingAccount != null ? org.ofbiz.order.order.OrderReadHelper.getBillingAccountBalance(billingAccount) : 0}" type="BigDecimal"/> + <set field="availableBalance" value="${groovy:billingAccount != null ? org.ofbiz.order.order.OrderReadHelper.getBillingAccountBalance(billingAccount) : 0}" type="BigDecimal"/> </actions> <alt-target use-when="billingAccount==null" target="createBillingAccount"/> <auto-fields-service service-name="updateBillingAccount" map-name="billingAccount"/> @@ -152,7 +152,7 @@ under the License. </field> <!-- <field name="netBalance" title="${uiLabelMap.AccountingBillingNetBalance}" tooltip="${uiLabelMap.AccountingBillingNetBalanceMessage}"> - <display description="${bsh:org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountNetBalance(delegator, billingAccountId)}" type="currency" currency="${billingAccount.accountCurrencyUomId}"/> + <display description="${groovy:org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountNetBalance(delegator, billingAccountId)}" type="currency" currency="${billingAccount.accountCurrencyUomId}"/> </field> --> <field name="availableBalance" title="${uiLabelMap.AccountingBillingAvailableBalance}" tooltip="${uiLabelMap.AccountingBillingAvailableBalanceMessage}"> Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=1613432&r1=1613431&r2=1613432&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Fri Jul 25 13:28:20 2014 @@ -501,7 +501,7 @@ under the License. <entity-one entity-name="GlAccountClass" value-field="revenueGlAccountClass"> <field-map field-name="glAccountClassId" value="REVENUE"/> </entity-one> - <set field="revenueAccountClassIds" value="${bsh:org.ofbiz.accounting.util.UtilAccounting.getDescendantGlAccountClassIds(revenueGlAccountClass)}" type="List"/> + <set field="revenueAccountClassIds" value="${groovy:org.ofbiz.accounting.util.UtilAccounting.getDescendantGlAccountClassIds(revenueGlAccountClass)}" type="List"/> </actions> <auto-fields-service service-name="addInvoiceItemTypeGlAssignment"/> <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> @@ -555,7 +555,7 @@ under the License. <entity-one entity-name="GlAccountClass" value-field="expenseGlAccountClass"> <field-map field-name="glAccountClassId" value="EXPENSE"/> </entity-one> - <set field="expenseAccountClassIds" value="${bsh:org.ofbiz.accounting.util.UtilAccounting.getDescendantGlAccountClassIds(expenseGlAccountClass)}" type="List"/> + <set field="expenseAccountClassIds" value="${groovy:org.ofbiz.accounting.util.UtilAccounting.getDescendantGlAccountClassIds(expenseGlAccountClass)}" type="List"/> </actions> <auto-fields-service service-name="addInvoiceItemTypeGlAssignment"/> <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> Modified: ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml?rev=1613432&r1=1613431&r2=1613432&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml Fri Jul 25 13:28:20 2014 @@ -69,9 +69,9 @@ under the License. <field-map field-name="compareDate" from-field="invoiceDate"/> <field-map field-name="lastNameFirst" value="Y"/> </service> - <set field="amountToApply" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId) + <set field="amountToApply" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId) .multiply(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceCurrencyConversionRate(delegator,invoiceId))}"/> - <set field="total" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId) + <set field="total" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId) .multiply(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceCurrencyConversionRate(delegator,invoiceId))}"/> <set field="currencyUomId" from-field="defaultOrganizationPartyCurrencyUomId"/> </row-actions> @@ -102,7 +102,7 @@ under the License. <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:return(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice));}"/> + <set field="total" value="${groovy: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"/> @@ -131,10 +131,10 @@ under the License. </field> <field position="1" name="roleTypeId"><display/></field> <field position="2" name="billingAccountId"><display/></field> - <field position="1" name="invoiceDate"><display description="${bsh:if(invoice.get("invoiceDate")!=null)return(invoice.getString("invoiceDate").substring(0,10));}"/></field> - <field position="2" name="dueDate"><display description="${bsh:if(invoice.get("dueDate")!=null)return(invoice.getString("dueDate").substring(0,10));}"/></field> + <field position="1" name="invoiceDate"><display description="${groovy:if(invoice.get("invoiceDate")!=null)return(invoice.getString("invoiceDate").substring(0,10));}"/></field> + <field position="2" name="dueDate"><display description="${groovy:if(invoice.get("dueDate")!=null)return(invoice.getString("dueDate").substring(0,10));}"/></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("paidDate")!=null)return(invoice.getString("paidDate").substring(0,10));}"/></field> + <field position="2" name="paidDate"><display description="${groovy:if(invoice.get("paidDate")!=null)return(invoice.getString("paidDate").substring(0,10));}"/></field> <field position="1" name="referenceNumber" title="${uiLabelMap.FormFieldTitle_referenceNum}"><display/></field> <field name="currencyUomId"><hidden/></field> </form> @@ -435,7 +435,7 @@ under the License. <form name="ListInvoiceStatus" list-name="invoiceStatus" target="" title="" type="list" paginate-target="ListInvoiceStatus" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="invoiceId"><hidden/></field> - <field name="statusDate"><display description="${bsh:statusDate.toString().substring(0,10)}"/></field> + <field name="statusDate"><display description="${groovy:statusDate.toString().substring(0,10)}"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field> </form> Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=1613432&r1=1613431&r2=1613432&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Fri Jul 25 13:28:20 2014 @@ -188,9 +188,9 @@ under the License. <order-by field-name="invoiceItemSeqId"/> </entity-and> <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy"/> - <set field="invoiceAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)}" type="BigDecimal"/> - <set field="notAppliedAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}" type="BigDecimal"/> - <set field="appliedAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(invoice)}" type="BigDecimal"/> + <set field="invoiceAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)}" type="BigDecimal"/> + <set field="notAppliedAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}" type="BigDecimal"/> + <set field="appliedAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(invoice)}" type="BigDecimal"/> <entity-condition entity-name="InvItemAndOrdItem" list="invItemAndOrdItems"> <condition-expr field-name="invoiceId" operator="equals" from-field="invoiceId"/> <order-by field-name="invoiceItemSeqId"/> @@ -346,9 +346,9 @@ under the License. <entity-one entity-name="Invoice" value-field="invoice"/> <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy"/> <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/ListNotAppliedPayments.groovy"/> - <set field="invoiceAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)}" type="BigDecimal"/> - <set field="notAppliedAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}" type="BigDecimal"/> - <set field="appliedAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(invoice)}" type="BigDecimal"/> + <set field="invoiceAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)}" type="BigDecimal"/> + <set field="notAppliedAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}" type="BigDecimal"/> + <set field="appliedAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(invoice)}" type="BigDecimal"/> </actions> <widgets> <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}"> Modified: ofbiz/trunk/applications/accounting/widget/PaymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentForms.xml?rev=1613432&r1=1613431&r2=1613432&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentForms.xml Fri Jul 25 13:28:20 2014 @@ -60,7 +60,7 @@ under the License. </service> </actions> <row-actions> - <set field="amountToApply" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(delegator,paymentId);}"/> + <set field="amountToApply" value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(delegator,paymentId);}"/> </row-actions> <field name="paymentId" widget-style="buttontext"> <hyperlink description="${paymentId}" target="paymentOverview"> @@ -415,7 +415,7 @@ under the License. </entity-condition> </actions> <row-actions> - <set field="amountApplied" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentAppliedAmount(delegator, paymentApplicationId);}"/> + <set field="amountApplied" value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentAppliedAmount(delegator, paymentApplicationId);}"/> </row-actions> <auto-fields-entity entity-name="PaymentApplication" default-field-type="display"/> <field name="paymentApplicationId"><hidden/></field> Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=1613432&r1=1613431&r2=1613432&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Fri Jul 25 13:28:20 2014 @@ -168,11 +168,11 @@ under the License. <set field="tabButtonItem" value="editPaymentApplications"/> <set field="paymentId" from-field="parameters.paymentId"/> <entity-one entity-name="Payment" value-field="payment"/> - <set field="appliedAmount" type="String" value="${bsh: + <set field="appliedAmount" type="String" value="${groovy: import java.text.NumberFormat; return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.payment.PaymentWorker.getPaymentApplied(payment)));}"/> - <set field="notAppliedAmount" type="BigDecimal" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment)}"/> - <set field="notAppliedAmountStr" type="String" value="${bsh: + <set field="notAppliedAmount" type="BigDecimal" value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment)}"/> + <set field="notAppliedAmountStr" type="String" value="${groovy: import java.text.NumberFormat; return(NumberFormat.getCurrencyInstance(context.get("locale")).format(org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment)));}"/> <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy"/> @@ -351,8 +351,8 @@ under the License. <entity-one entity-name="Payment" value-field="payment"/> <set field="finAccountTransId" from-field="payment.finAccountTransId"/> <entity-one entity-name="FinAccountTrans" value-field="finAccountTrans"/> - <set field="appliedAmount" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentApplied(payment).toString()}"/> - <set field="notAppliedAmount" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment).toString()}"/> + <set field="appliedAmount" value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentApplied(payment).toString()}"/> + <set field="notAppliedAmount" value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment).toString()}"/> <entity-condition entity-name="AcctgTransAndEntries" list="AcctgTransAndEntries"> <condition-expr field-name="paymentId" from-field="paymentId"/> <order-by field-name="acctgTransId"/> Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=1613432&r1=1613431&r2=1613432&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml Fri Jul 25 13:28:20 2014 @@ -27,8 +27,8 @@ under the License. <set field="titleProperty" value="PageTitleFinancialSummaryReportOptions"/> <set field="headerItem" value="FinancialSummryReports"/> - <set field="month" from-field="parameters.month" default-value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("MM")}"/> - <set field="year" from-field="parameters.year" default-value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy")}"/> + <set field="month" from-field="parameters.month" default-value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("MM")}"/> + <set field="year" from-field="parameters.year" default-value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy")}"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -60,8 +60,8 @@ under the License. <actions> <set field="headerItem" value="FinancialSummryReports"/> - <set field="month" from-field="parameters.month" type="Integer" default-value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("MM")}"/> - <set field="year" from-field="parameters.year" type="Integer" default-value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy")}"/> + <set field="month" from-field="parameters.month" type="Integer" default-value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("MM")}"/> + <set field="year" from-field="parameters.year" type="Integer" default-value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy")}"/> <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> <set field="currencyUomId" from-field="parameters.currencyUomId"/> Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml?rev=1613432&r1=1613431&r2=1613432&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml Fri Jul 25 13:28:20 2014 @@ -33,10 +33,10 @@ under the License. <field-map field-name="compareDate" from-field="invoiceDate"/> <field-map field-name="lastNameFirst" value="Y"/> </service> - <set field="amountToApply" value="${bsh: + <set field="amountToApply" value="${groovy: import java.text.NumberFormat; return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> - <set field="total" value="${bsh: + <set field="total" value="${groovy: import java.text.NumberFormat; return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)));}"/> </row-actions> Modified: ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml?rev=1613432&r1=1613431&r2=1613432&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml Fri Jul 25 13:28:20 2014 @@ -34,10 +34,10 @@ under the License. <field-map field-name="compareDate" from-field="invoiceDate"/> <field-map field-name="lastNameFirst" value="Y"/> </service> - <set field="amountToApply" value="${bsh: + <set field="amountToApply" value="${groovy: import java.text.NumberFormat; return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> - <set field="total" value="${bsh: + <set field="total" value="${groovy: import java.text.NumberFormat; return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)));}"/> </row-actions> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |