svn commit: r1487323 - /ofbiz/trunk/applications/accounting/widget/PaymentForms.xml

[hansbak-2]

Author: hansbak
Date: Wed May 29 06:41:13 2013
New Revision: 1487323

URL: http://svn.apache.org/r1487323
Log:
improve payment form to select payment method depending on organization party

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

Modified: ofbiz/trunk/applications/accounting/widget/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentForms.xml?rev=1487323&r1=1487322&r2=1487323&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentForms.xml Wed May 29 06:41:13 2013
@@ -143,10 +143,10 @@ under the License.
                 <list-options list-name="paymentTypes" key-name="paymentTypeId" description="${description}"/>
             </drop-down>
         </field>
-        <field name="paymentMethodId" id-name="paymentMethodId" position="2">
+        <field name="paymentMethodId" title="${uiLabelMap.AccountingPaymentMethodId}" position="2">
             <drop-down allow-empty="false">
                 <entity-options entity-name="PaymentMethod" description="${description}">
-                    <entity-constraint name="partyId" operator="equals" env-name="paymentPartyId"/>
+                    <entity-constraint name="partyId" operator="equals" env-name="defaultOrganizationPartyId"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -181,9 +181,10 @@ under the License.
                 </entity-options>
             </drop-down>
         </field>
-        <field position="2" name="paymentMethodTypeId">
-            <drop-down allow-empty="true">
-                <entity-options entity-name="PaymentMethodType"  description="${description}">
+        <field name="paymentMethodId" title="${uiLabelMap.AccountingPaymentMethodId}" position="2">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="PaymentMethod" description="${description}">
+                    <entity-constraint name="partyId" operator="equals" env-name="defaultOrganizationPartyId"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -244,10 +245,10 @@ under the License.
                 </entity-options>
             </drop-down>
         </field>
-        <field position="1" name="paymentMethodId">
+        <field name="paymentMethodId" title="${uiLabelMap.AccountingPaymentMethodId}" position="1">
             <drop-down allow-empty="false">
                 <entity-options  key-field-name="paymentMethodId" entity-name="PaymentMethod" description="${paymentMethodTypeId} (${paymentMethodId})">
-                    <entity-constraint name="partyId" operator="equals" value="${payment.partyIdFrom}"/>
+                    <entity-constraint name="partyId" operator="equals" value="${groovy:isDisbursement==true?payment.partyIdFrom:payment.partyIdTo}"/>
                     <entity-order-by field-name="paymentMethodTypeId"/>
                 </entity-options>
             </drop-down>