svn commit: r828371 - in /ofbiz/trunk/applications/accounting: data/DemoFinAccountData.xml data/DemoGlSetupData.xml webapp/accounting/payment/PaymentForms.xml widget/Menus.xml

[apatel-2]

Author: apatel
Date: Thu Oct 22 08:32:23 2009
New Revision: 828371

URL: http://svn.apache.org/viewvc?rev=828371&view=rev
Log:
Adding Demo Credit Card type Financial Account for Corporate Credit Card. Removed constraints from Menus, constraints were limiting options to Bank Account type only.
Now When Disbursement Payment user should, Select Payment Method Type Credit Card,  and select Credit Card account from financial account dropdown.
Move payment to Send status.
Open Credit Card Financial Account, On Transactions tab, select Not Assigned in Gl Reconciliation dropdown. Search for transactions.
Select transaction created above, Select reconciliation from dropdown above list and click assign to reconciliation.  

Modified:
    ofbiz/trunk/applications/accounting/data/DemoFinAccountData.xml
    ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
    ofbiz/trunk/applications/accounting/widget/Menus.xml

Modified: ofbiz/trunk/applications/accounting/data/DemoFinAccountData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoFinAccountData.xml?rev=828371&r1=828370&r2=828371&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/DemoFinAccountData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/DemoFinAccountData.xml Thu Oct 22 08:32:23 2009
@@ -27,4 +27,8 @@
             organizationPartyId="Company" ownerPartyId="Company" postToGlAccountId="111100" isRefundable="Y" replenishLevel="0.00" actualBalance="0.00" availableBalance="0.00"/>
     <FinAccountStatus finAccountId="9001" statusId="FNACT_ACTIVE" statusDate="2009-04-01 00:00:01.000"/>
 
+    <FinAccount finAccountId="AMEX-01" finAccountTypeId="CREDIT_CARD_ACCOUNT" statusId="FNACT_ACTIVE" finAccountName="Corporate AMEX " finAccountCode="357898787678934" finAccountPin="9876" currencyUomId="USD"
+            organizationPartyId="Company" ownerPartyId="Company" postToGlAccountId="231000" isRefundable="Y" replenishLevel="0.00" actualBalance="0.00" availableBalance="0.00"/>
+    <FinAccountStatus finAccountId="AMEX-01" statusId="FNACT_ACTIVE" statusDate="2009-04-01 00:00:01.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=828371&r1=828370&r2=828371&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml Thu Oct 22 08:32:23 2009
@@ -244,6 +244,7 @@
     <GlAccountOrganization organizationPartyId="Company" glAccountId="224151" fromDate="2001-01-01 00:00:00.0"/>
     <GlAccountOrganization organizationPartyId="Company" glAccountId="224153" fromDate="2001-01-01 00:00:00.0"/>
     <GlAccountOrganization organizationPartyId="Company" glAccountId="224209" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="231000" fromDate="2001-01-01 00:00:00.0"/>
     <GlAccountOrganization organizationPartyId="Company" glAccountId="336000" fromDate="2001-01-01 00:00:00.0"/>
     <GlAccountOrganization organizationPartyId="Company" glAccountId="400000" fromDate="2001-01-01 00:00:00.0"/>
     <GlAccountOrganization organizationPartyId="Company" glAccountId="401000" fromDate="2001-01-01 00:00:00.0"/>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml?rev=828371&r1=828370&r2=828371&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Thu Oct 22 08:32:23 2009
@@ -130,7 +130,6 @@
         <field name="finAccountId">
             <drop-down allow-empty="true">
                 <entity-options entity-name="FinAccount" description="${finAccountName} [${finAccountId}]" filter-by-date="true">
-                    <entity-constraint name="finAccountTypeId" value="BANK_ACCOUNT"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=828371&r1=828370&r2=828371&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Thu Oct 22 08:32:23 2009
@@ -1178,9 +1178,6 @@
             </link>
         </menu-item>
         <menu-item name="depositWithdraw" title="${uiLabelMap.AccountingDepositWithdraw}">
-            <condition>
-                <if-compare field="finAccount.finAccountTypeId" operator="equals" value="BANK_ACCOUNT"/>
-            </condition>
             <link target="FindPaymentsForDepositOrWithdraw">
                 <parameter param-name="finAccountId"/>
                 <parameter param-name="organizationPartyId" from-field="finAccount.ownerPartyId"/>