You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2010/06/03 15:23:48 UTC
svn commit: r950986 - in /ofbiz/trunk/applications/accounting:
webapp/ap/WEB-INF/controller.xml webapp/ar/WEB-INF/controller.xml
widget/ap/LookupScreens.xml widget/ap/forms/LookupForms.xml
widget/ar/LookupScreens.xml widget/ar/forms/LookupForms.xml
Author: mor
Date: Thu Jun 3 13:23:47 2010
New Revision: 950986
URL: http://svn.apache.org/viewvc?rev=950986&view=rev
Log:
Added payment lookup specific to Account Receivable and Account Payable application. This fix a bug with the payment types that was showing up wrong values in the lookup screen used before.
Modified:
ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/widget/ap/LookupScreens.xml
ofbiz/trunk/applications/accounting/widget/ap/forms/LookupForms.xml
ofbiz/trunk/applications/accounting/widget/ar/LookupScreens.xml
ofbiz/trunk/applications/accounting/widget/ar/forms/LookupForms.xml
Modified: ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml?rev=950986&r1=950985&r2=950986&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml Thu Jun 3 13:23:47 2010
@@ -154,4 +154,5 @@ under the License.
<view-map name="EditVendor" type="screen" page="component://accounting/widget/ap/CommonScreens.xml#EditVendor"/>
<view-map name="LookupInvoice" type="screen" page="component://accounting/widget/ap/LookupScreens.xml#LookupInvoice"/>
+ <view-map name="LookupPayment" type="screen" page="component://accounting/widget/ap/LookupScreens.xml#LookupPayment"/>
</site-conf>
Modified: ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml?rev=950986&r1=950985&r2=950986&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml Thu Jun 3 13:23:47 2010
@@ -113,5 +113,7 @@ under the License.
<view-map name="NewSalesInvoice" type="screen" page="component://accounting/widget/ar/InvoiceScreens.xml#NewSalesInvoice"/>
<view-map name="LookupInvoice" type="screen" page="component://accounting/widget/ar/LookupScreens.xml#LookupInvoice"/>
+ <view-map name="LookupPayment" type="screen" page="component://accounting/widget/ar/LookupScreens.xml#LookupPayment"/>
+
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/applications/accounting/widget/ap/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/LookupScreens.xml?rev=950986&r1=950985&r2=950986&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/LookupScreens.xml Thu Jun 3 13:23:47 2010
@@ -45,4 +45,31 @@ under the License.
</widgets>
</section>
</screen>
+
+ <screen name="LookupPayment">
+ <section>
+ <condition>
+ <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
+ </condition>
+ <actions>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="title" value="${uiLabelMap.AccountingLookupPayment}"/>
+ <set field="queryString" from-field="result.queryString"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
+ <set field="entityName" value="Payment"/>
+ <set field="searchFields" value="[paymentId, partyIdFrom, partyIdTo, currencyUomId]"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="LookupPayment" location="component://accounting/widget/ap/forms/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listPayment" location="component://accounting/widget/FieldLookupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/LookupForms.xml?rev=950986&r1=950985&r2=950986&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/forms/LookupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/forms/LookupForms.xml Thu Jun 3 13:23:47 2010
@@ -47,4 +47,22 @@ under the License.
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+
+ <form name="LookupPayment" target="LookupPayment" title="" type="single"
+ header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-entity entity-name="Payment" default-field-type="hidden"/>
+ <field name="paymentId" title="${uiLabelMap.AccountingPaymentID}"><text-find/></field>
+ <field name="paymentTypeId">
+ <drop-down allow-empty="true" no-current-selected-key="VENDOR_PAYMENT">
+ <entity-options description="${description}" entity-name="PaymentType" key-field-name="paymentTypeId">
+ <entity-constraint name="parentTypeId" operator="equals" value="DISBURSEMENT"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="partyIdTo"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="amountApplied"><text-find default-value=""></text-find> </field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/widget/ar/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/LookupScreens.xml?rev=950986&r1=950985&r2=950986&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/LookupScreens.xml Thu Jun 3 13:23:47 2010
@@ -45,4 +45,31 @@ under the License.
</widgets>
</section>
</screen>
+
+ <screen name="LookupPayment">
+ <section>
+ <condition>
+ <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
+ </condition>
+ <actions>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="title" value="${uiLabelMap.AccountingLookupPayment}"/>
+ <set field="queryString" from-field="result.queryString"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
+ <set field="entityName" value="Payment"/>
+ <set field="searchFields" value="[paymentId, partyIdFrom, partyIdTo, currencyUomId]"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="LookupPayment" location="component://accounting/widget/ar/forms/LookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listPayment" location="component://accounting/widget/FieldLookupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/widget/ar/forms/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/forms/LookupForms.xml?rev=950986&r1=950985&r2=950986&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/LookupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/LookupForms.xml Thu Jun 3 13:23:47 2010
@@ -47,4 +47,22 @@ under the License.
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+
+ <form name="LookupPayment" target="LookupPayment" title="" type="single"
+ header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-entity entity-name="Payment" default-field-type="hidden"/>
+ <field name="paymentId" title="${uiLabelMap.AccountingPaymentID}"><text-find/></field>
+ <field name="paymentTypeId">
+ <drop-down allow-empty="true" no-current-selected-key="CUSTOMER_PAYMENT">
+ <entity-options description="${description}" entity-name="PaymentType" key-field-name="paymentTypeId">
+ <entity-constraint name="parentTypeId" operator="equals" value="RECEIPT"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="partyIdTo"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="amountApplied"><text-find default-value=""></text-find> </field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
</forms>
\ No newline at end of file