Author: apatel
Date: Sat Dec 19 07:58:12 2009
New Revision: 892448
URL: http://svn.apache.org/viewvc?rev=892448&view=rev
Log:
Added demo PaymentMethod of type CASH. Now user can create Payment from AP to
Pay CASH.
Modified:
ofbiz/trunk/applications/accounting/data/DemoFinAccountData.xml
ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml
ofbiz/trunk/applications/accounting/widget/PaymentForms.xml
Modified: ofbiz/trunk/applications/accounting/data/DemoFinAccountData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoFinAccountData.xml?rev=892448&r1=892447&r2=892448&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/DemoFinAccountData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/DemoFinAccountData.xml Sat Dec 19
07:58:12 2009
@@ -35,5 +35,6 @@
<PaymentMethod paymentMethodId="AMEX_01" paymentMethodTypeId="CREDIT_CARD"
partyId="Company" description="AmEx 0005" glAccountId="231000"
finAccountId="AMEX_01" fromDate="2009-04-01 00:00:00.000"/>
<CreditCard paymentMethodId="AMEX_01" cardType="AmericanExpress"
cardNumber="378282246310005" expireDate="02/2020" companyNameOnCard="Your
Company Name"
titleOnCard="" firstNameOnCard="Smart" middleNameOnCard=""
lastNameOnCard="Guy" suffixOnCard="" contactMechId="9000"/>
+ <PaymentMethod paymentMethodId="PETTY_CASH" paymentMethodTypeId="CASH"
partyId="Company" description="Petty Cash" glAccountId="110000"
fromDate="2009-04-01 00:00:00.000"/>
</entity-engine-xml>
Modified: ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml?rev=892448&r1=892447&r2=892448&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml Sat Dec 19
07:58:12 2009
@@ -215,8 +215,10 @@
<!-- Chart Of Accounts -->
<GlAccountOrganization organizationPartyId="Company" glAccountId="100000"
fromDate="2001-01-01 00:00:00.0"/>
+ <GlAccountOrganization organizationPartyId="Company" glAccountId="110000"
fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="111000"
fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="111100"
fromDate="2001-01-01 00:00:00.0"/>
+ <GlAccountOrganization organizationPartyId="Company" glAccountId="111900"
fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="112000"
fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="120000"
fromDate="2001-01-01 00:00:00.0"/>
<GlAccountOrganization organizationPartyId="Company" glAccountId="125000"
fromDate="2001-01-01 00:00:00.0"/>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentForms.xml?rev=892448&r1=892447&r2=892448&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentForms.xml Sat Dec 19
07:58:12 2009
@@ -125,7 +125,10 @@
</field>
<field name="paymentMethodId" id-name="paymentMethodId" position="2">
<drop-down allow-empty="false">
- <list-options list-name="paymentMethodAndFinAccounts"
key-name="paymentMethodId" description="${description}"/>
+ <entity-options entity-name="PaymentMethod"
description="${description}">
+ <entity-constraint name="partyId" operator="equals"
env-name="paymentPartyId"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
</drop-down>
</field>
<field name="partyIdTo" position="1"><lookup
target-form-name="LookupPartyName"/></field>