svn commit: r1744120 - in /ofbiz/branches/release14.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:36 2016
New Revision: 1744120

URL: http://svn.apache.org/viewvc?rev=1744120&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/release14.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/release14.12/   (props changed)
    ofbiz/branches/release14.12/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/branches/release14.12/applications/accounting/widget/PaymentForms.xml
    ofbiz/branches/release14.12/applications/accounting/widget/PaymentScreens.xml

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 16 19:44:36 2016
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065
 77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1727894,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735750,1735773,1736083,1736087,1736272,1736434,1736851,1736854,1737156,1737440,1738235,1738303,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097,1742103,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065
 77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1727894,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735750,1735773,1736083,1736087,1736272,1736434,1736851,1736854,1737156,1737440,1738235,1738303,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097,1742103,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117

Modified: ofbiz/branches/release14.12/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1744120&r1=1744119&r2=1744120&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release14.12/applications/accounting/webapp/accounting/WEB-INF/controller.xml Mon May 16 19:44:36 2016
@@ -368,23 +368,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/release14.12/applications/accounting/widget/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/widget/PaymentForms.xml?rev=1744120&r1=1744119&r2=1744120&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/branches/release14.12/applications/accounting/widget/PaymentForms.xml Mon May 16 19:44:36 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/release14.12/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/widget/PaymentScreens.xml?rev=1744120&r1=1744119&r2=1744120&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/branches/release14.12/applications/accounting/widget/PaymentScreens.xml Mon May 16 19:44:36 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}">