OFBiz › OFBiz - Commits

svn commit: r812743 - in /ofbiz/trunk/applications/accounting: config/ webapp/ap/WEB-INF/ webapp/ar/WEB-INF/ widget/ap/ widget/ap/forms/ widget/ar/ widget/ar/forms/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

apatel-2

svn commit: r812743 - in /ofbiz/trunk/applications/accounting: config/ webapp/ap/WEB-INF/ webapp/ar/WEB-INF/ widget/ap/ widget/ap/forms/ widget/ar/ widget/ar/forms/

Author: apatel
Date: Wed Sep 9 01:25:48 2009
New Revision: 812743

URL: http://svn.apache.org/viewvc?rev=812743&view=rev
Log:
Added a screen in AP to find and view Payment Group of type Check Run and Batch Payment Deposits in.
Patch from OFBIZ-2896.
Thanks Ratnesh for implementation.

Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
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/ApScreens.xml
ofbiz/trunk/applications/accounting/widget/ap/Menus.xml
ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml
ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml
ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml
ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=812743&r1=812742&r2=812743&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Wed Sep 9 01:25:48 2009
@@ -1031,6 +1031,9 @@
<value xml:lang="nl">Toon rapporten</value>
<value xml:lang="zh">æ¥è¡¨åè¡¨</value>
</property>
+ <property key="AccountingArPaymentGroupMenu">
+ <value xml:lang="en">AR Payment Groups</value>
+ </property>
<property key="AccountingAritmeticPropertiesNotConfigured">
<value xml:lang="ar">Ø§ÙØ®Ø§ØµÙØ§Øª Ø§ÙØØ³Ø§Ø¨ÙØ© ÙØ®Ø¯ÙØ§Øª Ø§ÙÙØ§ØªÙØ±Ø© ÙÙØ³Øª ÙØ±ØªØ¨Ø© Ø¨Ø·Ø±ÙÙØ© ÙÙØ§Ø¦ÙØ©. ÙØ§ ÙÙÙÙ Ø§ÙÙØ¶Ù ÙØ¯ÙØ§.</value>
<value xml:lang="de">Die arithmetischen Einstellungen fÃ¼r die Rechnungs-Services sind nicht richtig konfiguriert. Die Verarbeitung kann nicht fortgesetzt werden.</value>
@@ -1854,6 +1857,9 @@
<value xml:lang="th">à¸à¸£à¸§à¸à¸ªà¸à¸</value>
<value xml:lang="zh">æ¯ç¥¨</value>
</property>
+ <property key="AccountingApPaymentGroupMenu">
+ <value xml:lang="en">AP Payment Groups</value>
+ </property>
<property key="AccountingClosedTimePeriods">
<value xml:lang="de">Abgeschlossener Buchungszeitraum</value>
<value xml:lang="en">Closed Time Periods</value>
@@ -3261,6 +3267,9 @@
<value xml:lang="en">Fin Account Trans Associated To Gl Reconciliation</value>
<value xml:lang="hi_IN">Gl à¤®à¤¿à¤²à¤¾à¤¨ à¤¸à¥ à¤à¥à¤¡à¤¼à¥ Fin à¤à¤¾à¤¤à¤¾</value>
</property>
+ <property key="AccountingFindApPaymentGroups">
+ <value xml:lang="en">Find AP Payment Groups</value>
+ </property>
<property key="AccountingFindApInvoices">
<value xml:lang="en">Find AP Invoices</value>
<value xml:lang="hi_IN">à¤à¤ªà¥ (AP) à¤à¤¾à¤²à¤¾à¤¨ à¤à¥à¤à¥à¤</value>
@@ -3273,6 +3282,9 @@
<value xml:lang="en">Find AR Invoices</value>
<value xml:lang="hi_IN">à¤²à¥à¤à¤¾ à¤ªà¥à¤°à¤¾à¤ªà¥à¤¯ à¤à¤¾à¤²à¤¾à¤¨ à¤à¥à¤à¥à¤</value>
</property>
+ <property key="AccountingFindArPaymentGroups">
+ <value xml:lang="en">Find AR Payment Groups</value>
+ </property>
<property key="AccountingFindArPayments">
<value xml:lang="en">Find AR Payments</value>
<value xml:lang="hi_IN">à¤²à¥à¤à¤¾ à¤ªà¥à¤°à¤¾à¤ªà¥à¤¯ à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥à¤à¥à¤</value>

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=812743&r1=812742&r2=812743&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml Wed Sep 9 01:25:48 2009
@@ -95,6 +95,10 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="NewPurchaseInvoice"/>
</request-map>
+ <request-map uri="FindApPaymentGroups">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindApPaymentGroups"/>
+ </request-map>


<request-map uri="findVendors">
@@ -135,6 +139,7 @@
<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"/>
<view-map name="CommissionReport" type="screen" page="component://accounting/widget/ap/InvoiceScreens.xml#CommissionReport"/>
+ <view-map name="FindApPaymentGroups" type="screen" page="component://accounting/widget/ap/ApScreens.xml#FindApPaymentGroups"/>


<view-map name="CommissionReportPdf" type="screenfop" page="component://accounting/widget/ap/ApPrintScreens.xml#CommissionReportPdf" content-type="application/pdf" encoding="none"/>

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=812743&r1=812742&r2=812743&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml Wed Sep 9 01:25:48 2009
@@ -79,6 +79,10 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="NewSalesInvoice"/>
</request-map>
+ <request-map uri="FindArPaymentGroups">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindArPaymentGroups"/>
+ </request-map>



