You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/05/16 19:44:34 UTC
svn commit: r1744119 - in /ofbiz/branches/release15.12: ./
applications/accounting/webapp/accounting/WEB-INF/
applications/accounting/webapp/accounting/WEB-INF/actions/payment/
applications/accounting/widget/
Author: jleroux
Date: Mon May 16 19:44:34 2016
New Revision: 1744119
URL: http://svn.apache.org/viewvc?rev=1744119&view=rev
Log:
"Applied fix from trunk for revision: 1744117"
------------------------------------------------------------------------
r1744117 | jleroux | 2016-05-16 21:38:14 +0200 (lun. 16 mai 2016) | 4 lignes
Fixes "Pagination Problem in Find Invoices By Due Date" - https://issues.apache.org/jira/browse/OFBIZ-7070
Instead of calling the getInvoicePaymentInfoListByDueDateOffset service through the controller, uses redirect-parameter and a groovy script to call the service. This prevents the parameters in the pagination URLs.
The groovy script is needed to prevent the initial search which would always be done by a simple "<service..." call in the screen (daysOffset must not be null for the search to fire).
------------------------------------------------------------------------
Added:
ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy
- copied unchanged from r1744117, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/branches/release15.12/applications/accounting/widget/PaymentForms.xml
ofbiz/branches/release15.12/applications/accounting/widget/PaymentScreens.xml
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 16 19:44:34 2016
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117
Modified: ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1744119&r1=1744118&r2=1744119&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/controller.xml Mon May 16 19:44:34 2016
@@ -374,23 +374,21 @@ under the License.
<request-map uri="FindSalesInvoicesByDueDate">
<security https="true" auth="true"/>
- <response name="success" type="view" value="FindSalesInvoicesByDueDate"/>
- </request-map>
- <request-map uri="findSalesInvoicesByDueDate">
- <security https="false" auth="true"/>
- <event type="service" invoke="getInvoicePaymentInfoListByDueDateOffset"/>
- <response name="success" type="view" value="FindSalesInvoicesByDueDate"/>
- <response name="error" type="view" value="FindSalesInvoicesByDueDate"/>
+ <response name="success" type="view" value="FindSalesInvoicesByDueDate">
+ <redirect-parameter name="invoiceTypeId"/>
+ <redirect-parameter name="organizationPartyId"/>
+ <redirect-parameter name="partyId"/>
+ <redirect-parameter name="daysOffset"/>
+ </response>
</request-map>
<request-map uri="FindPurchaseInvoicesByDueDate">
<security https="true" auth="true"/>
- <response name="success" type="view" value="FindPurchaseInvoicesByDueDate"/>
- </request-map>
- <request-map uri="findPurchaseInvoicesByDueDate">
- <security https="false" auth="true"/>
- <event type="service" invoke="getInvoicePaymentInfoListByDueDateOffset"/>
- <response name="success" type="view" value="FindPurchaseInvoicesByDueDate"/>
- <response name="error" type="view" value="FindPurchaseInvoicesByDueDate"/>
+ <response name="success" type="view" value="FindPurchaseInvoicesByDueDate">
+ <redirect-parameter name="invoiceTypeId"/>
+ <redirect-parameter name="organizationPartyId"/>
+ <redirect-parameter name="partyId"/>
+ <redirect-parameter name="daysOffset"/>
+ </response>
</request-map>
<!-- Payment Group requests -->
Modified: ofbiz/branches/release15.12/applications/accounting/widget/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/widget/PaymentForms.xml?rev=1744119&r1=1744118&r2=1744119&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/branches/release15.12/applications/accounting/widget/PaymentForms.xml Mon May 16 19:44:34 2016
@@ -485,9 +485,8 @@ under the License.
<field name="submitButton" title="${uiLabelMap.CommonSend}" widget-style="smallSubmit"><submit/></field>
</form>
- <form name="FindSalesInvoicesByDueDate" type="single" target="findSalesInvoicesByDueDate"
+ <form name="FindSalesInvoicesByDueDate" type="single" target="FindSalesInvoicesByDueDate"
header-row-style="header-row" default-table-style="basic-table">
- <field name="invoiceTypeId"><hidden value="SALES_INVOICE"/></field>
<field name="organizationPartyId" parameter-name="partyIdFrom">
<drop-down allow-empty="false">
<entity-options description="${partyId}" entity-name="PartyRole" key-field-name="partyId">
@@ -502,9 +501,8 @@ under the License.
<submit button-type="button"/>
</field>
</form>
- <form name="FindPurchaseInvoicesByDueDate" type="single" target="findPurchaseInvoicesByDueDate"
+ <form name="FindPurchaseInvoicesByDueDate" type="single" target="FindPurchaseInvoicesByDueDate"
header-row-style="header-row" default-table-style="basic-table">
- <field name="invoiceTypeId"><hidden value="PURCHASE_INVOICE"/></field>
<field name="organizationPartyId" parameter-name="partyId">
<drop-down allow-empty="false">
<entity-options description="${partyId}" entity-name="PartyRole" key-field-name="partyId">
Modified: ofbiz/branches/release15.12/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/widget/PaymentScreens.xml?rev=1744119&r1=1744118&r2=1744119&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/branches/release15.12/applications/accounting/widget/PaymentScreens.xml Mon May 16 19:44:34 2016
@@ -502,7 +502,8 @@ under the License.
<property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
- <set field="invoicePaymentInfoList" from-field="parameters.invoicePaymentInfoList" type="List"/>
+ <set field="parameters.invoiceTypeId" value="SALES_INVOICE"/>
+ <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -534,7 +535,8 @@ under the License.
<property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
- <set field="invoicePaymentInfoList" from-field="parameters.invoicePaymentInfoList" type="List"/>
+ <set field="parameters.invoiceTypeId" value="PURCHASE_INVOICE"/>
+ <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">