You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2016/10/15 13:11:47 UTC

svn commit: r1765057 - in /ofbiz/trunk/applications/accounting/groovyScripts: admin/ ap/invoices/ ar/ chartofaccounts/ fixedasset/ invoice/ order/ payment/ period/ reports/ transaction/

Author: mridulpathak
Date: Sat Oct 15 13:11:46 2016
New Revision: 1765057

URL: http://svn.apache.org/viewvc?rev=1765057&view=rev
Log:
Improved: Removed unused imports from groovy files in accounting component.
(OFBIZ-8484)

Thanks: Suraj Khurana for contribution.

Modified:
    ofbiz/trunk/applications/accounting/groovyScripts/admin/ListInvoiceItemTypesGlAccount.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/ap/invoices/CommissionReport.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/ar/BatchPayments.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/chartofaccounts/TaxAuthorityGlAccounts.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/invoice/CreateApplicationList.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/invoice/EditInvoice.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/invoice/GetAccountOrganizationAndClass.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/invoice/InvoiceReport.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/invoice/ListNotAppliedPayments.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/invoice/PrintInvoices.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/order/BillingAccountOrders.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/payment/BillingAccounts.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/payment/DepositWithdrawPayments.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/payment/FindInvoicesByDueDate.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/payment/ListNotAppliedInvoices.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/payment/ListNotAppliedPayments.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/payment/ManualTx.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/payment/PrintChecks.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/period/EditCustomTimePeriod.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/reports/BalanceSheet.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/reports/CashFlowStatement.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/reports/ComparativeBalanceSheet.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/reports/ComparativeCashFlowStatement.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/reports/ComparativeIncomeStatement.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/reports/CostCenters.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/reports/SalesInvoiceByProductCategorySummary.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/reports/TransactionTotals.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/transaction/AuthorizeTransaction.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/transaction/CaptureTransaction.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/transaction/ViewGatewayResponse.groovy

Modified: ofbiz/trunk/applications/accounting/groovyScripts/admin/ListInvoiceItemTypesGlAccount.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/admin/ListInvoiceItemTypesGlAccount.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/admin/ListInvoiceItemTypesGlAccount.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/admin/ListInvoiceItemTypesGlAccount.groovy Sat Oct 15 13:11:46 2016
@@ -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";

Modified: ofbiz/trunk/applications/accounting/groovyScripts/ap/invoices/CommissionReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/ap/invoices/CommissionReport.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/ap/invoices/CommissionReport.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/ap/invoices/CommissionReport.groovy Sat Oct 15 13:11:46 2016
@@ -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;

Modified: ofbiz/trunk/applications/accounting/groovyScripts/ar/BatchPayments.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/ar/BatchPayments.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/ar/BatchPayments.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/ar/BatchPayments.groovy Sat Oct 15 13:11:46 2016
@@ -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 = [];

Modified: ofbiz/trunk/applications/accounting/groovyScripts/chartofaccounts/TaxAuthorityGlAccounts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/chartofaccounts/TaxAuthorityGlAccounts.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/chartofaccounts/TaxAuthorityGlAccounts.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/chartofaccounts/TaxAuthorityGlAccounts.groovy Sat Oct 15 13:11:46 2016
@@ -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 ->

Modified: ofbiz/trunk/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy Sat Oct 15 13:11:46 2016
@@ -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);
 

Modified: ofbiz/trunk/applications/accounting/groovyScripts/invoice/CreateApplicationList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/invoice/CreateApplicationList.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/invoice/CreateApplicationList.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/invoice/CreateApplicationList.groovy Sat Oct 15 13:11:46 2016
@@ -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;

Modified: ofbiz/trunk/applications/accounting/groovyScripts/invoice/EditInvoice.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/invoice/EditInvoice.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/invoice/EditInvoice.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/invoice/EditInvoice.groovy Sat Oct 15 13:11:46 2016
@@ -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");
 

