Author: diveshdutta
Date: Sat Nov 5 14:14:04 2016 New Revision: 1768219 URL: http://svn.apache.org/viewvc?rev=1768219&view=rev Log: Improvement: Miniland code readability and consistency improvements (OFBIZ-8744) (OFBIZ-8745) (OFBIZ-8746) (OFBIZ-8748) (OFBIZ-8829) (OFBIZ-8830) (OFBIZ-8907) (OFBIZ-8908) (OFBIZ-8924) (OFBIZ-8925) Thanks: Ankush Upadhyay , Sega patidar , Abhijeet Ashapure for your patches. Modified: ofbiz/trunk/applications/accounting/minilang/UpgradeServices.xml ofbiz/trunk/applications/accounting/minilang/admin/AcctgAdminServices.xml ofbiz/trunk/applications/accounting/minilang/agreement/AgreementServices.xml ofbiz/trunk/applications/accounting/minilang/budget/BudgetServices.xml ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml ofbiz/trunk/applications/accounting/minilang/tax/TaxAuthorityServices.xml ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml ofbiz/trunk/applications/accounting/minilang/test/AutoInvoiceTests.xml ofbiz/trunk/applications/accounting/minilang/test/InvoicePerShipmentTests.xml ofbiz/trunk/applications/accounting/minilang/test/PaymentApplicationTests.xml ofbiz/trunk/applications/accounting/widget/AgreementForms.xml ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml ofbiz/trunk/applications/accounting/widget/BudgetForms.xml ofbiz/trunk/applications/accounting/widget/CommonScreens.xml ofbiz/trunk/applications/accounting/widget/CostForms.xml ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml ofbiz/trunk/applications/accounting/widget/GlForms.xml ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml ofbiz/trunk/applications/accounting/widget/PaymentForms.xml ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml ofbiz/trunk/applications/accounting/widget/TransactionForms.xml ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml ofbiz/trunk/applications/commonext/minilang/SystemInfoServices.xml ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml ofbiz/trunk/applications/commonext/widget/CommonScreens.xml ofbiz/trunk/applications/commonext/widget/SystemInfoForms.xml ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml ofbiz/trunk/applications/content/minilang/blog/BlogServices.xml ofbiz/trunk/applications/content/minilang/compdoc/CompDocServices.xml ofbiz/trunk/applications/content/minilang/content/ContentEvents.xml ofbiz/trunk/applications/content/minilang/content/ContentPermissionEvents.xml ofbiz/trunk/applications/content/minilang/content/ContentServices.xml ofbiz/trunk/applications/content/minilang/data/DataServices.xml ofbiz/trunk/applications/content/minilang/layout/LayoutEvents.xml ofbiz/trunk/applications/content/widget/LookupForms.xml ofbiz/trunk/applications/content/widget/WebSiteScreens.xml ofbiz/trunk/applications/content/widget/cms/CMSForms.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml ofbiz/trunk/applications/content/widget/content/ContentForms.xml ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml ofbiz/trunk/applications/content/widget/forum/BlogForms.xml ofbiz/trunk/applications/content/widget/forum/ForumForms.xml ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml ofbiz/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml ofbiz/trunk/applications/humanres/minilang/HumanResEvents.xml ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml ofbiz/trunk/applications/humanres/minilang/UpgradeServices.xml ofbiz/trunk/applications/humanres/widget/CommonScreens.xml ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml ofbiz/trunk/applications/manufacturing/minilang/test/ProductionRunTests.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml ofbiz/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml ofbiz/trunk/applications/marketing/widget/ContactListForms.xml ofbiz/trunk/applications/marketing/widget/DataSourceForms.xml ofbiz/trunk/applications/marketing/widget/LookupForms.xml ofbiz/trunk/applications/marketing/widget/MarketingCampaignForms.xml ofbiz/trunk/applications/marketing/widget/SegmentForms.xml ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/CommonForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml ofbiz/trunk/applications/order/minilang/order/OrderDeliveryServices.xml ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml ofbiz/trunk/applications/order/minilang/order/OrderServices.xml ofbiz/trunk/applications/order/minilang/order/OrderSimpleMethods.xml ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadEvent.xml ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml ofbiz/trunk/applications/order/minilang/reports/ProductDemandReportEvent.xml ofbiz/trunk/applications/order/minilang/reports/SalesReportEvent.xml ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml ofbiz/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml ofbiz/trunk/applications/order/minilang/test/QuoteTests.xml ofbiz/trunk/applications/order/minilang/test/ShoppingCartTests.xml ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml ofbiz/trunk/applications/order/widget/ordermgr/RequirementForms.xml ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml ofbiz/trunk/applications/party/minilang/contact/PartyContactMechServices.xml ofbiz/trunk/applications/party/minilang/customer/CustomerEvents.xml ofbiz/trunk/applications/party/minilang/party/PartyInvitationServices.xml ofbiz/trunk/applications/party/minilang/party/PartyServices.xml ofbiz/trunk/applications/party/minilang/party/PartySimpleMethods.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyContactListForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodForms.xml ofbiz/trunk/applications/product/minilang/product/catalog/CatalogServices.xml ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml ofbiz/trunk/applications/product/minilang/product/cost/CostServices.xml ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml ofbiz/trunk/applications/product/minilang/product/inventory/InventoryIssueServices.xml ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml ofbiz/trunk/applications/product/minilang/product/inventory/StockMoveServices.xml ofbiz/trunk/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml ofbiz/trunk/applications/product/minilang/product/product/ProductServices.xml ofbiz/trunk/applications/product/minilang/product/storage/FacilityContactMechServices.xml ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml ofbiz/trunk/applications/product/minilang/product/subscription/SubscriptionServices.xml ofbiz/trunk/applications/product/minilang/product/test/GroupOrderTest.xml ofbiz/trunk/applications/product/minilang/product/test/ProductTagTest.xml ofbiz/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml ofbiz/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml ofbiz/trunk/applications/product/minilang/shipment/test/ShipmentTests.xml ofbiz/trunk/applications/product/widget/catalog/CategoryForms.xml ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml ofbiz/trunk/applications/product/widget/catalog/PromoForms.xml ofbiz/trunk/applications/product/widget/catalog/ReviewForms.xml ofbiz/trunk/applications/product/widget/catalog/ShippingForms.xml ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml ofbiz/trunk/applications/product/widget/facility/FieldLookupForms.xml ofbiz/trunk/applications/product/widget/facility/InventoryForms.xml ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelForms.xml ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml ofbiz/trunk/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml ofbiz/trunk/applications/workeffort/widget/LookupForms.xml ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml ofbiz/trunk/framework/common/minilang/CdyneServices.xml ofbiz/trunk/framework/common/minilang/CommonServices.xml ofbiz/trunk/framework/common/minilang/PortalPageServices.xml ofbiz/trunk/framework/common/widget/HelpScreens.xml ofbiz/trunk/framework/common/widget/LookupForms.xml ofbiz/trunk/framework/common/widget/PortalPageForms.xml ofbiz/trunk/framework/common/widget/SecurityForms.xml ofbiz/trunk/framework/webapp/config/url.properties ofbiz/trunk/framework/webtools/widget/ArtifactInfoForms.xml ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml ofbiz/trunk/framework/webtools/widget/GeoManagementForms.xml ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml ofbiz/trunk/framework/webtools/widget/MiscForms.xml ofbiz/trunk/framework/webtools/widget/ServiceForms.xml ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml ofbiz/trunk/framework/webtools/widget/tempExprForms.xml ofbiz/trunk/specialpurpose/assetmaint/minilang/FixedAssetMaintServices.xml ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountForms.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbayEmailScreens.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml ofbiz/trunk/specialpurpose/ecommerce/widget/ContentForms.xml ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml ofbiz/trunk/specialpurpose/example/minilang/example/ExampleServices.xml ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureForms.xml ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml ofbiz/trunk/specialpurpose/lucene/widget/LuceneForms.xml ofbiz/trunk/specialpurpose/myportal/minilang/Events.xml ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml ofbiz/trunk/specialpurpose/scrum/minilang/ScrumPermissionServices.xml ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml ofbiz/trunk/specialpurpose/scrum/minilang/test/DailyMeetingMinuteTests.xml ofbiz/trunk/specialpurpose/scrum/minilang/test/MyWorkTests.xml ofbiz/trunk/specialpurpose/scrum/minilang/test/ProductBacklogTest.xml ofbiz/trunk/specialpurpose/scrum/minilang/test/ProductTest.xml ofbiz/trunk/specialpurpose/scrum/minilang/test/QATests.xml ofbiz/trunk/specialpurpose/scrum/minilang/test/ScrumProjectTests.xml ofbiz/trunk/specialpurpose/scrum/minilang/test/SprintBacklogTests.xml ofbiz/trunk/specialpurpose/scrum/minilang/test/SprintTests.xml ofbiz/trunk/specialpurpose/scrum/minilang/test/TaskTests.xml ofbiz/trunk/specialpurpose/scrum/minilang/test/TimesheetTests.xml ofbiz/trunk/specialpurpose/scrum/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/scrum/widget/CommunicationEventForms.xml ofbiz/trunk/specialpurpose/scrum/widget/FieldLookupForms.xml ofbiz/trunk/specialpurpose/scrum/widget/MyWorkForms.xml ofbiz/trunk/specialpurpose/scrum/widget/OpenTestForms.xml ofbiz/trunk/specialpurpose/scrum/widget/OpenTestScreens.xml ofbiz/trunk/specialpurpose/scrum/widget/ProjectForms.xml ofbiz/trunk/specialpurpose/scrum/widget/ResourceForms.xml ofbiz/trunk/specialpurpose/scrum/widget/ResourceScreens.xml ofbiz/trunk/specialpurpose/scrum/widget/TaskForms.xml ofbiz/trunk/specialpurpose/scrum/widget/TaskScreens.xml ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetForms.xml ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetScreens.xml ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml ofbiz/trunk/specialpurpose/scrum/widget/scrumScreens.xml ofbiz/trunk/specialpurpose/webpos/minilang/CartEvents.xml ofbiz/trunk/specialpurpose/webpos/minilang/PaymentEvents.xml Modified: ofbiz/trunk/applications/accounting/minilang/UpgradeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/UpgradeServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/UpgradeServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/UpgradeServices.xml Sat Nov 5 14:14:04 2016 @@ -51,7 +51,7 @@ under the License. </simple-method> <simple-method method-name="migrateFixedAssetMaintMeter" short-description="Copy FixedAssetMaintMeter To FixedAssetMeter"> - <entity-condition list="maintMeterList" entity-name="FixedAssetMaintMeter"/> + <entity-condition entity-name="FixedAssetMaintMeter" list="maintMeterList"/> <iterate list="maintMeterList" entry="maintMeter"> <make-value value-field="newEntity" entity-name="FixedAssetMeter"/> <set-pk-fields map="maintMeter" value-field="newEntity"/> @@ -70,7 +70,7 @@ under the License. </simple-method> <simple-method method-name="migrateAgreementWorkEffortAppl" short-description="Copy AgreementWorkEffortAppl To AgreementWorkEffortApplic"> - <entity-condition list="agreementWorkEffortApplList" entity-name="OldAgreementWorkEffortAppl"/> + <entity-condition entity-name="OldAgreementWorkEffortAppl" list="agreementWorkEffortApplList"/> <iterate list="agreementWorkEffortApplList" entry="agreementWorkEffortAppl"> <make-value value-field="newEntity" entity-name="AgreementWorkEffortApplic"/> <set-pk-fields map="agreementWorkEffortAppl" value-field="newEntity"/> Modified: ofbiz/trunk/applications/accounting/minilang/admin/AcctgAdminServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/admin/AcctgAdminServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/admin/AcctgAdminServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/admin/AcctgAdminServices.xml Sat Nov 5 14:14:04 2016 @@ -146,7 +146,7 @@ under the License. <store-list list="uomConversions"/> <!-- now create a new conversion relationship --> - <set-service-fields to-map="createParams" service-name="createUomConversionDated" map="parameters"/> + <set-service-fields service-name="createUomConversionDated" map="parameters" to-map="createParams"/> <if-empty field="parameters.fromDate"> <set field="createParams.fromDate" from-field="nowTimestamp"/> </if-empty> Modified: ofbiz/trunk/applications/accounting/minilang/agreement/AgreementServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/agreement/AgreementServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/agreement/AgreementServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/agreement/AgreementServices.xml Sat Nov 5 14:14:04 2016 @@ -39,7 +39,7 @@ under the License. <simple-method method-name="copyAgreement" short-description="Copy an existing Agreement"> <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/> <check-errors/> - <set-service-fields service-name="createAgreement" to-map="createAgreementInMap" map="agreement"/> + <set-service-fields service-name="createAgreement" map="agreement" to-map="createAgreementInMap"/>/> <call-service service-name="createAgreement" in-map-name="createAgreementInMap"> <result-to-field result-name="agreementId" field="agreementIdTo"/> </call-service> @@ -47,7 +47,7 @@ under the License. <get-related value-field="agreement" relation-name="AgreementItem" list="agreementItems"/> <iterate list="agreementItems" entry="agreementItem"> <clear-field field="createAgreementItemInMap"/> - <set-service-fields service-name="createAgreementItem" to-map="createAgreementItemInMap" map="agreementItem"/> + <set-service-fields service-name="createAgreementItem" map="agreementItem" to-map="createAgreementItemInMap"/>/> <set from-field="agreementIdTo" field="createAgreementItemInMap.agreementId"/> <call-service service-name="createAgreementItem" in-map-name="createAgreementItemInMap"/> </iterate> @@ -55,7 +55,7 @@ under the License. <get-related value-field="agreement" relation-name="AgreementTerm" list="agreementTerms"/> <iterate list="agreementTerms" entry="agreementTerm"> <clear-field field="createAgreementTermInMap"/> - <set-service-fields service-name="createAgreementTerm" to-map="createAgreementTermInMap" map="agreementTerm"/> + <set-service-fields service-name="createAgreementTerm" map="agreementTerm" to-map="createAgreementTermInMap"/>/> <set from-field="agreementIdTo" field="createAgreementTermInMap.agreementId"/> <call-service service-name="createAgreementTerm" in-map-name="createAgreementTermInMap"/> </iterate> @@ -64,7 +64,7 @@ under the License. <get-related value-field="agreement" relation-name="AgreementProductAppl" list="agreementProductAppls"/> <iterate list="agreementProductAppls" entry="agreementProductAppl"> <clear-field field="createAgreementProductApplInMap"/> - <set-service-fields service-name="createAgreementProductAppl" to-map="createAgreementProductApplInMap" map="agreementProductAppl"/> + <set-service-fields service-name="createAgreementProductAppl" map="agreementProductAppl" to-map="createAgreementProductApplInMap"/>/> <set from-field="agreementIdTo" field="createAgreementProductApplInMap.agreementId"/> <call-service service-name="createAgreementProductAppl" in-map-name="createAgreementProductApplInMap"/> </iterate> @@ -73,7 +73,7 @@ under the License. <get-related value-field="agreement" relation-name="AgreementFacilityAppl" list="agreementFacilityAppls"/> <iterate list="agreementFacilityAppls" entry="agreementFacilityAppl"> <clear-field field="createAgreementFacilityApplInMap"/> - <set-service-fields service-name="createAgreementFacilityAppl" to-map="createAgreementFacilityApplInMap" map="agreementFacilityAppl"/> + <set-service-fields service-name="createAgreementFacilityAppl" map="agreementFacilityAppl" to-map="createAgreementFacilityApplInMap"/>/> <set from-field="agreementIdTo" field="createAgreementFacilityApplInMap.agreementId"/> <call-service service-name="createAgreementFacilityAppl" in-map-name="createAgreementFacilityApplInMap"/> </iterate> @@ -82,7 +82,7 @@ under the License. <get-related value-field="agreement" relation-name="AgreementPartyApplic" list="agreementPartyApplic"/> <iterate list="agreementPartyApplics" entry="agreementPartyApplic"> <clear-field field="createAgreementPartyApplicInMap"/> - <set-service-fields service-name="createAgreementPartyApplic" to-map="createAgreementPartyApplicInMap" map="agreementPartyApplic"/> + <set-service-fields service-name="createAgreementPartyApplic" map="agreementPartyApplic" to-map="createAgreementPartyApplicInMap"/>/> <set from-field="agreementIdTo" field="createAgreementPartyApplicInMap.agreementId"/> <call-service service-name="createAgreementPartyApplic" in-map-name="createAgreementPartyApplicInMap"/> </iterate> Modified: ofbiz/trunk/applications/accounting/minilang/budget/BudgetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/budget/BudgetServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/budget/BudgetServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/budget/BudgetServices.xml Sat Nov 5 14:14:04 2016 @@ -46,16 +46,16 @@ under the License. </entity-and> <if-not-empty field="budgetStatuses"> <first-from-list entry="budgetStatus" list="budgetStatuses"/> - <entity-one value-field="statusValidChange" entity-name="StatusValidChange"> + <entity-one entity-name="StatusValidChange" value-field="statusValidChange"> <field-map field-name="statusId" from-field="budgetStatus.statusId"/> <field-map field-name="statusIdTo" from-field="parameters.statusId"/> </entity-one> <if-not-empty field="statusValidChange"> - <set-service-fields service-name="createBudgetStatus" to-map="createBudgetStatusMap" map="parameters" mode="IN"/> + <set-service-fields service-name="createBudgetStatus" map="parameters" to-map="createBudgetStatusMap"/> mode="IN"/> <call-service service-name="createBudgetStatus" in-map-name="createBudgetStatusMap"/> </if-not-empty> <else> - <set-service-fields service-name="createBudgetStatus" to-map="createBudgetStatusMap" map="parameters" mode="IN"/> + <set-service-fields service-name="createBudgetStatus" map="parameters" to-map="createBudgetStatusMap"/> mode="IN"/> <call-service service-name="createBudgetStatus" in-map-name="createBudgetStatusMap"/> </else> </if-not-empty> Modified: ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml Sat Nov 5 14:14:04 2016 @@ -148,7 +148,7 @@ under the License. <field-to-result field="lookedUpValue.finAccountId" result-name="finAccountId"/> </simple-method> <simple-method method-name="deleteFinAccount" short-description="Delete a Financial Account"> - <entity-one value-field="finAccount" entity-name="FinAccount"/> + <entity-one entity-name="FinAccount" value-field="finAccount"/> <remove-value value-field="finAccount"/> </simple-method> @@ -494,7 +494,7 @@ under the License. <field-map field-name="paymentId" from-field="payment.paymentId"/> </entity-and> <if-not-empty field="paymentGroupMembers"> - <first-from-list entry="paymentGroupMember" list="paymentGroupMembers"/> + <first-from-list list="paymentGroupMembers" entry="paymentGroupMember"/> <set-service-fields service-name="expirePaymentGroupMember" map="paymentGroupMember" to-map="expirePaymentGroupMemberMap"/> <call-service service-name="expirePaymentGroupMember" in-map-name="expirePaymentGroupMemberMap"/> <clear-field field="expirePaymentGroupMemberMap"/> Modified: ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml Sat Nov 5 14:14:04 2016 @@ -64,7 +64,7 @@ under the License. <else> <!-- Create the WorkEffort --> <!-- Maintenance WorkEffort entity --> - <entity-one value-field="fixedAsset" entity-name="FixedAsset"/> + <entity-one entity-name="FixedAsset" value-field="fixedAsset"/> <property-to-field field="workEffortName" resource="AccountingUiLabels" property="AccountingFixedAssetMaintWorkEffortName"/> <set from-field="workEffortName" field="maintWorkEffortMap.workEffortName"/> <set value="TASK" field="maintWorkEffortMap.workEffortTypeId"/> @@ -111,7 +111,7 @@ under the License. </condition> <then> <set field="workEffortId" from-field="lookedUpValue.scheduleWorkEffortId"/> - <entity-one value-field="workEffort" entity-name="WorkEffort"/> + <entity-one entity-name="WorkEffort" value-field="workEffort"/> <if> <condition> <and> @@ -130,7 +130,7 @@ under the License. <set field="updateWorkEffortCtx.actualCompletionDate" from-field="nowTimestamp"/> <call-service service-name="updateWorkEffort" in-map-name="updateWorkEffortCtx"/> <check-errors/> - <entity-condition list="wepas" entity-name="WorkEffortPartyAssignment" filter-by-date="true"> + <entity-condition entity-name="WorkEffortPartyAssignment" list="wepas" filter-by-date="true"> <condition-expr field-name="workEffortId" from-field="workEffortId" operator="equals"/> </entity-condition> <iterate list="wepas" entry="wepa"> @@ -176,7 +176,7 @@ under the License. </entity-and> <iterate list="productMaintList" entry="productMaintValue"> <set field="repeatCount" from-field="productMaintValue.repeatCount" default-value="0" type="Long"/> - <entity-condition list="maintList" entity-name="FixedAssetMaint"> + <entity-condition entity-name="FixedAssetMaint" list="maintList"> <condition-list combine="and"> <condition-expr field-name="fixedAssetId" operator="equals" from-field="fixedAssetValue.fixedAssetId"/> <condition-expr field-name="productMaintTypeId" operator="equals" from-field="productMaintValue.productMaintTypeId"/> @@ -209,7 +209,7 @@ under the License. </else> </if-compare> <if-compare field="maintDue" operator="equals" value="true"> - <set-service-fields service-name="createFixedAssetMaint" to-map="createMaintCxt" map="productMaintValue"/> + <set-service-fields service-name="createFixedAssetMaint" map="productMaintValue" to-map="createMaintCxt"/>/> <set field="createMaintCxt.fixedAssetId" from-field="fixedAssetValue.fixedAssetId"/> <set field="createMaintCxt.intervalQuantity" from-field="meterValue.meterValue"/> <set field="createMaintCxt.statusId" value="FAM_CREATED"/> @@ -222,14 +222,14 @@ under the License. </simple-method> <simple-method method-name="createMaintsFromTimeInterval" short-description="Create Fixed Asset Maintenances From A Product Maint Time Interval"> <now-timestamp field="nowTimestamp"/> - <entity-condition list="fixedAssets" entity-name="FixedAsset"> + <entity-condition entity-name="FixedAsset" list="fixedAssets"> <condition-list combine="and"> <condition-expr field-name="instanceOfProductId" operator="not-equals" from-field="null"/> <condition-expr field-name="actualEndOfLife" operator="equals" from-field="null"/> </condition-list> </entity-condition> <iterate list="fixedAssets" entry="fixedAsset"> - <entity-condition list="productMaints" entity-name="ProductMaint"> + <entity-condition entity-name="ProductMaint" list="productMaints"> <condition-list combine="and"> <condition-expr field-name="productId" from-field="fixedAsset.instanceOfProductId"/> <condition-expr field-name="intervalUomId" operator="like" value="TF_%"/> @@ -237,7 +237,7 @@ under the License. </entity-condition> <iterate list="productMaints" entry="productMaint"> <set field="repeatCount" from-field="productMaint.repeatCount" default-value="0" type="Long"/> - <entity-condition list="maintList" entity-name="FixedAssetMaintWorkEffort"> + <entity-condition entity-name="FixedAssetMaintWorkEffort" list="maintList"> <condition-list combine="and"> <condition-expr field-name="fixedAssetId" operator="equals" from-field="fixedAsset.fixedAssetId"/> <condition-expr field-name="productMaintTypeId" operator="equals" from-field="productMaint.productMaintTypeId"/> @@ -282,7 +282,7 @@ under the License. </else> </if-compare> <if-compare field="maintDue" operator="equals" value="true"> - <set-service-fields service-name="createFixedAssetMaint" to-map="createMaintCxt" map="productMaint"/> + <set-service-fields service-name="createFixedAssetMaint" map="productMaint" to-map="createMaintCxt"/>/> <set field="createMaintCxt.fixedAssetId" from-field="fixedAsset.fixedAssetId"/> <set field="createMaintCxt.statusId" value="FAM_CREATED"/> <call-service service-name="createFixedAssetMaint" in-map-name="createMaintCxt"/> Modified: ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml Sat Nov 5 14:14:04 2016 @@ -150,7 +150,7 @@ under the License. <!-- call getNextInvoiceId service with the parameters.partyIdFrom when invoice Id is not suplied else use it from the input --> <if-empty field="parameters.invoiceId"> - <set-service-fields service-name="getNextInvoiceId" to-map="getNextInvoiceIdMap" map="parameters"/> + <set-service-fields service-name="getNextInvoiceId" map="parameters" to-map="getNextInvoiceIdMap"/>/> <set field="getNextInvoiceIdMap.partyId" from-field="parameters.partyIdFrom"/> <call-service service-name="getNextInvoiceId" in-map-name="getNextInvoiceIdMap"> <result-to-field result-name="invoiceId" field="parameters.invoiceId"/> @@ -755,7 +755,7 @@ under the License. <fail-property resource="AccountingUiLabels" property="AccountingTaxCannotCalculate"/> </add-error> </if-empty> - <first-from-list entry="contactMech" list="contacts"/> + <first-from-list list="contacts" entry="contactMech"/> <entity-one entity-name="PostalAddress" value-field="postalAddress"> <field-map field-name="contactMechId" from-field="contactMech.contactMechId"/> </entity-one> @@ -770,7 +770,7 @@ under the License. <entity-and entity-name="Product" list="product"> <field-map field-name="productId" from-field="invoiceItem.productId"/> </entity-and> - <first-from-list entry="itemProduct" list="product"/> + <first-from-list list="product" entry="itemProduct"/> <if-not-empty field="invoiceItem.productId"> <entity-and entity-name="InvoiceItem" list="findinvoiceItems"> <field-map field-name="invoiceId" from-field="invoice.invoiceId"/> @@ -899,7 +899,7 @@ under the License. </simple-method> <simple-method method-name="createInvoiceFromOrder" short-description="Create an invoice from existing order when invoicePerShipment is N"> - <entity-one value-field="orderHeader" entity-name="OrderHeader"> + <entity-one entity-name="OrderHeader" value-field="orderHeader"> <field-map field-name="orderId" from-field="parameters.orderId"/> </entity-one> <set field="invoicePerShipment" from-field="orderHeader.invoicePerShipment"/> @@ -987,7 +987,7 @@ under the License. </simple-method> <simple-method method-name="isInvoiceInForeignCurrency" short-description="check if a invoice is in a foreign currency related to the accounting company."> - <entity-one value-field="invoice" entity-name="InvoiceAndType"> + <entity-one entity-name="InvoiceAndType" value-field="invoice"> <field-map field-name="invoiceId" from-field="parameters.invoiceId"/> </entity-one> <if-empty field="invoice"> Modified: ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml Sat Nov 5 14:14:04 2016 @@ -26,7 +26,7 @@ under the License. <!-- TODO: Do we need to create a GlJournal record here? --> <!-- first, create the AcctgTrans --> - <set-service-fields service-name="createAcctgTrans" to-map="createAcctgTransParams" map="parameters"/> + <set-service-fields service-name="createAcctgTrans" map="parameters" to-map="createAcctgTransParams"/>/> <if-empty field="createAcctgTransParams.transactionDate"> <now-timestamp field="createAcctgTransParams.transactionDate"/> </if-empty> @@ -337,10 +337,10 @@ under the License. <if-compare field="acctgTransEntry.origAmount" operator="less" value="0"> <log level="verbose" message="${acctgTransEntry} is going to get inverted"/> <calculate field="acctgTransEntry.origAmount"> - <calcop field="acctgTransEntry.origAmount" operator="negative"/> + <calcop operator="negative" field="acctgTransEntry.origAmount"/> </calculate> <calculate field="acctgTransEntry.amount"> - <calcop field="acctgTransEntry.amount" operator="negative"/> + <calcop operator="negative" field="acctgTransEntry.amount"/> </calculate> <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D"> <set value="C" field="acctgTransEntry.debitCreditFlag"/> @@ -684,18 +684,18 @@ under the License. </condition> <then> <calculate field="totalDebitAmount"> - <calcop field="totalDebitAmount" operator="add"><calcop field="amount" operator="get"/></calcop> + <calcop operator="add" field="totalDebitAmount"><calcop operator="get" field="amount"/></calcop> </calculate> </then> <else> <calculate field="totalCreditAmount"> - <calcop field="totalCreditAmount" operator="add"><calcop field="amount" operator="get"/></calcop> + <calcop operator="add" field="totalCreditAmount"><calcop operator="get" field="amount"/></calcop> </calculate> </else> </if> </iterate> <calculate field="totalAmount"> - <calcop field="totalCreditAmount" operator="subtract"><calcop field="totalDebitAmount" operator="get"/></calcop> + <calcop operator="subtract" field="totalCreditAmount"><calcop operator="get" field="totalDebitAmount"/></calcop> </calculate> <set field="partyAccountingPreferencesCallMap.organizationPartyId" from-field="customTimePeriod.organizationPartyId"/> <call-service service-name="getPartyAccountingPreferences" in-map-name="partyAccountingPreferencesCallMap"> @@ -963,31 +963,31 @@ under the License. </condition> <then> <calculate field="amount"> - <calcop field="amount" operator="negative"/> + <calcop operator="negative" field="amount"/> </calculate> </then> </if> <if-compare field="isExpenseAccount" operator="equals" value="true" type="Boolean"> <calculate field="amount"> - <calcop field="amount" operator="negative"/> + <calcop operator="negative" field="amount"/> </calculate> </if-compare> <calculate field="totalNetIncome"> - <calcop field="totalNetIncome" operator="add"><calcop field="amount" operator="get"/></calcop> + <calcop operator="add" field="totalNetIncome"><calcop operator="get" field="amount"/></calcop> </calculate> <if-compare field="isExpenseAccount" operator="equals" value="true" type="Boolean"> <if-empty field="glAccountTotalsExpenseMap[glAccount.glAccountId]"> <set field="glAccountTotalsExpenseMap[glAccount.glAccountId]" value="0.0" type="BigDecimal"/> </if-empty> <calculate field="glAccountTotalsExpenseMap[glAccount.glAccountId]"> - <calcop field="glAccountTotalsExpenseMap[glAccount.glAccountId]" operator="add"><calcop field="amount" operator="get"/></calcop> + <calcop operator="add" field="glAccountTotalsExpenseMap[glAccount.glAccountId]"><calcop operator="get" field="amount"/></calcop> </calculate> <else> <if-empty field="glAccountTotalsProfitMap[glAccount.glAccountId]"> <set field="glAccountTotalsProfitMap[glAccount.glAccountId]" value="0.0" type="BigDecimal"/> </if-empty> <calculate field="glAccountTotalsProfitMap[glAccount.glAccountId]"> - <calcop field="glAccountTotalsProfitMap[glAccount.glAccountId]" operator="add"><calcop field="amount" operator="get"/></calcop> + <calcop operator="add" field="glAccountTotalsProfitMap[glAccount.glAccountId]"><calcop operator="get" field="amount"/></calcop> </calculate> </else> </if-compare> @@ -1976,7 +1976,7 @@ under the License. <iterate list="orderItemBillings" entry="orderItemBilling"> <get-related-one value-field="orderItemBilling" relation-name="OrderItem" to-value-field="orderItem"/> <calculate field="amountFromOrder" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> - <calcop field="amountFromOrder" operator="add"> + <calcop operator="add" field="amountFromOrder"> <calcop operator="multiply"> <calcop operator="get" field="orderItemBilling.quantity"/> <calcop operator="get" field="orderItem.unitPrice"/> @@ -2399,7 +2399,7 @@ under the License. <!--Cloning AcctgTrans--> <clone-value value-field="acctgTrans" new-value-field="newAcctgTrans"/> <clear-field field="newAcctgTrans.acctgTransId"/> - <set-service-fields to-map="createAcctgTransInMap" service-name="createAcctgTrans" map="newAcctgTrans"/> + <set-service-fields service-name="createAcctgTrans" map="newAcctgTrans" to-map="createAcctgTransInMap"/> <now-timestamp field="nowTimestamp"/> <set field="createAcctgTransInMap.transactionDate" from-field="nowTimestamp"/> <set field="createAcctgTransInMap.isPosted" value="N"/> @@ -2415,7 +2415,7 @@ under the License. <!--Cloning AcctgTransEntry--> <clone-value value-field="acctgTransEntry" new-value-field="newAcctgTransEntry"/> <clear-field field="newAcctgTransEntry.acctgTransId"/> - <set-service-fields to-map="createAcctgTransAndEntryInMap" service-name="createAcctgTransEntry" map="newAcctgTransEntry"/> + <set-service-fields service-name="createAcctgTransEntry" map="newAcctgTransEntry" to-map="createAcctgTransAndEntryInMap"/> <set field="createAcctgTransAndEntryInMap.acctgTransId" from-field="newAcctgTrans.acctgTransId"/> <if-compare field="parameters.revert" operator="equals" value="Y"> <if-compare field="newAcctgTransEntry.debitCreditFlag" operator="equals" value="D"> @@ -2690,7 +2690,7 @@ under the License. <call-service service-name="createGlAccountCategoryMember" in-map-name="createGlAccountCategoryMemberMap"/> <log level="info" message="GlAccountCategoryMember created for [${glAccountCategoryId}] and [${glAccountId}]"/> <else> - <set-service-fields service-name="updateGlAccountCategoryMember" to-map="updateGlAccountCategoryMemberMap" map="glAccountCategoryMember"/> + <set-service-fields service-name="updateGlAccountCategoryMember" map="glAccountCategoryMember" to-map="updateGlAccountCategoryMemberMap"/>/> <set field="updateGlAccountCategoryMemberMap.amountPercentage" from-field="amountPercentage" type="BigDecimal"/> <call-service service-name="updateGlAccountCategoryMember" in-map-name="updateGlAccountCategoryMemberMap"/> </else> Modified: ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml Sat Nov 5 14:14:04 2016 @@ -61,7 +61,7 @@ under the License. </if-compare-field> </if-not-empty> <if-not-empty field="parameters.paymentPreferenceId"> - <entity-one value-field="orderPaymentPreference" entity-name="OrderPaymentPreference"> + <entity-one entity-name="OrderPaymentPreference" value-field="orderPaymentPreference"> <field-map field-name="orderPaymentPreferenceId" from-field="parameters.paymentPreferenceId"/> </entity-one> <if-empty field="parameters.paymentMethodId"> @@ -236,13 +236,13 @@ under the License. <entity-one entity-name="Payment" value-field="toPayment"> <field-map field-name="paymentId" from-field="parameters.toPaymentId"/> </entity-one> - <entity-one value-field="toPaymentType" entity-name="PaymentType"> + <entity-one entity-name="PaymentType" value-field="toPaymentType"> <field-map field-name="paymentTypeId" from-field="toPayment.paymentTypeId"/> </entity-one> <entity-one entity-name="Payment" value-field="payment"> <field-map field-name="paymentId" from-field="parameters.paymentId"/> </entity-one> - <entity-one value-field="paymentType" entity-name="PaymentType"> + <entity-one entity-name="PaymentType" value-field="paymentType"> <field-map field-name="paymentTypeId" from-field="payment.paymentTypeId"/> </entity-one> @@ -280,7 +280,7 @@ under the License. <field-to-result field="paymentAppl.paymentApplicationId" result-name="paymentApplicationId"/> <create-value value-field="paymentAppl"/> - <entity-one value-field="payment" entity-name="Payment"/> + <entity-one entity-name="Payment" value-field="payment"/> <field-to-result field="payment.paymentTypeId" result-name="paymentTypeId"/> </simple-method> @@ -369,14 +369,14 @@ under the License. <simple-method method-name="createPaymentAndApplication" short-description="Create a payment and a payment application for the full amount"> <set-service-fields service-name="createPayment" map="parameters" to-map="createPaymentInMap"/> <call-service service-name="createPayment" in-map-name="createPaymentInMap"> - <result-to-field field="paymentId" result-name="paymentId"/> + <result-to-field result-name="paymentId" field="paymentId"/> </call-service> <check-errors/> <set-service-fields service-name="createPaymentApplication" map="parameters" to-map="createPaymentAppInMap"/> <set field="createPaymentAppInMap.paymentId" from-field="paymentId"/> <set field="createPaymentAppInMap.amountApplied" from-field="parameters.amount"/> <call-service service-name="createPaymentApplication" in-map-name="createPaymentAppInMap"> - <result-to-field field="paymentApplicationId" result-name="paymentApplicationId"/> + <result-to-field result-name="paymentApplicationId" field="paymentApplicationId"/> </call-service> <check-errors/> <field-to-result field="paymentId" result-name="paymentId"/> @@ -411,26 +411,26 @@ under the License. <field field="invoiceTerm.termDays" type="Long"/> </call-class-method> <calculate field="invoiceTermAmount" type="BigDecimal"> - <calcop field="invoiceTotalAmount" operator="multiply"> - <calcop field="invoiceTerm.termValue" operator="get"/> + <calcop operator="multiply" field="invoiceTotalAmount"> + <calcop operator="get" field="invoiceTerm.termValue"/> </calcop> </calculate> <calculate field="invoiceTermAmount" type="BigDecimal"> - <calcop field="invoiceTermAmount" operator="divide"> + <calcop operator="divide" field="invoiceTermAmount"> <number value="100"/> </calcop> </calculate> <set field="invoicePaymentInfo.amount" from-field="invoiceTermAmount"/> <calculate field="computedTotalAmount" type="BigDecimal"> - <calcop field="computedTotalAmount" operator="add"> - <calcop field="invoicePaymentInfo.amount" operator="get"/> + <calcop operator="add" field="computedTotalAmount"> + <calcop operator="get" field="invoicePaymentInfo.amount"/> </calcop> </calculate> <if-compare-field field="remainingAppliedAmount" to-field="invoiceTermAmount" operator="greater-equals" type="BigDecimal"> <set field="invoicePaymentInfo.paidAmount" from-field="invoiceTermAmount" type="BigDecimal"/> <calculate field="remainingAppliedAmount" type="BigDecimal"> - <calcop field="remainingAppliedAmount" operator="subtract"> - <calcop field="invoiceTermAmount" operator="get"/> + <calcop operator="subtract" field="remainingAppliedAmount"> + <calcop operator="get" field="invoiceTermAmount"/> </calcop> </calculate> <else> @@ -439,8 +439,8 @@ under the License. </else> </if-compare-field> <calculate field="invoicePaymentInfo.outstandingAmount" type="BigDecimal"> - <calcop field="invoicePaymentInfo.amount" operator="subtract"> - <calcop field="invoicePaymentInfo.paidAmount" operator="get"/> + <calcop operator="subtract" field="invoicePaymentInfo.amount"> + <calcop operator="get" field="invoicePaymentInfo.paidAmount"/> </calcop> </calculate> <set field="invoicePaymentInfoList[]" from-field="invoicePaymentInfo"/> @@ -473,14 +473,14 @@ under the License. </if-not-empty> <set field="invoicePaymentInfo.invoiceId" from-field="invoice.invoiceId"/> <calculate field="invoicePaymentInfo.amount" type="BigDecimal"> - <calcop field="invoiceTotalAmount" operator="subtract"> - <calcop field="computedTotalAmount" operator="get"/> + <calcop operator="subtract" field="invoiceTotalAmount"> + <calcop operator="get" field="computedTotalAmount"/> </calcop> </calculate> <set field="invoicePaymentInfo.paidAmount" from-field="remainingAppliedAmount" type="BigDecimal"/> <calculate field="invoicePaymentInfo.outstandingAmount" type="BigDecimal"> - <calcop field="invoicePaymentInfo.amount" operator="subtract"> - <calcop field="invoicePaymentInfo.paidAmount" operator="get"/> + <calcop operator="subtract" field="invoicePaymentInfo.amount"> + <calcop operator="get" field="invoicePaymentInfo.paidAmount"/> </calcop> </calculate> <set field="invoicePaymentInfoList[]" from-field="invoicePaymentInfo"/> @@ -509,7 +509,7 @@ under the License. <clear-field field="getInvoicePaymentInfoListInMap"/> <set field="getInvoicePaymentInfoListInMap.invoice" from-field="invoice"/> <call-service service-name="getInvoicePaymentInfoList" in-map-name="getInvoicePaymentInfoListInMap"> - <result-to-field field="invoicePaymentInfoList" result-name="invoicePaymentInfoList"/> + <result-to-field result-name="invoicePaymentInfoList" field="invoicePaymentInfoList"/> </call-service> <iterate list="invoicePaymentInfoList" entry="invoicePaymentInfo"> <if> @@ -566,7 +566,7 @@ under the License. <set field="copyAcctgTransCtx.fromAcctgTransId" from-field="acctgTransPayment.acctgTransId"/> <set field="copyAcctgTransCtx.revert" value="Y"/> <call-service service-name="copyAcctgTransAndEntries" in-map-name="copyAcctgTransCtx"> - <result-to-field field="postAcctgTransMap.acctgTransId" result-name="acctgTransId"/> + <result-to-field result-name="acctgTransId" field="postAcctgTransMap.acctgTransId"/> </call-service> <if-compare field="acctgTransPayment.isPosted" operator="equals" value="Y"> <call-service service-name="postAcctgTrans" in-map-name="postAcctgTransMap"/> @@ -880,7 +880,7 @@ under the License. </simple-method> <simple-method method-name="createPaymentFromOrder" short-description="Service auto create Payment from Order when payment does exist yet and not disabled by accounting config"> - <entity-one value-field="orderHeader" entity-name="OrderHeader"/> + <entity-one entity-name="OrderHeader" value-field="orderHeader"/> <if-compare operator="equals" value="PURCHASE_ORDER" field="orderHeader.orderTypeId"> <property-to-field resource="accounting" property="accounting.payment.purchaseorder.autocreate" field="purchaseAutoCreate" default="Y"/> @@ -1006,18 +1006,18 @@ under the License. <set field="parameters.partyIdTo" from-field="orderRoleTo.partyId"/> <set field="parameters.paymentMethodTypeId" value="COMPANY_ACCOUNT"/> <set field="parameters.statusId" value="PMNT_NOT_PAID"/> - <set-service-fields service-name="createPayment" to-map="createPayment" map="parameters"/> + <set-service-fields service-name="createPayment" map="parameters" to-map="createPayment"/>/> <call-service service-name="createPayment" in-map-name="createPayment"> <result-to-field result-name="paymentId" field="parameters.paymentId"/> </call-service> <set field="parameters.orderId" from-field="orderHeader.orderId"/> <set field="parameters.maxAmount" from-field="orderHeader.grandTotal"/> - <set-service-fields service-name="createOrderPaymentPreference" to-map="newOrderPaymentPreference" map="parameters"/> + <set-service-fields service-name="createOrderPaymentPreference" map="parameters" to-map="newOrderPaymentPreference"/>/> <call-service service-name="createOrderPaymentPreference" in-map-name="newOrderPaymentPreference"> <result-to-field result-name="orderPaymentPreferenceId" field="parameters.paymentPreferenceId"/> </call-service> - <set-service-fields service-name="updatePayment" to-map="updatePayment" map="parameters"/> + <set-service-fields service-name="updatePayment" map="parameters" to-map="updatePayment"/>/> <call-service service-name="updatePayment" in-map-name="updatePayment"/> <field-to-result field="parameters.paymentId" result-name="paymentId"/> <log level="info" message="payment ${parameters.paymentId} with the not-paid status automatically created from order: ${parameters.orderId} (can be disabled in accounting.properties)"/> @@ -1031,7 +1031,7 @@ under the License. </if-compare> <if-not-empty field="parameters.invoiceId"> - <entity-one value-field="invoice" entity-name="Invoice"/> + <entity-one entity-name="Invoice" value-field="invoice"/> <if-not-empty field="invoice"> <call-class-method method-name="getInvoiceTotal" class-name="org.apache.ofbiz.accounting.invoice.InvoiceWorker" ret-field="invoiceTotal"> <field field="invoice" type="GenericValue"/> @@ -1042,7 +1042,7 @@ under the License. <result-to-field result-name="isForeign"/> </call-service> <if-compare operator="equals" value="true" field="isForeign"> - <entity-condition list="payments" entity-name="Payment"> + <entity-condition entity-name="Payment" list="payments"> <condition-list combine="and"> <condition-expr field-name="statusId" value="PMNT_CONFIRMED" operator="not-equals"/> <condition-expr field-name="partyIdFrom" from-field="invoice.partyId" operator="equals"/> @@ -1053,7 +1053,7 @@ under the License. <order-by field-name="effectiveDate"/> </entity-condition> <else> - <entity-condition list="payments" entity-name="Payment"> + <entity-condition entity-name="Payment" list="payments"> <condition-list combine="and"> <condition-expr field-name="statusId" value="PMNT_CONFIRMED" operator="not-equals"/> <condition-expr field-name="partyIdFrom" from-field="invoice.partyId" operator="equals"/> @@ -1086,10 +1086,10 @@ under the License. </if-not-empty> <if-not-empty field="parameters.paymentId"> - <entity-one value-field="payment" entity-name="Payment"/> + <entity-one entity-name="Payment" value-field="payment"/> <if-not-empty field="payment"> - <entity-condition list="invoices" entity-name="Invoice"> + <entity-condition entity-name="Invoice" list="invoices"> <condition-list combine="and"> <condition-expr field-name="statusId" value="INVOICE_READY" operator="not-equals"/> <condition-expr field-name="statusId" value="INVOICE_PAID" operator="not-equals"/> Modified: ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml Sat Nov 5 14:14:04 2016 @@ -51,7 +51,7 @@ under the License. <!-- end existing value --> <if-not-empty field="rateAmounts"> - <first-from-list entry="rateAmount" list="rateAmounts"/> + <first-from-list list="rateAmounts" entry="rateAmount"/> <if-compare-field field="rateAmount.rateAmount" operator="not-equals" to-field="parameters.rateAmount"> <set-service-fields service-name="deleteRateAmount" map="rateAmount" to-map="delRateAmount"/> <call-service service-name="deleteRateAmount" in-map-name="delRateAmount"/> @@ -195,7 +195,7 @@ under the License. <!-- We narrowed as much as we could the result, now returning the first record of the list --> <if-not-empty field="parameters.ratesList"> - <first-from-list entry="amount" list="parameters.ratesList"/> + <first-from-list list="parameters.ratesList" entry="amount"/> <if-empty field="amount.rateAmount"> <set field="amount.rateAmount" value="0" type="BigDecimal"/> </if-empty> @@ -341,7 +341,7 @@ under the License. <field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/> </entity-and> <if-not-empty field="partyRates"> - <first-from-list entry="partyRate" list="partyRates"/> + <first-from-list list="partyRates" entry="partyRate"/> <now-timestamp field="partyRate.thruDate"/> <store-value value-field="partyRate"/> </if-not-empty> @@ -371,7 +371,7 @@ under the License. <field-map field-name="defaultRate" value="Y"/> </entity-and> <if-not-empty field="rates"> - <first-from-list entry="rate" list="rates"/> + <first-from-list list="rates" entry="rate"/> <set field="rate.defaultRate" value="N"/> <store-value value-field="rate"/> </if-not-empty> Modified: ofbiz/trunk/applications/accounting/minilang/tax/TaxAuthorityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/tax/TaxAuthorityServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/tax/TaxAuthorityServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/tax/TaxAuthorityServices.xml Sat Nov 5 14:14:04 2016 @@ -43,7 +43,7 @@ under the License. <simple-method method-name="createPartyTaxAuthInfo" short-description="create a PartyTaxAuthInfo"> <call-simple-method method-name="validatePartyTaxIdInline"/> - <entity-one value-field="taxAuth" entity-name="TaxAuthority"/> + <entity-one entity-name="TaxAuthority" value-field="taxAuth"/> <if-empty field="taxAuth"> <add-error> <fail-property resource="PartyUiLabels" property="PartyTaxAuthPartyAndGeoNotAvailable"/> Modified: ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml Sat Nov 5 14:14:04 2016 @@ -57,7 +57,7 @@ under the License. <field-map field-name="shipmentId"/> </entity-and> <assert><not><if-empty field="acctgTransList"/></not></assert> - <first-from-list entry="acctgTrans" list="acctgTransList"/> + <first-from-list list="acctgTransList" entry="acctgTrans"/> <assert><if-compare field="acctgTrans.glJournalId" operator="not-equals" value="ERROR_JOURNAL"/></assert> @@ -113,7 +113,7 @@ under the License. <entity-and entity-name="OrderItemBilling" list="orderItemBillings"> <field-map field-name="orderId"/> </entity-and> - <first-from-list entry="orderItemBilling" list="orderItemBillings"/> + <first-from-list list="orderItemBillings" entry="orderItemBilling"/> <entity-one entity-name="UserLogin" value-field="userLogin"> <field-map field-name="userLoginId" value="system"/> </entity-one> Modified: ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml Sat Nov 5 14:14:04 2016 @@ -56,12 +56,12 @@ under the License. <set field="serviceCtx.quantity" from-field="quantity"/> <call-service service-name="issueOrderItemShipGrpInvResToShipment" in-map-name="serviceCtx"/> - <entity-condition list="acctgTransList" entity-name="AcctgTrans"> + <entity-condition entity-name="AcctgTrans" list="acctgTransList"> <condition-expr field-name="shipmentId" from-field="shipmentId"/> <order-by field-name="-postedDate"/> </entity-condition> <assert><not><if-empty field="acctgTransList"/></not></assert> - <first-from-list entry="acctgTrans" list="acctgTransList"/> + <first-from-list list="acctgTransList" entry="acctgTrans"/> <assert><if-compare field="acctgTrans.glJournalId" operator="not-equals" value="ERROR_JOURNAL"/></assert> @@ -119,12 +119,12 @@ under the License. <set field="serviceCtx.statusId" value="SHIPMENT_PACKED"/> <call-service service-name="updateShipment" in-map-name="serviceCtx"/> - <entity-condition list="shipmentItemBillings" entity-name="ShipmentItemBilling"> + <entity-condition entity-name="ShipmentItemBilling" list="shipmentItemBillings"> <condition-expr field-name="shipmentId" value="9998"/> <order-by field-name="-createdStamp"/> </entity-condition> <assert><not><if-empty field="shipmentItemBillings"/></not></assert> - <first-from-list entry="shipmentItemBilling" list="shipmentItemBillings"/> + <first-from-list list="shipmentItemBillings" entry="shipmentItemBilling"/> <set field="invoiceId" from-field="shipmentItemBilling.invoiceId"/> <entity-one entity-name="Invoice" value-field="invoice"> @@ -136,7 +136,7 @@ under the License. <!-- Check the invoice transaction --> <set field="acctgTransFilter.acctgTransTypeId" value="SALES_INVOICE"/> <filter-list-by-and to-list="salesAcctgTransList" list="acctgTransList" map="acctgTransFilter"/> - <first-from-list entry="salesAcctgTrans" list="salesAcctgTransList"/> + <first-from-list list="salesAcctgTransList" entry="salesAcctgTrans"/> <assert><if-compare field="salesAcctgTrans.glJournalId" operator="not-equals" value="ERROR_JOURNAL"/></assert> @@ -160,7 +160,7 @@ under the License. <clear-field field="acctgTransEntryFilter"/> <set field="acctgTransFilter.acctgTransTypeId" value="PAYMENT_APPL"/> <filter-list-by-and to-list="paymentAcctgTransList" list="acctgTransList" map="acctgTransFilter"/> - <first-from-list entry="paymentAcctgTrans" list="paymentAcctgTransList"/> + <first-from-list list="paymentAcctgTransList" entry="paymentAcctgTrans"/> <assert><if-compare field="paymentAcctgTrans.glJournalId" operator="not-equals" value="ERROR_JOURNAL"/></assert> @@ -202,7 +202,7 @@ under the License. <entity-and entity-name="PartyRole" list="customerRoles"> <field-map field-name="roleTypeId" value="CUSTOMER"/> </entity-and> - <first-from-list entry="customerRole" list="customerRoles"/> + <first-from-list list="customerRoles" entry="customerRole"/> <set field="serviceCtx.partyIdFrom" from-field="customerRole.partyId"/> <set field="serviceCtx.amount" value="100.00" type="BigDecimal"/> <set field="serviceCtx.partyIdTo" value="Company"/> Modified: ofbiz/trunk/applications/accounting/minilang/test/AutoInvoiceTests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/test/AutoInvoiceTests.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/test/AutoInvoiceTests.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/test/AutoInvoiceTests.xml Sat Nov 5 14:14:04 2016 @@ -99,7 +99,7 @@ under the License. </simple-method> <simple-method method-name="assertInvoiceTotal" login-required="false" short-description="Inline method to assist testInvoiceWorkerGetInvoiceTotal"> - <entity-one value-field="invoice" entity-name="Invoice"> + <entity-one entity-name="Invoice" value-field="invoice"> <field-map field-name="invoiceId"/> </entity-one> <call-class-method method-name="getInvoiceTotal" class-name="org.apache.ofbiz.accounting.invoice.InvoiceWorker" ret-field="invoiceTotal"> Modified: ofbiz/trunk/applications/accounting/minilang/test/InvoicePerShipmentTests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/test/InvoicePerShipmentTests.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/test/InvoicePerShipmentTests.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/test/InvoicePerShipmentTests.xml Sat Nov 5 14:14:04 2016 @@ -43,7 +43,7 @@ under the License. <field field="response" type="javax.servlet.http.HttpServletResponse"/> </call-class-method> <log level="info" message="===== >>> Event : routeOrderEntry, Response : ${result}"/> - <entity-one value-field="userLogin" entity-name="UserLogin"> + <entity-one entity-name="UserLogin" value-field="userLogin"> <field-map field-name="userLoginId" value="admin"/> </entity-one> <script>groovy: @@ -103,11 +103,11 @@ under the License. </call-class-method> <log level="info" message="===== >>> Event : destroyCart, Response = ${result}"/> <!-- Step 3 --> - <entity-condition list="orderHeaders" entity-name="OrderHeader"> + <entity-condition entity-name="OrderHeader" list="orderHeaders"> <condition-expr field-name="orderTypeId" value="SALES_ORDER"/> <order-by field-name="-entryDate"/> </entity-condition> - <first-from-list entry="orderHeader" list="orderHeaders"/> + <first-from-list list="orderHeaders" entry="orderHeader"/> <log level="info" message="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx : ${orderHeader}"/> <script>groovy: import org.apache.ofbiz.shipment.packing.PackingSession; @@ -133,7 +133,7 @@ under the License. <result-to-field result-name="responseMessage"/> </call-service> <log level="info" message="===== >>> Service: packBulkItems, Response = ${responseMessage}"/> - <set-service-fields service-name="completePack" to-map="completePackInput" map="packInput"/> + <set-service-fields service-name="completePack" map="packInput" to-map="completePackInput"/>/> <call-service service-name="completePack" in-map-name="completePackInput"> <result-to-field result-name="shipmentId"/> </call-service> @@ -170,7 +170,7 @@ under the License. <field field="response" type="javax.servlet.http.HttpServletResponse"/> </call-class-method> <log level="info" message="===== >>> Event : routeOrderEntry, Response = ${result}"/> - <entity-one value-field="userLogin" entity-name="UserLogin"> + <entity-one entity-name="UserLogin" value-field="userLogin"> <field-map field-name="userLoginId" value="admin"/> </entity-one> <script>groovy: @@ -230,11 +230,11 @@ under the License. </call-class-method> <log level="info" message="===== >>> Event : destroyCart, Response = ${result}"/> <!-- Step 3 --> - <entity-condition list="orderHeaders" entity-name="OrderHeader"> + <entity-condition entity-name="OrderHeader" list="orderHeaders"> <condition-expr field-name="orderTypeId" value="SALES_ORDER"/> <order-by field-name="-entryDate"/> </entity-condition> - <first-from-list entry="orderHeader" list="orderHeaders"/> + <first-from-list list="orderHeaders" entry="orderHeader"/> <script>groovy: import org.apache.ofbiz.shipment.packing.PackingSession; packingSession = new PackingSession(dispatcher, userLogin); @@ -259,7 +259,7 @@ under the License. <result-to-field result-name="responseMessage"/> </call-service> <log level="info" message="===== >>> Service: packBulkItems, Response = ${responseMessage}"/> - <set-service-fields service-name="completePack" to-map="completePackInput" map="packInput"/> + <set-service-fields service-name="completePack" map="packInput" to-map="completePackInput"/>/> <call-service service-name="completePack" in-map-name="completePackInput"> <result-to-field result-name="shipmentId"/> </call-service> @@ -288,7 +288,7 @@ under the License. <field field="response" type="javax.servlet.http.HttpServletResponse"/> </call-class-method> <log level="info" message="===== >>> Event : routeOrderEntry, Response = ${result}"/> - <entity-one value-field="userLogin" entity-name="UserLogin"> + <entity-one entity-name="UserLogin" value-field="userLogin"> <field-map field-name="userLoginId" value="admin"/> </entity-one> <script>groovy: @@ -347,11 +347,11 @@ under the License. <field field="response" type="javax.servlet.http.HttpServletResponse"/> </call-class-method> <log level="info" message="===== >>> Event : destroyCart, Response = ${result}"/> - <entity-condition list="orderHeaders" entity-name="OrderHeader"> + <entity-condition entity-name="OrderHeader" list="orderHeaders"> <condition-expr field-name="orderTypeId" value="SALES_ORDER"/> <order-by field-name="-entryDate"/> </entity-condition> - <first-from-list entry="orderHeader" list="orderHeaders"/> + <first-from-list list="orderHeaders" entry="orderHeader"/> <set field="orderInput.orderId" from-field="orderHeader.orderId"/> <set field="orderInput.invoicePerShipment" value="N"/> <set field="orderInput.userLogin" from-field="userLogin"/> @@ -384,7 +384,7 @@ under the License. <result-to-field result-name="responseMessage"/> </call-service> <log level="info" message="===== >>> Service: packBulkItems, Response = ${responseMessage}"/> - <set-service-fields service-name="completePack" to-map="completePackInput" map="packInput"/> + <set-service-fields service-name="completePack" map="packInput" to-map="completePackInput"/>/> <call-service service-name="completePack" in-map-name="completePackInput"> <result-to-field result-name="shipmentId"/> </call-service> @@ -413,7 +413,7 @@ under the License. <field field="response" type="javax.servlet.http.HttpServletResponse"/> </call-class-method> <log level="info" message="===== >>> Event : routeOrderEntry, Response = ${result}"/> - <entity-one value-field="userLogin" entity-name="UserLogin"> + <entity-one entity-name="UserLogin" value-field="userLogin"> <field-map field-name="userLoginId" value="admin"/> </entity-one> <script>groovy: @@ -472,11 +472,11 @@ under the License. <field field="response" type="javax.servlet.http.HttpServletResponse"/> </call-class-method> <log level="info" message="===== >>> Event : destroyCart, Response = ${result}"/> - <entity-condition list="orderHeaders" entity-name="OrderHeader"> + <entity-condition entity-name="OrderHeader" list="orderHeaders"> <condition-expr field-name="orderTypeId" value="SALES_ORDER"/> <order-by field-name="-entryDate"/> </entity-condition> - <first-from-list entry="orderHeader" list="orderHeaders"/> + <first-from-list list="orderHeaders" entry="orderHeader"/> <set field="orderInput.orderId" from-field="orderHeader.orderId"/> <set field="orderInput.invoicePerShipment" value="Y"/> <set field="orderInput.userLogin" from-field="userLogin"/> @@ -509,7 +509,7 @@ under the License. <result-to-field result-name="responseMessage"/> </call-service> <log level="info" message="===== >>> Service: packBulkItems, Response = ${responseMessage}"/> - <set-service-fields service-name="completePack" to-map="completePackInput" map="packInput"/> + <set-service-fields service-name="completePack" map="packInput" to-map="completePackInput"/>/> <call-service service-name="completePack" in-map-name="completePackInput"> <result-to-field result-name="shipmentId"/> </call-service> Modified: ofbiz/trunk/applications/accounting/minilang/test/PaymentApplicationTests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/test/PaymentApplicationTests.xml?rev=1768219&r1=1768218&r2=1768219&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/test/PaymentApplicationTests.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/test/PaymentApplicationTests.xml Sat Nov 5 14:14:04 2016 @@ -41,7 +41,7 @@ under the License. <entity-one entity-name="PaymentApplication" value-field="paymentApplication"> <field-map field-name="paymentApplicationId" from-field="paymentApplicationId"/> </entity-one> - <entity-one value-field="payment" entity-name="Payment"> + <entity-one entity-name="Payment" value-field="payment"> <field-map field-name="paymentId" from-field="serviceInMap.paymentId"/> </entity-one> <assert> @@ -91,7 +91,7 @@ under the License. <field field="delegator" type="org.apache.ofbiz.entity.Delegator"/> <field field="serviceInMap.paymentId"/> </call-class-method> - <entity-one value-field="payment" entity-name="Payment"> + <entity-one entity-name="Payment" value-field="payment"> <field-map field-name="paymentId" from-field="serviceInMap.paymentId"/> </entity-one> <assert> @@ -142,7 +142,7 @@ under the License. <field field="delegator" type="org.apache.ofbiz.entity.Delegator"/> <field field="serviceInMap.paymentId"/> </call-class-method> - <entity-one value-field="payment" entity-name="Payment"> + <entity-one entity-name="Payment" value-field="payment"> <field-map field-name="paymentId" from-field="serviceInMap.paymentId"/> </entity-one> <assert> @@ -186,7 +186,7 @@ under the License. <entity-one entity-name="PaymentApplication" value-field="paymentApplication"> <field-map field-name="paymentApplicationId" from-field="paymentApplicationId"/> </entity-one> - <entity-one value-field="payment" entity-name="Payment"> + <entity-one entity-name="Payment" value-field="payment"> <field-map field-name="paymentId" from-field="serviceInMap.paymentId"/> </entity-one> <assert> |
Free forum by Nabble | Edit this page |