svn commit: r1744199 - in /ofbiz/branches/release15.12: ./ applications/accounting/webapp
Locked
svn commit: r1744199 - in /ofbiz/branches/release15.12: ./ applications/accounting/webapp
 
|
Author: jleroux
Date: Tue May 17 07:35:32 2016 New Revision: 1744199 URL: http://svn.apache.org/viewvc?rev=1744199&view=rev Log: "Applied fix from trunk for revision: 1744198" ------------------------------------------------------------------------ r1744198 | jleroux | 2016-05-17 09:34:44 +0200 (mar. 17 mai 2016) | 1 ligne Not a big change but I prefer this way of doing for "Pagination Problem in Find Invoices By Due Date" - https://issues.apache.org/jira/browse/OFBIZ-7070 ------------------------------------------------------------------------ Modified: ofbiz/branches/release15.12/ (props changed) ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy ofbiz/branches/release15.12/applications/accounting/widget/PaymentForms.xml ofbiz/branches/release15.12/applications/accounting/widget/PaymentScreens.xml ofbiz/branches/release15.12/framework/widget/config/widget.properties Propchange: ofbiz/branches/release15.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 17 07:35:32 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,1744117 +/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,1744198 Modified: ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy?rev=1744199&r1=1744198&r2=1744199&view=diff ============================================================================== --- ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy (original) +++ ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy Tue May 17 07:35:32 2016 @@ -21,7 +21,7 @@ import org.ofbiz.service.*; context.invoicePaymentInfoList = [] -if (parameters.daysOffset) { // it's not the initialisation but a real search request +if (parameters.invoiceTypeId) { // it's not the initialisation but a real search request serviceCtx = dispatcher.getDispatchContext().makeValidContext("getInvoicePaymentInfoListByDueDateOffset", "IN", parameters); result = runService("getInvoicePaymentInfoListByDueDateOffset", serviceCtx) context.invoicePaymentInfoList = result.invoicePaymentInfoList 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=1744199&r1=1744198&r2=1744199&view=diff ============================================================================== --- ofbiz/branches/release15.12/applications/accounting/widget/PaymentForms.xml (original) +++ ofbiz/branches/release15.12/applications/accounting/widget/PaymentForms.xml Tue May 17 07:35:32 2016 @@ -487,6 +487,7 @@ under the License. <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"> @@ -503,6 +504,7 @@ under the License. </form> <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=1744199&r1=1744198&r2=1744199&view=diff ============================================================================== --- ofbiz/branches/release15.12/applications/accounting/widget/PaymentScreens.xml (original) +++ ofbiz/branches/release15.12/applications/accounting/widget/PaymentScreens.xml Tue May 17 07:35:32 2016 @@ -501,8 +501,6 @@ under the License. <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <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="parameters.invoiceTypeId" value="SALES_INVOICE"/> <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy"/> </actions> <widgets> @@ -534,8 +532,6 @@ under the License. <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <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="parameters.invoiceTypeId" value="PURCHASE_INVOICE"/> <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy"/> </actions> <widgets> Modified: ofbiz/branches/release15.12/framework/widget/config/widget.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/widget/config/widget.properties?rev=1744199&r1=1744198&r2=1744199&view=diff ============================================================================== --- ofbiz/branches/release15.12/framework/widget/config/widget.properties (original) +++ ofbiz/branches/release15.12/framework/widget/config/widget.properties Tue May 17 07:35:32 2016 @@ -24,11 +24,11 @@ # A setting of true will enable widget boundary comments. The true setting can be # overridden in an application's web.xml file or in the screen rendering context. # A setting of false will override all other settings and disable all widget -# boundary comments. +# boundary comments. widget.verbose=true # Default number of items to be displayed per page in a list form -widget.form.defaultViewSize=20 +widget.form.defaultViewSize=2 # Default number of items to be displayed in lookup ajax autocompleter widget.autocompleter.defaultViewSize=10 |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |