svn commit: r1768209 [1/9] - in /ofbiz/trunk: applications/accounting/minila
Locked
svn commit: r1768209 [1/9] - in /ofbiz/trunk: applications/accounting/minila
 
|
Author: diveshdutta
Date: Sat Nov 5 12:41:35 2016 New Revision: 1768209 URL: http://svn.apache.org/viewvc?rev=1768209&view=rev Log: Improvement: Minilang code readibility and conistency improvements (OFBIZ-8445) (OFBIZ-8447) (OFBIZ-8448) (OFBIZ-8450) ( OFBIZ-8451) (OFBIZ-8653) (OFBIZ-8740) (OFBIZ-8741) (OFBIZ-8742) (OFBIZ-8743) Thanks: Devanshu Vyas, Anuj Jain, Sega Patidar, Abhijeet Ashapure for your patches Modified: 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/InvoiceEvents.xml ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml ofbiz/trunk/applications/accounting/minilang/invoice/SampleCommissionServices.xml ofbiz/trunk/applications/accounting/minilang/ledger/AcctgTransServices.xml ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml ofbiz/trunk/applications/accounting/minilang/payment/PaymentMethodServices.xml ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml ofbiz/trunk/applications/accounting/minilang/period/PeriodServices.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/InvoicePerShipmentTests.xml ofbiz/trunk/applications/accounting/widget/AgreementForms.xml ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml ofbiz/trunk/applications/accounting/widget/BudgetScreens.xml ofbiz/trunk/applications/accounting/widget/InvoiceScreens.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/content/minilang/blog/BlogServices.xml ofbiz/trunk/applications/content/minilang/compdoc/CompDocServices.xml ofbiz/trunk/applications/content/minilang/content/ContentServices.xml ofbiz/trunk/applications/content/minilang/data/DataServices.xml ofbiz/trunk/applications/content/minilang/permission/ContentPermissionServices.xml ofbiz/trunk/applications/content/minilang/survey/SurveyServices.xml ofbiz/trunk/applications/content/minilang/website/WebSiteServices.xml ofbiz/trunk/applications/content/widget/WebSiteScreens.xml ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml ofbiz/trunk/applications/content/widget/content/ContentForms.xml ofbiz/trunk/applications/humanres/minilang/HumanResEvents.xml ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml ofbiz/trunk/applications/manufacturing/minilang/test/ProductionRunTests.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListEvents.xml ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml ofbiz/trunk/applications/marketing/widget/ContactListForms.xml ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml ofbiz/trunk/applications/marketing/widget/DataSourceForms.xml ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml ofbiz/trunk/applications/order/minilang/UpgradeServices.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/quote/QuoteServices.xml ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml ofbiz/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml ofbiz/trunk/applications/order/minilang/test/QuoteTests.xml ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml ofbiz/trunk/applications/party/minilang/LookupServices.xml ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml ofbiz/trunk/applications/party/minilang/contact/ContactMechServices.xml ofbiz/trunk/applications/party/minilang/contact/PartyContactMechServices.xml ofbiz/trunk/applications/party/minilang/party/PartyPermissionServices.xml ofbiz/trunk/applications/party/minilang/party/PartyServices.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.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/feature/ProductFeatureServices.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/product/ProductUomFormulas.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/CostTests.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/ConfigScreens.xml ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml ofbiz/trunk/applications/product/widget/facility/FacilityScreens.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/WorkEffortForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml ofbiz/trunk/framework/common/minilang/CommonServices.xml ofbiz/trunk/framework/common/minilang/PortalPageMethods.xml ofbiz/trunk/framework/common/minilang/PortalPageServices.xml ofbiz/trunk/framework/common/widget/SecurityScreens.xml ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml ofbiz/trunk/specialpurpose/birt/widget/birt/BirtScreens.xml ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/QuickAnonCustomerEvents.xml ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/CustRequestScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/QuoteScreens.xml ofbiz/trunk/specialpurpose/myportal/minilang/Events.xml ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectPermissionServices.xml ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectSimpleEvents.xml ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.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/ScrumTests.xml ofbiz/trunk/specialpurpose/scrum/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/scrum/widget/OpenTestScreens.xml ofbiz/trunk/specialpurpose/scrum/widget/ResourceScreens.xml ofbiz/trunk/specialpurpose/scrum/widget/TaskScreens.xml ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml ofbiz/trunk/specialpurpose/scrum/widget/scrumScreens.xml ofbiz/trunk/specialpurpose/solr/widget/SolrScreens.xml Modified: ofbiz/trunk/applications/accounting/minilang/budget/BudgetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/budget/BudgetServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/budget/BudgetServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/budget/BudgetServices.xml Sat Nov 5 12:41:35 2016 @@ -40,7 +40,7 @@ under the License. <!-- update Budget Status --> <simple-method method-name="updateBudgetStatus" short-description="Update Budget Status"> - <entity-and list="budgetStatuses" entity-name="BudgetStatus"> + <entity-and entity-name="BudgetStatus" list="budgetStatuses"> <field-map field-name="budgetId" from-field="parameters.budgetId"/> <order-by field-name="-statusDate"/> </entity-and> Modified: ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml Sat Nov 5 12:41:35 2016 @@ -96,7 +96,7 @@ under the License. <condition> <and> <not><if-empty field="parameters.statusId"></if-empty></not> - <if-compare-field operator="not-equals" field="lookedUpValue.statusId" to-field="parameters.statusId"></if-compare-field> + <if-compare-field field="lookedUpValue.statusId" operator="not-equals" to-field="parameters.statusId"></if-compare-field> </and> </condition> <then> @@ -169,7 +169,7 @@ under the License. <call-simple-method method-name="getArithmeticSettingsInline"/> <make-value value-field="newEntity" entity-name="FinAccountTrans"/> - <set-nonpk-fields value-field="newEntity" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="FinAccountTrans" field="newEntity.finAccountTransId"/> <now-timestamp field="nowTimestamp"/> @@ -213,7 +213,7 @@ under the License. <check-errors/> <make-value value-field="newEntity" entity-name="FinAccountRole"/> <set-pk-fields value-field="newEntity" map="parameters"/> - <set-nonpk-fields value-field="newEntity" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> <now-timestamp field="newEntity.fromDate"/> @@ -227,7 +227,7 @@ under the License. <call-simple-method method-name="getArithmeticSettingsInline"/> <make-value value-field="newEntity" entity-name="FinAccountAuth"/> - <set-nonpk-fields value-field="newEntity" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="FinAccountAuth" field="newEntity.finAccountAuthId"/> @@ -295,7 +295,7 @@ under the License. <condition-expr field-name="finAccountId" from-field="finAccountId"/> </entity-condition> <set field="actualBalanceSum" value="0" type="BigDecimal"/> - <iterate entry="finAccountTrans" list="finAccountTransList"> + <iterate list="finAccountTransList" entry="finAccountTrans"> <if> <condition> <if-compare field="finAccountTrans.statusId" operator="equals" value="FINACT_TRNS_APPROVED"/> @@ -326,7 +326,7 @@ under the License. <entity-condition entity-name="FinAccountAuth" list="finAccountAuthList" filter-by-date="true"> <condition-expr field-name="finAccountId" from-field="finAccountId"/> </entity-condition> - <iterate entry="finAccountAuth" list="finAccountAuthList"> + <iterate list="finAccountAuthList" entry="finAccountAuth"> <calculate field="availableBalanceSum" type="BigDecimal" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}"> <calcop operator="add" field="availableBalanceSum"> <calcop operator="negative" field="finAccountAuth.amount"/> Modified: ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml Sat Nov 5 12:41:35 2016 @@ -170,7 +170,7 @@ under the License. <if-empty field="fixedAssetValue.instanceOfProductId"> <return/> </if-empty> - <entity-and list="productMaintList" entity-name="ProductMaint"> + <entity-and entity-name="ProductMaint" list="productMaintList"> <field-map field-name="productId" from-field="fixedAssetValue.instanceOfProductId"/> <field-map field-name="intervalMeterTypeId" from-field="meterValue.productMeterTypeId"/> </entity-and> @@ -350,7 +350,7 @@ under the License. <if-empty field="workEffortId"> <set field="workEffortId" from-field="maintValue.scheduleWorkEffortId"/> </if-empty> - <entity-and list="assignedParties" entity-name="PartyFixedAssetAssignAndRole" filter-by-date="true"> + <entity-and entity-name="PartyFixedAssetAssignAndRole" list="assignedParties" filter-by-date="true"> <field-map field-name="fixedAssetId" from-field="fixedAssetId"/> <field-map field-name="parentTypeId" value="FAM_ASSIGNEE"/> </entity-and> Modified: ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceEvents.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceEvents.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceEvents.xml Sat Nov 5 12:41:35 2016 @@ -26,8 +26,8 @@ under the License. <condition-expr field-name="parentTypeId" value="PAYROL"/> </entity-condition> <entity-condition entity-name="InvoiceItemType" list="PayrolList"/> - <iterate entry="payrolGroup" list="PayrolGroup"> - <iterate entry="payrolList" list="PayrolList"> + <iterate list="PayrolGroup" entry="payrolGroup"> + <iterate list="PayrolList" entry="payrolList"> <if-compare field="payrolList.parentTypeId" value="${payrolGroup.invoiceItemTypeId}" operator="equals"> <set field="AddInvoiceItem" value="N"/> <set field="createInvoiceItem.invoiceId" from-field="parameters.invoiceId"/> Modified: ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml Sat Nov 5 12:41:35 2016 @@ -204,7 +204,7 @@ under the License. </call-service> <field-to-result field="invoiceId" result-name="invoiceId"/> <field-to-request field="invoiceId" request-name="invoiceId"/> - <iterate entry="invoiceItem" list="invoiceItems"> + <iterate list="invoiceItems" entry="invoiceItem"> <set-service-fields service-name="createInvoiceItem" map="invoiceItem" to-map="createInvoiceItem"/> <set field="createInvoiceItem.invoiceId" from-field="invoiceId"/> <call-service service-name="createInvoiceItem" in-map-name="createInvoiceItem"/> @@ -650,7 +650,7 @@ under the License. <set field="removePaymentApplicationCtx.paymentApplicationId" from-field="paymentApplication.paymentApplicationId"/> <call-service service-name="removePaymentApplication" in-map-name="removePaymentApplicationCtx"/> </iterate> - <field-to-result result-name="invoiceTypeId" field="invoice.invoiceTypeId"/> + <field-to-result field="invoice.invoiceTypeId" result-name="invoiceTypeId"/> </simple-method> <simple-method method-name="getInvoiceRunningTotal" short-description="calculate running total for Invoices"> @@ -698,7 +698,7 @@ under the License. <entity-and entity-name="InvoiceItemAssoc" list="invoiceItemAssocs"> <field-map field-name="invoiceIdTo" from-field="parameters.invoiceId"/> </entity-and> - <iterate entry="invoiceItemAssoc" list="invoiceItemAssocs"> + <iterate list="invoiceItemAssocs" entry="invoiceItemAssoc"> <set-service-fields service-name="deleteInvoiceItemAssoc" map="invoiceItemAssoc" to-map="deleteInvoiceItemAssocMap"/> <call-service service-name="deleteInvoiceItemAssoc" in-map-name="deleteInvoiceItemAssocMap"/> <log level="info" message="Removed invoiceItemAssoc: ${invoiceItemAssoc}"/> @@ -710,7 +710,7 @@ under the License. <entity-and entity-name="OrderItemBilling" list="orderItemBillings"> <field-map field-name="invoiceId" from-field="parameters.invoiceId"/> </entity-and> - <iterate entry="orderItemBilling" list="orderItemBillings"> + <iterate list="orderItemBillings" entry="orderItemBilling"> <set field="orderItemBilling.quantity" value="0" type="BigDecimal"/> <store-value value-field="orderItemBilling"/> </iterate> @@ -718,7 +718,7 @@ under the License. <entity-and entity-name="OrderAdjustmentBilling" list="orderAdjustmentBillings"> <field-map field-name="invoiceId" from-field="parameters.invoiceId"/> </entity-and> - <iterate entry="orderAdjustmentBilling" list="orderAdjustmentBillings"> + <iterate list="orderAdjustmentBillings" entry="orderAdjustmentBilling"> <set field="orderAdjustmentBilling.amount" value="0" type="BigDecimal"/> <store-value value-field="orderAdjustmentBilling"/> </iterate> @@ -907,7 +907,7 @@ under the License. <property-to-field resource="accounting" property="create.invoice.per.shipment" field="invoicePerShipment"/> </if-empty> <if-compare operator="equals" value="N" field="invoicePerShipment"> - <entity-and list="orderItemBilling" entity-name="OrderItemBilling"> + <entity-and entity-name="OrderItemBilling" list="orderItemBilling"> <field-map field-name="orderId" from-field="parameters.orderId"/> </entity-and> <if-empty field="orderItemBilling"> @@ -920,7 +920,7 @@ under the License. <field-map field-name="orderId" from-field="parameters.orderId"/> <order-by field-name="orderItemSeqId"/> </entity-and> - <iterate entry="orderItem" list="orderItems"> + <iterate list="orderItems" entry="orderItem"> <entity-and list="checkOrderItem" entity-name="OrderItemBilling"> <field-map field-name="orderId" from-field="parameters.orderId"/> <field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/> @@ -1005,7 +1005,7 @@ under the License. <call-service service-name="getPartyAccountingPreferences" in-map-name="pref"> <result-to-field result-name="partyAccountingPreference"/> </call-service> - <if-compare-field to-field="partyAccountingPreference.baseCurrencyUomId" operator="equals" field="invoice.currencyUomId"> + <if-compare-field field="invoice.currencyUomId" operator="equals" to-field="partyAccountingPreference.baseCurrencyUomId">> <set field="isForeign" value="false" type="Boolean"/> <else> <set field="isForeign" value="true" type="Boolean"/> Modified: ofbiz/trunk/applications/accounting/minilang/invoice/SampleCommissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/invoice/SampleCommissionServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/invoice/SampleCommissionServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/invoice/SampleCommissionServices.xml Sat Nov 5 12:41:35 2016 @@ -31,7 +31,7 @@ under the License. <field-map field-name="partyRelationshipTypeId" value="SALES_AFFILIATE"/><!-- this constraint could be optional if not being set in company data --> </entity-and> - <iterate entry="affiliatePartyRelationship" list="affiliatePartyRelationshipList"> + <iterate list="affiliatePartyRelationshipList" entry="affiliatePartyRelationship"> <!-- calculate a commission for each commission partner, identified by affiliatePartyRelationship.partyIdTo --> <if> <condition><if-compare field="affiliatePartyRelationship.roleTypeIdTo" operator="equals" value="AFFILIATE"/></condition> Modified: ofbiz/trunk/applications/accounting/minilang/ledger/AcctgTransServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/ledger/AcctgTransServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/ledger/AcctgTransServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/ledger/AcctgTransServices.xml Sat Nov 5 12:41:35 2016 @@ -163,7 +163,7 @@ under the License. </entity-condition> <calculate field="debitTotal" type="BigDecimal"><number value="0"/></calculate> <calculate field="creditTotal" type="BigDecimal"><number value="0"/></calculate> - <iterate entry="acctgTransEntry" list="acctgTransEntryList"> + <iterate list="acctgTransEntryList" entry="acctgTransEntry"> <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D"> <calculate field="debitTotal" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="add"> @@ -281,7 +281,7 @@ under the License. <!-- get current period(s) and check if closed --> <!-- also check if the glAccountId, amount, currencyUomId fields are all set --> - <iterate entry="acctgTransEntry" list="acctgTransEntryList"> + <iterate list="acctgTransEntryList" entry="acctgTransEntry"> <!-- we want to do this for each organizationPartyId, so only do this if we haven't already found the list for the current org --> <if-empty field="customTimePeriodListByOrganizationPartyIdMap[acctgTransEntry.organizationPartyId]"> <clear-field field="findCustomTimePeriodCallMap"/> @@ -302,7 +302,7 @@ under the License. </add-error> </if-empty> <!-- now do the actual isClose check --> - <iterate entry="customTimePeriod" list="customTimePeriodList"> + <iterate list="customTimePeriodList" entry="customTimePeriod"> <if-compare field="customTimePeriod.isClosed" operator="equals" value="Y"> <add-error> <fail-property resource="AccountingUiLabels" property="AccountingNoCustomTimePeriodClosed"/> @@ -393,7 +393,7 @@ under the License. <set field="creditTotal" type="BigDecimal" value="0"/> <set field="debitCreditDifference" type="BigDecimal" value="0"/> - <iterate entry="acctgTransEntry" list="acctgTransAndEntries"> + <iterate list="acctgTransAndEntries" entry="acctgTransEntry"> <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D"> <set field="debitTotal" value="${debitTotal + acctgTransEntry.amount}" type="BigDecimal"/> <else> @@ -435,7 +435,7 @@ under the License. <use-iterator/> </entity-condition> - <iterate entry="glAccOrgAndAcctgTransAndEntry" list="glAccOrgAndAcctgTransAndEntries"> + <iterate list="glAccOrgAndAcctgTransAndEntries" entry="glAccOrgAndAcctgTransAndEntry"> <if-compare field="glAccOrgAndAcctgTransAndEntry.debitCreditFlag" operator="equals" value="D"> <set field="openingBalanceDebit" value="${openingBalanceDebit + glAccOrgAndAcctgTransAndEntry.totalAmount}" type="BigDecimal" default-value="0"/> <else> Modified: ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml Sat Nov 5 12:41:35 2016 @@ -65,7 +65,7 @@ under the License. </condition-list> </entity-condition> - <iterate entry="acctgTrans" list="acctgTransList"> + <iterate list="acctgTransList" entry="acctgTrans"> <clear-field field="callServiceMap"/> <clear-field field="serviceResults"/> <set from-field="acctgTrans.acctgTransId" field="callServiceMap.acctgTransId"/> @@ -112,7 +112,7 @@ under the License. <condition-expr field-name="isPosted" operator="not-equals" value="Y"/> </condition-list> </entity-condition> - <iterate entry="acctgTrans" list="acctgTransList"> + <iterate list="acctgTransList" entry="acctgTrans"> <clear-field field="callServiceMap"/> <set from-field="acctgTrans.acctgTransId" field="callServiceMap.acctgTransId"/> <call-service service-name="postAcctgTrans" in-map-name="callServiceMap"/> @@ -1365,7 +1365,7 @@ under the License. </calcop> </calculate> <!-- if originAmount is equals to 0 do not create transaction, this is causing error in postAcctgTrans --> - <if-compare operator="not-equals" field="origAmount" value="0"> + <if-compare field="origAmount" operator="not-equals" value="0"> <!-- Credit --> <make-value entity-name="AcctgTransEntry" value-field="creditEntry"/> <set field="creditEntry.debitCreditFlag" value="C"/> @@ -1868,7 +1868,7 @@ under the License. <field field="invoice" type="org.apache.ofbiz.entity.GenericValue"/> </call-class-method> <iterate-map key="taxAuthPartyId" value="taxAuthGeoIds" map="taxAuthPartyAndGeos"> - <iterate entry="taxAuthGeoId" list="taxAuthGeoIds"> + <iterate list="taxAuthGeoIds" entry="taxAuthGeoId"> <clear-field field="debitEntry"/> <make-value entity-name="AcctgTransEntry" value-field="debitEntry"/> <set field="debitEntry.debitCreditFlag" value="D"/> @@ -2035,7 +2035,7 @@ under the License. <field field="invoice" type="org.apache.ofbiz.entity.GenericValue"/> </call-class-method> <iterate-map key="taxAuthPartyId" value="taxAuthGeoIds" map="taxAuthPartyAndGeos"> - <iterate entry="taxAuthGeoId" list="taxAuthGeoIds"> + <iterate list="taxAuthGeoIds" entry="taxAuthGeoId"> <clear-field field="debitEntry"/> <make-value entity-name="AcctgTransEntry" value-field="debitEntry"/> <set field="debitEntry.debitCreditFlag" value="D"/> @@ -2190,7 +2190,7 @@ under the License. <field field="invoice" type="org.apache.ofbiz.entity.GenericValue"/> </call-class-method> <iterate-map key="taxAuthPartyId" value="taxAuthGeoIds" map="taxAuthPartyAndGeos"> - <iterate entry="taxAuthGeoId" list="taxAuthGeoIds"> + <iterate list="taxAuthGeoIds" entry="taxAuthGeoId"> <clear-field field="creditEntry"/> <make-value entity-name="AcctgTransEntry" value-field="creditEntry"/> <set field="creditEntry.debitCreditFlag" value="C"/> @@ -2279,7 +2279,7 @@ under the License. <field field="payment" type="org.apache.ofbiz.entity.GenericValue"/> </call-class-method> - <if-compare value="true" field="isDisbursement" operator="equals" type="Boolean"> + <if-compare field="isDisbursement" operator="equals" value="true" type="Boolean"> <set field="organizationPartyId" from-field="payment.partyIdFrom"/> <set field="partyId" from-field="payment.partyIdTo"/> <set field="roleTypeId" value="BILL_FROM_VENDOR"/> Modified: ofbiz/trunk/applications/accounting/minilang/payment/PaymentMethodServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/payment/PaymentMethodServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/payment/PaymentMethodServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/payment/PaymentMethodServices.xml Sat Nov 5 12:41:35 2016 @@ -48,7 +48,7 @@ under the License. <set field="lookupMap.contactMechId" from-field="parameters.oldContactMechId"/> <find-by-and entity-name="CreditCard" map="lookupMap" list="creditCards"/> - <iterate entry="creditCard" list="creditCards"> + <iterate list="creditCards" entry="creditCard"> <call-class-method class-name="org.apache.ofbiz.base.util.UtilValidate" method-name="isDateAfterToday" ret-field="isNotExpired"> <field field="creditCard.expireDate"/> </call-class-method> @@ -62,7 +62,7 @@ under the License. </iterate> <find-by-and entity-name="EftAccount" map="lookupMap" list="eftAccounts"/> - <iterate entry="eftAccount" list="eftAccounts"> + <iterate list="eftAccounts" entry="eftAccount"> <get-related-one relation-name="PaymentMethod" to-value-field="paymentMethod" value-field="eftAccount"/> <if-empty field="paymentMethod.thruDate"> <set-service-fields service-name="updateEftAccount" map="eftAccount" to-map="ueaMap"/> @@ -87,15 +87,15 @@ under the License. <if-empty field="newPaymentMethod.paymentMethodId"> <sequenced-id sequence-name="PaymentMethod" field="newPaymentMethod.paymentMethodId"/> </if-empty> - <set-nonpk-fields value-field="newPaymentMethod" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="newPaymentMethod"/> <set field="newPaymentMethod.paymentMethodTypeId" value="EXT_PAYPAL"/> <create-value value-field="newPaymentMethod"/> <make-value value-field="newPayPalPaymentMethod" entity-name="PayPalPaymentMethod"/> <set field="newPayPalPaymentMethod.paymentMethodId" from-field="newPaymentMethod.paymentMethodId"/> - <set-nonpk-fields value-field="newPayPalPaymentMethod" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="newPayPalPaymentMethod"/> <create-value value-field="newPayPalPaymentMethod"/> - <field-to-result result-name="paymentMethodId" field="newPaymentMethod.paymentMethodId"/> + <field-to-result field="newPaymentMethod.paymentMethodId" result-name="paymentMethodId"/> </simple-method> <simple-method method-name="createPaymentGroupMember" short-description="Check For Outgoing/Incoming Payment And Create Payment Group Member"> Modified: ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml Sat Nov 5 12:41:35 2016 @@ -109,9 +109,9 @@ under the License. <!-- check if only status change --> <make-value value-field="newPayment" entity-name="Payment"/> <make-value value-field="oldPayment" entity-name="Payment"/> - <set-nonpk-fields value-field="newPayment" map="payment"/> - <set-nonpk-fields value-field="oldPayment" map="payment"/> - <set-nonpk-fields value-field="newPayment" map="parameters"/> + <set-nonpk-fields map="payment" value-field="newPayment"/> + <set-nonpk-fields map="payment" value-field="oldPayment"/> + <set-nonpk-fields map="parameters" value-field="newPayment"/> <!-- fields :- comments, paymentRefNum, finAccountTransId, statusId can editable for Payment --> <set field="oldPayment.statusId" from-field="newPayment.statusId"/> <set field="oldPayment.comments" from-field="newPayment.comments"/> @@ -254,7 +254,7 @@ under the License. <call-class-method method-name="getPaymentNotApplied" class-name="org.apache.ofbiz.accounting.payment.PaymentWorker" ret-field="notAppliedToPayment"> <field field="toPayment" type="GenericValue"/> </call-class-method> - <if-compare-field operator="less" field="notAppliedPayment" to-field="notAppliedToPayment"> + <if-compare-field field="notAppliedPayment" operator="less" to-field="notAppliedToPayment"> <set field="paymentAppl.amountApplied" from-field="notAppliedPayment"/> <else> <set field="paymentAppl.amountApplied" from-field="notAppliedToPayment"/> @@ -910,18 +910,18 @@ under the License. <return/> </if-not-empty> - <entity-and list="orderRoleToList" entity-name="OrderRole"> + <entity-and entity-name="OrderRole" list="orderRoleToList"> <field-map field-name="orderId" from-field="orderHeader.orderId"/> <field-map field-name="roleTypeId" value="BILL_FROM_VENDOR"/> </entity-and> <first-from-list entry="orderRoleTo" list="orderRoleToList"/> - <entity-and list="orderRoleFromList" entity-name="OrderRole"> + <entity-and entity-name="OrderRole" list="orderRoleFromList"> <field-map field-name="orderId" from-field="orderHeader.orderId"/> <field-map field-name="roleTypeId" value="BILL_TO_CUSTOMER"/> </entity-and> <first-from-list entry="orderRoleFrom" list="orderRoleFromList"/> <if-compare operator="equals" value="PURCHASE_ORDER" field="orderHeader.orderTypeId"> - <entity-and list="agreementList" entity-name="Agreement" filter-by-date="true"> + <entity-and entity-name="Agreement" list="agreementList" filter-by-date="true"> <field-map field-name="partyIdFrom" from-field="orderRoleFrom.partyId"/> <field-map field-name="partyIdTo" from-field="orderRoleTo.partyId"/> <field-map field-name="agreementTypeId" value="PURCHASE_AGREEMENT"/> @@ -929,7 +929,7 @@ under the License. <set field="parameters.paymentTypeId" value="VENDOR_PAYMENT"/> <set field="organizationPartyId" from-field="orderRoleFrom.partyId"/> <else> - <entity-and list="agreementList" entity-name="Agreement" filter-by-date="true"> + <entity-and entity-name="Agreement" list="agreementList" filter-by-date="true"> <field-map field-name="partyIdFrom" from-field="orderRoleFrom.partyId"/> <field-map field-name="partyIdTo" from-field="orderRoleTo.partyId"/> <field-map field-name="agreementTypeId" value="SALES_AGREEMENT"/> @@ -940,7 +940,7 @@ under the License. </if-compare> <first-from-list entry="agreement" list="agreementList"/> <if-not-empty field="agreement"> - <entity-and list="orderTermList" entity-name="OrderTerm"> + <entity-and entity-name="OrderTerm" list="orderTermList"> <field-map field-name="orderId" from-field="orderHeader.orderId"/> <field-map field-name="termTypeId" value="FIN_PAYMENT_TERM"/> </entity-and> @@ -969,14 +969,14 @@ under the License. <not> <if-empty field="partyAcctgPreference.baseCurrencyUomId" /> </not> - <if-compare-field to-field="partyAcctgPreference.baseCurrencyUomId" operator="equals" field="orderHeader.currencyUom" /> + <if-compare-field field="orderHeader.currencyUom" operator="equals" to-field="partyAcctgPreference.baseCurrencyUomId"> /> </and> </condition> <then> <set field="parameters.currencyUomId" from-field="orderHeader.currencyUom" /> <set field="parameters.amount" from-field="orderHeader.grandTotal" /> <!-- get conversion rate from related invoice when exists --> - <entity-and list="invoices" entity-name="OrderItemBillingAndInvoiceAndItem"> + <entity-and entity-name="OrderItemBillingAndInvoiceAndItem" list="invoices"> <field-map field-name="orderId" from-field="orderId" /> </entity-and> <if-not-empty field="invoices"> @@ -1068,7 +1068,7 @@ under the License. <if-not-empty field="payments"> <!-- check if already applied --> - <entity-and list="paymentAppls" entity-name="PaymentApplication"> + <entity-and entity-name="PaymentApplication" list="paymentAppls"> <field-map field-name="paymentId" from-field="payments[0].paymentId"/> </entity-and> <if-empty field="paymentAppls"> @@ -1100,7 +1100,7 @@ under the License. </condition-list> <order-by field-name="invoiceDate"/> </entity-condition> - <iterate entry="invoice" list="invoices"> + <iterate list="invoices" entry="invoice"> <set field="isPurchaseInvoice" value="${groovy: org.apache.ofbiz.entity.util.EntityTypeUtil.hasParentType(delegator, 'InvoiceType', 'invoiceTypeId', invoice.getString('invoiceTypeId'), 'parentTypeId', 'PURCHASE_INVOICE')}" type="Boolean"/> <set field="isSalesInvoice" value="${groovy: org.apache.ofbiz.entity.util.EntityTypeUtil.hasParentType(delegator, 'InvoiceType', 'invoiceTypeId', invoice.getString('invoiceTypeId'), 'parentTypeId', 'SALES_INVOICE')}" type="Boolean"/> <if> @@ -1120,15 +1120,15 @@ under the License. <result-to-field result-name="isForeign"/> </call-service> <if-compare operator="equals" value="true" field="isForeign"> - <if-compare-field operator="equals" field="invoiceTotal" to-field="payment.actualCurrencyAmount"> - <if-compare-field operator="equals" field="invoice.currencyUomId" to-field="payment.actualCurrencyUomId"> + <if-compare-field field="invoiceTotal" operator="equals" to-field="payment.actualCurrencyAmount"> + <if-compare-field field="invoice.currencyUomId" operator="equals" to-field="payment.actualCurrencyUomId"> <set field="invoiceId" from-field="invoice.invoiceId"/> <set field="amountApplied" from-field="payment.actualCurrencyAmount"/> </if-compare-field> </if-compare-field> <else> - <if-compare-field operator="equals" field="invoiceTotal" to-field="payment.amount"> - <if-compare-field operator="equals" field="invoice.currencyUomId" to-field="payment.currencyUomId"> + <if-compare-field field="invoiceTotal" operator="equals" to-field="payment.amount"> + <if-compare-field field="invoice.currencyUomId" operator="equals" to-field="payment.currencyUomId"> <set field="invoiceId" from-field="invoice.invoiceId"/> <set field="amountApplied" from-field="payment.amount"/> </if-compare-field> @@ -1139,7 +1139,7 @@ under the License. </if> </iterate> <if-not-empty field="invoiceId"> - <entity-and list="paymentAppls" entity-name="PaymentApplication"> + <entity-and entity-name="PaymentApplication" list="paymentAppls"> <field-map field-name="invoiceId" from-field="invoiceId"/> </entity-and> <if-empty field="paymentAppls"> Modified: ofbiz/trunk/applications/accounting/minilang/period/PeriodServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/period/PeriodServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/period/PeriodServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/period/PeriodServices.xml Sat Nov 5 12:41:35 2016 @@ -28,7 +28,7 @@ under the License. <result-to-field result-name="parentOrganizationPartyIdList"/> </call-service> - <iterate entry="curOrganizationPartyId" list="parentOrganizationPartyIdList"> + <iterate list="parentOrganizationPartyIdList" entry="curOrganizationPartyId"> <clear-field field="orgTimePeriodList"/> <entity-condition entity-name="CustomTimePeriod" list="orgTimePeriodList" use-cache="true"> <condition-list combine="and"> Modified: ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml Sat Nov 5 12:41:35 2016 @@ -390,28 +390,28 @@ under the License. <!-- migrate service --> <simple-method method-name="migrateRateFactor" short-description="migrate the several entities which were change in the rate refactor activity"> <entity-condition entity-name="OldEmplPositionTypeRate" list="posRates"/> - <iterate entry="posRate" list="posRates"> + <iterate list="posRates" entry="posRate"> <make-value value-field="emplPositionTypeRate" entity-name="EmplPositionTypeRate"/> <set-pk-fields value-field="posRate" map="emplPositionTypeRate"/> - <set-nonpk-fields value-field="posRate" map="emplPositionTypeRate"/> + <set-nonpk-fields map="emplPositionTypeRate" value-field="posRate"/> <create-value value-field="emplPositionTypeRate"/> <make-value value-field="rateAmount" entity-name="RateAmount"/> <set-pk-fields value-field="posRate" map="rateAmount"/> - <set-nonpk-fields value-field="posRate" map="rateAmount"/> + <set-nonpk-fields map="rateAmount" value-field="posRate"/> <set field="rateAmount.workeffortId" value="_NA_"/> <set field="rateAmount.partyId" value="_NA_"/> <property-to-field resource="general.properties" property="currency.uom.id.default" field="rateAmount.rateCurrencyUomId"/> <create-value value-field="rateAmount"/> </iterate> <entity-condition entity-name="OldPartyRate" list="partyRates"/> - <iterate entry="oldPartyRate" list="oldPartyRates"> + <iterate list="oldPartyRates" entry="oldPartyRate"> <make-value value-field="partyRate" entity-name="PartyRate"/> <set-pk-fields value-field="oldPartyRate" map="partyRate"/> - <set-nonpk-fields value-field="oldPartyRate" map="partyRate"/> + <set-nonpk-fields map="partyRate" value-field="oldPartyRate"/> <create-value value-field="partyRate"/> <make-value value-field="rateAmount" entity-name="RateAmount"/> <set-pk-fields value-field="oldPartyRate" map="rateAmount"/> - <set-nonpk-fields value-field="oldPartyRate" map="rateAmount"/> + <set-nonpk-fields map="rateAmount" value-field="oldPartyRate"/> <set field="rateAmount.workeffortId" value="_NA_"/> <set field="rateAmount.emplPositionTypeId" value="_NA_"/> <set field="rateAmount.periodTypeId" value="RATE_HOUR"/> Modified: ofbiz/trunk/applications/accounting/minilang/tax/TaxAuthorityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/tax/TaxAuthorityServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/tax/TaxAuthorityServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/tax/TaxAuthorityServices.xml Sat Nov 5 12:41:35 2016 @@ -67,7 +67,7 @@ under the License. <check-errors/> <entity-one entity-name="PartyTaxAuthInfo" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="validatePartyTaxIdInline" short-description="validatePartyTaxIdInline"> Modified: ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml Sat Nov 5 12:41:35 2016 @@ -53,7 +53,7 @@ under the License. <call-service service-name="receiveInventoryProduct" in-map-name="serviceCtx"/> - <entity-and list="acctgTransList" entity-name="AcctgTrans"> + <entity-and entity-name="AcctgTrans" list="acctgTransList"> <field-map field-name="shipmentId"/> </entity-and> <assert><not><if-empty field="acctgTransList"/></not></assert> @@ -86,7 +86,7 @@ under the License. </if-compare> </iterate> <!-- check if invoice created --> - <entity-and list="orderItemBillings" entity-name="OrderItemBilling"> + <entity-and entity-name="OrderItemBilling" list="orderItemBillings"> <field-map field-name="orderId"/> </entity-and> <assert> @@ -110,7 +110,7 @@ under the License. --> <set field="orderId" value="DEMO10091"/> - <entity-and list="orderItemBillings" entity-name="OrderItemBilling"> + <entity-and entity-name="OrderItemBilling" list="orderItemBillings"> <field-map field-name="orderId"/> </entity-and> <first-from-list entry="orderItemBilling" list="orderItemBillings"/> Modified: ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml Sat Nov 5 12:41:35 2016 @@ -199,7 +199,7 @@ under the License. <set field="serviceCtx.userLogin" from-field="userLogin"/> <!-- Find a customer --> - <entity-and list="customerRoles" entity-name="PartyRole"> + <entity-and entity-name="PartyRole" list="customerRoles"> <field-map field-name="roleTypeId" value="CUSTOMER"/> </entity-and> <first-from-list entry="customerRole" list="customerRoles"/> @@ -214,7 +214,7 @@ under the License. <result-to-field result-name="paymentId"/> </call-service> - <entity-and list="acctgTransList" entity-name="AcctgTrans"> + <entity-and entity-name="AcctgTrans" list="acctgTransList"> <field-map field-name="paymentId"/> <field-map field-name="acctgTransTypeId" value="INCOMING_PAYMENT"/> </entity-and> @@ -228,7 +228,7 @@ under the License. <call-simple-method method-name="UtilCheckEntriesBalance" xml-resource="component://accounting/minilang/test/AutoAcctgTransTestsPurchase.xml"/> - <iterate entry="acctgTransEntry" list="acctgTransEntryList"> + <iterate list="acctgTransEntryList" entry="acctgTransEntry"> <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C"> <assert> <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="ACCREC_UNAPPLIED"/> Modified: ofbiz/trunk/applications/accounting/minilang/test/InvoicePerShipmentTests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/test/InvoicePerShipmentTests.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/test/InvoicePerShipmentTests.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/test/InvoicePerShipmentTests.xml Sat Nov 5 12:41:35 2016 @@ -139,7 +139,7 @@ under the License. </call-service> <log level="info" message="===== >>> Service: completePack, shipmentId = ${shipmentId}"/> <!-- Step 4 --> - <entity-and list="invoices" entity-name="OrderItemBillingAndInvoiceAndItem"> + <entity-and entity-name="OrderItemBillingAndInvoiceAndItem" list="invoices"> <field-map field-name="orderId" from-field="orderHeader.orderId"/> </entity-and> <assert> @@ -265,7 +265,7 @@ under the License. </call-service> <log level="info" message="===== >>> Service: completePack, shipmentId = ${shipmentId}"/> <!-- Step 4 --> - <entity-and list="invoices" entity-name="OrderItemBillingAndInvoiceAndItem"> + <entity-and entity-name="OrderItemBillingAndInvoiceAndItem" list="invoices"> <field-map field-name="orderId" from-field="orderHeader.orderId"/> </entity-and> <assert> @@ -390,7 +390,7 @@ under the License. </call-service> <log level="info" message="===== >>> Service: completePack, shipmentId = ${shipmentId}"/> <!-- Step 3 --> - <entity-and list="invoices" entity-name="OrderItemBillingAndInvoiceAndItem"> + <entity-and entity-name="OrderItemBillingAndInvoiceAndItem" list="invoices"> <field-map field-name="orderId" from-field="orderHeader.orderId"/> </entity-and> <assert> @@ -515,7 +515,7 @@ under the License. </call-service> <log level="info" message="===== >>> Service: completePack, shipmentId = ${shipmentId}"/> <!-- Step 3 --> - <entity-and list="invoices" entity-name="OrderItemBillingAndInvoiceAndItem"> + <entity-and entity-name="OrderItemBillingAndInvoiceAndItem" list="invoices"> <field-map field-name="orderId" from-field="orderHeader.orderId"/> </entity-and> <assert> Modified: ofbiz/trunk/applications/accounting/widget/AgreementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementForms.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AgreementForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AgreementForms.xml Sat Nov 5 12:41:35 2016 @@ -677,7 +677,7 @@ under the License. odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="AgreementWorkEffortApplic" use-cache="true" list="agreementWorkEffortApplics"> - <field-map from-field="agreementId" field-name="agreementId"/> + <field-map field-name="agreementId" from-field="agreementId"/> </entity-and> </actions> <field name="agreementItemSeqId"><display/></field> Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Sat Nov 5 12:41:35 2016 @@ -160,7 +160,7 @@ under the License. <set field="agreementId" from-field="parameters.agreementId"/> <entity-one entity-name="Agreement" value-field="agreement"/> <entity-and entity-name="AgreementItem" list="agreementItems"> - <field-map from-field="agreement.agreementId" field-name="agreementId"/> + <field-map field-name="agreementId" from-field="agreement.agreementId"/> </entity-and> </actions> <widgets> @@ -268,8 +268,8 @@ under the License. <entity-one entity-name="Agreement" value-field="agreement"/> <entity-one entity-name="AgreementItem" value-field="agreementItem"/> <entity-and entity-name="AgreementPromoAppl" list="agreementPromoAppls"> - <field-map from-field="agreement.agreementId" field-name="agreementId"/> - <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/> + <field-map field-name="agreementId" from-field="agreement.agreementId"/> + <field-map field-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> <order-by field-name="sequenceNum"/> </entity-and> </actions> @@ -331,8 +331,8 @@ under the License. <entity-one entity-name="Agreement" value-field="agreement"/> <entity-one entity-name="AgreementItem" value-field="agreementItem"/> <entity-and entity-name="AgreementTerm" list="agreementTerms"> - <field-map from-field="agreement.agreementId" field-name="agreementId"/> - <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/> + <field-map field-name="agreementId" from-field="agreement.agreementId"/> + <field-map field-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> </entity-and> </actions> <widgets> @@ -393,8 +393,8 @@ under the License. <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/> <entity-one entity-name="AgreementItem" value-field="agreementItem"/> <entity-and entity-name="AgreementProductAppl" list="agreementProducts"> - <field-map from-field="agreement.agreementId" field-name="agreementId"/> - <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/> + <field-map field-name="agreementId" from-field="agreement.agreementId"/> + <field-map field-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> <order-by field-name="productId"/> </entity-and> </actions> @@ -429,8 +429,8 @@ under the License. <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/> <entity-one entity-name="AgreementItem" value-field="agreementItem"/> <entity-and entity-name="AgreementFacilityAppl" list="agreementFacilities"> - <field-map from-field="agreement.agreementId" field-name="agreementId"/> - <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/> + <field-map field-name="agreementId" from-field="agreement.agreementId"/> + <field-map field-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> <order-by field-name="facilityId"/> </entity-and> </actions> @@ -466,8 +466,8 @@ under the License. <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/> <entity-one entity-name="AgreementItem" value-field="agreementItem"/> <entity-and entity-name="AgreementProductAppl" list="agreementProducts"> - <field-map from-field="agreement.agreementId" field-name="agreementId"/> - <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/> + <field-map field-name="agreementId" from-field="agreement.agreementId"/> + <field-map field-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> <order-by field-name="productId"/> </entity-and> </actions> @@ -499,8 +499,8 @@ under the License. <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/> <entity-one entity-name="AgreementItem" value-field="agreementItem"/> <entity-and entity-name="AgreementFacilityAppl" list="agreementFacilities"> - <field-map from-field="agreement.agreementId" field-name="agreementId"/> - <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/> + <field-map field-name="agreementId" from-field="agreement.agreementId"/> + <field-map field-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> <order-by field-name="facilityId"/> </entity-and> </actions> @@ -592,8 +592,8 @@ under the License. <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/> <entity-one entity-name="AgreementItem" value-field="agreementItem"/> <entity-and entity-name="SupplierProduct" list="agreementProducts"> - <field-map from-field="agreement.agreementId" field-name="agreementId"/> - <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/> + <field-map field-name="agreementId" from-field="agreement.agreementId"/> + <field-map field-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> <order-by field-name="productId"/> </entity-and> </actions> @@ -630,8 +630,8 @@ under the License. <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/> <entity-one entity-name="AgreementItem" value-field="agreementItem"/> <entity-and entity-name="SupplierProduct" list="agreementProducts"> - <field-map from-field="agreement.agreementId" field-name="agreementId"/> - <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/> + <field-map field-name="agreementId" from-field="agreement.agreementId"/> + <field-map field-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> <order-by field-name="productId"/> </entity-and> </actions> @@ -712,8 +712,8 @@ under the License. <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/> <entity-one entity-name="AgreementItem" value-field="agreementItem"/> <entity-and entity-name="AgreementPartyApplic" list="agreementParties"> - <field-map from-field="agreement.agreementId" field-name="agreementId"/> - <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/> + <field-map field-name="agreementId" from-field="agreement.agreementId"/> + <field-map field-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> </entity-and> </actions> <widgets> @@ -774,8 +774,8 @@ under the License. <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/> <entity-one entity-name="AgreementItem" value-field="agreementItem"/> <entity-and entity-name="AgreementGeographicalApplic" list="agreementGeographicalApplics"> - <field-map from-field="agreement.agreementId" field-name="agreementId"/> - <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/> + <field-map field-name="agreementId" from-field="agreement.agreementId"/> + <field-map field-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> </entity-and> </actions> <widgets> Modified: ofbiz/trunk/applications/accounting/widget/BudgetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BudgetScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/BudgetScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/BudgetScreens.xml Sat Nov 5 12:41:35 2016 @@ -78,7 +78,7 @@ under the License. <set field="headerItem" value="ListBudgets"/> <set field="budgetId" from-field="budget.budgetId" default-value="${parameters.budgetId}"/> <entity-one entity-name="Budget" value-field="budget"/> - <entity-and list="budgetStatus" entity-name="BudgetStatus"> + <entity-and entity-name="BudgetStatus" list="budgetStatus"> <field-map field-name="budgetId" from-field="budgetId"/> <order-by field-name="-statusDate"/> </entity-and> @@ -163,19 +163,19 @@ under the License. <set field="budgetId" from-field="parameters.budgetId"/> <entity-one entity-name="Budget" value-field="budget"/> <entity-and entity-name="BudgetRole" list="budgetRoles"> - <field-map from-field="parameters.budgetId" field-name="budgetId"/> + <field-map field-name="budgetId" from-field="parameters.budgetId"/> <order-by field-name="partyId"/> </entity-and> <entity-and entity-name="BudgetStatus" list="budgetStatuses"> - <field-map from-field="parameters.budgetId" field-name="budgetId"/> + <field-map field-name="budgetId" from-field="parameters.budgetId"/> <order-by field-name="statusId"/> </entity-and> <entity-and entity-name="BudgetItem" list="budgetItems"> - <field-map from-field="parameters.budgetId" field-name="budgetId"/> + <field-map field-name="budgetId" from-field="parameters.budgetId"/> <order-by field-name="budgetItemSeqId"/> </entity-and> <entity-and entity-name="BudgetReview" list="budgetReviews"> - <field-map from-field="budgetId" field-name="budgetId"/> + <field-map field-name="budgetId" from-field="budgetId"/> <order-by field-name="budgetReviewId"/> </entity-and> </actions> @@ -253,7 +253,7 @@ under the License. <set field="budgetId" from-field="parameters.budgetId"/> <entity-one entity-name="Budget" value-field="budget"/> <entity-and entity-name="BudgetRole" list="budgetRoles"> - <field-map from-field="budgetId" field-name="budgetId"/> + <field-map field-name="budgetId" from-field="budgetId"/> <order-by field-name="partyId"/> </entity-and> </actions> @@ -277,7 +277,7 @@ under the License. <set field="budgetId" from-field="parameters.budgetId"/> <entity-one entity-name="Budget" value-field="budget"/> <entity-and entity-name="BudgetReview" list="budgetReviews"> - <field-map from-field="budgetId" field-name="budgetId"/> + <field-map field-name="budgetId" from-field="budgetId"/> <order-by field-name="budgetReviewId"/> </entity-and> </actions> Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Sat Nov 5 12:41:35 2016 @@ -172,19 +172,19 @@ under the License. <set field="invoiceId" from-field="parameters.invoiceId"/> <entity-one entity-name="Invoice" value-field="invoice"/> <entity-and entity-name="InvoiceRole" list="invoiceRoles"> - <field-map from-field="parameters.invoiceId" field-name="invoiceId"/> + <field-map field-name="invoiceId" from-field="parameters.invoiceId"/> <order-by field-name="partyId"/> </entity-and> <entity-and entity-name="InvoiceStatus" list="invoiceStatus"> - <field-map from-field="parameters.invoiceId" field-name="invoiceId"/> + <field-map field-name="invoiceId" from-field="parameters.invoiceId"/> <order-by field-name="statusDate"/> </entity-and> <entity-and entity-name="InvoiceTerm" list="invoiceTerms"> - <field-map from-field="parameters.invoiceId" field-name="invoiceId"/> + <field-map field-name="invoiceId" from-field="parameters.invoiceId"/> <order-by field-name="invoiceTermId"/> </entity-and> <entity-and entity-name="TimeEntry" list="timeEntries"> - <field-map from-field="parameters.invoiceId" field-name="invoiceId"/> + <field-map field-name="invoiceId" from-field="parameters.invoiceId"/> <order-by field-name="invoiceItemSeqId"/> </entity-and> <script location="component://accounting/groovyScripts/invoice/CreateApplicationList.groovy"/> @@ -335,7 +335,7 @@ under the License. <set field="invoiceId" from-field="parameters.invoiceId"/> <entity-one entity-name="Invoice" value-field="invoice" auto-field-map="true"/> <entity-and entity-name="InvoiceStatus" list="invoiceStatus"> - <field-map from-field="invoice.invoiceId" field-name="invoiceId"/> + <field-map field-name="invoiceId" from-field="invoice.invoiceId"/> <order-by field-name="statusDate"/> </entity-and> </actions> @@ -518,7 +518,7 @@ under the License. <set field="invoiceId" from-field="parameters.invoiceId"/> <entity-one entity-name="Invoice" value-field="invoice"/> <entity-and entity-name="InvoiceRole" list="invoiceRoles"> - <field-map from-field="invoiceId" field-name="invoiceId"/> + <field-map field-name="invoiceId" from-field="invoiceId"/> <order-by field-name="partyId"/> </entity-and> </actions> @@ -543,7 +543,7 @@ under the License. <set field="invoiceId" from-field="parameters.invoiceId"/> <entity-one entity-name="Invoice" value-field="invoice"/> <entity-and entity-name="InvoiceTerm" list="invoiceTerms"> - <field-map from-field="invoiceId" field-name="invoiceId"/> + <field-map field-name="invoiceId" from-field="invoiceId"/> <order-by field-name="invoiceTermId"/> </entity-and> </actions> Modified: ofbiz/trunk/applications/commonext/minilang/SystemInfoServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/minilang/SystemInfoServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/minilang/SystemInfoServices.xml (original) +++ ofbiz/trunk/applications/commonext/minilang/SystemInfoServices.xml Sat Nov 5 12:41:35 2016 @@ -24,7 +24,7 @@ under the License. <simple-method method-name="createSystemInfoNote" short-description="Create a system to to a specific party"> <set field="parameters.partyId" from-field="parameters.partyId" default-value="userLogin.partyId"/> <make-value value-field="noteData" entity-name="NoteData"/> - <set-nonpk-fields value-field="noteData" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="noteData"/> <now-timestamp field="noteData.noteDateTime"/> <sequenced-id sequence-name="NoteData" field="noteData.noteId"/> <set field="noteData.noteName" value="SYSTEMNOTE"/> Modified: ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml (original) +++ ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml Sat Nov 5 12:41:35 2016 @@ -349,7 +349,7 @@ <set field="defaultDaysToShip" from-field="parameters.defaultDaysToShip" type="Long"/> <clear-field field="parameters.defaultDaysToShip"/> - <set-nonpk-fields value-field="newEntity" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> <set field="newEntity.defaultDaysToShip" from-field="defaultDaysToShip" type="Long"/> <if-empty field="parameters.facilityId"> @@ -397,17 +397,17 @@ </if-empty> <if-compare field="parameters.showPricesWithVatTax" operator="equals" value="Y"> <if-empty field="parameters.vatTaxAuthGeoId"> - <add-error><fail-property property="ProductVatTaxAuthGeoNotSet" resource="ProductUiLabels"/></add-error> + <add-error><fail-property resource="ProductUiLabels" property="ProductVatTaxAuthGeoNotSet"/></add-error> </if-empty> <if-empty field="parameters.vatTaxAuthPartyId"> - <add-error><fail-property property="ProductVatTaxAuthPartyNotSet" resource="ProductUiLabels"/></add-error> + <add-error><fail-property resource="ProductUiLabels" property="ProductVatTaxAuthPartyNotSet"/></add-error> </if-empty> </if-compare> <check-errors/> <!-- Create ProductStore --> <make-value value-field="newEntity" entity-name="ProductStore"/> - <set-nonpk-fields value-field="newEntity" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> <set field="newEntity.storeCreditValidDays" value="90" type="Long"/> <set field="newEntity.daysToCancelNonPay" value="30" type="Long"/> Modified: ofbiz/trunk/applications/commonext/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/CommonScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/commonext/widget/CommonScreens.xml Sat Nov 5 12:41:35 2016 @@ -46,10 +46,10 @@ under the License. <set field="layoutSettings.middleTopLink3" value="${lastSystemInfoNote3.moreInfoUrl}${groovy: if (lastSystemInfoNote3&&lastSystemInfoNote3.moreInfoItemName&&lastSystemInfoNote3.moreInfoItemId)"?" + lastSystemInfoNote3.moreInfoItemName + "=" + lastSystemInfoNote3.moreInfoItemId + "&id=" + lastSystemInfoNote3.moreInfoItemId;}"/> <!-- Help link actions --> <set field="helpTopic" value="${groovy: webappName.toUpperCase() + '_' + requestAttributes._CURRENT_VIEW_}"/> - <entity-and list="pageAvail" entity-name="ContentAssoc"> + <entity-and entity-name="ContentAssoc" list="pageAvail"> <field-map field-name="mapKey" from-field="helpTopic"/> </entity-and> - <entity-and list="layoutSettings.WEB_ANALYTICS" entity-name="WebAnalyticsConfig"> + <entity-and entity-name="WebAnalyticsConfig" list="layoutSettings.WEB_ANALYTICS"> <field-map field-name="webAnalyticsTypeId" value="BACKEND_ANALYTICS"/> </entity-and> </actions> @@ -67,7 +67,7 @@ under the License. <entity-one value-field="orgPartyLogoMap" entity-name="PartyGroup"> <field-map field-name="partyId" from-field="defaultOrganizationPartyId"/> </entity-one> - <entity-and list="orgPartyContentMap" entity-name="PartyContent" filter-by-date="true"> + <entity-and entity-name="PartyContent" list="orgPartyContentMap" filter-by-date="true"> <field-map field-name="partyId" from-field="defaultOrganizationPartyId"/> <field-map field-name="partyContentTypeId" value="LGOIMGURL"/> <order-by field-name="-fromDate"/> Modified: ofbiz/trunk/applications/content/minilang/blog/BlogServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/blog/BlogServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/content/minilang/blog/BlogServices.xml (original) +++ ofbiz/trunk/applications/content/minilang/blog/BlogServices.xml Sat Nov 5 12:41:35 2016 @@ -250,21 +250,21 @@ </entity-condition> <filter-list-by-date list="unfilteredList" to-list="blogItems"/> <set field="blogList[]"/> - <iterate entry="blogItem" list="blogItems"> + <iterate list="blogItems" entry="blogItem"> <set-service-fields service-name="genericContentPermission" map="blogItem" to-map="mapIn"/> <set field="mapIn.ownerContentId" from-field="parameters.contentId"/> <set field="mapIn.mainAction" value="VIEW"/> <call-service service-name="genericContentPermission" in-map-name="mapIn"> <result-to-field result-name="hasPermission" field="hasPermission"/> </call-service> - <if-compare operator="equals" field="hasPermission" value="true" type="Boolean"> + <if-compare field="hasPermission" operator="equals" value="true" type="Boolean"> <set field="blogList[]" from-field="blogItem"/> <else> <set field="mapIn.mainAction" value="UPDATE"/> <call-service service-name="genericContentPermission" in-map-name="mapIn"> <result-to-field result-name="hasPermission" field="hasPermission"/> </call-service> - <if-compare operator="equals" field="hasPermission" value="true" type="Boolean"> + <if-compare field="hasPermission" operator="equals" value="true" type="Boolean"> <set field="blogList[]" from-field="blogItem"/> </if-compare> </else> @@ -282,7 +282,7 @@ <entity-one entity-name="Content" value-field="content"/> <get-related value-field="content" relation-name="FromContentAssoc" list="rawAssocs"/> <filter-list-by-date list="rawAssocs" to-list="assocs"/> - <iterate entry="assoc" list="assocs"> + <iterate list="assocs" entry="assoc"> <if-compare field="assoc.mapKey" value="ARTICLE" operator="equals"> <get-related-one value-field="assoc" relation-name="ToContent" to-value-field="mainContent"/> <get-related-one value-field="mainContent" relation-name="DataResource" to-value-field="dataResource"/> Modified: ofbiz/trunk/applications/content/minilang/compdoc/CompDocServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/compdoc/CompDocServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/content/minilang/compdoc/CompDocServices.xml (original) +++ ofbiz/trunk/applications/content/minilang/compdoc/CompDocServices.xml Sat Nov 5 12:41:35 2016 @@ -78,7 +78,7 @@ under the License. <create-value value-field="rootInstanceContent"/> <log message="genCompDocInstance 3> rootInstanceContent: ${rootInstanceContent}" level="info"/> - <field-to-result result-name="contentId" field="rootInstanceContent.contentId"/> + <field-to-result field="rootInstanceContent.contentId" result-name="contentId"/> <set from-field="parameters.instanceOfContentId" field="parentTemplateContentId"/> <set from-field="rootInstanceContent.contentId" field="parentInstanceContentId"/> <log message="genCompDocInstance 4> parentTemplateContentId: ${parentTemplateContentId}" level="info"/> @@ -665,7 +665,7 @@ under the License. <if-compare field="contentApproval.partyId" value="${partyId}" operator="equals"> <set field="approvalPermExists" value="true"/> <log level="info" message="approvalPermExists: ${approvalPermExists}"/> - <field-to-result result-name="approvalPermExists" field="approvalPermExists"/> + <field-to-result field="approvalPermExists" result-name="approvalPermExists"/> <return/> </if-compare> <if-not-empty field="contentApproval.roleTypeId"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |