Author: ashish
Date: Wed Dec 17 12:20:06 2014
New Revision: 1646213
URL: http://svn.apache.org/r1646213
Log:
Applied patch from jira issue - OFBIZ-5892 - Replace all occurences of
dispatcher.runSync in groovy files with runService() of DSL.
In this patch removed the use of "userLogin". Thanks Arun for the contribution.
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy
ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/productsToGooglebase.groovy
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy?rev=1646213&r1=1646212&r2=1646213&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy
Wed Dec 17 12:20:06 2014
@@ -45,7 +45,7 @@ if (invoiceTypeId) {
PastDueInvoices = delegator.findList("Invoice", expr, null, ["dueDate
DESC"], null, false);
if (PastDueInvoices) {
invoiceIds = PastDueInvoices.invoiceId;
- totalAmount = runService('getInvoiceRunningTotal', [invoiceIds:
invoiceIds, organizationPartyId: organizationPartyId, userLogin: userLogin]);
+ totalAmount = runService('getInvoiceRunningTotal', [invoiceIds:
invoiceIds, organizationPartyId: organizationPartyId]);
if (totalAmount) {
context.PastDueInvoicestotalAmount =
totalAmount.invoiceRunningTotal;
}
@@ -61,7 +61,7 @@ if (invoiceTypeId) {
InvoicesDueSoon = delegator.findList("Invoice", invoicesCond, null,
["dueDate ASC"], findOptions, false);
if (InvoicesDueSoon) {
invoiceIds = InvoicesDueSoon.invoiceId;
- totalAmount = runService('getInvoiceRunningTotal', [invoiceIds:
invoiceIds, organizationPartyId: organizationPartyId, userLogin: userLogin]);
+ totalAmount = runService('getInvoiceRunningTotal', [invoiceIds:
invoiceIds, organizationPartyId: organizationPartyId]);
if (totalAmount) {
context.InvoicesDueSoonTotalAmount =
totalAmount.invoiceRunningTotal;
}
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy?rev=1646213&r1=1646212&r2=1646213&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy
Wed Dec 17 12:20:06 2014
@@ -41,7 +41,7 @@ if (parameters.customTimePeriodId) {
postedCreditsTotal = 0
organizationGlAccounts.each { organizationGlAccount ->
accountBalance = [:]
- accountBalance = runService('computeGlAccountBalanceForTimePeriod',
[organizationPartyId: organizationGlAccount.organizationPartyId,
customTimePeriodId: customTimePeriod.customTimePeriodId, glAccountId:
organizationGlAccount.glAccountId, userLogin: userLogin]);
+ accountBalance = runService('computeGlAccountBalanceForTimePeriod',
[organizationPartyId: organizationGlAccount.organizationPartyId,
customTimePeriodId: customTimePeriod.customTimePeriodId, glAccountId:
organizationGlAccount.glAccountId]);
if (accountBalance.postedDebits != 0 || accountBalance.postedCredits
!= 0) {
accountBalance.glAccountId = organizationGlAccount.glAccountId
accountBalance.accountCode = organizationGlAccount.accountCode
Modified:
ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/productsToGooglebase.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/productsToGooglebase.groovy?rev=1646213&r1=1646212&r2=1646213&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/productsToGooglebase.groovy
(original)
+++
ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/productsToGooglebase.groovy
Wed Dec 17 12:20:06 2014
@@ -49,7 +49,7 @@ prodCatalogList.each { prodCatalogList -
prodCatalogCategoryList =
delegator.findByAnd("ProdCatalogCategory",["prodCatalogId":currentCatalogId,
"prodCatalogCategoryTypeId":"PCCT_BROWSE_ROOT"], null, false);
topCategory = prodCatalogCategoryList.productCategoryId[0];
if (topCategory){
- relatedCategories = runService('getRelatedCategories',
[parentProductCategoryId: topCategory, userLogin: userLogin]);
+ relatedCategories = runService('getRelatedCategories',
[parentProductCategoryId: topCategory]);
categoryList = relatedCategories.categories
} else {
categoryIdsTemp.clear()
