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

[hansbak-2]

Author: hansbak
Date: Tue Oct 12 09:29:07 2010
New Revision: 1021706

URL: http://svn.apache.org/viewvc?rev=1021706&view=rev
Log:
make layout of the payment 'out' screen consistent with payment 'in', only show payment 'out' types on payment 'out' screen

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=1021706&r1=1021705&r2=1021706&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentForms.xml Tue Oct 12 09:29:07 2010
@@ -123,6 +123,12 @@ under the License.
                 </entity-options>
             </drop-down>
         </field>
+        <field name="partyIdTo" position="2"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="1">
+            <drop-down allow-empty="false">
+                <list-options list-name="paymentTypes" key-name="paymentTypeId" description="${description}"/>
+            </drop-down>
+        </field>
         <field name="paymentMethodId" id-name="paymentMethodId" position="2">
             <drop-down allow-empty="false">
                 <entity-options entity-name="PaymentMethod" description="${description}">
@@ -131,12 +137,6 @@ under the License.
                 </entity-options>
             </drop-down>
         </field>
-        <field name="partyIdTo" position="1"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="2">
-            <drop-down allow-empty="false">
-                <list-options list-name="paymentTypes" key-name="paymentTypeId" description="${description}"/>
-            </drop-down>
-        </field>
         <field name="paymentRefNum" position="1"><text/></field>
         <field name="overrideGlAccountId" position="2"><lookup target-form-name="LookupGlAccount"/></field>
         <field name="amount" position="1"><text/></field>
@@ -203,12 +203,14 @@ under the License.
             <entity-one entity-name="StatusItem" value-field="currentStatus">
                 <field-map field-name="statusId" from-field="payment.statusId"/>
             </entity-one>
+            <set field="isDisbursement" value="${groovy:org.ofbiz.accounting.util.UtilAccounting.isDisbursement(payment);}" type="Boolean"/>
         </actions>
         <auto-fields-entity entity-name="Payment"/>
         <field name="paymentId"><hidden/></field>
         <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="1">
             <drop-down allow-empty="false">
                 <entity-options description="${description}" entity-name="PaymentType">
+                    <entity-constraint name="parentTypeId" value="${groovy:isDisbursement==true?&quot;DISBURSEMENT&quot;:&quot;RECEIPT&quot;}"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>