Posted by
sichen on
Jul 22, 2006; 12:46am
URL: http://ofbiz.116.s1.nabble.com/svn-commit-r424494-in-incubator-ofbiz-trunk-applications-accounting-config-AccountingUiLabels-properl-tp208623.html
Author: sichen
Date: Fri Jul 21 16:46:22 2006
New Revision: 424494
URL:
http://svn.apache.org/viewvc?rev=424494&view=revLog:
Main biling account screen shows available and net balance
Modified:
incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
incubator/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
Modified: incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?rev=424494&r1=424493&r2=424494&view=diff==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Fri Jul 21 16:46:22 2006
@@ -83,11 +83,15 @@
AccountingBillingAccountPayments=Billing Account Payments
AccountingBillingAccounts=Billing Accounts
AccountingBillingAcct=Billing Acct
+AccountingBillingAvailableBalance=Available Balance
+AccountingBillingAvailableBalanceMessage=This is the amount which can be used for new orders.
AccountingBillingAddress=Billing Address
AccountingBillingContactMechId=Billing Contact Mech
AccountingBillingContactMechIdMessage=Billing Address; Add Party/Role first, then select from drop-down
AccountingBillingInformation=AccountingBilling Information
AccountingBillingMenu=Billing Accounts
+AccountingBillingNetBalance=Net Balance
+AccountingBillingNetBalanceMessage=This is the amount which is currently outstanding on the billing account.
AccountingBillToAddress1=Bill-To Address1
AccountingBillToAddress2=Bill-To Address2
AccountingBillUpTo=Bill-Up To
Modified: incubator/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=424494&r1=424493&r2=424494&view=diff==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Fri Jul 21 16:46:22 2006
@@ -23,6 +23,8 @@
<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" title="${uiLabelMap.PartyParty}" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
<field use-when="billingAccount==null&&billingAccountId==null" name="billingAccountId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName"/></field>
<field use-when="billingAccount==null&&billingAccountId!=null" name="billingAccountId" title="${uiLabelMap.PartyParty}" tooltip="${uiLabelMap.CommonCannotBeFound}:[${billingAccountId}]"><lookup target-form-name="LookupPartyName"/></field>
@@ -44,7 +46,13 @@
</entity-options>
</drop-down>
</field>
-
+ <field name="netBalance" widget-style="tabletext" title="${uiLabelMap.AccountingBillingNetBalance}" tooltip="${uiLabelMap.AccountingBillingNetBalanceMesage}">
+ <display description="${bsh:org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountNetBalance(delegator, billingAccountId)}"/>
+ </field>
+ <field name="availableBalance" widget-style="tabletext" title="${uiLabelMap.AccountingBillingAvailableBalance}" tooltip="${uiLabelMap.AccountingBillingAvailableBalanceMesage}">
+ <display description="${bsh:org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountAvailableBalance(billingAccount)}"/>
+ </field>
+
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>