svn commit: r833980 - in /ofbiz/trunk/applications/accounting: entitydef/entitymodel.xml widget/PaymentForms.xml

[apatel-2]

Author: apatel
Date: Mon Nov  9 06:49:18 2009
New Revision: 833980

URL: http://svn.apache.org/viewvc?rev=833980&view=rev
Log:
Adding PaymentAndTypeAndCreditCard. Allows to filter payments by credit card type.

Modified:
    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
    ofbiz/trunk/applications/accounting/widget/PaymentForms.xml

Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=833980&r1=833979&r2=833980&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Mon Nov  9 06:49:18 2009
@@ -2792,6 +2792,18 @@
         <key-map field-name="paymentId" rel-field-name="toPaymentId"/>
       </relation>
     </view-entity>
+    <view-entity entity-name="PaymentAndTypeAndCreditCard"
+            package-name="org.ofbiz.financials.payment"
+            never-cache="true"
+            title="Payment, Payment type and CreadiCard View Entity">
+        <member-entity entity-alias="PAT" entity-name="PaymentAndType"/>
+        <member-entity entity-alias="CC" entity-name="CreditCard"/>
+        <alias-all entity-alias="PAT"/>
+        <alias-all entity-alias="CC"/>
+        <view-link entity-alias="PAT" rel-entity-alias="CC" rel-optional="true">
+            <key-map field-name="paymentMethodId" rel-field-name="paymentMethodId"/>
+        </view-link>
+    </view-entity>
     <view-entity entity-name="PaymentAndApplication"
             package-name="org.ofbiz.accounting.payment"
             never-cache="true"

Modified: ofbiz/trunk/applications/accounting/widget/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentForms.xml?rev=833980&r1=833979&r2=833980&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentForms.xml Mon Nov  9 06:49:18 2009
@@ -53,7 +53,7 @@
         <actions>
             <service service-name="performFind" result-map="result" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
-                <field-map field-name="entityName" value="PaymentAndType"/>
+                <field-map field-name="entityName" value="PaymentAndTypeAndCreditCard"/>
                 <field-map field-name="orderBy" value="effectiveDate DESC"/>
                 <field-map field-name="viewIndex" from-field="viewIndex"/>
                 <field-map field-name="viewSize" from-field="viewSize"/>