Author: ashish
Date: Sat Jul 24 06:16:36 2010
New Revision: 978808
URL: http://svn.apache.org/viewvc?rev=978808&view=rev
Log:
Applied fix from trunk for revision: 978806
Applied patch from jira issue - OFBIZ-3872.
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/accounting/webapp/ap/WEB-INF/actions/invoices/CommissionRun.groovy
ofbiz/branches/release10.04/applications/accounting/webapp/ap/invoices/CommissionRun.ftl
ofbiz/branches/release10.04/applications/accounting/widget/ap/InvoiceScreens.xml
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 24 06:16:36 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958953,960491,960997,963610,964558,965470,965916,966525,966785,967098
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958953,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806
Modified:
ofbiz/branches/release10.04/applications/accounting/webapp/ap/WEB-INF/actions/invoices/CommissionRun.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/webapp/ap/WEB-INF/actions/invoices/CommissionRun.groovy?rev=978808&r1=978807&r2=978808&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/accounting/webapp/ap/WEB-INF/actions/invoices/CommissionRun.groovy
(original)
+++
ofbiz/branches/release10.04/applications/accounting/webapp/ap/WEB-INF/actions/invoices/CommissionRun.groovy
Sat Jul 24 06:16:36 2010
@@ -22,7 +22,6 @@ import org.ofbiz.entity.condition.Entity
fromDate = parameters.fromDate;
thruDate = parameters.thruDate;
-partyIds = parameters.partyIds;
if (fromDate) {
List invoiceCond = [];
@@ -33,8 +32,8 @@ if (fromDate) {
if (thruDate) {
invoiceCond.add(EntityCondition.makeCondition("invoiceDate",
EntityOperator.LESS_THAN_EQUAL_TO, Timestamp.valueOf(thruDate)));
}
- if (partyIds) {
- invoiceCond.add(EntityCondition.makeCondition("invoiceRolePartyId",
EntityOperator.IN, partyIds));
+ if (context.salesRepPartyList) {
+ invoiceCond.add(EntityCondition.makeCondition("invoiceRolePartyId",
EntityOperator.IN, context.salesRepPartyList));
}
invoiceList = delegator.findList("InvoiceAndRole",
EntityCondition.makeCondition(invoiceCond, EntityOperator.AND), null, null,
null, false);
Modified:
ofbiz/branches/release10.04/applications/accounting/webapp/ap/invoices/CommissionRun.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/webapp/ap/invoices/CommissionRun.ftl?rev=978808&r1=978807&r2=978808&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/accounting/webapp/ap/invoices/CommissionRun.ftl
(original)
+++
ofbiz/branches/release10.04/applications/accounting/webapp/ap/invoices/CommissionRun.ftl
Sat Jul 24 06:16:36 2010
@@ -76,8 +76,8 @@ function enableSubmitButton() {
<#if invoices?has_content >
<form name="listSalesInvoices" id="listSalesInvoices" method="post">
- <#if parties?has_content>
- <input type="hidden" name="partyIds" value="${parties?if_exists}"/>
+ <#if salesRepPartyList?has_content>
+ ${setRequestAttribute("partyIds", salesRepPartyList)}
</#if>
<div align="right">
<select name="serviceName" id="serviceName"
onchange="javascript:setServiceName(this);">
Modified:
ofbiz/branches/release10.04/applications/accounting/widget/ap/InvoiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/ap/InvoiceScreens.xml?rev=978808&r1=978807&r2=978808&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/accounting/widget/ap/InvoiceScreens.xml
(original)
+++
ofbiz/branches/release10.04/applications/accounting/widget/ap/InvoiceScreens.xml
Sat Jul 24 06:16:36 2010
@@ -165,7 +165,7 @@ under the License.
<actions>
<set field="titleProperty"
value="AccountingFindSalesInvoicesForCommissionRun"/>
<set field="tabButtonItem" value="commissionRun"/>
- <set field="parties" type="List"
from-field="parameters.partyIds"/>
+ <set field="salesRepPartyList" type="List"
from-field="parameters.partyIds"/>
<script
location="component://accounting/webapp/ap/WEB-INF/actions/invoices/CommissionRun.groovy"/>
</actions>
<widgets>
