svn commit: r775104 - in /ofbiz/trunk/applications/accounting/widget: BillingAccountForms.xml BillingAccountScreens.xml

[mor-2]

Author: mor
Date: Fri May 15 12:27:26 2009
New Revision: 775104

URL: http://svn.apache.org/viewvc?rev=775104&view=rev
Log:
Sort the existing Billing Account on accounting.
Patch from Vivek Mishra, part of OFBIZ-2465 (https://issues.apache.org/jira/browse/OFBIZ-2465)

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

Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=775104&r1=775103&r2=775104&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Fri May 15 12:27:26 2009
@@ -36,7 +36,7 @@
         <field name="thruDate"><display/></field>
     </form>
 
-    <form name="ListBillingAccountsByParty" type="list" list-name="billingAccounts" paginate-target="FindBillingAccount" default-entity-name="BillingAccountAndRole"
+    <form name="ListBillingAccountsByParty" type="list" list-name="billingAccounts" paginate-target="FindBillingAccount"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="billingAccountId" widget-style="buttontext">
             <hyperlink description="${billingAccountId}" target="EditBillingAccount">
@@ -46,10 +46,11 @@
         <field name="accountLimit">
             <display type="currency" currency="${billingAccount.accountCurrencyUomId}"/>
         </field>
+        <field name="accountBalance"><display type="currency"/></field>
         <field name="description"><display/></field>
         <field name="fromDate"><display/></field>
         <field name="thruDate"><display/></field>
-        <field name="partyId"><display/></field>
+        <field name="partyId" title="${uiLabelMap.PartyPartyId}"><display description="${parameters.partyId}"/></field>
         <field name="roleTypeId" title="${uiLabelMap.AccountingRoleType}"><display-entity entity-name="RoleType"/></field>
     </form>
 

Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=775104&r1=775103&r2=775104&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Fri May 15 12:27:26 2009
@@ -82,9 +82,8 @@
                             <fail-widgets>
                                 <section>
                                     <actions>
-                                        <entity-condition entity-name="BillingAccountAndRole" list="billingAccounts">
-                                            <condition-expr field-name="partyId" from-field="parameters.partyId"/>
-                                        </entity-condition>
+                                        <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/BillingAccounts.groovy"/>
+                                        <set field="roleTypeId" value="BILL_TO_CUSTOMER"/>
                                     </actions>
                                     <widgets>
                                         <screenlet title="${uiLabelMap.PageTitleFindBillingAccount}">