From 9b2643d9be04ee6805ea57f69d0fefc19dfd52b3 Mon Sep 17 00:00:00 2001 From: Mridul Pathak Date: Sat, 15 Oct 2016 13:11:46 +0000 Subject: [PATCH] Improved: Removed unused imports from groovy files in accounting component. (OFBIZ-8484) Thanks: Suraj Khurana for contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1765057 13f79535-47bb-0310-9956-ffa450edef68 --- .../ListInvoiceItemTypesGlAccount.groovy | 7 +----- .../ap/invoices/CommissionReport.groovy | 12 +++++----- .../groovyScripts/ar/BatchPayments.groovy | 10 +++++---- .../TaxAuthorityGlAccounts.groovy | 2 -- .../fixedasset/FixedAssetGeoLocation.groovy | 7 +++--- .../invoice/CreateApplicationList.groovy | 14 ++++-------- .../groovyScripts/invoice/EditInvoice.groovy | 16 ++++---------- .../GetAccountOrganizationAndClass.groovy | 10 +++------ .../invoice/InvoiceReport.groovy | 11 +++------- .../invoice/ListNotAppliedPayments.groovy | 18 +++++---------- .../invoice/PrintInvoices.groovy | 9 ++++---- .../order/BillingAccountOrders.groovy | 3 --- .../payment/BillingAccounts.groovy | 1 - .../payment/DepositWithdrawPayments.groovy | 10 ++++----- .../payment/FindInvoicesByDueDate.groovy | 4 +--- .../payment/ListNotAppliedInvoices.groovy | 19 ++++++---------- .../payment/ListNotAppliedPayments.groovy | 20 +++++------------ .../groovyScripts/payment/ManualTx.groovy | 2 -- .../groovyScripts/payment/PrintChecks.groovy | 10 +++------ .../period/EditCustomTimePeriod.groovy | 6 ----- .../groovyScripts/reports/BalanceSheet.groovy | 22 +++++++++---------- .../reports/CashFlowStatement.groovy | 20 ++++++++--------- .../reports/ComparativeBalanceSheet.groovy | 3 --- .../ComparativeCashFlowStatement.groovy | 1 - .../reports/ComparativeIncomeStatement.groovy | 1 - .../groovyScripts/reports/CostCenters.groovy | 11 +++++----- .../reports/GlAccountTrialBalance.groovy | 13 ++++++----- ...alesInvoiceByProductCategorySummary.groovy | 8 +++---- .../reports/TransactionTotals.groovy | 17 ++++++-------- .../transaction/AuthorizeTransaction.groovy | 2 -- .../transaction/CaptureTransaction.groovy | 10 ++++----- .../transaction/ViewGatewayResponse.groovy | 8 +++---- 32 files changed, 113 insertions(+), 194 deletions(-) diff --git a/applications/accounting/groovyScripts/admin/ListInvoiceItemTypesGlAccount.groovy b/applications/accounting/groovyScripts/admin/ListInvoiceItemTypesGlAccount.groovy index 439fc3e224..95421efbdc 100644 --- a/applications/accounting/groovyScripts/admin/ListInvoiceItemTypesGlAccount.groovy +++ b/applications/accounting/groovyScripts/admin/ListInvoiceItemTypesGlAccount.groovy @@ -17,12 +17,7 @@ * under the License. */ -import java.util.*; -import java.lang.*; -import org.apache.ofbiz.entity.*; -import org.apache.ofbiz.entity.condition.*; -import org.apache.ofbiz.base.util.*; -import org.apache.ofbiz.base.util.UtilMisc; +import org.apache.ofbiz.entity.condition.EntityConditionBuilder; // Optional prefix parameter to filter InvoiceItemTypes by (i.e. "INV" or "PINV") defaults to INV invItemTypePrefix = context.invItemTypePrefix ?: "INV"; diff --git a/applications/accounting/groovyScripts/ap/invoices/CommissionReport.groovy b/applications/accounting/groovyScripts/ap/invoices/CommissionReport.groovy index 3d59270af8..b3ae713af8 100644 --- a/applications/accounting/groovyScripts/ap/invoices/CommissionReport.groovy +++ b/applications/accounting/groovyScripts/ap/invoices/CommissionReport.groovy @@ -17,12 +17,12 @@ * under the License. */ - -import java.sql.Timestamp; -import org.apache.ofbiz.base.util.UtilMisc; -import org.apache.ofbiz.entity.condition.EntityCondition; -import org.apache.ofbiz.entity.condition.EntityOperator; -import org.apache.ofbiz.entity.util.EntityUtil; + +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator +import org.apache.ofbiz.entity.util.EntityUtil + +import java.sql.Timestamp if ("Y".equals(parameters.isSearch)) { fromDate = parameters.fromDate; diff --git a/applications/accounting/groovyScripts/ar/BatchPayments.groovy b/applications/accounting/groovyScripts/ar/BatchPayments.groovy index 0d58203bb6..caf6afc571 100644 --- a/applications/accounting/groovyScripts/ar/BatchPayments.groovy +++ b/applications/accounting/groovyScripts/ar/BatchPayments.groovy @@ -17,11 +17,13 @@ * under the License. */ + import org.apache.ofbiz.accounting.util.UtilAccounting -import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.entity.util.EntityUtil; -import org.apache.ofbiz.entity.condition.EntityCondition; -import org.apache.ofbiz.entity.condition.EntityOperator; +import org.apache.ofbiz.base.util.UtilValidate +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator +import org.apache.ofbiz.entity.util.EntityUtil + if ("Y".equals(parameters.noConditionFind)) { List paymentCond = []; payments = []; diff --git a/applications/accounting/groovyScripts/chartofaccounts/TaxAuthorityGlAccounts.groovy b/applications/accounting/groovyScripts/chartofaccounts/TaxAuthorityGlAccounts.groovy index f61d0ef456..ba4d77f7d0 100644 --- a/applications/accounting/groovyScripts/chartofaccounts/TaxAuthorityGlAccounts.groovy +++ b/applications/accounting/groovyScripts/chartofaccounts/TaxAuthorityGlAccounts.groovy @@ -17,8 +17,6 @@ * under the License. */ -import org.apache.ofbiz.base.util.UtilMisc; - taxAuthorities = from('TaxAuthority').orderBy("taxAuthGeoId", "taxAuthPartyId").queryList(); context.taxAuthorityHavingNoGlAccountList = taxAuthorities.findAll { taxAuthority -> diff --git a/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy b/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy index a6c68ae758..8d7123a6ae 100644 --- a/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy +++ b/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy @@ -17,9 +17,10 @@ * under the License. */ -import org.apache.ofbiz.base.util.*; -import org.apache.ofbiz.common.geo.*; -import org.apache.ofbiz.entity.*; + +import org.apache.ofbiz.base.util.UtilMisc +import org.apache.ofbiz.base.util.UtilProperties +import org.apache.ofbiz.common.geo.GeoWorker uiLabelMap = UtilProperties.getResourceBundleMap("AccountingUiLabels", locale); diff --git a/applications/accounting/groovyScripts/invoice/CreateApplicationList.groovy b/applications/accounting/groovyScripts/invoice/CreateApplicationList.groovy index 19acf91127..0d35b90ecc 100644 --- a/applications/accounting/groovyScripts/invoice/CreateApplicationList.groovy +++ b/applications/accounting/groovyScripts/invoice/CreateApplicationList.groovy @@ -17,16 +17,10 @@ * under the License. */ -import java.util.*; -import java.math.BigDecimal; -import org.apache.ofbiz.entity.*; -import org.apache.ofbiz.base.util.*; -import org.apache.ofbiz.base.util.collections.*; -import org.apache.ofbiz.accounting.invoice.*; -import org.apache.ofbiz.accounting.payment.*; -import java.text.DateFormat; -import java.text.*; -import java.text.NumberFormat; + +import org.apache.ofbiz.accounting.invoice.InvoiceWorker + +import java.text.NumberFormat // @param GenericValue invoice - The Invoice entity to find payment applications for if (!invoice) return; diff --git a/applications/accounting/groovyScripts/invoice/EditInvoice.groovy b/applications/accounting/groovyScripts/invoice/EditInvoice.groovy index f21cc3ea8c..32d6392b44 100644 --- a/applications/accounting/groovyScripts/invoice/EditInvoice.groovy +++ b/applications/accounting/groovyScripts/invoice/EditInvoice.groovy @@ -17,18 +17,11 @@ * under the License. */ -import java.util.*; -import org.apache.ofbiz.entity.*; -import org.apache.ofbiz.entity.util.EntityUtil; -import org.apache.ofbiz.base.util.*; -import org.apache.ofbiz.base.util.collections.*; -import org.apache.ofbiz.accounting.invoice.*; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.math.BigDecimal; -import java.math.MathContext; -import org.apache.ofbiz.base.util.UtilNumber; +import org.apache.ofbiz.accounting.invoice.InvoiceWorker +import org.apache.ofbiz.base.util.UtilNumber + +import java.text.DateFormat invoiceId = parameters.get("invoiceId"); @@ -37,7 +30,6 @@ context.invoice = invoice; currency = parameters.currency; // allow the display of the invoice in the original currency, the default is to display the invoice in the default currency BigDecimal conversionRate = new BigDecimal("1"); -ZERO = BigDecimal.ZERO; decimals = UtilNumber.getBigDecimalScale("invoice.decimals"); rounding = UtilNumber.getBigDecimalRoundingMode("invoice.rounding"); diff --git a/applications/accounting/groovyScripts/invoice/GetAccountOrganizationAndClass.groovy b/applications/accounting/groovyScripts/invoice/GetAccountOrganizationAndClass.groovy index 2f656d99d7..38fb30ba8a 100644 --- a/applications/accounting/groovyScripts/invoice/GetAccountOrganizationAndClass.groovy +++ b/applications/accounting/groovyScripts/invoice/GetAccountOrganizationAndClass.groovy @@ -17,13 +17,9 @@ * under the License. */ -import org.apache.ofbiz.base.util.UtilMisc; -import org.apache.ofbiz.entity.util.EntityUtil; -import org.apache.ofbiz.entity.condition.EntityCondition; -import org.apache.ofbiz.entity.condition.EntityConditionBuilder; -import org.apache.ofbiz.entity.condition.EntityConditionList; -import org.apache.ofbiz.entity.condition.EntityExpr; -import org.apache.ofbiz.entity.condition.EntityOperator; + +import org.apache.ofbiz.entity.condition.EntityConditionBuilder +import org.apache.ofbiz.entity.util.EntityUtil exprBldr = new EntityConditionBuilder(); invoice = context.invoice; diff --git a/applications/accounting/groovyScripts/invoice/InvoiceReport.groovy b/applications/accounting/groovyScripts/invoice/InvoiceReport.groovy index 78366cbc35..eedac7459c 100644 --- a/applications/accounting/groovyScripts/invoice/InvoiceReport.groovy +++ b/applications/accounting/groovyScripts/invoice/InvoiceReport.groovy @@ -17,14 +17,9 @@ * under the License. */ -import org.apache.ofbiz.entity.util.EntityUtil; -import org.apache.ofbiz.entity.condition.EntityCondition; -import org.apache.ofbiz.entity.condition.EntityConditionBuilder; -import org.apache.ofbiz.entity.condition.EntityConditionList; -import org.apache.ofbiz.entity.condition.EntityExpr; -import org.apache.ofbiz.entity.condition.EntityOperator; -import org.apache.ofbiz.base.util.UtilDateTime; -import org.apache.ofbiz.entity.util.EntityFindOptions; + +import org.apache.ofbiz.base.util.UtilDateTime +import org.apache.ofbiz.entity.condition.EntityConditionBuilder exprBldr = new org.apache.ofbiz.entity.condition.EntityConditionBuilder(); diff --git a/applications/accounting/groovyScripts/invoice/ListNotAppliedPayments.groovy b/applications/accounting/groovyScripts/invoice/ListNotAppliedPayments.groovy index 7aa5997c9a..da8b533ec4 100644 --- a/applications/accounting/groovyScripts/invoice/ListNotAppliedPayments.groovy +++ b/applications/accounting/groovyScripts/invoice/ListNotAppliedPayments.groovy @@ -17,19 +17,11 @@ * under the License. */ -import java.util.*; -import org.apache.ofbiz.entity.*; -import org.apache.ofbiz.base.util.*; -import org.apache.ofbiz.base.util.collections.*; -import org.apache.ofbiz.accounting.invoice.*; -import org.apache.ofbiz.accounting.payment.*; -import org.apache.ofbiz.accounting.util.UtilAccounting; -import org.apache.ofbiz.entity.condition.EntityCondition; -import org.apache.ofbiz.entity.condition.EntityConditionBuilder; -import org.apache.ofbiz.entity.condition.EntityConditionList; -import org.apache.ofbiz.entity.condition.EntityExpr; -import org.apache.ofbiz.entity.condition.EntityOperator; -import java.math.*; + +import org.apache.ofbiz.accounting.invoice.InvoiceWorker +import org.apache.ofbiz.accounting.payment.PaymentWorker +import org.apache.ofbiz.base.util.UtilNumber +import org.apache.ofbiz.entity.condition.EntityConditionBuilder invoiceId = parameters.invoiceId; invoice = from("Invoice").where(invoiceId : invoiceId).queryOne(); diff --git a/applications/accounting/groovyScripts/invoice/PrintInvoices.groovy b/applications/accounting/groovyScripts/invoice/PrintInvoices.groovy index d772c07598..bfdbd24152 100644 --- a/applications/accounting/groovyScripts/invoice/PrintInvoices.groovy +++ b/applications/accounting/groovyScripts/invoice/PrintInvoices.groovy @@ -17,10 +17,11 @@ * under the License. */ -import java.text.DateFormat; -import org.apache.ofbiz.accounting.invoice.InvoiceWorker; -import org.apache.ofbiz.base.util.UtilNumber; -import org.apache.ofbiz.entity.condition.EntityCondition; + +import org.apache.ofbiz.accounting.invoice.InvoiceWorker +import org.apache.ofbiz.base.util.UtilNumber + +import java.text.DateFormat invoiceDetailList = []; invoiceIds.each { invoiceId -> diff --git a/applications/accounting/groovyScripts/order/BillingAccountOrders.groovy b/applications/accounting/groovyScripts/order/BillingAccountOrders.groovy index ec7640926a..7777c8c3da 100644 --- a/applications/accounting/groovyScripts/order/BillingAccountOrders.groovy +++ b/applications/accounting/groovyScripts/order/BillingAccountOrders.groovy @@ -17,9 +17,6 @@ * under the License. */ -import org.apache.ofbiz.base.util.UtilMisc; -import org.apache.ofbiz.entity.util.EntityUtil; - if (billingAccountId) { orderPaymentPreferencesList = []; orderList = from("OrderHeader").where('billingAccountId', billingAccountId).queryList(); diff --git a/applications/accounting/groovyScripts/payment/BillingAccounts.groovy b/applications/accounting/groovyScripts/payment/BillingAccounts.groovy index 833d79ca56..1dbd0e5d09 100644 --- a/applications/accounting/groovyScripts/payment/BillingAccounts.groovy +++ b/applications/accounting/groovyScripts/payment/BillingAccounts.groovy @@ -18,7 +18,6 @@ */ import org.apache.ofbiz.accounting.payment.BillingAccountWorker; -import org.apache.ofbiz.entity.util.EntityUtil; partyId = parameters.partyId; currencyUomId = null; diff --git a/applications/accounting/groovyScripts/payment/DepositWithdrawPayments.groovy b/applications/accounting/groovyScripts/payment/DepositWithdrawPayments.groovy index 76c7617d99..fba5570576 100644 --- a/applications/accounting/groovyScripts/payment/DepositWithdrawPayments.groovy +++ b/applications/accounting/groovyScripts/payment/DepositWithdrawPayments.groovy @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -import org.apache.ofbiz.base.util.UtilDateTime; -import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.entity.util.EntityUtil; -import org.apache.ofbiz.entity.condition.EntityCondition; -import org.apache.ofbiz.entity.condition.EntityOperator; + +import org.apache.ofbiz.base.util.UtilValidate +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator +import org.apache.ofbiz.entity.util.EntityUtil if ("Y".equals(parameters.noConditionFind)) { List exprListForParameters = []; diff --git a/applications/accounting/groovyScripts/payment/FindInvoicesByDueDate.groovy b/applications/accounting/groovyScripts/payment/FindInvoicesByDueDate.groovy index 14fe1748f5..9f2e2c1019 100644 --- a/applications/accounting/groovyScripts/payment/FindInvoicesByDueDate.groovy +++ b/applications/accounting/groovyScripts/payment/FindInvoicesByDueDate.groovy @@ -17,12 +17,10 @@ * under the License. */ -import org.apache.ofbiz.service.*; - context.invoicePaymentInfoList = [] 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 -} \ No newline at end of file +} diff --git a/applications/accounting/groovyScripts/payment/ListNotAppliedInvoices.groovy b/applications/accounting/groovyScripts/payment/ListNotAppliedInvoices.groovy index c16eb3285c..0d9ae9fa6d 100644 --- a/applications/accounting/groovyScripts/payment/ListNotAppliedInvoices.groovy +++ b/applications/accounting/groovyScripts/payment/ListNotAppliedInvoices.groovy @@ -17,18 +17,13 @@ * under the License. */ -import java.util.*; -import org.apache.ofbiz.entity.*; -import org.apache.ofbiz.base.util.*; -import org.apache.ofbiz.base.util.collections.*; -import org.apache.ofbiz.accounting.invoice.*; -import org.apache.ofbiz.accounting.payment.*; -import org.apache.ofbiz.accounting.util.UtilAccounting; -import org.apache.ofbiz.entity.condition.EntityCondition; -import org.apache.ofbiz.entity.condition.EntityOperator; -import org.apache.ofbiz.entity.condition.EntityExpr; -import org.apache.ofbiz.entity.condition.EntityConditionList; -import java.math.*; + +import org.apache.ofbiz.accounting.invoice.* +import org.apache.ofbiz.accounting.payment.* +import org.apache.ofbiz.base.util.UtilNumber +import org.apache.ofbiz.base.util.collections.* +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator paymentId = parameters.paymentId; payment = from("Payment").where("paymentId", paymentId).queryOne(); diff --git a/applications/accounting/groovyScripts/payment/ListNotAppliedPayments.groovy b/applications/accounting/groovyScripts/payment/ListNotAppliedPayments.groovy index eff11c7a97..9bdb398782 100644 --- a/applications/accounting/groovyScripts/payment/ListNotAppliedPayments.groovy +++ b/applications/accounting/groovyScripts/payment/ListNotAppliedPayments.groovy @@ -17,21 +17,11 @@ * under the License. */ -import java.util.*; -import org.apache.ofbiz.entity.*; -import org.apache.ofbiz.base.util.*; -import org.apache.ofbiz.base.util.collections.*; -import org.apache.ofbiz.accounting.invoice.*; -import org.apache.ofbiz.accounting.payment.*; -import org.apache.ofbiz.accounting.util.UtilAccounting; -import java.text.DateFormat; -import java.math.*; -import org.apache.ofbiz.entity.condition.EntityCondition; -import org.apache.ofbiz.entity.condition.EntityConditionList; -import org.apache.ofbiz.entity.condition.EntityExpr; -import org.apache.ofbiz.entity.condition.EntityOperator; -import org.apache.ofbiz.entity.model.*; -import java.text.NumberFormat; + +import org.apache.ofbiz.accounting.payment.PaymentWorker +import org.apache.ofbiz.base.util.UtilNumber +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator basePaymentId = parameters.paymentId; basePayment = from("Payment").where("paymentId", basePaymentId).queryOne(); diff --git a/applications/accounting/groovyScripts/payment/ManualTx.groovy b/applications/accounting/groovyScripts/payment/ManualTx.groovy index b58a963531..39cf5578ed 100644 --- a/applications/accounting/groovyScripts/payment/ManualTx.groovy +++ b/applications/accounting/groovyScripts/payment/ManualTx.groovy @@ -17,8 +17,6 @@ * under the License. */ -import org.apache.ofbiz.base.util.*; - // stores productStores = from("ProductStore").orderBy("storeName").cache(true).queryList(); context.productStores = productStores; diff --git a/applications/accounting/groovyScripts/payment/PrintChecks.groovy b/applications/accounting/groovyScripts/payment/PrintChecks.groovy index ab896aa286..0e8bae0df6 100644 --- a/applications/accounting/groovyScripts/payment/PrintChecks.groovy +++ b/applications/accounting/groovyScripts/payment/PrintChecks.groovy @@ -17,13 +17,9 @@ * under the License. */ -import java.util.ArrayList; -import org.apache.ofbiz.base.util.UtilHttp; -import org.apache.ofbiz.base.util.UtilMisc; -import org.apache.ofbiz.base.util.UtilNumber; -import org.apache.ofbiz.entity.condition.EntityCondition; -import org.apache.ofbiz.entity.condition.EntityOperator; -import org.apache.ofbiz.entity.util.EntityUtil; + +import org.apache.ofbiz.base.util.UtilHttp +import org.apache.ofbiz.base.util.UtilNumber // rounding mode decimals = UtilNumber.getBigDecimalScale("invoice.decimals"); diff --git a/applications/accounting/groovyScripts/period/EditCustomTimePeriod.groovy b/applications/accounting/groovyScripts/period/EditCustomTimePeriod.groovy index 8cbe343470..d81945e5dd 100644 --- a/applications/accounting/groovyScripts/period/EditCustomTimePeriod.groovy +++ b/applications/accounting/groovyScripts/period/EditCustomTimePeriod.groovy @@ -17,12 +17,6 @@ * under the License. */ -import java.util.*; -import java.net.*; -import org.apache.ofbiz.security.*; -import org.apache.ofbiz.entity.*; -import org.apache.ofbiz.base.util.*; - findOrganizationPartyId = parameters.findOrganizationPartyId; if (findOrganizationPartyId) { context.findOrganizationPartyId = findOrganizationPartyId; diff --git a/applications/accounting/groovyScripts/reports/BalanceSheet.groovy b/applications/accounting/groovyScripts/reports/BalanceSheet.groovy index 2a80c5a11b..90a0280e42 100644 --- a/applications/accounting/groovyScripts/reports/BalanceSheet.groovy +++ b/applications/accounting/groovyScripts/reports/BalanceSheet.groovy @@ -17,17 +17,17 @@ * under the License. */ -import org.apache.ofbiz.base.util.UtilDateTime; -import org.apache.ofbiz.base.util.UtilMisc; -import org.apache.ofbiz.base.util.UtilProperties; -import org.apache.ofbiz.entity.GenericValue; -import org.apache.ofbiz.entity.condition.EntityCondition; -import org.apache.ofbiz.entity.condition.EntityOperator; -import org.apache.ofbiz.accounting.util.UtilAccounting; -import org.apache.ofbiz.party.party.PartyWorker; -import java.sql.Date; -import java.sql.Timestamp; +import org.apache.ofbiz.accounting.util.UtilAccounting +import org.apache.ofbiz.base.util.UtilDateTime +import org.apache.ofbiz.base.util.UtilMisc +import org.apache.ofbiz.base.util.UtilProperties +import org.apache.ofbiz.entity.GenericValue +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator +import org.apache.ofbiz.party.party.PartyWorker + +import java.sql.Timestamp uiLabelMap = UtilProperties.getResourceBundleMap("AccountingUiLabels", locale); @@ -430,4 +430,4 @@ context.liabilityEquityBalanceTotal = context.liabilityBalanceTotal + context.eq balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingEquities", "balance", context.equityBalanceTotal)); balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingTotalLiabilitiesAndEquities", "balance", context.liabilityEquityBalanceTotal)); -context.balanceTotalList = balanceTotalList; \ No newline at end of file +context.balanceTotalList = balanceTotalList; diff --git a/applications/accounting/groovyScripts/reports/CashFlowStatement.groovy b/applications/accounting/groovyScripts/reports/CashFlowStatement.groovy index 9ed25761a1..3e1dad64f9 100644 --- a/applications/accounting/groovyScripts/reports/CashFlowStatement.groovy +++ b/applications/accounting/groovyScripts/reports/CashFlowStatement.groovy @@ -17,17 +17,17 @@ * under the License. */ -import org.apache.ofbiz.accounting.util.UtilAccounting; -import org.apache.ofbiz.base.util.UtilDateTime; -import org.apache.ofbiz.base.util.UtilMisc; -import org.apache.ofbiz.base.util.UtilProperties; -import org.apache.ofbiz.entity.GenericValue; -import org.apache.ofbiz.entity.condition.EntityCondition; -import org.apache.ofbiz.entity.condition.EntityOperator; -import org.apache.ofbiz.party.party.PartyWorker; -import java.sql.Date; -import java.sql.Timestamp; +import org.apache.ofbiz.accounting.util.UtilAccounting +import org.apache.ofbiz.base.util.UtilDateTime +import org.apache.ofbiz.base.util.UtilMisc +import org.apache.ofbiz.base.util.UtilProperties +import org.apache.ofbiz.entity.GenericValue +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator +import org.apache.ofbiz.party.party.PartyWorker + +import java.sql.Timestamp if (!fromDate) { return; diff --git a/applications/accounting/groovyScripts/reports/ComparativeBalanceSheet.groovy b/applications/accounting/groovyScripts/reports/ComparativeBalanceSheet.groovy index 00bdfba24b..4f163d3562 100644 --- a/applications/accounting/groovyScripts/reports/ComparativeBalanceSheet.groovy +++ b/applications/accounting/groovyScripts/reports/ComparativeBalanceSheet.groovy @@ -18,9 +18,6 @@ */ import org.apache.ofbiz.base.util.UtilMisc; -import java.math.BigDecimal; -import java.sql.Timestamp; -import org.apache.ofbiz.entity.util.EntityUtil; assetAccountBalanceMap = [:]; assetAccountBalanceList = []; diff --git a/applications/accounting/groovyScripts/reports/ComparativeCashFlowStatement.groovy b/applications/accounting/groovyScripts/reports/ComparativeCashFlowStatement.groovy index b139abac45..cc91db515e 100644 --- a/applications/accounting/groovyScripts/reports/ComparativeCashFlowStatement.groovy +++ b/applications/accounting/groovyScripts/reports/ComparativeCashFlowStatement.groovy @@ -18,7 +18,6 @@ */ import org.apache.ofbiz.base.util.UtilMisc; -import java.math.BigDecimal; openingCashBalanceMap = [:]; openingCashBalanceList = []; diff --git a/applications/accounting/groovyScripts/reports/ComparativeIncomeStatement.groovy b/applications/accounting/groovyScripts/reports/ComparativeIncomeStatement.groovy index bd644d22fd..e72a60cd9a 100644 --- a/applications/accounting/groovyScripts/reports/ComparativeIncomeStatement.groovy +++ b/applications/accounting/groovyScripts/reports/ComparativeIncomeStatement.groovy @@ -18,7 +18,6 @@ */ import org.apache.ofbiz.base.util.UtilMisc; -import java.math.BigDecimal; revenueAccountBalanceMap = [:]; revenueAccountBalanceList = []; diff --git a/applications/accounting/groovyScripts/reports/CostCenters.groovy b/applications/accounting/groovyScripts/reports/CostCenters.groovy index c55da54102..1958a2b4fb 100644 --- a/applications/accounting/groovyScripts/reports/CostCenters.groovy +++ b/applications/accounting/groovyScripts/reports/CostCenters.groovy @@ -17,12 +17,11 @@ * under the License. */ -import org.apache.ofbiz.base.util.UtilDateTime; -import org.apache.ofbiz.base.util.UtilMisc; -import org.apache.ofbiz.base.util.UtilNumber; -import org.apache.ofbiz.entity.condition.EntityCondition; -import org.apache.ofbiz.entity.condition.EntityOperator; -import org.apache.ofbiz.entity.util.EntityUtil; + +import org.apache.ofbiz.base.util.UtilDateTime +import org.apache.ofbiz.base.util.UtilMisc +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator if (!fromDate) { return; diff --git a/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy b/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy index 22c627ae05..182d4e15aa 100644 --- a/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy +++ b/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy @@ -16,12 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -import java.sql.Timestamp; -import org.apache.ofbiz.base.util.UtilDateTime; -import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.base.util.UtilNumber; -import org.apache.ofbiz.accounting.util.UtilAccounting; -import com.ibm.icu.util.Calendar; + +import org.apache.ofbiz.accounting.util.UtilAccounting +import org.apache.ofbiz.base.util.UtilDateTime +import org.apache.ofbiz.base.util.UtilNumber +import org.apache.ofbiz.base.util.UtilValidate + +import java.sql.Timestamp if (parameters.get('ApplicationDecorator|organizationPartyId')) { onlyIncludePeriodTypeIdList = []; diff --git a/applications/accounting/groovyScripts/reports/SalesInvoiceByProductCategorySummary.groovy b/applications/accounting/groovyScripts/reports/SalesInvoiceByProductCategorySummary.groovy index 9d0658280c..39ce4776cf 100644 --- a/applications/accounting/groovyScripts/reports/SalesInvoiceByProductCategorySummary.groovy +++ b/applications/accounting/groovyScripts/reports/SalesInvoiceByProductCategorySummary.groovy @@ -17,10 +17,10 @@ * under the License. */ -import org.apache.ofbiz.base.util.*; -import org.apache.ofbiz.entity.*; -import org.apache.ofbiz.entity.condition.*; -import org.apache.ofbiz.entity.util.*; + +import org.apache.ofbiz.base.util.UtilMisc +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator //NOTE: this code ignores from/thru dates on the products and categories under the rootProductCategoryId! diff --git a/applications/accounting/groovyScripts/reports/TransactionTotals.groovy b/applications/accounting/groovyScripts/reports/TransactionTotals.groovy index 0272f1512e..8d2a9eb263 100644 --- a/applications/accounting/groovyScripts/reports/TransactionTotals.groovy +++ b/applications/accounting/groovyScripts/reports/TransactionTotals.groovy @@ -17,18 +17,15 @@ * under the License. */ -import java.sql.Timestamp; -import org.apache.ofbiz.base.util.UtilDateTime; -import org.apache.ofbiz.base.util.UtilMisc; -import org.apache.ofbiz.entity.GenericValue; -import org.apache.ofbiz.entity.condition.EntityCondition; -import org.apache.ofbiz.entity.condition.EntityOperator; -import org.apache.ofbiz.entity.util.EntityUtil; +import org.apache.ofbiz.accounting.util.UtilAccounting +import org.apache.ofbiz.base.util.UtilDateTime +import org.apache.ofbiz.base.util.UtilMisc +import org.apache.ofbiz.entity.GenericValue +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator -import org.apache.ofbiz.accounting.util.UtilAccounting; - -import java.sql.Date; +import java.sql.Timestamp if (!fromDate) { return; diff --git a/applications/accounting/groovyScripts/transaction/AuthorizeTransaction.groovy b/applications/accounting/groovyScripts/transaction/AuthorizeTransaction.groovy index 3cc978b1d0..05fd3e3edd 100644 --- a/applications/accounting/groovyScripts/transaction/AuthorizeTransaction.groovy +++ b/applications/accounting/groovyScripts/transaction/AuthorizeTransaction.groovy @@ -16,9 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import java.math.BigDecimal; import org.apache.ofbiz.order.order.OrderReadHelper; -import org.apache.ofbiz.base.util.UtilMisc; orderId = context.orderId; orderPaymentPreferenceId = context.orderPaymentPreferenceId; diff --git a/applications/accounting/groovyScripts/transaction/CaptureTransaction.groovy b/applications/accounting/groovyScripts/transaction/CaptureTransaction.groovy index 95004bc76b..306f8dea44 100644 --- a/applications/accounting/groovyScripts/transaction/CaptureTransaction.groovy +++ b/applications/accounting/groovyScripts/transaction/CaptureTransaction.groovy @@ -16,12 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -import org.apache.ofbiz.order.order.OrderReadHelper; -import org.apache.ofbiz.base.util.UtilMisc; -import org.apache.ofbiz.entity.condition.EntityExpr; -import org.apache.ofbiz.entity.condition.EntityOperator; -import org.apache.ofbiz.entity.condition.EntityCondition; -import org.apache.ofbiz.entity.util.EntityUtil; + +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator +import org.apache.ofbiz.entity.util.EntityUtil orderId = context.orderId; orderPaymentPreferenceId = context.orderPaymentPreferenceId; diff --git a/applications/accounting/groovyScripts/transaction/ViewGatewayResponse.groovy b/applications/accounting/groovyScripts/transaction/ViewGatewayResponse.groovy index 2cedd88c2c..eaea21af86 100644 --- a/applications/accounting/groovyScripts/transaction/ViewGatewayResponse.groovy +++ b/applications/accounting/groovyScripts/transaction/ViewGatewayResponse.groovy @@ -25,11 +25,9 @@ * a backlink to the order can be created. */ -import org.apache.ofbiz.base.util.UtilMisc; -import org.apache.ofbiz.entity.condition.EntityExpr; -import org.apache.ofbiz.entity.condition.EntityOperator; -import org.apache.ofbiz.entity.condition.EntityCondition; -import org.apache.ofbiz.entity.util.EntityUtil; +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator +import org.apache.ofbiz.entity.util.EntityUtil // get this field first, it determines which purpose this script satisfies orderPaymentPreferenceId = context.orderPaymentPreferenceId;