Author: jleroux
Date: Tue May 17 07:34:44 2016
New Revision: 1744198
URL: http://svn.apache.org/viewvc?rev=1744198&view=rev
Log:
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/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy
ofbiz/trunk/applications/accounting/widget/PaymentForms.xml
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy?rev=1744198&r1=1744197&r2=1744198&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy
Tue May 17 07:34:44 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/trunk/applications/accounting/widget/PaymentForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentForms.xml?rev=1744198&r1=1744197&r2=1744198&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentForms.xml Tue May 17
07:34:44 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/trunk/applications/accounting/widget/PaymentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=1744198&r1=1744197&r2=1744198&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Tue May 17
07:34:44 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>
