You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2009/08/07 16:00:00 UTC
svn commit: r802012 - in /ofbiz/trunk/applications/accounting: config/
webapp/accounting/payment/ webapp/ap/WEB-INF/ widget/ap/ widget/ap/forms/
Author: apatel
Date: Fri Aug 7 14:00:00 2009
New Revision: 802012
URL: http://svn.apache.org/viewvc?rev=802012&view=rev
Log:
Streamline behavior of screens in AP. Thanks Surya and Sumit for working on it. Patch from OFBIZ-2803.
Added:
ofbiz/trunk/applications/accounting/widget/ap/ApScreens.xml (with props)
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml
ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=802012&r1=802011&r2=802012&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Fri Aug 7 14:00:00 2009
@@ -2945,6 +2945,10 @@
<property key="AccountingFindApInvoices">
<value xml:lang="en">Find AP Invoices</value>
</property>
+ <property key="AccountingFindApPayments">
+ <value xml:lang="en">Find AP Payments</value>
+ <value xml:lang="hi_IN">लà¥à¤à¤¾ दà¥à¤¯ à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¥à¤</value>
+ </property>
<property key="AccountingFindDepositSlip">
<value xml:lang="en">Find Deposit Slips for finAccount ${finAccountId}</value>
</property>
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=802012&r1=802011&r2=802012&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Fri Aug 7 14:00:00 2009
@@ -52,7 +52,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="Payment"/>
+ <field-map field-name="entityName" value="PaymentAndType"/>
<field-map field-name="orderBy" value="effectiveDate DESC"/>
</service>
</actions>
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=802012&r1=802011&r2=802012&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml Fri Aug 7 14:00:00 2009
@@ -59,6 +59,34 @@
<event type="service" invoke="createCommissionInvoices"/>
<response name="success" type="view" value="CommissionRun"/>
</request-map>
+ <request-map uri="findInvoices">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindApInvoices"/>
+ </request-map>
+ <request-map uri="createInvoice">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createInvoice"/>
+ <response name="success" type="request" value="editInvoice"/>
+ <response name="error" type="view" value="NewPurchaseInvoice"/>
+ </request-map>
+ <request-map uri="findPayments">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindApPayments"/>
+ </request-map>
+ <request-map uri="FindApPayments">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindApPayments"/>
+ </request-map>
+ <request-map uri="newPayment">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="NewOutgoingPayment"/>
+ </request-map>
+ <request-map uri="createPayment">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createPayment"/>
+ <response name="success" type="view" value="editPayment"/>
+ <response name="error" type="view" value="NewOutgoingPayment"/>
+ </request-map>
<!-- ================ Vendor requests ================ -->
<request-map uri="findVendors">
@@ -90,7 +118,8 @@
<view-map name="FindPurchaseInvoices" type="screen" page="component://accounting/widget/ap/InvoiceScreens.xml#FindPurchaseInvoices"/>
<view-map name="FindApInvoices" type="screen" page="component://accounting/widget/ap/InvoiceScreens.xml#FindApInvoices"/>
<view-map name="NewPurchaseInvoice" type="screen" page="component://accounting/widget/ap/InvoiceScreens.xml#NewPurchaseInvoice"/>
-
+ <view-map name="FindApPayments" type="screen" page="component://accounting/widget/ap/ApScreens.xml#FindApPayments"/>
+ <view-map name="NewOutgoingPayment" type="screen" page="component://accounting/widget/ap/ApScreens.xml#NewOutgoingPayment"/>
<!-- Vendor Mappings -->
<view-map name="FindVendors" type="screen" page="component://accounting/widget/ap/CommonScreens.xml#FindVendors"/>
<view-map name="EditVendor" type="screen" page="component://accounting/widget/ap/CommonScreens.xml#EditVendor"/>
Modified: ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml?rev=802012&r1=802011&r2=802012&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml Fri Aug 7 14:00:00 2009
@@ -50,6 +50,11 @@
<param-value>component://accounting/widget/ap/CommonScreens.xml</param-value>
<description>The location of the CommonApInvoiceDecorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
</context-param>
+ <context-param>
+ <param-name>CommonApPaymentDecoratorLocation</param-name>
+ <param-value>component://accounting/widget/ap/CommonScreens.xml</param-value>
+ <description>The location of the CommonApPaymentDecorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
+ </context-param>
<filter>
<filter-name>ContextFilter</filter-name>
Added: ofbiz/trunk/applications/accounting/widget/ap/ApScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/ApScreens.xml?rev=802012&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/ApScreens.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/ap/ApScreens.xml Fri Aug 7 14:00:00 2009
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+
+ <screen name="FindApPayments">
+ <section>
+ <actions>
+ <set field="titleProperty" value="AccountingFindApPayments"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonApPaymentDecorator" location="component://accounting/widget/ap/CommonScreens.xml">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <container style="button-bar">
+ <link target="newPayment" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/>
+ </container>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindApPayments" location="component://accounting/widget/ap/forms/VendorForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListPayments" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="NewOutgoingPayment">
+ <section>
+ <actions>
+ <set field="titleProperty" value="AccountingNewPaymentOutgoing"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonApPaymentDecorator" location="component://accounting/widget/ap/CommonScreens.xml">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <screenlet title="${uiLabelMap.AccountingNewPaymentOutgoing}">
+ <include-form name="NewPaymentOut" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+</screens>
Propchange: ofbiz/trunk/applications/accounting/widget/ap/ApScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/widget/ap/ApScreens.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/accounting/widget/ap/ApScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=802012&r1=802011&r2=802012&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Fri Aug 7 14:00:00 2009
@@ -304,4 +304,24 @@
</widgets>
</section>
</screen>
+
+ <screen name="CommonApPaymentDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="payments"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameter.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <decorator-section-include name="body"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml?rev=802012&r1=802011&r2=802012&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml Fri Aug 7 14:00:00 2009
@@ -67,4 +67,14 @@
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="find" title="${uiLabelMap.CommonFind}"><submit/></field>
</form>
+ <form name="FindApPayments" type="single" target="FindApPayments" extends="FindPayments" extends-resource="component://accounting/webapp/accounting/payment/PaymentForms.xml">
+ <field name="parentTypeId"><hidden value="DISBURSEMENT"/></field>
+ <field name="paymentTypeId" position="1">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="PaymentType" description="${description}">
+ <entity-constraint name="parentTypeId" value="DISBURSEMENT"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ </form>
</forms>
\ No newline at end of file