@@ -87,6 +91,7 @@
<view-map name="ListReports" type="screen" page="component://accounting/widget/ar/InvoiceScreens.xml#ListReports"/>
<view-map name="FindPayments" type="screen" page="component://accounting/widget/ar/ArPaymentScreens.xml#FindPayments"/>
<view-map name="BatchPayments" type="screen" page="component://accounting/widget/ar/ArPaymentScreens.xml#BatchPayments"/>
+ <view-map name="FindArPaymentGroups" type="screen" page="component://accounting/widget/ar/ArPaymentScreens.xml#FindArPaymentGroups"/>
<view-map name="NewIncomingPayment" type="screen" page="component://accounting/widget/ar/ArPaymentScreens.xml#NewIncomingPayment"/>
<view-map name="FindArInvoices" type="screen" page="component://accounting/widget/ar/InvoiceScreens.xml#FindArInvoices"/>
<view-map name="NewSalesInvoice" type="screen" page="component://accounting/widget/ar/InvoiceScreens.xml#NewSalesInvoice"/>

Modified: ofbiz/trunk/applications/accounting/widget/ap/ApScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/ApScreens.xml?rev=812743&r1=812742&r2=812743&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/ApScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/ApScreens.xml Wed Sep 9 01:25:48 2009
@@ -71,4 +71,26 @@
</widgets>
</section>
</screen>
+ <screen name="FindApPaymentGroups">
+ <section>
+ <actions>
+ <set field="titleProperty" value="AccountingFindApPaymentGroups"/>
+ <set field="headerItem" value="apPaymentGroups"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="FindApPaymentGroups" location="component://accounting/widget/ap/forms/VendorForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListPaymentGroup" location="component://accounting/widget/PaymentGroupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>

Modified: ofbiz/trunk/applications/accounting/widget/ap/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/Menus.xml?rev=812743&r1=812742&r2=812743&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/Menus.xml Wed Sep 9 01:25:48 2009
@@ -22,7 +22,7 @@
<menu-item name="agreements" title="${uiLabelMap.AccountingAgreements}"><link target="FindAgreement"/></menu-item>
<menu-item name="invoices" title="${uiLabelMap.AccountingInvoicesMenu}"><link target="FindApInvoices"/></menu-item>
<menu-item name="payments" title="${uiLabelMap.AccountingPaymentsMenu}"><link target="findPayments"/></menu-item>
- <menu-item name="PaymentGroup" title="${uiLabelMap.AccountingPaymentGroup}"><link target="FindPaymentGroup"/></menu-item>
+ <menu-item name="apPaymentGroups" title="${uiLabelMap.AccountingApPaymentGroupMenu}"><link target="FindApPaymentGroups"/></menu-item>
<menu-item name="findVendors" title="${uiLabelMap.PartyVendor} ${uiLabelMap.CommonList}"><link target="findVendors"/></menu-item>
<menu-item name="reports" title="${uiLabelMap.AccountingReports}"><link target="listReports"/></menu-item>
</menu>

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=812743&r1=812742&r2=812743&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml Wed Sep 9 01:25:48 2009
@@ -79,4 +79,7 @@
</drop-down>
</field>
</form>
+ <form name="FindApPaymentGroups" target="FindApPaymentGroups" extends="FindPaymentGroup" extends-resource="component://accounting/widget/PaymentGroupForms.xml">
+ <field name="paymentGroupTypeId"><hidden value="CHECK_RUN"/></field>
+ </form>
</forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml?rev=812743&r1=812742&r2=812743&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml Wed Sep 9 01:25:48 2009
@@ -23,7 +23,7 @@
<menu-item name="agreements" title="${uiLabelMap.AccountingAgreements}"><link target="FindAgreement"/></menu-item>
<menu-item name="invoices" title="${uiLabelMap.AccountingInvoicesMenu}"><link target="findInvoices"/></menu-item>
<menu-item name="payments" title="${uiLabelMap.AccountingPaymentsMenu}"><link target="findPayments"/></menu-item>
- <menu-item name="PaymentGroup" title="${uiLabelMap.AccountingPaymentGroup}"><link target="FindPaymentGroup"/></menu-item>
+ <menu-item name="arPaymentGroups" title="${uiLabelMap.AccountingArPaymentGroupMenu}"><link target="FindArPaymentGroups"/></menu-item>
<menu-item name="reports" title="${uiLabelMap.AccountingReports}"><link target="ListReports"/></menu-item>
</menu>
<menu name="ArPaymentTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">

Modified: ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml?rev=812743&r1=812742&r2=812743&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml Wed Sep 9 01:25:48 2009
@@ -111,5 +111,26 @@
</widgets>
</section>
</screen>
-
+ <screen name="FindArPaymentGroups">
+ <section>
+ <actions>
+ <set field="titleProperty" value="AccountingFindArPaymentGroups"/>
+ <set field="headerItem" value="arPaymentGroups"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="FindArPaymentGroups" location="component://accounting/widget/ar/forms/ArPaymentForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListPaymentGroup" location="component://accounting/widget/PaymentGroupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>

Modified: ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml?rev=812743&r1=812742&r2=812743&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml Wed Sep 9 01:25:48 2009
@@ -63,5 +63,7 @@
</drop-down>
</field>
</form>
-
+ <form name="FindArPaymentGroups" target="FindArPaymentGroups" extends="FindPaymentGroup" extends-resource="component://accounting/widget/PaymentGroupForms.xml">
+ <field name="paymentGroupTypeId"><hidden value="BATCH_PAYMENT"/></field>
+ </form>
</forms>