You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/01/20 08:54:22 UTC
svn commit: r735961 -
/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
Author: hansbak
Date: Mon Jan 19 23:54:22 2009
New Revision: 735961
URL: http://svn.apache.org/viewvc?rev=735961&view=rev
Log:
use defaultOrganisation in payment creation form and change form syntax
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
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=735961&r1=735960&r2=735961&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Mon Jan 19 23:54:22 2009
@@ -50,8 +50,8 @@
<form name="ListPayments" type="list" separate-columns="true" default-entity-name="Payment" list-name="listIt" paginate-target="findPayments" paginate="true"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
- <field-map field-name="inputFields" env-name="parameters"/>
+ <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="Payment"/>
<field-map field-name="orderBy" value="effectiveDate DESC"/>
</service>
@@ -84,7 +84,7 @@
<form name="NewPaymentOut" type="single" target="createPayment" default-map-name="payment"
header-row-style="header-row" default-table-style="basic-table">
<actions>
- <entity-condition entity-name="PaymentType" list-name="paymentTypes">
+ <entity-condition entity-name="PaymentType" list="paymentTypes">
<condition-list combine="or">
<condition-expr field-name="parentTypeId" operator="equals" value="DISBURSEMENT"/>
<condition-expr field-name="parentTypeId" operator="equals" value="TAX_PAYMENT"/>
@@ -94,10 +94,9 @@
</actions>
<field name="statusId"><hidden value="PMNT_NOT_PAID"/></field>
<field position="1" name="organizationPartyId" parameter-name="partyIdFrom">
- <drop-down allow-empty="false">
- <entity-options description="${partyId}" entity-name="PartyRole" key-field-name="partyId">
- <entity-constraint name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
- <entity-order-by field-name="partyId"/>
+ <drop-down allow-empty="false" no-current-selected-key="${defaultOrganizationPartyId}">
+ <entity-options description="${groupName}" entity-name="PartyAcctgPrefAndGroup" key-field-name="partyId">
+ <entity-order-by field-name="groupName"/>
</entity-options>
</drop-down>
</field>
@@ -131,10 +130,9 @@
header-row-style="header-row" default-table-style="basic-table">
<field name="statusId"><hidden value="PMNT_NOT_PAID"/></field>
<field position="1" name="organizationPartyId" parameter-name="partyIdTo">
- <drop-down allow-empty="false">
- <entity-options description="${partyId}" entity-name="PartyRole" key-field-name="partyId">
- <entity-constraint name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
- <entity-order-by field-name="partyId"/>
+ <drop-down allow-empty="false" no-current-selected-key="${defaultOrganizationPartyId}">
+ <entity-options description="${groupName}" entity-name="PartyAcctgPrefAndGroup" key-field-name="partyId">
+ <entity-order-by field-name="groupName"/>
</entity-options>
</drop-down>
</field>
@@ -142,7 +140,7 @@
<field position="1" name="paymentTypeId">
<drop-down allow-empty="false">
<entity-options description="${description}" entity-name="PaymentType">
- <entity-constraint field-name="parentTypeId" value="RECEIPT"/>
+ <entity-constraint name="parentTypeId" value="RECEIPT"/>
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -170,12 +168,12 @@
<form name="EditPayment" type="single" target="updatePayment" default-map-name="payment">
<actions>
- <entity-one entity-name="Party" value-name="partyFrom">
- <field-map field-name="partyId" env-name="payment.partyIdFrom"/>
+ <entity-one entity-name="Party" value-field="partyFrom">
+ <field-map field-name="partyId" from-field="payment.partyIdFrom"/>
</entity-one>
<set field="uomId" from-field="partyFrom.preferredCurrencyUomId" default-value="${defaultCurrencyUomId}"/>
- <entity-one entity-name="StatusItem" value-name="currentStatus">
- <field-map field-name="statusId" env-name="payment.statusId"/>
+ <entity-one entity-name="StatusItem" value-field="currentStatus">
+ <field-map field-name="statusId" from-field="payment.statusId"/>
</entity-one>
</actions>
<auto-fields-entity entity-name="Payment"/>
@@ -368,14 +366,14 @@
<form name="paymentHeader" type="single" default-map-name="payment"
header-row-style="header-row" default-table-style="basic-table">
<actions>
- <service service-name="getPartyNameForDate" result-map-name="partyNameResultFrom">
- <field-map field-name="partyId" env-name="payment.partyIdFrom"/>
- <field-map field-name="compareDate" env-name="payment.effectiveDate"/>
+ <service service-name="getPartyNameForDate" result-map="partyNameResultFrom">
+ <field-map field-name="partyId" from-field="payment.partyIdFrom"/>
+ <field-map field-name="compareDate" from-field="payment.effectiveDate"/>
<field-map field-name="lastNameFirst" value="Y"/>
</service>
- <service service-name="getPartyNameForDate" result-map-name="partyNameResultTo">
- <field-map field-name="partyId" env-name="payment.partyIdTo"/>
- <field-map field-name="compareDate" env-name="payment.effectiveDate"/>
+ <service service-name="getPartyNameForDate" result-map="partyNameResultTo">
+ <field-map field-name="partyId" from-field="payment.partyIdTo"/>
+ <field-map field-name="compareDate" from-field="payment.effectiveDate"/>
<field-map field-name="lastNameFirst" value="Y"/>
</service>
</actions>
@@ -402,8 +400,8 @@
<actions>
<entity-condition entity-name="PaymentApplication">
<condition-list combine="or">
- <condition-expr field-name="paymentId" env-name="paymentId"/>
- <condition-expr field-name="toPaymentId" env-name="paymentId"/>
+ <condition-expr field-name="paymentId" from-field="paymentId"/>
+ <condition-expr field-name="toPaymentId" from-field="paymentId"/>
</condition-list>
<order-by field-name="invoiceId"/>
<order-by field-name="invoiceItemSeqId"/>
@@ -427,7 +425,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="AcctgTransAndEntries">
- <condition-expr field-name="paymentId" env-name="paymentId"/>
+ <condition-expr field-name="paymentId" from-field="paymentId"/>
<order-by field-name="acctgTransEntrySeqId"/>
</entity-condition>
</actions>