Modified: ofbiz/trunk/applications/accounting/groovyScripts/invoice/GetAccountOrganizationAndClass.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/invoice/GetAccountOrganizationAndClass.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/invoice/GetAccountOrganizationAndClass.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/invoice/GetAccountOrganizationAndClass.groovy Sat Oct 15 13:11:46 2016
@@ -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;

Modified: ofbiz/trunk/applications/accounting/groovyScripts/invoice/InvoiceReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/invoice/InvoiceReport.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/invoice/InvoiceReport.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/invoice/InvoiceReport.groovy Sat Oct 15 13:11:46 2016
@@ -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();
 

Modified: ofbiz/trunk/applications/accounting/groovyScripts/invoice/ListNotAppliedPayments.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/invoice/ListNotAppliedPayments.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/invoice/ListNotAppliedPayments.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/invoice/ListNotAppliedPayments.groovy Sat Oct 15 13:11:46 2016
@@ -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();

Modified: ofbiz/trunk/applications/accounting/groovyScripts/invoice/PrintInvoices.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/invoice/PrintInvoices.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/invoice/PrintInvoices.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/invoice/PrintInvoices.groovy Sat Oct 15 13:11:46 2016
@@ -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 ->

Modified: ofbiz/trunk/applications/accounting/groovyScripts/order/BillingAccountOrders.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/order/BillingAccountOrders.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/order/BillingAccountOrders.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/order/BillingAccountOrders.groovy Sat Oct 15 13:11:46 2016
@@ -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();

Modified: ofbiz/trunk/applications/accounting/groovyScripts/payment/BillingAccounts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/payment/BillingAccounts.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/payment/BillingAccounts.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/payment/BillingAccounts.groovy Sat Oct 15 13:11:46 2016
@@ -18,7 +18,6 @@
  */
 
 import org.apache.ofbiz.accounting.payment.BillingAccountWorker;
-import org.apache.ofbiz.entity.util.EntityUtil;
 
 partyId = parameters.partyId;
 currencyUomId = null;

Modified: ofbiz/trunk/applications/accounting/groovyScripts/payment/DepositWithdrawPayments.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/payment/DepositWithdrawPayments.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/payment/DepositWithdrawPayments.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/payment/DepositWithdrawPayments.groovy Sat Oct 15 13:11:46 2016
@@ -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 = [];

Modified: ofbiz/trunk/applications/accounting/groovyScripts/payment/FindInvoicesByDueDate.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/payment/FindInvoicesByDueDate.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/payment/FindInvoicesByDueDate.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/payment/FindInvoicesByDueDate.groovy Sat Oct 15 13:11:46 2016
@@ -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
+}

Modified: ofbiz/trunk/applications/accounting/groovyScripts/payment/ListNotAppliedInvoices.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/payment/ListNotAppliedInvoices.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/payment/ListNotAppliedInvoices.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/payment/ListNotAppliedInvoices.groovy Sat Oct 15 13:11:46 2016
@@ -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();

Modified: ofbiz/trunk/applications/accounting/groovyScripts/payment/ListNotAppliedPayments.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/payment/ListNotAppliedPayments.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/payment/ListNotAppliedPayments.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/payment/ListNotAppliedPayments.groovy Sat Oct 15 13:11:46 2016
@@ -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();

Modified: ofbiz/trunk/applications/accounting/groovyScripts/payment/ManualTx.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/payment/ManualTx.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/payment/ManualTx.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/payment/ManualTx.groovy Sat Oct 15 13:11:46 2016
@@ -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;

Modified: ofbiz/trunk/applications/accounting/groovyScripts/payment/PrintChecks.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/payment/PrintChecks.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/payment/PrintChecks.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/payment/PrintChecks.groovy Sat Oct 15 13:11:46 2016
@@ -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");

Modified: ofbiz/trunk/applications/accounting/groovyScripts/period/EditCustomTimePeriod.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/period/EditCustomTimePeriod.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/period/EditCustomTimePeriod.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/period/EditCustomTimePeriod.groovy Sat Oct 15 13:11:46 2016
@@ -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;

Modified: ofbiz/trunk/applications/accounting/groovyScripts/reports/BalanceSheet.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/reports/BalanceSheet.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/reports/BalanceSheet.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/reports/BalanceSheet.groovy Sat Oct 15 13:11:46 2016
@@ -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 = co
 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;

Modified: ofbiz/trunk/applications/accounting/groovyScripts/reports/CashFlowStatement.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/reports/CashFlowStatement.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/reports/CashFlowStatement.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/reports/CashFlowStatement.groovy Sat Oct 15 13:11:46 2016
@@ -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;

Modified: ofbiz/trunk/applications/accounting/groovyScripts/reports/ComparativeBalanceSheet.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/reports/ComparativeBalanceSheet.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/reports/ComparativeBalanceSheet.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/reports/ComparativeBalanceSheet.groovy Sat Oct 15 13:11:46 2016
@@ -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 = [];

Modified: ofbiz/trunk/applications/accounting/groovyScripts/reports/ComparativeCashFlowStatement.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/reports/ComparativeCashFlowStatement.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/reports/ComparativeCashFlowStatement.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/reports/ComparativeCashFlowStatement.groovy Sat Oct 15 13:11:46 2016
@@ -18,7 +18,6 @@
  */
 
 import org.apache.ofbiz.base.util.UtilMisc;
-import java.math.BigDecimal; 
 
 openingCashBalanceMap = [:];
 openingCashBalanceList = [];

Modified: ofbiz/trunk/applications/accounting/groovyScripts/reports/ComparativeIncomeStatement.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/reports/ComparativeIncomeStatement.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/reports/ComparativeIncomeStatement.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/reports/ComparativeIncomeStatement.groovy Sat Oct 15 13:11:46 2016
@@ -18,7 +18,6 @@
  */
 
 import org.apache.ofbiz.base.util.UtilMisc;
-import java.math.BigDecimal; 
 
 revenueAccountBalanceMap = [:];
 revenueAccountBalanceList = [];

Modified: ofbiz/trunk/applications/accounting/groovyScripts/reports/CostCenters.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/reports/CostCenters.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/reports/CostCenters.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/reports/CostCenters.groovy Sat Oct 15 13:11:46 2016
@@ -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;

Modified: ofbiz/trunk/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy Sat Oct 15 13:11:46 2016
@@ -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 = [];

Modified: ofbiz/trunk/applications/accounting/groovyScripts/reports/SalesInvoiceByProductCategorySummary.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/reports/SalesInvoiceByProductCategorySummary.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/reports/SalesInvoiceByProductCategorySummary.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/reports/SalesInvoiceByProductCategorySummary.groovy Sat Oct 15 13:11:46 2016
@@ -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!
 

Modified: ofbiz/trunk/applications/accounting/groovyScripts/reports/TransactionTotals.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/reports/TransactionTotals.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/reports/TransactionTotals.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/reports/TransactionTotals.groovy Sat Oct 15 13:11:46 2016
@@ -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;

Modified: ofbiz/trunk/applications/accounting/groovyScripts/transaction/AuthorizeTransaction.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/transaction/AuthorizeTransaction.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/transaction/AuthorizeTransaction.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/transaction/AuthorizeTransaction.groovy Sat Oct 15 13:11:46 2016
@@ -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;

Modified: ofbiz/trunk/applications/accounting/groovyScripts/transaction/CaptureTransaction.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/transaction/CaptureTransaction.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/transaction/CaptureTransaction.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/transaction/CaptureTransaction.groovy Sat Oct 15 13:11:46 2016
@@ -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;

Modified: ofbiz/trunk/applications/accounting/groovyScripts/transaction/ViewGatewayResponse.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/transaction/ViewGatewayResponse.groovy?rev=1765057&r1=1765056&r2=1765057&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/transaction/ViewGatewayResponse.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/transaction/ViewGatewayResponse.groovy Sat Oct 15 13:11:46 2016
@@ -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;