svn commit: r589991 - /ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r589991 - /ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml

jacopoc
Author: jacopoc
Date: Tue Oct 30 01:52:35 2007
New Revision: 589991

URL: http://svn.apache.org/viewvc?rev=589991&view=rev
Log:
This is a better solution for the fix about billing account balance in some locale.

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

Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=589991&r1=589990&r2=589991&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Tue Oct 30 01:52:35 2007
@@ -92,9 +92,12 @@
     </form>
 
     <form name="EditBillingAccount" type="single" target="updateBillingAccount" title="" default-map-name="billingAccount">
+        <actions>
+            <set field="availableBalance" value="${bsh:org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountBalance(billingAccount)}" type="BigDecimal"/>
+        </actions>
         <alt-target use-when="billingAccount==null" target="createBillingAccount"/>
         <auto-fields-service service-name="updateBillingAccount" map-name="billingAccount"/>
-
+
         <field name="description"><text size="60"/></field>
         
         <field use-when="billingAccount!=null" name="billingAccountId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
@@ -126,11 +129,8 @@
             <display description="${bsh:org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountNetBalance(delegator, billingAccountId)}" type="currency" currency="${billingAccount.accountCurrencyUomId}"/>
         </field>
         -->
-        <field name="availableBalanceBIL" title="${uiLabelMap.AccountingBillingAvailableBalance}" tooltip="${uiLabelMap.AccountingBillingAvailableBalanceMessage}">
-            <display description="${bsh:
-                import java.text.NumberFormat;
-                return(NumberFormat.getNumberInstance(context.get(&quot;locale&quot;)).format(org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountBalance(billingAccount)));}"
-                     type="currency" currency="${billingAccount.accountCurrencyUomId}"/>
+        <field name="availableBalance" title="${uiLabelMap.AccountingBillingAvailableBalance}" tooltip="${uiLabelMap.AccountingBillingAvailableBalanceMessage}">
+            <display type="currency" currency="${billingAccount.accountCurrencyUomId}"/>
         </field>
 
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>


Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r589991 - /ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml

Rashko Rejmer
Index: applications/accounting/widget/BillingAccountForms.xml
===================================================================
--- applications/accounting/widget/BillingAccountForms.xml (revision 590138)
+++ applications/accounting/widget/BillingAccountForms.xml (working copy)
@@ -130,7 +130,7 @@
         </field>
         -->
         <field name="availableBalance" title="${uiLabelMap.AccountingBillingAvailableBalance}" tooltip="${uiLabelMap.AccountingBillingAvailableBalanceMessage}">
-            <display type="currency" currency="${billingAccount.accountCurrencyUomId}"/>
+            <display type="currency" currency="${billingAccount.accountCurrencyUomId}" description="${availableBalance}"/>
         </field>
 
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>


jacopoc wrote
Author: jacopoc
Date: Tue Oct 30 01:52:35 2007
New Revision: 589991

URL: http://svn.apache.org/viewvc?rev=589991&view=rev
Log:
This is a better solution for the fix about billing account balance in some locale.

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

Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=589991&r1=589990&r2=589991&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Tue Oct 30 01:52:35 2007
@@ -92,9 +92,12 @@
     </form>
 
     <form name="EditBillingAccount" type="single" target="updateBillingAccount" title="" default-map-name="billingAccount">
+        <actions>
+            <set field="availableBalance" value="${bsh:org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountBalance(billingAccount)}" type="BigDecimal"/>
+        </actions>
         <alt-target use-when="billingAccount==null" target="createBillingAccount"/>
         <auto-fields-service service-name="updateBillingAccount" map-name="billingAccount"/>
-
+
         <field name="description"><text size="60"/></field> 
         
         <field use-when="billingAccount!=null" name="billingAccountId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
@@ -126,11 +129,8 @@
             <display description="${bsh:org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountNetBalance(delegator, billingAccountId)}" type="currency" currency="${billingAccount.accountCurrencyUomId}"/>
         </field>
         -->
-        <field name="availableBalanceBIL" title="${uiLabelMap.AccountingBillingAvailableBalance}" tooltip="${uiLabelMap.AccountingBillingAvailableBalanceMessage}">
-            <display description="${bsh:
-                import java.text.NumberFormat;
-                return(NumberFormat.getNumberInstance(context.get(&quot;locale&quot;)).format(org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountBalance(billingAccount)));}"
-                     type="currency" currency="${billingAccount.accountCurrencyUomId}"/>
+        <field name="availableBalance" title="${uiLabelMap.AccountingBillingAvailableBalance}" tooltip="${uiLabelMap.AccountingBillingAvailableBalanceMessage}">
+            <display type="currency" currency="${billingAccount.accountCurrencyUomId}"/>
         </field>
 
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r589991 - /ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml

Rashko Rejmer
Hi Jacopo,

This is the description for my previous post - I forgot it, sorry :)
I think that you forgot to add description to the field available
account balance. The amount is missing.
Maybe this will help: