svn commit: r1767764 [1/33] - in /ofbiz/trunk: applications/accounting/groovy
Locked
svn commit: r1767764 [1/33] - in /ofbiz/trunk: applications/accounting/groovy
 
|
Author: arunpatidar
Date: Wed Nov 2 19:09:13 2016 New Revision: 1767764 URL: http://svn.apache.org/viewvc?rev=1767764&view=rev Log: Improved: Removed semicolon from all Groovy files of all components. (OFBIZ-8652) Thanks: Rohit Koushal, Jacques Le Roux and Rishi Solanki for the contribution. Modified: ofbiz/trunk/applications/accounting/groovyScripts/admin/FilterOutReceipts.groovy ofbiz/trunk/applications/accounting/groovyScripts/admin/ListInvoiceItemTypesGlAccount.groovy ofbiz/trunk/applications/accounting/groovyScripts/ap/invoices/CommissionReport.groovy ofbiz/trunk/applications/accounting/groovyScripts/ap/invoices/CommissionRun.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/IncomeStatement.groovy ofbiz/trunk/applications/accounting/groovyScripts/reports/MonthSelection.groovy ofbiz/trunk/applications/accounting/groovyScripts/reports/SalesInvoiceByProductCategorySummary.groovy ofbiz/trunk/applications/accounting/groovyScripts/reports/TransactionTotals.groovy ofbiz/trunk/applications/accounting/groovyScripts/reports/TrialBalance.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 ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/agreement/GetPartyNameForDate.groovy ofbiz/trunk/applications/commonext/groovyScripts/ofbizsetup/ChangeOrgPartyId.groovy ofbiz/trunk/applications/commonext/groovyScripts/ofbizsetup/FindFacility.groovy ofbiz/trunk/applications/commonext/groovyScripts/ofbizsetup/GetProdCatalog.groovy ofbiz/trunk/applications/commonext/groovyScripts/ofbizsetup/GetProductStoreAndWebSite.groovy ofbiz/trunk/applications/content/groovyScripts/cms/CmsEditAddPrep.groovy ofbiz/trunk/applications/content/groovyScripts/cms/FeaturePrep.groovy ofbiz/trunk/applications/content/groovyScripts/cms/GetMenuContext.groovy ofbiz/trunk/applications/content/groovyScripts/cms/MostRecentPrep.groovy ofbiz/trunk/applications/content/groovyScripts/cms/UserPermPrep.groovy ofbiz/trunk/applications/content/groovyScripts/content/ContentSearchOptions.groovy ofbiz/trunk/applications/content/groovyScripts/content/ContentSearchResults.groovy ofbiz/trunk/applications/content/groovyScripts/content/GetContentLookupList.groovy ofbiz/trunk/applications/content/groovyScripts/content/PrepSeqNo.groovy ofbiz/trunk/applications/content/groovyScripts/contentsetup/UserPermPrep.groovy ofbiz/trunk/applications/content/groovyScripts/datasetup/DataCategoryPrep.groovy ofbiz/trunk/applications/content/groovyScripts/layout/EditSubContent.groovy ofbiz/trunk/applications/content/groovyScripts/print/FindPrinters.groovy ofbiz/trunk/applications/content/groovyScripts/survey/EditSurveyQuestions.groovy ofbiz/trunk/applications/content/groovyScripts/survey/EditSurveyResponse.groovy ofbiz/trunk/applications/content/groovyScripts/survey/ViewSurveyResponses.groovy ofbiz/trunk/applications/content/groovyScripts/website/EditWebSiteParties.groovy ofbiz/trunk/applications/content/groovyScripts/website/WebSiteCMSMetaInfo.groovy ofbiz/trunk/applications/content/groovyScripts/website/WebSitePublishPoint.groovy ofbiz/trunk/applications/humanres/groovyScripts/category/CategoryTree.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/bom/BomSimulation.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/bom/EditProductBom.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/bom/FindProductBom.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunActualComponents.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunAllFixedAssets.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunComponents.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunContent.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunCosts.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunDeclaration.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunFixedAssets.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunTaskParties.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ProductionRunTasks.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ShowProductionRun.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ViewProductionRun.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/jobshopmgt/WorkWithShipmentPlans.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/reports/CuttingListReport.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/reports/PRunsComponentsByFeature.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/reports/PRunsInfoAndOrder.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/reports/PRunsProductsAndOrder.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/reports/PRunsProductsByFeature.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/reports/PRunsProductsStacks.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/reports/PackageContentsAndOrder.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/reports/ShipmentLabel.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/reports/ShipmentPlanStockReport.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/reports/ShipmentWorkEffortTasks.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/routing/EditCalendar.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/routing/EditCalendarExceptionDay.groovy ofbiz/trunk/applications/manufacturing/groovyScripts/routing/EditCalendarExceptionWeek.groovy ofbiz/trunk/applications/marketing/groovyScripts/marketing/contact/GetContactListMarketingEmail.groovy ofbiz/trunk/applications/marketing/groovyScripts/marketing/reports/EmailStatusReport.groovy ofbiz/trunk/applications/marketing/groovyScripts/marketing/reports/MarketingCampaignReport.groovy ofbiz/trunk/applications/marketing/groovyScripts/marketing/reports/PartyStatusReport.groovy ofbiz/trunk/applications/marketing/groovyScripts/marketing/reports/TrackingCodeReport.groovy ofbiz/trunk/applications/marketing/groovyScripts/sfa/CloneLead.groovy ofbiz/trunk/applications/marketing/groovyScripts/sfa/MergeContacts.groovy ofbiz/trunk/applications/order/groovyScripts/entry/AddGiftCertificates.groovy ofbiz/trunk/applications/order/groovyScripts/entry/AdditionalPartyListing.groovy ofbiz/trunk/applications/order/groovyScripts/entry/BillSettings.groovy ofbiz/trunk/applications/order/groovyScripts/entry/CheckInits.groovy ofbiz/trunk/applications/order/groovyScripts/entry/CheckoutOptions.groovy ofbiz/trunk/applications/order/groovyScripts/entry/CheckoutPayment.groovy ofbiz/trunk/applications/order/groovyScripts/entry/CheckoutReview.groovy ofbiz/trunk/applications/order/groovyScripts/entry/CheckoutShippingAddress.groovy ofbiz/trunk/applications/order/groovyScripts/entry/OptionSettings.groovy ofbiz/trunk/applications/order/groovyScripts/entry/OrderAgreements.groovy ofbiz/trunk/applications/order/groovyScripts/entry/OrderTerms.groovy ofbiz/trunk/applications/order/groovyScripts/entry/SetAdditionalParty.groovy ofbiz/trunk/applications/order/groovyScripts/entry/SetCheckOutTabBar.groovy ofbiz/trunk/applications/order/groovyScripts/entry/SetShoppingCart.groovy ofbiz/trunk/applications/order/groovyScripts/entry/ShipSettings.groovy ofbiz/trunk/applications/order/groovyScripts/entry/ShoppingList.groovy ofbiz/trunk/applications/order/groovyScripts/entry/ShowCart.groovy ofbiz/trunk/applications/order/groovyScripts/entry/ShowPromoText.groovy ofbiz/trunk/applications/order/groovyScripts/entry/SplitShip.groovy ofbiz/trunk/applications/order/groovyScripts/entry/StorePaymentOptions.groovy ofbiz/trunk/applications/order/groovyScripts/entry/cart/LookupBulkAddProducts.groovy ofbiz/trunk/applications/order/groovyScripts/entry/cart/LookupBulkAddSupplierProducts.groovy ofbiz/trunk/applications/order/groovyScripts/entry/cart/ShowPromotionDetails.groovy ofbiz/trunk/applications/order/groovyScripts/entry/catalog/AdvancedSearchOptions.groovy ofbiz/trunk/applications/order/groovyScripts/entry/catalog/Category.groovy ofbiz/trunk/applications/order/groovyScripts/entry/catalog/CategoryDetail.groovy ofbiz/trunk/applications/order/groovyScripts/entry/catalog/ChooseCatalog.groovy ofbiz/trunk/applications/order/groovyScripts/entry/catalog/CompareProducts.groovy ofbiz/trunk/applications/order/groovyScripts/entry/catalog/InlineProductDetail.groovy ofbiz/trunk/applications/order/groovyScripts/entry/catalog/KeywordSearch.groovy ofbiz/trunk/applications/order/groovyScripts/entry/catalog/KeywordSearchOptions.groovy ofbiz/trunk/applications/order/groovyScripts/entry/catalog/PrepareConfigForm.groovy ofbiz/trunk/applications/order/groovyScripts/entry/catalog/Product.groovy ofbiz/trunk/applications/order/groovyScripts/entry/catalog/ProductDetail.groovy ofbiz/trunk/applications/order/groovyScripts/entry/catalog/ProductSummary.groovy ofbiz/trunk/applications/order/groovyScripts/entry/catalog/ProductUomDropDownOnly.groovy ofbiz/trunk/applications/order/groovyScripts/entry/catalog/QuickAdd.groovy ofbiz/trunk/applications/order/groovyScripts/entry/catalog/SideDeepCategory.groovy ofbiz/trunk/applications/order/groovyScripts/lookup/LookupAssociatedProducts.groovy ofbiz/trunk/applications/order/groovyScripts/order/CompanyHeader.groovy ofbiz/trunk/applications/order/groovyScripts/order/FilterOrderList.groovy ofbiz/trunk/applications/order/groovyScripts/order/FindOrders.groovy ofbiz/trunk/applications/order/groovyScripts/order/NewNote.groovy ofbiz/trunk/applications/order/groovyScripts/order/OrderDeliveryScheduleInfo.groovy ofbiz/trunk/applications/order/groovyScripts/order/OrderHistory.groovy ofbiz/trunk/applications/order/groovyScripts/order/OrderList.groovy ofbiz/trunk/applications/order/groovyScripts/order/OrderStats.groovy ofbiz/trunk/applications/order/groovyScripts/order/OrderView.groovy ofbiz/trunk/applications/order/groovyScripts/order/OrderViewWebSecure.groovy ofbiz/trunk/applications/order/groovyScripts/order/ReceivePayment.groovy ofbiz/trunk/applications/order/groovyScripts/order/SendConfirmationEmail.groovy ofbiz/trunk/applications/order/groovyScripts/order/ShipGroups.groovy ofbiz/trunk/applications/order/groovyScripts/order/ViewImage.groovy ofbiz/trunk/applications/order/groovyScripts/quote/GetPartyAddress.groovy ofbiz/trunk/applications/order/groovyScripts/quote/GetPartyEmailAddress.groovy ofbiz/trunk/applications/order/groovyScripts/quote/ManageQuotePrices.groovy ofbiz/trunk/applications/order/groovyScripts/quote/ViewQuoteProfit.groovy ofbiz/trunk/applications/order/groovyScripts/reports/OpenOrderItemsReport.groovy ofbiz/trunk/applications/order/groovyScripts/request/GetNextSequenceNum.groovy ofbiz/trunk/applications/order/groovyScripts/request/RequestItemNotes.groovy ofbiz/trunk/applications/order/groovyScripts/request/SetRequestQuote.groovy ofbiz/trunk/applications/order/groovyScripts/requirement/ApprovedProductRequirements.groovy ofbiz/trunk/applications/order/groovyScripts/requirement/ApprovedProductRequirementsByVendor.groovy ofbiz/trunk/applications/order/groovyScripts/requirement/SelectCreatedProposed.groovy ofbiz/trunk/applications/order/groovyScripts/return/QuickReturn.groovy ofbiz/trunk/applications/order/groovyScripts/return/ReturnHeader.groovy ofbiz/trunk/applications/order/groovyScripts/return/ReturnHistory.groovy ofbiz/trunk/applications/order/groovyScripts/return/ReturnItems.groovy ofbiz/trunk/applications/order/groovyScripts/setup/PaymentSetup.groovy ofbiz/trunk/applications/order/groovyScripts/task/OrderTaskList.groovy ofbiz/trunk/applications/party/groovyScripts/HasPartyPermissions.groovy ofbiz/trunk/applications/party/groovyScripts/communication/FindCommEventContactMechs.groovy ofbiz/trunk/applications/party/groovyScripts/communication/GetMyCommunicationEventRole.groovy ofbiz/trunk/applications/party/groovyScripts/communication/GetPartyEmailFromCommEventInfo.groovy ofbiz/trunk/applications/party/groovyScripts/communication/ListCommunications.groovy ofbiz/trunk/applications/party/groovyScripts/communication/RecentVisitor.groovy ofbiz/trunk/applications/party/groovyScripts/party/EditContactMech.groovy ofbiz/trunk/applications/party/groovyScripts/party/EditPaymentMethod.groovy ofbiz/trunk/applications/party/groovyScripts/party/EditShoppingList.groovy ofbiz/trunk/applications/party/groovyScripts/party/FindLookUp.groovy ofbiz/trunk/applications/party/groovyScripts/party/FindMatches.groovy ofbiz/trunk/applications/party/groovyScripts/party/FindParty.groovy ofbiz/trunk/applications/party/groovyScripts/party/GetContactMechs.groovy ofbiz/trunk/applications/party/groovyScripts/party/GetCurrentCart.groovy ofbiz/trunk/applications/party/groovyScripts/party/GetGeoLocation.groovy ofbiz/trunk/applications/party/groovyScripts/party/GetLoyaltyPoints.groovy ofbiz/trunk/applications/party/groovyScripts/party/GetMyCompany.groovy ofbiz/trunk/applications/party/groovyScripts/party/GetPaymentMethods.groovy ofbiz/trunk/applications/party/groovyScripts/party/GetPostalAddressTemplate.groovy ofbiz/trunk/applications/party/groovyScripts/party/GetUserLoginPrimaryEmail.groovy ofbiz/trunk/applications/party/groovyScripts/party/PartyFinancialHistory.groovy ofbiz/trunk/applications/party/groovyScripts/party/PartyGeoLocation.groovy ofbiz/trunk/applications/party/groovyScripts/party/SetRoleVars.groovy ofbiz/trunk/applications/party/groovyScripts/party/StatusCondition.groovy ofbiz/trunk/applications/party/groovyScripts/party/UnAppliedInvoicesForParty.groovy ofbiz/trunk/applications/party/groovyScripts/party/UnAppliedPaymentsForParty.groovy ofbiz/trunk/applications/party/groovyScripts/party/ViewProfile.groovy ofbiz/trunk/applications/party/groovyScripts/visit/ShowVisits.groovy ofbiz/trunk/applications/party/groovyScripts/visit/VisitDetails.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/ChooseTopCategory.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/FastLoadCache.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/GetSupplierInventories.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/PrepareCreateShipMeth.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/category/CategoryTree.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/category/CreateProductInCategoryCheckExisting.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/category/EditCategory.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/category/EditCategoryContentContent.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/category/EditCategoryProducts.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/category/EditCategorySEO.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/config/EditProductConfigItemContent.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/config/EditProductConfigItemContentContent.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/feature/EditFeatureCategoryFeatures.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/feature/EditFeatureGroups.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/feature/QuickAddProductFeatures.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/find/AdvancedSearchOptions.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/find/KeywordSearch.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/find/KeywordSearchBox.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/find/MiniProductList.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/find/SideCatalogs.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/find/SideDeepCategory.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/CheckAction.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/CheckRejected.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/ImageFrame.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/ImageGallery.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/ImageRecentlyApproved.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/ImageUpload.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/SeoLocales.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/SetDefaultImage.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/imagemanagement/SortSequenceNum.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/lookup/LookupVariantProduct.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/price/EditProductPriceRules.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/price/EditProductPriceRules_old.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/product/ApplyFeaturesFromCategory.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/product/ApplyFeaturesFromGroup.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/product/BestProducts.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/product/EditProductAssoc.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/product/EditProductContent.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/product/EditProductContentContent.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/product/EditProductFeatures.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/product/EditProductInventoryItems.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/product/EditProductQuickAdmin.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/product/EditProductSEO.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/product/QuickAddVariants.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/promo/EditProductPromoCode.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/store/EditProductStorePaySetup.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/store/EditProductStoreSurveys.groovy ofbiz/trunk/applications/product/groovyScripts/catalog/thesaurus/EditKeywordThesaurus.groovy ofbiz/trunk/applications/product/groovyScripts/facility/facility/ComputeProductSellThroughData.groovy ofbiz/trunk/applications/product/groovyScripts/facility/facility/CountFacilityInventoryByProduct.groovy ofbiz/trunk/applications/product/groovyScripts/facility/facility/EditContactMech.groovy ofbiz/trunk/applications/product/groovyScripts/facility/facility/EditFacility.groovy ofbiz/trunk/applications/product/groovyScripts/facility/facility/EditFacilityLocation.groovy ofbiz/trunk/applications/product/groovyScripts/facility/facility/FacilityLocationGeoLocation.groovy ofbiz/trunk/applications/product/groovyScripts/facility/facility/FindFacility.groovy ofbiz/trunk/applications/product/groovyScripts/facility/facility/FindFacilityLocation.groovy ofbiz/trunk/applications/product/groovyScripts/facility/facility/FindFacilityTransfers.groovy ofbiz/trunk/applications/product/groovyScripts/facility/facility/FindInventoryItemsByLabels.groovy ofbiz/trunk/applications/product/groovyScripts/facility/facility/ViewContactMechs.groovy ofbiz/trunk/applications/product/groovyScripts/facility/facility/ViewFacilityInventoryByProduct.groovy ofbiz/trunk/applications/product/groovyScripts/facility/inventory/FindFacilityPhysicalInventory.groovy ofbiz/trunk/applications/product/groovyScripts/facility/inventory/InventoryAverageCosts.groovy ofbiz/trunk/applications/product/groovyScripts/facility/inventory/InventoryItemTotals.groovy ofbiz/trunk/applications/product/groovyScripts/facility/inventory/LookupInventoryItems.groovy ofbiz/trunk/applications/product/groovyScripts/facility/inventory/PhysicalInventoryVariance.groovy ofbiz/trunk/applications/product/groovyScripts/facility/inventory/ReceiveInventory.groovy ofbiz/trunk/applications/product/groovyScripts/facility/inventory/TransferInventoryItem.groovy ofbiz/trunk/applications/product/groovyScripts/facility/returns/ReceiveReturn.groovy ofbiz/trunk/applications/product/groovyScripts/facility/shipment/AddItemsFromInventory.groovy ofbiz/trunk/applications/product/groovyScripts/facility/shipment/AddItemsFromOrder.groovy ofbiz/trunk/applications/product/groovyScripts/facility/shipment/EditShipment.groovy ofbiz/trunk/applications/product/groovyScripts/facility/shipment/EditShipmentItems.groovy ofbiz/trunk/applications/product/groovyScripts/facility/shipment/EditShipmentPackages.groovy ofbiz/trunk/applications/product/groovyScripts/facility/shipment/EditShipmentPlan.groovy ofbiz/trunk/applications/product/groovyScripts/facility/shipment/EditShipmentRouteSegments.groovy ofbiz/trunk/applications/product/groovyScripts/facility/shipment/PackOrder.groovy ofbiz/trunk/applications/product/groovyScripts/facility/shipment/PackingSlip.groovy ofbiz/trunk/applications/product/groovyScripts/facility/shipment/PrintPickSheets.groovy ofbiz/trunk/applications/product/groovyScripts/facility/shipment/QuickShipOrder.groovy ofbiz/trunk/applications/product/groovyScripts/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy ofbiz/trunk/applications/product/groovyScripts/facility/shipment/ReviewOrdersNotPickedOrPacked.groovy ofbiz/trunk/applications/product/groovyScripts/facility/shipment/ShipmentManifest.groovy ofbiz/trunk/applications/product/groovyScripts/facility/shipment/VerifyPick.groovy ofbiz/trunk/applications/product/groovyScripts/facility/shipment/ViewShipment.groovy ofbiz/trunk/applications/product/groovyScripts/facility/shipment/WeightPackage.groovy ofbiz/trunk/applications/workeffort/groovyScripts/ical/IsCalOwner.groovy ofbiz/trunk/applications/workeffort/groovyScripts/workeffort/calendar/CreateUrlParam.groovy ofbiz/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Days.groovy ofbiz/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Month.groovy ofbiz/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Upcoming.groovy ofbiz/trunk/applications/workeffort/groovyScripts/workeffort/calendar/Week.groovy ofbiz/trunk/applications/workeffort/groovyScripts/workeffort/content/WorkEffortContentWrapper.groovy ofbiz/trunk/applications/workeffort/groovyScripts/workeffort/find/WorkEffortSearchOptions.groovy ofbiz/trunk/applications/workeffort/groovyScripts/workeffort/find/WorkEffortSearchResults.groovy ofbiz/trunk/applications/workeffort/groovyScripts/workeffort/request/RequestList.groovy ofbiz/trunk/framework/common/groovyScripts/CcTypes.groovy ofbiz/trunk/framework/common/groovyScripts/CertKeystore.groovy ofbiz/trunk/framework/common/groovyScripts/FindAutocompleteOptions.groovy ofbiz/trunk/framework/common/groovyScripts/GeoLocation.groovy ofbiz/trunk/framework/common/groovyScripts/GetLocaleList.groovy ofbiz/trunk/framework/common/groovyScripts/GetParentPortalPageId.groovy ofbiz/trunk/framework/common/groovyScripts/ListPortalPortlets.groovy ofbiz/trunk/framework/common/groovyScripts/PrepareDataForFlotGraph.groovy ofbiz/trunk/framework/common/minilang/GroovyServiceTest.groovy ofbiz/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyBaseScript.groovy ofbiz/trunk/framework/webtools/groovyScripts/artifactinfo/ArtifactInfo.groovy ofbiz/trunk/framework/webtools/groovyScripts/artifactinfo/ComponentList.groovy ofbiz/trunk/framework/webtools/groovyScripts/artifactinfo/TestSuiteInfo.groovy ofbiz/trunk/framework/webtools/groovyScripts/cache/EditUtilCache.groovy ofbiz/trunk/framework/webtools/groovyScripts/cache/FindUtilCache.groovy ofbiz/trunk/framework/webtools/groovyScripts/cache/FindUtilCacheElements.groovy ofbiz/trunk/framework/webtools/groovyScripts/datafile/ViewDataFile.groovy ofbiz/trunk/framework/webtools/groovyScripts/entity/CheckDb.groovy ofbiz/trunk/framework/webtools/groovyScripts/entity/EntityMaint.groovy ofbiz/trunk/framework/webtools/groovyScripts/entity/EntityPerformanceTest.groovy ofbiz/trunk/framework/webtools/groovyScripts/entity/EntityRef.groovy ofbiz/trunk/framework/webtools/groovyScripts/entity/EntityRefList.groovy ofbiz/trunk/framework/webtools/groovyScripts/entity/EntitySQLProcessor.groovy ofbiz/trunk/framework/webtools/groovyScripts/entity/FindGeneric.groovy ofbiz/trunk/framework/webtools/groovyScripts/entity/ProgramExport.groovy ofbiz/trunk/framework/webtools/groovyScripts/entity/ViewGeneric.groovy ofbiz/trunk/framework/webtools/groovyScripts/entity/ViewRelations.groovy ofbiz/trunk/framework/webtools/groovyScripts/entity/XmlDsDump.groovy ofbiz/trunk/framework/webtools/groovyScripts/geo/GetGeoLocation.groovy ofbiz/trunk/framework/webtools/groovyScripts/labelmanager/LabelManager.groovy ofbiz/trunk/framework/webtools/groovyScripts/labelmanager/UpdateManager.groovy ofbiz/trunk/framework/webtools/groovyScripts/labelmanager/ViewFile.groovy ofbiz/trunk/framework/webtools/groovyScripts/labelmanager/ViewReferences.groovy ofbiz/trunk/framework/webtools/groovyScripts/log/FetchLogs.groovy ofbiz/trunk/framework/webtools/groovyScripts/log/LogConfiguration.groovy ofbiz/trunk/framework/webtools/groovyScripts/service/AvailableServices.groovy ofbiz/trunk/framework/webtools/groovyScripts/service/JobDetails.groovy ofbiz/trunk/framework/webtools/groovyScripts/service/ScheduleJob.groovy ofbiz/trunk/framework/webtools/groovyScripts/service/ServiceResult.groovy ofbiz/trunk/framework/webtools/groovyScripts/service/Services.groovy ofbiz/trunk/framework/webtools/groovyScripts/service/Threads.groovy ofbiz/trunk/framework/webtools/groovyScripts/stats/StatBinsHistory.groovy ofbiz/trunk/framework/webtools/groovyScripts/stats/StatsSinceStart.groovy ofbiz/trunk/specialpurpose/assetmaint/groovyScripts/assetmaint/EditMaint.groovy ofbiz/trunk/specialpurpose/assetmaint/groovyScripts/assetmaint/PrintFixedAssetMaint.groovy ofbiz/trunk/specialpurpose/assetmaint/groovyScripts/workeffort/EditWorkEfforts.groovy ofbiz/trunk/specialpurpose/bi/groovyScripts/GetStarSchemaFields.groovy ofbiz/trunk/specialpurpose/bi/groovyScripts/GetStarSchemas.groovy ofbiz/trunk/specialpurpose/bi/groovyScripts/RunStarSchemaQuery.groovy ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/AcctgTransEntriesSearchResultsParameters.groovy ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/BalanceSheetParameters.groovy ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/IncomeStatementParameters.groovy ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/InvoiceAcctgTransEntryParameters.groovy ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/PaymentAcctgTransEntryParameters.groovy ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/PaymentReport.groovy ofbiz/trunk/specialpurpose/birt/groovyScripts/accounting/TrialBalanceParameters.groovy ofbiz/trunk/specialpurpose/birt/groovyScripts/facility/InventoryItemReport.groovy ofbiz/trunk/specialpurpose/birt/groovyScripts/order/CheckReportBy.groovy ofbiz/trunk/specialpurpose/birt/groovyScripts/order/NetBeforeOverheadReport.groovy ofbiz/trunk/specialpurpose/birt/groovyScripts/order/OrderByChannel.groovy ofbiz/trunk/specialpurpose/birt/groovyScripts/order/ProductDemandReport.groovy ofbiz/trunk/specialpurpose/birt/groovyScripts/order/SalesReport.groovy ofbiz/trunk/specialpurpose/ebay/groovyScripts/EbayAdvancedSearch.groovy ofbiz/trunk/specialpurpose/ebay/groovyScripts/EbayOrders.groovy ofbiz/trunk/specialpurpose/ebay/groovyScripts/ProductsExportToEbay.groovy ofbiz/trunk/specialpurpose/ebay/groovyScripts/UpdatedEbayOrders.groovy ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/automationPreferences/GetDisputeInfo.groovy ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/automationPreferences/GetEbayJobsandbox.groovy ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/email/GetProductStoreEmailTemplate.groovy ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/feedback/FeedbackList.groovy ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/store/CheckOrderStatus.groovy ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/store/OrderListParameters.groovy ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/store/OrderListPrepare.groovy ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/store/PrepareProductListing.groovy ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/store/RetrieveStoreOptions.groovy ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/store/SoldAction.groovy ofbiz/trunk/specialpurpose/ebaystore/groovyScripts/store/StoreAccount.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/EcommerceSetup.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/Login.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/Main.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/ProcessPaymentSettings.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/cart/ShowCart.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/cart/ShowPromoText.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/catalog/AjaxBreadcrumbs.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/catalog/BestSellingCategory.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/catalog/LayeredNavigation.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/catalog/MiniProductSummary.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/catalog/MiniReorderProds.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/catalog/PopularTags.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/catalog/ProductCategories.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/content/AdvancedSearchPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/content/ContentPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/content/Mrv.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/content/Search.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/customer/ChangePassword.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/customer/ContactList.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/customer/CustomerReviews.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/customer/CustomerSurvey.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/customer/EditBillingAddress.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/customer/EditContactMech.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/customer/EditEmailAndTelecomNumber.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/customer/EditPaymentMethod.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/customer/EditPerson.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/customer/EditShippingAddress.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/customer/GiftCardBalance.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/customer/GiftCardLink.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/customer/NewCustomer.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/customer/OnePageCheckoutOptions.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/customer/ViewProfile.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/forum/ContentAddPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/forum/ContentPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/forum/CurrentValPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/forum/EditAddPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/forum/HtmlAreaPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/forum/NodeTrailPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/forum/OwnerContentPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/forum/PermPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/forum/PubInit.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/forum/RespondPermAndPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/forum/ResponsePrep.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/forum/ViewPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/includes/MruAdd.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/AnonymousCheckoutLinks.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/AnonymousTrail.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/BillSettings.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/CheckoutReview.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/CheckoutShippingOptions.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/CustSettings.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/OptionSettings.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/OrderHistory.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/OrderStatus.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/PaymentInformation.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/PaymentOptions.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/QuickAnonCheckoutLinks.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/QuickAnonCustSettings.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/QuickAnonOptionSettings.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/QuickAnonPaymentInformation.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/RequestReturn.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/ShipSettings.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/order/ShipmentStatus.groovy ofbiz/trunk/specialpurpose/ecommerce/groovyScripts/shoppinglist/EditShoppingList.groovy ofbiz/trunk/specialpurpose/example/groovyScripts/FindExampleFeatures.groovy ofbiz/trunk/specialpurpose/example/groovyScripts/PrepareLocalesForDropDown.groovy ofbiz/trunk/specialpurpose/hhfacility/groovyScripts/ProductList.groovy ofbiz/trunk/specialpurpose/hhfacility/groovyScripts/ProductStockTake.groovy ofbiz/trunk/specialpurpose/lucene/groovyScripts/content/AdvancedSearchPrep.groovy ofbiz/trunk/specialpurpose/lucene/groovyScripts/content/IndexProducts.groovy ofbiz/trunk/specialpurpose/lucene/groovyScripts/content/Search.groovy ofbiz/trunk/specialpurpose/lucene/groovyScripts/content/SearchProducts.groovy ofbiz/trunk/specialpurpose/passport/groovyScripts/login/GetThirdPartyLogins.groovy ofbiz/trunk/specialpurpose/projectmgr/groovyScripts/EditWeekTimesheet.groovy ofbiz/trunk/specialpurpose/projectmgr/groovyScripts/GanttChart.groovy ofbiz/trunk/specialpurpose/projectmgr/groovyScripts/GetLastRequestAssignment.groovy ofbiz/trunk/specialpurpose/projectmgr/groovyScripts/GetProjectId.groovy ofbiz/trunk/specialpurpose/projectmgr/groovyScripts/ListCurrentProjects.groovy ofbiz/trunk/specialpurpose/projectmgr/groovyScripts/ListResourceBillingHours.groovy ofbiz/trunk/specialpurpose/projectmgr/groovyScripts/ProjectBilling.groovy ofbiz/trunk/specialpurpose/projectmgr/groovyScripts/ProjectIsBillable.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/AddProductBacklogItem.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/AddResourceTaskParty.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/BacklogNotifications.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/EditDailyHourReport.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/EditWeekTimesheet.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/FindBacklogItem.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/FindProductBacklogItem.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/FindTaskList.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/ListCurrentProducts.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/ListCurrentSprints.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/ListRevision.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/ListScrumPreferenceSecurityGroup.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/ListScrumResource.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/ListScrumRolesPersonAndCompany.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/ListTimeSheets.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/ListUnplanBacklog.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/ProductBilling.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/ProductEmail.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/QuickAddBacklog.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/SprintBacklogListItems.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/SprintBacklogOptions.groovy ofbiz/trunk/specialpurpose/scrum/groovyScripts/TaskList.groovy ofbiz/trunk/specialpurpose/webpos/groovyScripts/Login.groovy ofbiz/trunk/specialpurpose/webpos/groovyScripts/WebPosMenus.groovy ofbiz/trunk/specialpurpose/webpos/groovyScripts/WebPosSetup.groovy ofbiz/trunk/specialpurpose/webpos/groovyScripts/catalog/Category.groovy ofbiz/trunk/specialpurpose/webpos/groovyScripts/catalog/SideDeepCategory.groovy ofbiz/trunk/specialpurpose/webpos/groovyScripts/customer/EditAddress.groovy ofbiz/trunk/specialpurpose/webpos/groovyScripts/manager/PaidOutAndIn.groovy ofbiz/trunk/specialpurpose/webpos/groovyScripts/search/CustomerAddress.groovy ofbiz/trunk/specialpurpose/webpos/groovyScripts/search/SearchSalesReps.groovy Modified: ofbiz/trunk/applications/accounting/groovyScripts/admin/FilterOutReceipts.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/admin/FilterOutReceipts.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/groovyScripts/admin/FilterOutReceipts.groovy (original) +++ ofbiz/trunk/applications/accounting/groovyScripts/admin/FilterOutReceipts.groovy Wed Nov 2 19:09:13 2016 @@ -18,6 +18,6 @@ */ // simple script to filter out receipts in a list of payments -import org.apache.ofbiz.accounting.util.UtilAccounting; +import org.apache.ofbiz.accounting.util.UtilAccounting -context.payments.removeAll{UtilAccounting.isReceipt(it)}; +context.payments.removeAll{UtilAccounting.isReceipt(it)} Modified: ofbiz/trunk/applications/accounting/groovyScripts/admin/ListInvoiceItemTypesGlAccount.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/admin/ListInvoiceItemTypesGlAccount.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/groovyScripts/admin/ListInvoiceItemTypesGlAccount.groovy (original) +++ ofbiz/trunk/applications/accounting/groovyScripts/admin/ListInvoiceItemTypesGlAccount.groovy Wed Nov 2 19:09:13 2016 @@ -17,32 +17,32 @@ * under the License. */ -import org.apache.ofbiz.entity.condition.EntityConditionBuilder; +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"; -invItemTypePrefix += "_%"; +invItemTypePrefix = context.invItemTypePrefix ?: "INV" +invItemTypePrefix += "_%" -organizationPartyId = parameters.organizationPartyId; -exprBldr = new EntityConditionBuilder(); -invoiceItemTypes = from('InvoiceItemType').where(exprBldr.LIKE(invoiceItemTypeId: invItemTypePrefix)).queryList(); +organizationPartyId = parameters.organizationPartyId +exprBldr = new EntityConditionBuilder() +invoiceItemTypes = from('InvoiceItemType').where(exprBldr.LIKE(invoiceItemTypeId: invItemTypePrefix)).queryList() context.invoiceItemTypes = invoiceItemTypes.collect { invoiceItemType -> defaultAccount = true - glAccount = null; - invoiceItemTypeOrgs = invoiceItemType.getRelated("InvoiceItemTypeGlAccount", [organizationPartyId : organizationPartyId], null, false); + glAccount = null + invoiceItemTypeOrgs = invoiceItemType.getRelated("InvoiceItemTypeGlAccount", [organizationPartyId : organizationPartyId], null, false) overrideGlAccountId = null if (invoiceItemTypeOrgs) { - invoiceItemTypeOrg = invoiceItemTypeOrgs[0]; - overrideGlAccountId = invoiceItemTypeOrg.glAccountId; + invoiceItemTypeOrg = invoiceItemTypeOrgs[0] + overrideGlAccountId = invoiceItemTypeOrg.glAccountId - glAccounts = invoiceItemTypeOrg.getRelated("GlAccount", null, null, false); + glAccounts = invoiceItemTypeOrg.getRelated("GlAccount", null, null, false) if (glAccounts) { - glAccount = glAccounts[0]; + glAccount = glAccounts[0] defaultAccount = false } } else { - glAccount = invoiceItemType.getRelatedOne("DefaultGlAccount", false); + glAccount = invoiceItemType.getRelatedOne("DefaultGlAccount", false) } return [invoiceItemTypeId : invoiceItemType.invoiceItemTypeId, @@ -50,5 +50,5 @@ context.invoiceItemTypes = invoiceItemTy defaultGlAccountId : invoiceItemType.defaultGlAccountId, overrideGlAccountId : overrideGlAccountId, defaultAccount : defaultAccount, - activeGlDescription : glAccount?.accountName]; + activeGlDescription : glAccount?.accountName] } 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=1767764&r1=1767763&r2=1767764&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/groovyScripts/ap/invoices/CommissionReport.groovy (original) +++ ofbiz/trunk/applications/accounting/groovyScripts/ap/invoices/CommissionReport.groovy Wed Nov 2 19:09:13 2016 @@ -25,81 +25,81 @@ import org.apache.ofbiz.entity.util.Enti import java.sql.Timestamp if ("Y".equals(parameters.isSearch)) { - fromDate = parameters.fromDate; - thruDate = parameters.thruDate; - partyId = parameters.partyId; - productId = parameters.productId; - invoiceItemAndAssocProductCond = []; + fromDate = parameters.fromDate + thruDate = parameters.thruDate + partyId = parameters.partyId + productId = parameters.productId + invoiceItemAndAssocProductCond = [] if (productId) { - invoiceItemAndAssocProductCond.add(EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId)); + invoiceItemAndAssocProductCond.add(EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId)) } if (partyId) { - invoiceItemAndAssocProductCond.add(EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, partyId)); + invoiceItemAndAssocProductCond.add(EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, partyId)) } if (fromDate) { - invoiceItemAndAssocProductCond.add(EntityCondition.makeCondition("fromDate", EntityOperator.GREATER_THAN_EQUAL_TO, Timestamp.valueOf(fromDate))); + invoiceItemAndAssocProductCond.add(EntityCondition.makeCondition("fromDate", EntityOperator.GREATER_THAN_EQUAL_TO, Timestamp.valueOf(fromDate))) } if (thruDate) { - invoiceItemAndAssocProductCond.add(EntityCondition.makeCondition("thruDate", EntityOperator.LESS_THAN_EQUAL_TO, Timestamp.valueOf(thruDate))); + invoiceItemAndAssocProductCond.add(EntityCondition.makeCondition("thruDate", EntityOperator.LESS_THAN_EQUAL_TO, Timestamp.valueOf(thruDate))) } - invoiceItemAndAssocProductList = []; - invoiceItemAndAssocProductList = from("InvoiceItemAndAssocProduct").where(invoiceItemAndAssocProductCond).queryList(); + invoiceItemAndAssocProductList = [] + invoiceItemAndAssocProductList = from("InvoiceItemAndAssocProduct").where(invoiceItemAndAssocProductCond).queryList() //filtering invoiceItemAndAssocProductList for each productId with updating quantity, commission amount and number of order which generated sales invoices. - totalQuantity = BigDecimal.ZERO; - totalNumberOfOrders = BigDecimal.ZERO; - totalCommissionAmount = BigDecimal.ZERO; - totalNetSales = BigDecimal.ZERO; - commissionReportList = []; + totalQuantity = BigDecimal.ZERO + totalNumberOfOrders = BigDecimal.ZERO + totalCommissionAmount = BigDecimal.ZERO + totalNetSales = BigDecimal.ZERO + commissionReportList = [] if (invoiceItemAndAssocProductList) { - productIds = EntityUtil.getFieldListFromEntityList(invoiceItemAndAssocProductList, "productId", true); + productIds = EntityUtil.getFieldListFromEntityList(invoiceItemAndAssocProductList, "productId", true) productIds.each { productId -> - quantity = BigDecimal.ZERO; - commissionAmount = BigDecimal.ZERO; - termAmount = BigDecimal.ZERO; - invoiceItemProductAmount = BigDecimal.ZERO; - assocProductId = null; - productName = null; - commissionReportMap = [:]; - salesAgentAndTermAmtMap = [:]; - salesInvoiceIds = []; + quantity = BigDecimal.ZERO + commissionAmount = BigDecimal.ZERO + termAmount = BigDecimal.ZERO + invoiceItemProductAmount = BigDecimal.ZERO + assocProductId = null + productName = null + commissionReportMap = [:] + salesAgentAndTermAmtMap = [:] + salesInvoiceIds = [] invoiceItemAndAssocProductList.each { invoiceItemAndAssocProduct -> if (productId.equals(invoiceItemAndAssocProduct.productId)) { - partyIdTermAmountMap = [:]; - partyIdTermAmountKey = null; - assocProductId = invoiceItemAndAssocProduct.productId; - productName = invoiceItemAndAssocProduct.productName; - quantity = quantity.add(invoiceItemAndAssocProduct.quantity); - commissionAmount = commissionAmount.add(invoiceItemAndAssocProduct.termAmount.multiply(invoiceItemAndAssocProduct.quantity)); - termAmount = termAmount.add(invoiceItemAndAssocProduct.termAmount); - partyIdTermAmountMap.partyId = invoiceItemAndAssocProduct.partyIdFrom; - partyIdTermAmountMap.termAmount = invoiceItemAndAssocProduct.termAmount; - partyIdTermAmountKey = invoiceItemAndAssocProduct.partyIdFrom + invoiceItemAndAssocProduct.termAmount; + partyIdTermAmountMap = [:] + partyIdTermAmountKey = null + assocProductId = invoiceItemAndAssocProduct.productId + productName = invoiceItemAndAssocProduct.productName + quantity = quantity.add(invoiceItemAndAssocProduct.quantity) + commissionAmount = commissionAmount.add(invoiceItemAndAssocProduct.termAmount.multiply(invoiceItemAndAssocProduct.quantity)) + termAmount = termAmount.add(invoiceItemAndAssocProduct.termAmount) + partyIdTermAmountMap.partyId = invoiceItemAndAssocProduct.partyIdFrom + partyIdTermAmountMap.termAmount = invoiceItemAndAssocProduct.termAmount + partyIdTermAmountKey = invoiceItemAndAssocProduct.partyIdFrom + invoiceItemAndAssocProduct.termAmount if (!salesAgentAndTermAmtMap.containsKey(partyIdTermAmountKey)) { - salesAgentAndTermAmtMap.put(partyIdTermAmountKey, partyIdTermAmountMap); + salesAgentAndTermAmtMap.put(partyIdTermAmountKey, partyIdTermAmountMap) } - salesInvoiceIds.add(invoiceItemAndAssocProduct.invoiceIdFrom); - invoiceItemProductAmount = invoiceItemAndAssocProduct.amount; + salesInvoiceIds.add(invoiceItemAndAssocProduct.invoiceIdFrom) + invoiceItemProductAmount = invoiceItemAndAssocProduct.amount } } - commissionReportMap.productId = assocProductId; - commissionReportMap.productName = productName; - commissionReportMap.quantity = quantity; - commissionReportMap.salesAgentAndTermAmtMap = salesAgentAndTermAmtMap; - commissionReportMap.commissionAmount = commissionAmount; - commissionReportMap.netSale = invoiceItemProductAmount.multiply(quantity); - commissionReportMap.salesInvoiceIds = salesInvoiceIds; - commissionReportMap.numberOfOrders = salesInvoiceIds.size(); - commissionReportList.add(commissionReportMap); - totalQuantity = totalQuantity.add(quantity); - totalNumberOfOrders = totalNumberOfOrders.add(salesInvoiceIds.size()); - totalCommissionAmount = totalCommissionAmount.add(commissionAmount); - totalNetSales = totalNetSales.add(invoiceItemProductAmount.multiply(quantity)); + commissionReportMap.productId = assocProductId + commissionReportMap.productName = productName + commissionReportMap.quantity = quantity + commissionReportMap.salesAgentAndTermAmtMap = salesAgentAndTermAmtMap + commissionReportMap.commissionAmount = commissionAmount + commissionReportMap.netSale = invoiceItemProductAmount.multiply(quantity) + commissionReportMap.salesInvoiceIds = salesInvoiceIds + commissionReportMap.numberOfOrders = salesInvoiceIds.size() + commissionReportList.add(commissionReportMap) + totalQuantity = totalQuantity.add(quantity) + totalNumberOfOrders = totalNumberOfOrders.add(salesInvoiceIds.size()) + totalCommissionAmount = totalCommissionAmount.add(commissionAmount) + totalNetSales = totalNetSales.add(invoiceItemProductAmount.multiply(quantity)) } } - context.commissionReportList = commissionReportList; - context.totalQuantity = totalQuantity; - context.totalNumberOfOrders = totalNumberOfOrders; - context.totalCommissionAmount = totalCommissionAmount; - context.totalNetSales = totalNetSales; + context.commissionReportList = commissionReportList + context.totalQuantity = totalQuantity + context.totalNumberOfOrders = totalNumberOfOrders + context.totalCommissionAmount = totalCommissionAmount + context.totalNetSales = totalNetSales } Modified: ofbiz/trunk/applications/accounting/groovyScripts/ap/invoices/CommissionRun.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/ap/invoices/CommissionRun.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/groovyScripts/ap/invoices/CommissionRun.groovy (original) +++ ofbiz/trunk/applications/accounting/groovyScripts/ap/invoices/CommissionRun.groovy Wed Nov 2 19:09:13 2016 @@ -17,31 +17,31 @@ * under the License. */ -import java.sql.Timestamp; -import org.apache.ofbiz.entity.condition.EntityCondition; -import org.apache.ofbiz.entity.condition.EntityOperator; +import java.sql.Timestamp +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator -fromDate = parameters.fromDate; -thruDate = parameters.thruDate; +fromDate = parameters.fromDate +thruDate = parameters.thruDate if (fromDate) { - List invoiceCond = []; - invoiceCond.add(EntityCondition.makeCondition("invoiceTypeId", EntityOperator.EQUALS, parameters.invoiceTypeId)); - invoiceCond.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, parameters.statusId)); - invoiceCond.add(EntityCondition.makeCondition("invoiceDate", EntityOperator.GREATER_THAN_EQUAL_TO, Timestamp.valueOf(fromDate))); - invoiceCond.add(EntityCondition.makeCondition("invoiceRoleTypeId", EntityOperator.EQUALS, "SALES_REP")); + List invoiceCond = [] + invoiceCond.add(EntityCondition.makeCondition("invoiceTypeId", EntityOperator.EQUALS, parameters.invoiceTypeId)) + invoiceCond.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, parameters.statusId)) + invoiceCond.add(EntityCondition.makeCondition("invoiceDate", EntityOperator.GREATER_THAN_EQUAL_TO, Timestamp.valueOf(fromDate))) + invoiceCond.add(EntityCondition.makeCondition("invoiceRoleTypeId", EntityOperator.EQUALS, "SALES_REP")) if (thruDate) { - invoiceCond.add(EntityCondition.makeCondition("invoiceDate", EntityOperator.LESS_THAN_EQUAL_TO, Timestamp.valueOf(thruDate))); + invoiceCond.add(EntityCondition.makeCondition("invoiceDate", EntityOperator.LESS_THAN_EQUAL_TO, Timestamp.valueOf(thruDate))) } if (context.salesRepPartyList) { - invoiceCond.add(EntityCondition.makeCondition("invoiceRolePartyId", EntityOperator.IN, context.salesRepPartyList)); + invoiceCond.add(EntityCondition.makeCondition("invoiceRolePartyId", EntityOperator.IN, context.salesRepPartyList)) } - invoiceList = from("InvoiceAndRole").where(invoiceCond).queryList(); + invoiceList = from("InvoiceAndRole").where(invoiceCond).queryList() - List invoices = []; + List invoices = [] if (invoiceList) { - resultMap = runService('getInvoicesFilterByAssocType', [invoiceItemAssocTypeId : "COMMISSION_INVOICE", invoiceList : invoiceList, userLogin : userLogin]); - invoices = resultMap.filteredInvoiceList; - context.invoices = invoices; + resultMap = runService('getInvoicesFilterByAssocType', [invoiceItemAssocTypeId : "COMMISSION_INVOICE", invoiceList : invoiceList, userLogin : userLogin]) + invoices = resultMap.filteredInvoiceList + context.invoices = invoices } } Modified: ofbiz/trunk/applications/accounting/groovyScripts/ar/BatchPayments.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/ar/BatchPayments.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/groovyScripts/ar/BatchPayments.groovy (original) +++ ofbiz/trunk/applications/accounting/groovyScripts/ar/BatchPayments.groovy Wed Nov 2 19:09:13 2016 @@ -25,59 +25,59 @@ import org.apache.ofbiz.entity.condition import org.apache.ofbiz.entity.util.EntityUtil if ("Y".equals(parameters.noConditionFind)) { - List paymentCond = []; - payments = []; - finAccountId = parameters.finAccountId; - context.finAccountId = parameters.finAccountId; + List paymentCond = [] + payments = [] + finAccountId = parameters.finAccountId + context.finAccountId = parameters.finAccountId paymentStatusCond = EntityCondition.makeCondition([EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "PMNT_RECEIVED"), - EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "PMNT_SENT")], EntityOperator.OR); - paymentCond.add(paymentStatusCond); + EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "PMNT_SENT")], EntityOperator.OR) + paymentCond.add(paymentStatusCond) if (paymentMethodTypeId) { - paymentCond.add(EntityCondition.makeCondition("paymentMethodTypeId", EntityOperator.EQUALS, paymentMethodTypeId)); + paymentCond.add(EntityCondition.makeCondition("paymentMethodTypeId", EntityOperator.EQUALS, paymentMethodTypeId)) } if (fromDate) { - paymentCond.add(EntityCondition.makeCondition("effectiveDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate)); + paymentCond.add(EntityCondition.makeCondition("effectiveDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate)) } if (thruDate) { - paymentCond.add(EntityCondition.makeCondition("effectiveDate", EntityOperator.LESS_THAN_EQUAL_TO, thruDate)); + paymentCond.add(EntityCondition.makeCondition("effectiveDate", EntityOperator.LESS_THAN_EQUAL_TO, thruDate)) } if (partyIdFrom) { - paymentCond.add(EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, partyIdFrom)); + paymentCond.add(EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, partyIdFrom)) } if (finAccountId) { - finAccountTransList = from("FinAccountTrans").where("finAccountId", finAccountId).queryList(); + finAccountTransList = from("FinAccountTrans").where("finAccountId", finAccountId).queryList() if (finAccountTransList) { - finAccountTransIds = EntityUtil.getFieldListFromEntityList(finAccountTransList, "finAccountTransId", true); - paymentCond.add(EntityCondition.makeCondition("finAccountTransId", EntityOperator.IN, finAccountTransIds)); - payments = from("PaymentAndTypePartyNameView").where(paymentCond).queryList(); + finAccountTransIds = EntityUtil.getFieldListFromEntityList(finAccountTransList, "finAccountTransId", true) + paymentCond.add(EntityCondition.makeCondition("finAccountTransId", EntityOperator.IN, finAccountTransIds)) + payments = from("PaymentAndTypePartyNameView").where(paymentCond).queryList() } } else { - paymentCond.add(EntityCondition.makeCondition("finAccountTransId", EntityOperator.EQUALS, null)); - payments = from("PaymentAndTypePartyNameView").where(paymentCond).queryList(); + paymentCond.add(EntityCondition.makeCondition("finAccountTransId", EntityOperator.EQUALS, null)) + payments = from("PaymentAndTypePartyNameView").where(paymentCond).queryList() } - paymentListWithCreditCard = []; - paymentListWithoutCreditCard = []; + paymentListWithCreditCard = [] + paymentListWithoutCreditCard = [] if (payments) { payments.each { payment -> - isReceipt = UtilAccounting.isReceipt(payment); + isReceipt = UtilAccounting.isReceipt(payment) if (isReceipt) { - paymentGroupMembers = from("PaymentGroupMember").where("paymentId", payment.paymentId).filterByDate().queryList(); + paymentGroupMembers = from("PaymentGroupMember").where("paymentId", payment.paymentId).filterByDate().queryList() if (!paymentGroupMembers) { if (cardType && payment.paymentMethodId) { - creditCard = from("CreditCard").where("paymentMethodId", payment.paymentMethodId).queryOne(); + creditCard = from("CreditCard").where("paymentMethodId", payment.paymentMethodId).queryOne() if (creditCard.cardType == cardType) { - paymentListWithCreditCard.add(payment); + paymentListWithCreditCard.add(payment) } } else if (UtilValidate.isEmpty(cardType)) { - paymentListWithoutCreditCard.add(payment); + paymentListWithoutCreditCard.add(payment) } } } } if (paymentListWithCreditCard) { - context.paymentList = paymentListWithCreditCard; + context.paymentList = paymentListWithCreditCard } else { - context.paymentList = paymentListWithoutCreditCard; + context.paymentList = paymentListWithoutCreditCard } } } Modified: ofbiz/trunk/applications/accounting/groovyScripts/chartofaccounts/TaxAuthorityGlAccounts.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/chartofaccounts/TaxAuthorityGlAccounts.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/groovyScripts/chartofaccounts/TaxAuthorityGlAccounts.groovy (original) +++ ofbiz/trunk/applications/accounting/groovyScripts/chartofaccounts/TaxAuthorityGlAccounts.groovy Wed Nov 2 19:09:13 2016 @@ -17,7 +17,7 @@ * under the License. */ -taxAuthorities = from('TaxAuthority').orderBy("taxAuthGeoId", "taxAuthPartyId").queryList(); +taxAuthorities = from('TaxAuthority').orderBy("taxAuthGeoId", "taxAuthPartyId").queryList() context.taxAuthorityHavingNoGlAccountList = taxAuthorities.findAll { taxAuthority -> !taxAuthority.getRelated('TaxAuthorityGlAccount', [organizationPartyId : parameters.get('ApplicationDecorator|organizationPartyId')], null, false) Modified: ofbiz/trunk/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy (original) +++ ofbiz/trunk/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy Wed Nov 2 19:09:13 2016 @@ -22,22 +22,22 @@ import org.apache.ofbiz.base.util.UtilMi import org.apache.ofbiz.base.util.UtilProperties import org.apache.ofbiz.common.geo.GeoWorker -uiLabelMap = UtilProperties.getResourceBundleMap("AccountingUiLabels", locale); +uiLabelMap = UtilProperties.getResourceBundleMap("AccountingUiLabels", locale) if (fixedAsset) { - latestGeoPoint = GeoWorker.findLatestGeoPoint(delegator, "FixedAssetAndGeoPoint", "fixedAssetId", fixedAssetId, null, null); + latestGeoPoint = GeoWorker.findLatestGeoPoint(delegator, "FixedAssetAndGeoPoint", "fixedAssetId", fixedAssetId, null, null) if (latestGeoPoint) { - context.latestGeoPoint = latestGeoPoint; + context.latestGeoPoint = latestGeoPoint if (latestGeoPoint.containsKey("latitude") && latestGeoPoint.containsKey("longitude")) { List geoPoints = UtilMisc.toList(UtilMisc.toMap("lat", latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "fixedAssetId", fixedAssetId, - "link", UtilMisc.toMap("url", "EditFixedAsset?fixedAssetId="+ fixedAssetId, "label", uiLabelMap.AccountingFixedAsset + " " + fixedAsset.fixedAssetName))); + "link", UtilMisc.toMap("url", "EditFixedAsset?fixedAssetId="+ fixedAssetId, "label", uiLabelMap.AccountingFixedAsset + " " + fixedAsset.fixedAssetName))) - Map geoChart = UtilMisc.toMap("width", "500px", "height", "450px", "controlUI" , "small", "dataSourceId", latestGeoPoint.dataSourceId, "points", geoPoints); - context.geoChart = geoChart; + Map geoChart = UtilMisc.toMap("width", "500px", "height", "450px", "controlUI" , "small", "dataSourceId", latestGeoPoint.dataSourceId, "points", geoPoints) + context.geoChart = geoChart } if (latestGeoPoint.elevationUomId) { elevationUom = from('Uom').where('uomId', latestGeoPoint.elevationUomId).queryOne() - context.elevationUomAbbr = elevationUom.abbreviation; + context.elevationUomAbbr = elevationUom.abbreviation } } } Modified: ofbiz/trunk/applications/accounting/groovyScripts/invoice/CreateApplicationList.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/invoice/CreateApplicationList.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/groovyScripts/invoice/CreateApplicationList.groovy (original) +++ ofbiz/trunk/applications/accounting/groovyScripts/invoice/CreateApplicationList.groovy Wed Nov 2 19:09:13 2016 @@ -23,49 +23,49 @@ import org.apache.ofbiz.accounting.invoi import java.text.NumberFormat // @param GenericValue invoice - The Invoice entity to find payment applications for -if (!invoice) return; +if (!invoice) return -invoiceApplications = []; // to pass back to the screen with payment applications added +invoiceApplications = [] // to pass back to the screen with payment applications added // retrieve related applications with null itemnumber -invoiceAppls = invoice.getRelated("PaymentApplication", [invoiceItemSeqId : null], null, false); +invoiceAppls = invoice.getRelated("PaymentApplication", [invoiceItemSeqId : null], null, false) invoiceAppls.each { invoiceAppl -> - itemmap = [:]; - itemmap.invoiceId = invoiceAppl.invoiceId; - itemmap.invoiceItemSeqId = invoiceAppl.invoiceItemSeqId; - itemmap.total = InvoiceWorker.getInvoiceTotal(invoice); - itemmap.paymentApplicationId = invoiceAppl.paymentApplicationId; - itemmap.paymentId = invoiceAppl.paymentId; - itemmap.billingAccountId = invoiceAppl.billingAccountId; - itemmap.taxAuthGeoId = invoiceAppl.taxAuthGeoId; - itemmap.amountToApply = invoiceAppl.amountApplied; - itemmap.amountApplied = invoiceAppl.amountApplied; - invoiceApplications.add(itemmap); + itemmap = [:] + itemmap.invoiceId = invoiceAppl.invoiceId + itemmap.invoiceItemSeqId = invoiceAppl.invoiceItemSeqId + itemmap.total = InvoiceWorker.getInvoiceTotal(invoice) + itemmap.paymentApplicationId = invoiceAppl.paymentApplicationId + itemmap.paymentId = invoiceAppl.paymentId + itemmap.billingAccountId = invoiceAppl.billingAccountId + itemmap.taxAuthGeoId = invoiceAppl.taxAuthGeoId + itemmap.amountToApply = invoiceAppl.amountApplied + itemmap.amountApplied = invoiceAppl.amountApplied + invoiceApplications.add(itemmap) } // retrieve related applications with an existing itemnumber invoice.getRelated("InvoiceItem", null, null, false).each { item -> - BigDecimal itemTotal = null; + BigDecimal itemTotal = null if (item.amount != null) { if (!item.quantity) { - itemTotal = item.getBigDecimal("amount"); + itemTotal = item.getBigDecimal("amount") } else { - itemTotal = item.getBigDecimal("amount").multiply(item.getBigDecimal("quantity")); + itemTotal = item.getBigDecimal("amount").multiply(item.getBigDecimal("quantity")) } } // get relation payment applications for every item(can be more than 1 per item number) item.getRelated("PaymentApplication", null, null, false).each { paymentApplication -> - itemmap = [:]; - itemmap.putAll(item); - itemmap.total = NumberFormat.getInstance(locale).format(itemTotal); - itemmap.paymentApplicationId = paymentApplication.paymentApplicationId; - itemmap.paymentId = paymentApplication.paymentId; - itemmap.toPaymentId = paymentApplication.toPaymentId; - itemmap.amountApplied = paymentApplication.getBigDecimal("amountApplied"); - itemmap.amountToApply = paymentApplication.getBigDecimal("amountApplied"); - itemmap.billingAccountId = paymentApplication.billingAccountId; - itemmap.taxAuthGeoId = paymentApplication.taxAuthGeoId; - invoiceApplications.add(itemmap); + itemmap = [:] + itemmap.putAll(item) + itemmap.total = NumberFormat.getInstance(locale).format(itemTotal) + itemmap.paymentApplicationId = paymentApplication.paymentApplicationId + itemmap.paymentId = paymentApplication.paymentId + itemmap.toPaymentId = paymentApplication.toPaymentId + itemmap.amountApplied = paymentApplication.getBigDecimal("amountApplied") + itemmap.amountToApply = paymentApplication.getBigDecimal("amountApplied") + itemmap.billingAccountId = paymentApplication.billingAccountId + itemmap.taxAuthGeoId = paymentApplication.taxAuthGeoId + invoiceApplications.add(itemmap) } } -if (invoiceApplications) context.invoiceApplications = invoiceApplications; +if (invoiceApplications) context.invoiceApplications = invoiceApplications Modified: ofbiz/trunk/applications/accounting/groovyScripts/invoice/EditInvoice.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/invoice/EditInvoice.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/groovyScripts/invoice/EditInvoice.groovy (original) +++ ofbiz/trunk/applications/accounting/groovyScripts/invoice/EditInvoice.groovy Wed Nov 2 19:09:13 2016 @@ -23,136 +23,136 @@ import org.apache.ofbiz.base.util.UtilNu import java.text.DateFormat -invoiceId = parameters.get("invoiceId"); +invoiceId = parameters.get("invoiceId") -invoice = from('Invoice').where('invoiceId', invoiceId).queryOne(); -context.invoice = invoice; +invoice = from('Invoice').where('invoiceId', invoiceId).queryOne() +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"); -decimals = UtilNumber.getBigDecimalScale("invoice.decimals"); -rounding = UtilNumber.getBigDecimalRoundingMode("invoice.rounding"); +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") +decimals = UtilNumber.getBigDecimalScale("invoice.decimals") +rounding = UtilNumber.getBigDecimalRoundingMode("invoice.rounding") if (invoice) { // each invoice of course has two billing addresses, but the one that is relevant for purchase invoices is the PAYMENT_LOCATION of the invoice // (ie Accounts Payable address for the supplier), while the right one for sales invoices is the BILLING_LOCATION (ie Accounts Receivable or // home of the customer.) if ("PURCHASE_INVOICE".equals(invoice.invoiceTypeId)) { - billingAddress = InvoiceWorker.getSendFromAddress(invoice); + billingAddress = InvoiceWorker.getSendFromAddress(invoice) } else { - billingAddress = InvoiceWorker.getBillToAddress(invoice); + billingAddress = InvoiceWorker.getBillToAddress(invoice) } if (billingAddress) { - context.billingAddress = billingAddress; + context.billingAddress = billingAddress } - billToParty = InvoiceWorker.getBillToParty(invoice); - context.billToParty = billToParty; - sendingParty = InvoiceWorker.getSendFromParty(invoice); - context.sendingParty = sendingParty; + billToParty = InvoiceWorker.getBillToParty(invoice) + context.billToParty = billToParty + sendingParty = InvoiceWorker.getSendFromParty(invoice) + context.sendingParty = sendingParty if (currency && !invoice.getString("currencyUomId").equals(currency)) { - conversionRate = InvoiceWorker.getInvoiceCurrencyConversionRate(invoice); - invoice.currencyUomId = currency; - invoice.invoiceMessage = " converted from original with a rate of: " + conversionRate.setScale(8, rounding); + conversionRate = InvoiceWorker.getInvoiceCurrencyConversionRate(invoice) + invoice.currencyUomId = currency + invoice.invoiceMessage = " converted from original with a rate of: " + conversionRate.setScale(8, rounding) } - invoiceItems = invoice.getRelated("InvoiceItem", null, ["invoiceItemSeqId"], false); - invoiceItemsConv = []; - vatTaxesByType = [:]; + invoiceItems = invoice.getRelated("InvoiceItem", null, ["invoiceItemSeqId"], false) + invoiceItemsConv = [] + vatTaxesByType = [:] invoiceItems.each { invoiceItem -> - invoiceItem.amount = invoiceItem.getBigDecimal("amount").multiply(conversionRate).setScale(decimals, rounding); - invoiceItemsConv.add(invoiceItem); + invoiceItem.amount = invoiceItem.getBigDecimal("amount").multiply(conversionRate).setScale(decimals, rounding) + invoiceItemsConv.add(invoiceItem) // get party tax id for VAT taxes: they are required in invoices by EU // also create a map with tax grand total amount by VAT tax: it is also required in invoices by UE - taxRate = invoiceItem.getRelatedOne("TaxAuthorityRateProduct", false); + taxRate = invoiceItem.getRelatedOne("TaxAuthorityRateProduct", false) if (taxRate && "VAT_TAX".equals(taxRate.taxAuthorityRateTypeId)) { taxInfo = from("PartyTaxAuthInfo") .where('partyId', billToParty.partyId, 'taxAuthGeoId', taxRate.taxAuthGeoId, 'taxAuthPartyId', taxRate.taxAuthPartyId) .filterByDate(invoice.invoiceDate) - .queryFirst(); + .queryFirst() if (taxInfo) { - context.billToPartyTaxId = taxInfo.partyTaxId; + context.billToPartyTaxId = taxInfo.partyTaxId } taxInfo = from("PartyTaxAuthInfo") .where('partyId', sendingParty.partyId, 'taxAuthGeoId', taxRate.taxAuthGeoId, 'taxAuthPartyId', taxRate.taxAuthPartyId) .filterByDate(invoice.invoiceDate) - .queryFirst(); + .queryFirst() if (taxInfo) { - context.sendingPartyTaxId = taxInfo.partyTaxId; + context.sendingPartyTaxId = taxInfo.partyTaxId } - vatTaxesByTypeAmount = vatTaxesByType[taxRate.taxAuthorityRateSeqId]; + vatTaxesByTypeAmount = vatTaxesByType[taxRate.taxAuthorityRateSeqId] if (!vatTaxesByTypeAmount) { - vatTaxesByTypeAmount = 0.0; + vatTaxesByTypeAmount = 0.0 } - vatTaxesByType.put(taxRate.taxAuthorityRateSeqId, vatTaxesByTypeAmount + invoiceItem.amount); + vatTaxesByType.put(taxRate.taxAuthorityRateSeqId, vatTaxesByTypeAmount + invoiceItem.amount) } } - context.vatTaxesByType = vatTaxesByType; - context.vatTaxIds = vatTaxesByType.keySet().asList(); + context.vatTaxesByType = vatTaxesByType + context.vatTaxIds = vatTaxesByType.keySet().asList() - context.invoiceItems = invoiceItemsConv; + context.invoiceItems = invoiceItemsConv - invoiceTotal = InvoiceWorker.getInvoiceTotal(invoice).multiply(conversionRate).setScale(decimals, rounding); - invoiceNoTaxTotal = InvoiceWorker.getInvoiceNoTaxTotal(invoice).multiply(conversionRate).setScale(decimals, rounding); - context.invoiceTotal = invoiceTotal; - context.invoiceNoTaxTotal = invoiceNoTaxTotal; + invoiceTotal = InvoiceWorker.getInvoiceTotal(invoice).multiply(conversionRate).setScale(decimals, rounding) + invoiceNoTaxTotal = InvoiceWorker.getInvoiceNoTaxTotal(invoice).multiply(conversionRate).setScale(decimals, rounding) + context.invoiceTotal = invoiceTotal + context.invoiceNoTaxTotal = invoiceNoTaxTotal //*________________this snippet was added for adding Tax ID in invoice header if needed _________________ - sendingTaxInfos = sendingParty.getRelated("PartyTaxAuthInfo", null, null, false); - billingTaxInfos = billToParty.getRelated("PartyTaxAuthInfo", null, null, false); - sendingPartyTaxId = null; - billToPartyTaxId = null; + sendingTaxInfos = sendingParty.getRelated("PartyTaxAuthInfo", null, null, false) + billingTaxInfos = billToParty.getRelated("PartyTaxAuthInfo", null, null, false) + sendingPartyTaxId = null + billToPartyTaxId = null if (billingAddress) { sendingTaxInfos.eachWithIndex { sendingTaxInfo, i -> if (sendingTaxInfo.taxAuthGeoId.equals(billingAddress.countryGeoId)) { - sendingPartyTaxId = sendingTaxInfos[i-1].partyTaxId; + sendingPartyTaxId = sendingTaxInfos[i-1].partyTaxId } } billingTaxInfos.eachWithIndex { billingTaxInfo, i -> if (billingTaxInfo.taxAuthGeoId.equals(billingAddress.countryGeoId)) { - billToPartyTaxId = billingTaxInfos[i-1].partyTaxId; + billToPartyTaxId = billingTaxInfos[i-1].partyTaxId } } } if (sendingPartyTaxId) { - context.sendingPartyTaxId = sendingPartyTaxId; + context.sendingPartyTaxId = sendingPartyTaxId } if (billToPartyTaxId && !context.billToPartyTaxId) { - context.billToPartyTaxId = billToPartyTaxId; + context.billToPartyTaxId = billToPartyTaxId } //________________this snippet was added for adding Tax ID in invoice header if needed _________________*/ - terms = invoice.getRelated("InvoiceTerm", null, null, false); - context.terms = terms; + terms = invoice.getRelated("InvoiceTerm", null, null, false) + context.terms = terms - paymentAppls = from("PaymentApplication").where('invoiceId', invoiceId).queryList(); - context.payments = paymentAppls; + paymentAppls = from("PaymentApplication").where('invoiceId', invoiceId).queryList() + context.payments = paymentAppls - orderItemBillings = from("OrderItemBilling").where('invoiceId', invoiceId).orderBy('orderId').queryList(); - orders = new LinkedHashSet(); + orderItemBillings = from("OrderItemBilling").where('invoiceId', invoiceId).orderBy('orderId').queryList() + orders = new LinkedHashSet() orderItemBillings.each { orderIb -> - orders.add(orderIb.orderId); + orders.add(orderIb.orderId) } - context.orders = orders; + context.orders = orders - invoiceStatus = invoice.getRelatedOne("StatusItem", false); - context.invoiceStatus = invoiceStatus; + invoiceStatus = invoice.getRelatedOne("StatusItem", false) + context.invoiceStatus = invoiceStatus - edit = parameters.editInvoice; + edit = parameters.editInvoice if ("true".equalsIgnoreCase(edit)) { - invoiceItemTypes = from("InvoiceItemType").queryList(); - context.invoiceItemTypes = invoiceItemTypes; - context.editInvoice = true; + invoiceItemTypes = from("InvoiceItemType").queryList() + context.invoiceItemTypes = invoiceItemTypes + context.editInvoice = true } // format the date if (invoice.invoiceDate) { - invoiceDate = DateFormat.getDateInstance(DateFormat.LONG).format(invoice.invoiceDate); - context.invoiceDate = invoiceDate; + invoiceDate = DateFormat.getDateInstance(DateFormat.LONG).format(invoice.invoiceDate) + context.invoiceDate = invoiceDate } else { - context.invoiceDate = "N/A"; + context.invoiceDate = "N/A" } } Modified: ofbiz/trunk/applications/accounting/groovyScripts/invoice/GetAccountOrganizationAndClass.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/invoice/GetAccountOrganizationAndClass.groovy?rev=1767764&r1=1767763&r2=1767764&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/groovyScripts/invoice/GetAccountOrganizationAndClass.groovy (original) +++ ofbiz/trunk/applications/accounting/groovyScripts/invoice/GetAccountOrganizationAndClass.groovy Wed Nov 2 19:09:13 2016 @@ -21,10 +21,10 @@ import org.apache.ofbiz.entity.condition.EntityConditionBuilder import org.apache.ofbiz.entity.util.EntityUtil -exprBldr = new EntityConditionBuilder(); -invoice = context.invoice; -if (!invoice) return; -glAccountOrganizationAndClassList = null; +exprBldr = new EntityConditionBuilder() +invoice = context.invoice +if (!invoice) return +glAccountOrganizationAndClassList = null if ("SALES_INVOICE".equals(invoice.invoiceTypeId)) { itemTypesCond = exprBldr.OR() { EQUALS(invoiceItemTypeId: "SINVOICE_ADJ") @@ -34,8 +34,8 @@ if ("SALES_INVOICE".equals(invoice.invoi EQUALS(invoiceItemTypeId: "INV_PROD_ITEM") EQUALS(parentTypeId: "INV_PROD_ITEM") } - invoiceItemTypes = from("InvoiceItemType").where(itemTypesCond).orderBy(["parentTypeId", "invoiceItemTypeId"]).queryList(); - glAccountOrganizationAndClassList = from("GlAccountOrganizationAndClass").where('organizationPartyId', invoice.partyIdFrom).queryList(); + invoiceItemTypes = from("InvoiceItemType").where(itemTypesCond).orderBy(["parentTypeId", "invoiceItemTypeId"]).queryList() + glAccountOrganizationAndClassList = from("GlAccountOrganizationAndClass").where('organizationPartyId', invoice.partyIdFrom).queryList() } else if ("PURCHASE_INVOICE".equals(invoice.invoiceTypeId)) { itemTypesCond = exprBldr.OR() { EQUALS(invoiceItemTypeId: "PINVOICE_ADJ") @@ -45,8 +45,8 @@ if ("SALES_INVOICE".equals(invoice.invoi EQUALS(invoiceItemTypeId: "PINV_PROD_ITEM") EQUALS(parentTypeId: "PINV_PROD_ITEM") } - invoiceItemTypes = from("InvoiceItemType").where(itemTypesCond).orderBy(["parentTypeId", "invoiceItemTypeId"]).queryList(); - glAccountOrganizationAndClassList = from("GlAccountOrganizationAndClass").where('organizationPartyId', invoice.partyId).queryList(); + invoiceItemTypes = from("InvoiceItemType").where(itemTypesCond).orderBy(["parentTypeId", "invoiceItemTypeId"]).queryList() + glAccountOrganizationAndClassList = from("GlAccountOrganizationAndClass").where('organizationPartyId', invoice.partyId).queryList() } else if ("PAYROL_INVOICE".equals(invoice.invoiceTypeId)) { itemTypesCond = exprBldr.OR() { EQUALS(invoiceItemTypeId: "PAYROL_EARN_HOURS") @@ -56,8 +56,8 @@ if ("SALES_INVOICE".equals(invoice.invoi EQUALS(invoiceItemTypeId: "PAYROL_TAXES") EQUALS(parentTypeId: "PAYROL_TAXES") } - invoiceItemTypes = from("InvoiceItemType").where(itemTypesCond).orderBy(["parentTypeId", "invoiceItemTypeId"]).queryList(); - glAccountOrganizationAndClassList = from("GlAccountOrganizationAndClass").where('organizationPartyId', invoice.partyId).queryList(); + invoiceItemTypes = from("InvoiceItemType").where(itemTypesCond).orderBy(["parentTypeId", "invoiceItemTypeId"]).queryList() + glAccountOrganizationAndClassList = from("GlAccountOrganizationAndClass").where('organizationPartyId', invoice.partyId).queryList() } else if ("COMMISSION_INVOICE".equals(invoice.invoiceTypeId)) { itemTypesCond = exprBldr.OR() { EQUALS(invoiceItemTypeId: "COMM_INV_ITEM") @@ -65,12 +65,12 @@ if ("SALES_INVOICE".equals(invoice.invoi EQUALS(invoiceItemTypeId: "COMM_INV_ADJ") EQUALS(parentTypeId: "COMM_INV_ADJ") } - invoiceItemTypes = from("InvoiceItemType").where(itemTypesCond).orderBy(["parentTypeId", "invoiceItemTypeId"]).queryList(); - glAccountOrganizationAndClassList = from("GlAccountOrganizationAndClass").where('organizationPartyId', invoice.partyId).queryList(); + invoiceItemTypes = from("InvoiceItemType").where(itemTypesCond).orderBy(["parentTypeId", "invoiceItemTypeId"]).queryList() + glAccountOrganizationAndClassList = from("GlAccountOrganizationAndClass").where('organizationPartyId', invoice.partyId).queryList() } else { - map = from("InvoiceItemTypeMap").where('invoiceTypeId', invoice.invoiceTypeId).cache(true).queryList(); - invoiceItemTypes = EntityUtil.getRelated("InvoiceItemType", null, map, false); + map = from("InvoiceItemTypeMap").where('invoiceTypeId', invoice.invoiceTypeId).cache(true).queryList() + invoiceItemTypes = EntityUtil.getRelated("InvoiceItemType", null, map, false) } -context.invoiceItemTypes = invoiceItemTypes; +context.invoiceItemTypes = invoiceItemTypes -context.glAccountOrganizationAndClassList = glAccountOrganizationAndClassList; +context.glAccountOrganizationAndClassList = glAccountOrganizationAndClassList |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |