OFBiz › OFBiz - Commits

svn commit: r1805956 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/minilang/budget/ applications/accounting/minilang/finaccount/ applications/accounting/minilang/invoice/ applications/accounting/minilang/payment/ applications/commone...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

nmalin

svn commit: r1805956 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/minilang/budget/ applications/accounting/minilang/finaccount/ applications/accounting/minilang/invoice/ applications/accounting/minilang/payment/ applications/commone...

Author: nmalin
Date: Wed Aug 23 20:44:44 2017
New Revision: 1805956

URL: http://svn.apache.org/viewvc?rev=1805956&view=rev
Log:
Fixed: Consistency and Readability improvements for make-value tag (OFBIZ-8986)
Consistency on the attribute order for make-value element as : entity-name, value-field
Thanks to Ankush Upadhyay and Devanshu Vyas for the issue and the corrective patch

Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/budget/BudgetServices.xml
ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml
ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml
ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/payment/PaymentMethodServices.xml
ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/payment/PaymentServices.xml
ofbiz/ofbiz-framework/trunk/applications/commonext/minilang/SystemInfoServices.xml
ofbiz/ofbiz-framework/trunk/applications/commonext/minilang/setup/SetupEvents.xml
ofbiz/ofbiz-framework/trunk/applications/content/minilang/content/ContentServices.xml
ofbiz/ofbiz-framework/trunk/applications/content/minilang/survey/SurveyServices.xml
ofbiz/ofbiz-framework/trunk/applications/content/minilang/website/WebSiteServices.xml
ofbiz/ofbiz-framework/trunk/applications/humanres/minilang/HumanResServices.xml
ofbiz/ofbiz-framework/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml
ofbiz/ofbiz-framework/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml
ofbiz/ofbiz-framework/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml
ofbiz/ofbiz-framework/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml
ofbiz/ofbiz-framework/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml
ofbiz/ofbiz-framework/trunk/applications/order/minilang/opportunity/OpportunityServices.xml
ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderReturnServices.xml
ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml
ofbiz/ofbiz-framework/trunk/applications/order/minilang/quote/QuoteServices.xml
ofbiz/ofbiz-framework/trunk/applications/order/minilang/request/CustRequestServices.xml
ofbiz/ofbiz-framework/trunk/applications/order/minilang/requirement/RequirementServices.xml
ofbiz/ofbiz-framework/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml
ofbiz/ofbiz-framework/trunk/applications/party/minilang/communication/CommunicationEventServices.xml
ofbiz/ofbiz-framework/trunk/applications/party/minilang/contact/ContactMechServices.xml
ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartyServices.xml
ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartySimpleEvents.xml
ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartySimpleMethods.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/category/CategoryContentServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/category/CategoryServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/config/ProductConfigItemContentServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/cost/CostServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/feature/ProductFeatureServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/inventory/InventoryServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/price/PriceServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/product/ProductContentServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/product/ProductServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/promo/PromoServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/storage/FacilityContactMechServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/storage/StorageServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/store/ProductStoreServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml
ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml
ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml
ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
ofbiz/ofbiz-framework/trunk/framework/common/minilang/CommonServices.xml
ofbiz/ofbiz-framework/trunk/framework/common/minilang/PortalPageServices.xml
ofbiz/ofbiz-framework/trunk/framework/common/minilang/period/PeriodServices.xml
ofbiz/ofbiz-framework/trunk/framework/entityext/minilang/EntitySyncServices.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/budget/BudgetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/budget/BudgetServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/budget/BudgetServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/budget/BudgetServices.xml Wed Aug 23 20:44:44 2017
@@ -24,7 +24,7 @@ under the License.

<simple-method method-name="createBudget" short-description="Create an Budget">

- <make-value value-field="newEntity" entity-name="Budget"/>
+ <make-value entity-name="Budget" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>



Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml Wed Aug 23 20:44:44 2017
@@ -35,7 +35,7 @@ under the License.
<set field="parameters.statusId" value="FNACT_ACTIVE"/>
</if-empty>

- <make-value value-field="newEntity" entity-name="FinAccount"/>
+ <make-value entity-name="FinAccount" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>

@@ -168,7 +168,7 @@ under the License.
<check-errors/>
<call-simple-method method-name="getArithmeticSettingsInline"/>

- <make-value value-field="newEntity" entity-name="FinAccountTrans"/>
+ <make-value entity-name="FinAccountTrans" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id sequence-name="FinAccountTrans" field="newEntity.finAccountTransId"/>

@@ -211,7 +211,7 @@ under the License.
</add-error>
</if-compare>
<check-errors/>
- <make-value value-field="newEntity" entity-name="FinAccountRole"/>
+ <make-value entity-name="FinAccountRole" value-field="newEntity"/>
<set-pk-fields value-field="newEntity" map="parameters"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>

@@ -226,7 +226,7 @@ under the License.
<simple-method method-name="createFinAccountAuth" short-description="Create a Financial Account Authorization">
<call-simple-method method-name="getArithmeticSettingsInline"/>

- <make-value value-field="newEntity" entity-name="FinAccountAuth"/>
+ <make-value entity-name="FinAccountAuth" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>

<sequenced-id sequence-name="FinAccountAuth" field="newEntity.finAccountAuthId"/>
@@ -756,7 +756,7 @@ under the License.
</if-compare>
<iterate list="acctgTransEntries" entry="oldAcctgTransEntry">
<if-compare field="oldAcctgTransEntry.debitCreditFlag" operator="equals" value="D">
- <make-value value-field="newAcctgTransEntry" entity-name="AcctgTransEntry"/>
+ <make-value entity-name="AcctgTransEntry" value-field="newAcctgTransEntry"/>
<set field="newAcctgTransEntry.glAccountId" from-field="oldAcctgTransEntry.glAccountId"/>
<set field="organizationPartyId" from-field="oldAcctgTransEntry.organizationPartyId"/>
<set field="newAcctgTransEntry.organizationPartyId" from-field="organizationPartyId"/>
@@ -775,7 +775,7 @@ under the License.
<clear-field field="createAcctgTransAndEntriesMap.acctgTransId"/>
<set field="createAcctgTransAndEntriesMap.transactionDate" from-field="nowTimestamp"/>
<set field="createAcctgTransAndEntriesMap.postedDate" from-field="nowTimestamp"/>
- <make-value value-field="newAcctgTransEntry" entity-name="AcctgTransEntry"/>
+ <make-value entity-name="AcctgTransEntry" value-field="newAcctgTransEntry"/>
<set field="newAcctgTransEntry.glAccountId" from-field="finAccount.postToGlAccountId"/>
<set field="newAcctgTransEntry.organizationPartyId" from-field="organizationPartyId"/>
<set field="newAcctgTransEntry.partyId" from-field="oldAcctgTransEntry.partyId"/>
@@ -839,7 +839,7 @@ under the License.
</if-compare>
<iterate list="acctgTransEntries" entry="oldAcctgTransEntry">
<if-compare field="oldAcctgTransEntry.debitCreditFlag" operator="equals" value="C">
- <make-value value-field="newAcctgTransEntry" entity-name="AcctgTransEntry"/>
+ <make-value entity-name="AcctgTransEntry" value-field="newAcctgTransEntry"/>
<set field="newAcctgTransEntry.glAccountId" from-field="oldAcctgTransEntry.glAccountId"/>
<set field="organizationPartyId" from-field="oldAcctgTransEntry.organizationPartyId"/>
<set field="newAcctgTransEntry.organizationPartyId" from-field="organizationPartyId"/>
@@ -858,7 +858,7 @@ under the License.
<clear-field field="createAcctgTransAndEntriesMap.acctgTransId"/>
<set field="createAcctgTransAndEntriesMap.transactionDate" from-field="nowTimestamp"/>
<set field="createAcctgTransAndEntriesMap.postedDate" from-field="nowTimestamp"/>
- <make-value value-field="newAcctgTransEntry" entity-name="AcctgTransEntry"/>
+ <make-value entity-name="AcctgTransEntry" value-field="newAcctgTransEntry"/>
<set field="newAcctgTransEntry.glAccountId" from-field="finAccount.postToGlAccountId"/>
<set field="newAcctgTransEntry.organizationPartyId" from-field="organizationPartyId"/>
<set field="newAcctgTransEntry.partyId" from-field="oldAcctgTransEntry.partyId"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml Wed Aug 23 20:44:44 2017
@@ -145,7 +145,7 @@ under the License.
<simple-method method-name="createInvoice" short-description="Create a new Invoice">
<now-timestamp field="nowTimestamp"/>

- <make-value value-field="newEntity" entity-name="Invoice"/>
+ <make-value entity-name="Invoice" value-field="newEntity"/>


@@ -213,7 +213,7 @@ under the License.

<simple-method method-name="getInvoice" short-description="Retrieve an invoice and the items">

- <make-value value-field="lookupPKMap" entity-name="Invoice"/>
+ <make-value entity-name="Invoice" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="Invoice" map="lookupPKMap" value-field="invoiceValue"/>
<field-to-result field="invoiceValue" result-name="invoice"/>
@@ -225,7 +225,7 @@ under the License.
<simple-method method-name="updateInvoice" short-description="Update the header of an existing Invoice">
<call-simple-method method-name="InvoiceStatusInProgress"/>

- <make-value value-field="lookupPKMap" entity-name="Invoice"/>
+ <make-value entity-name="Invoice" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="Invoice" map="lookupPKMap" value-field="lookedUpValue"/>

@@ -272,7 +272,7 @@ under the License.
<simple-method method-name="createInvoiceItem" short-description="Create a new Invoice Item">
<set field="invoiceId" from-field="parameters.invoiceId"/>
<call-simple-method method-name="InvoiceStatusInProgress"/>
- <make-value value-field="newEntity" entity-name="InvoiceItem"/>
+ <make-value entity-name="InvoiceItem" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.invoiceItemSeqId">
@@ -306,7 +306,7 @@ under the License.
<simple-method method-name="updateInvoiceItem"
short-description="Update an existing Invoice Item">
<call-simple-method method-name="InvoiceStatusInProgress"/>
- <make-value value-field="lookupPKMap" entity-name="InvoiceItem"/>
+ <make-value entity-name="InvoiceItem" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>

<find-by-primary-key entity-name="InvoiceItem" map="lookupPKMap" value-field="lookedUpValue"/>
@@ -450,7 +450,7 @@ under the License.

<simple-method method-name="createInvoiceRole" short-description="Create a Invoice Role">
<call-simple-method method-name="InvoiceStatusInProgress"/>
- <make-value value-field="newEntity" entity-name="InvoiceRole"/>
+ <make-value entity-name="InvoiceRole" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.datetimePerformed"><now-timestamp field="newEntity.datetimePerformed"/></if-empty>
@@ -556,7 +556,7 @@ under the License.
<simple-method method-name="createInvoiceTerm" short-description="Create a Invoice Term">
<call-simple-method method-name="InvoiceStatusInProgress"/>

- <make-value value-field="newEntity" entity-name="InvoiceTerm"/>
+ <make-value entity-name="InvoiceTerm" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>

<sequenced-id sequence-name="InvoiceTerm" field="newEntity.invoiceTermId"/>
@@ -942,7 +942,7 @@ under the License.


<simple-method method-name="createInvoiceContent" short-description="Create Content For Invoice">
- <make-value value-field="newEntity" entity-name="InvoiceContent"/>
+ <make-value entity-name="InvoiceContent" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>

@@ -961,7 +961,7 @@ under the License.
<field-to-result field="newEntity.invoiceContentTypeId" result-name="invoiceContentTypeId"/>
</simple-method>
<simple-method method-name="updateInvoiceContent" short-description="Update Content For Invoice">
- <make-value value-field="lookupPKMap" entity-name="InvoiceContent"/>
+ <make-value entity-name="InvoiceContent" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/payment/PaymentMethodServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/payment/PaymentMethodServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/payment/PaymentMethodServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/payment/PaymentMethodServices.xml Wed Aug 23 20:44:44 2017
@@ -22,7 +22,7 @@ under the License.
xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">

<simple-method method-name="setPaymentMethodAddress" short-description="Set the initial payment method address">
- <make-value value-field="lookupPKMap" entity-name="PaymentMethod"/>
+ <make-value entity-name="PaymentMethod" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="PaymentMethod" map="lookupPKMap" value-field="lookedUpValue"/>
<if-compare field="lookedUpValue.paymentMethodTypeId" operator="equals" value="CREDIT_CARD">
@@ -82,7 +82,7 @@ under the License.
</simple-method>

<simple-method method-name="createPayPalPaymentMethod" short-description="Create a PayPal Payment Method">
- <make-value value-field="newPaymentMethod" entity-name="PaymentMethod"/>
+ <make-value entity-name="PaymentMethod" value-field="newPaymentMethod"/>
<set-pk-fields value-field="newPaymentMethod" map="parameters"/>
<if-empty field="newPaymentMethod.paymentMethodId">
<sequenced-id sequence-name="PaymentMethod" field="newPaymentMethod.paymentMethodId"/>
@@ -91,7 +91,7 @@ under the License.
<set field="newPaymentMethod.paymentMethodTypeId" value="EXT_PAYPAL"/>
<create-value value-field="newPaymentMethod"/>

- <make-value value-field="newPayPalPaymentMethod" entity-name="PayPalPaymentMethod"/>
+ <make-value entity-name="PayPalPaymentMethod" value-field="newPayPalPaymentMethod"/>
<set field="newPayPalPaymentMethod.paymentMethodId" from-field="newPaymentMethod.paymentMethodId"/>
<set-nonpk-fields map="parameters" value-field="newPayPalPaymentMethod"/>
<create-value value-field="newPayPalPaymentMethod"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/payment/PaymentServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/payment/PaymentServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/payment/PaymentServices.xml Wed Aug 23 20:44:44 2017
@@ -107,8 +107,8 @@ under the License.

<if-compare field="payment.statusId" value="PMNT_NOT_PAID" operator="not-equals">

- <make-value value-field="newPayment" entity-name="Payment"/>
- <make-value value-field="oldPayment" entity-name="Payment"/>
+ <make-value entity-name="Payment" value-field="newPayment"/>
+ <make-value entity-name="Payment" value-field="oldPayment"/>
<set-nonpk-fields map="payment" value-field="newPayment"/>
<set-nonpk-fields map="payment" value-field="oldPayment"/>
<set-nonpk-fields map="parameters" value-field="newPayment"/>
@@ -1161,7 +1161,7 @@ under the License.


<simple-method method-name="createPaymentContent" short-description="Create Content For Payment">
- <make-value value-field="newEntity" entity-name="PaymentContent"/>
+ <make-value entity-name="PaymentContent" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>

@@ -1180,7 +1180,7 @@ under the License.
<field-to-result field="newEntity.paymentContentTypeId" result-name="paymentContentTypeId"/>
</simple-method>
<simple-method method-name="updatePaymentContent" short-description="Update Content For Payment">
- <make-value value-field="lookupPKMap" entity-name="PaymentContent"/>
+ <make-value entity-name="PaymentContent" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/commonext/minilang/SystemInfoServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/commonext/minilang/SystemInfoServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/commonext/minilang/SystemInfoServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/commonext/minilang/SystemInfoServices.xml Wed Aug 23 20:44:44 2017
@@ -23,7 +23,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"/>
+ <make-value entity-name="NoteData" value-field="noteData"/>
<set-nonpk-fields map="parameters" value-field="noteData"/>
<now-timestamp field="noteData.noteDateTime"/>
<sequenced-id sequence-name="NoteData" field="noteData.noteId"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/commonext/minilang/setup/SetupEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/commonext/minilang/setup/SetupEvents.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/commonext/minilang/setup/SetupEvents.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/commonext/minilang/setup/SetupEvents.xml Wed Aug 23 20:44:44 2017
@@ -257,12 +257,12 @@

<session-to-field field="userLoginCtx" session-name="userLogin"/>
<if-empty field="userLoginCtx.partyId">
- <make-value value-field="newEntity" entity-name="Party"/>
+ <make-value entity-name="Party" value-field="newEntity"/>
<set field="newEntity.partyId" from-field="userLoginCtx.userLoginId"/>
<set field="newEntity.partyTypeId" value="PERSON"/>
<create-value value-field="newEntity"/>
<clear-field field="newEntity"/>
- <make-value value-field="newPerson" entity-name="Person"/>
+ <make-value entity-name="Person" value-field="newPerson"/>
<set field="newPerson.partyId" from-field="userLoginCtx.userLoginId"/>
<create-value value-field="newPerson"/>
<clear-field field="newPerson"/>
@@ -345,7 +345,7 @@
</if-empty>
<check-errors/>

- <make-value value-field="newEntity" entity-name="Facility"/>
+ <make-value entity-name="Facility" value-field="newEntity"/>
<set field="defaultDaysToShip" from-field="parameters.defaultDaysToShip" type="Long"/>
<clear-field field="parameters.defaultDaysToShip"/>

@@ -406,7 +406,7 @@
<check-errors/>


- <make-value value-field="newEntity" entity-name="ProductStore"/>
+ <make-value entity-name="ProductStore" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set field="newEntity.storeCreditValidDays" value="90" type="Long"/>
<set field="newEntity.daysToCancelNonPay" value="30" type="Long"/>
@@ -426,7 +426,7 @@

<now-timestamp field="nowTimestamp"/>
<if-not-empty field="newEntity.inventoryFacilityId">
- <make-value value-field="storeFacility" entity-name="ProductStoreFacility"/>
+ <make-value entity-name="ProductStoreFacility" value-field="storeFacility"/>
<set from-field="newEntity.inventoryFacilityId" field="storeFacility.facilityId"/>
<set from-field="newEntity.productStoreId" field="storeFacility.productStoreId"/>
<set from-field="nowTimestamp" field="storeFacility.fromDate"/>
@@ -505,7 +505,7 @@
<result-to-request result-name="productCategoryId" request-name="productCategoryId"/>
</call-service>

- <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/>
+ <make-value entity-name="ProductCategoryRollup" value-field="newEntity"/>
<set field="newEntity.parentProductCategoryId" from-field="parameters.primaryParentCategoryId"/>
<set field="newEntity.productCategoryId" from-field="productCategoryId"/>
<set field="newEntity.sequenceNum" value="1" type="Long"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/content/minilang/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/minilang/content/ContentServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/minilang/content/ContentServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/minilang/content/ContentServices.xml Wed Aug 23 20:44:44 2017
@@ -23,7 +23,7 @@


<simple-method method-name="createContent" short-description="Create a Content Record">
- <make-value value-field="content" entity-name="Content"/>
+ <make-value entity-name="Content" value-field="content"/>
<set-nonpk-fields map="parameters" value-field="content"/>
<set-pk-fields value-field="content" map="parameters"/>

@@ -93,7 +93,7 @@


<simple-method method-name="createContentAssoc" short-description="Create a ContntAssoc Record">
- <make-value value-field="assoc" entity-name="ContentAssoc"/>
+ <make-value entity-name="ContentAssoc" value-field="assoc"/>
<set-nonpk-fields map="parameters" value-field="assoc"/>
<set-pk-fields value-field="assoc" map="parameters"/>

@@ -414,7 +414,7 @@
</if-not-empty>
</simple-method>
<simple-method method-name="createTopic" short-description="Create TOPIC type Content">
- <make-value value-field="content" entity-name="Content"/>
+ <make-value entity-name="Content" value-field="content"/>
<set from-field="parameters.newTopicId" field="content.contentId"/>
<set from-field="parameters.newTopicId" field="content.contentName"/>
<set from-field="parameters.newTopicDescription" field="content.description"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/content/minilang/survey/SurveyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/minilang/survey/SurveyServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/minilang/survey/SurveyServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/minilang/survey/SurveyServices.xml Wed Aug 23 20:44:44 2017
@@ -191,7 +191,7 @@
</if-compare>

<if-empty field="surveyResponse">
- <make-value value-field="surveyResponse" entity-name="SurveyResponse"/>
+ <make-value entity-name="SurveyResponse" value-field="surveyResponse"/>
<sequenced-id sequence-name="SurveyResponse" field="surveyResponse.surveyResponseId"/>
<set-nonpk-fields map="parameters" value-field="surveyResponse"/>
<create-value value-field="surveyResponse"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/content/minilang/website/WebSiteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/minilang/website/WebSiteServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/minilang/website/WebSiteServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/minilang/website/WebSiteServices.xml Wed Aug 23 20:44:44 2017
@@ -24,7 +24,7 @@ under the License.


<simple-method method-name="getWebSitePathAlias" short-description="Returns a WebSite Path Alias">
- <make-value value-field="lookupPKMap" entity-name="WebSitePathAlias"/>
+ <make-value entity-name="WebSitePathAlias" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="WebSitePathAlias" map="lookupPKMap" value-field="alias" use-cache="true"/>
<field-to-result field="alias.pathTo" result-name="pathTo"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/minilang/HumanResServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/minilang/HumanResServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/humanres/minilang/HumanResServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/humanres/minilang/HumanResServices.xml Wed Aug 23 20:44:44 2017
@@ -93,7 +93,7 @@
<store-value value-field="emplPositionTypeRate"/>
</if-not-empty>

- <make-value value-field="newEntity" entity-name="EmplPositionTypeRate"/>
+ <make-value entity-name="EmplPositionTypeRate" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty>
<set-nonpk-fields map="parameters" value-field="newEntity"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml Wed Aug 23 20:44:44 2017
@@ -47,7 +47,7 @@ under the License.
</simple-method>

<simple-method method-name="copyBOMAssocs" short-description="Copy BOM associations from one product to another">
- <make-value value-field="lookupMap" entity-name="ProductAssoc"/>
+ <make-value entity-name="ProductAssoc" value-field="lookupMap"/>
<set-pk-fields map="parameters" value-field="lookupMap"/>
<find-by-and entity-name="ProductAssoc" map="lookupMap" list="assocs"/>
<filter-list-by-date list="assocs"/>
@@ -105,7 +105,7 @@ under the License.
<fail-property resource="ManufacturingUiLabels" property="ManufacturingMachineGroupPermissionError"/>
</check-permission>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="ProductManufacturingRule"/>
+ <make-value entity-name="ProductManufacturingRule" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductManufacturingRule" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -117,7 +117,7 @@ under the License.
<fail-property resource="ManufacturingUiLabels" property="ManufacturingMachineGroupPermissionError"/>
</check-permission>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="ProductManufacturingRule"/>
+ <make-value entity-name="ProductManufacturingRule" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductManufacturingRule" map="lookupPKMap" value-field="newEntity"/>
<if-not-empty field="newEntity.ruleId">
@@ -126,7 +126,7 @@ under the License.
</add-error>
<check-errors/>
<else>
- <make-value value-field="newEntity" entity-name="ProductManufacturingRule"/>
+ <make-value entity-name="ProductManufacturingRule" value-field="newEntity"/>
<if-empty field="parameters.ruleId">
<sequenced-id sequence-name="ProductManufacturingRule" field="parameters.ruleId"/>
</if-empty>
@@ -142,7 +142,7 @@ under the License.
<fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/>
</check-permission>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="ProductManufacturingRule"/>
+ <make-value entity-name="ProductManufacturingRule" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductManufacturingRule" map="lookupPKMap" value-field="lookedUpValue"/>
<if-not-empty field="lookedUpValue.ruleId">

Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml Wed Aug 23 20:44:44 2017
@@ -23,7 +23,7 @@ under the License.
<simple-method method-name="addRoutingTaskAssoc"
short-description="If copyTask field = Y create a copy of the routingTask, in all the case add a RoutingTaskAssociation">
<if-compare field="parameters.copyTask" operator="equals" value="Y">
- <make-value value-field="lookupPKMap" entity-name="WorkEffort"/>
+ <make-value entity-name="WorkEffort" value-field="lookupPKMap"/>
<set field="lookupPKMap.workEffortId" from-field="parameters.workEffortIdTo"/>
<find-by-primary-key entity-name="WorkEffort" map="lookupPKMap" value-field="lookedUpValue"/>
<call-map-processor xml-resource="component://manufacturing/minilang/techdata/RoutingMapProcs.xml"

Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml Wed Aug 23 20:44:44 2017
@@ -23,7 +23,7 @@ under the License.
<simple-method method-name="createCalendar" short-description="Create Calendar">
<check-permission permission="MANUFACTURING" action="_CREATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="TechDataCalendar"/>
+ <make-value entity-name="TechDataCalendar" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendar" map="lookupPKMap" value-field="newEntity"/>
<if-not-empty field="newEntity.calendarId">
@@ -32,7 +32,7 @@ under the License.
</add-error>
<check-errors/>
<else>
- <make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/>
+ <make-value entity-name="TechDataCalendarWeek" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarWeek" map="lookupPKMap" value-field="newEntity"/>
<if-empty field="newEntity.calendarWeekId">
@@ -41,7 +41,7 @@ under the License.
</add-error>
<check-errors/>
<else>
- <make-value value-field="newEntity" entity-name="TechDataCalendar"/>
+ <make-value entity-name="TechDataCalendar" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
@@ -54,7 +54,7 @@ under the License.
<simple-method method-name="updateCalendar" short-description="Update Calendar">
<check-permission permission="MANUFACTURING" action="_UPDATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="TechDataCalendar"/>
+ <make-value entity-name="TechDataCalendar" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendar" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -64,7 +64,7 @@ under the License.
<simple-method method-name="removeCalendar" short-description="Remove Calendar">
<check-permission permission="MANUFACTURING" action="_DELETE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="TechDataCalendar"/>
+ <make-value entity-name="TechDataCalendar" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<get-related value-field="lookupPKMap" relation-name="TechDataCalendarExcDay" list="relatedResultList"/>
<first-from-list list="relatedResultList" entry="relatedResult"/>
@@ -91,7 +91,7 @@ under the License.
<simple-method method-name="createCalendarWeek" short-description="Create Calendar Week">
<check-permission permission="MANUFACTURING" action="_CREATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/>
+ <make-value entity-name="TechDataCalendarWeek" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarWeek" map="lookupPKMap" value-field="newEntity"/>
<if-not-empty field="newEntity.calendarWeekId">
@@ -100,7 +100,7 @@ under the License.
</add-error>
<check-errors/>
<else>
- <make-value value-field="newEntity" entity-name="TechDataCalendarWeek"/>
+ <make-value entity-name="TechDataCalendarWeek" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
@@ -111,7 +111,7 @@ under the License.
<simple-method method-name="updateCalendarWeek" short-description="Update CalendarWeek">
<check-permission permission="MANUFACTURING" action="_UPDATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/>
+ <make-value entity-name="TechDataCalendarWeek" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarWeek" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -121,7 +121,7 @@ under the License.
<simple-method method-name="removeCalendarWeek" short-description="Remove CalendarWeek">
<check-permission permission="MANUFACTURING" action="_DELETE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/>
+ <make-value entity-name="TechDataCalendarWeek" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<get-related value-field="lookupPKMap" relation-name="TechDataCalendar" list="relatedResultList"/>
<first-from-list list="relatedResultList" entry="relatedResult"/>
@@ -148,7 +148,7 @@ under the License.
<simple-method method-name="createCalendarExceptionDay" short-description="Create Calendar Exception Day">
<check-permission permission="MANUFACTURING" action="_CREATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcDay"/>
+ <make-value entity-name="TechDataCalendarExcDay" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarExcDay" map="lookupPKMap" value-field="newEntity"/>
<if-not-empty field="newEntity.calendarId">
@@ -157,7 +157,7 @@ under the License.
</add-error>
<check-errors/>
<else>
- <make-value value-field="newEntity" entity-name="TechDataCalendarExcDay"/>
+ <make-value entity-name="TechDataCalendarExcDay" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
@@ -168,7 +168,7 @@ under the License.
<simple-method method-name="updateCalendarExceptionDay" short-description="Update CalendarExceptionDay">
<check-permission permission="MANUFACTURING" action="_UPDATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcDay"/>
+ <make-value entity-name="TechDataCalendarExcDay" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarExcDay" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -178,7 +178,7 @@ under the License.
<simple-method method-name="removeCalendarExceptionDay" short-description="Remove CalendarExceptionDay">
<check-permission permission="MANUFACTURING" action="_DELETE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcDay"/>
+ <make-value entity-name="TechDataCalendarExcDay" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarExcDay" map="lookupPKMap" value-field="lookedUpValue"/>
<if-not-empty field="lookedUpValue.calendarId">
@@ -189,7 +189,7 @@ under the License.
<simple-method method-name="createCalendarExceptionWeek" short-description="Create Calendar Exception Week">
<check-permission permission="MANUFACTURING" action="_CREATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcWeek"/>
+ <make-value entity-name="TechDataCalendarExcWeek" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarExcWeek" map="lookupPKMap" value-field="newEntity"/>
<if-not-empty field="newEntity.calendarId">
@@ -198,7 +198,7 @@ under the License.
</add-error>
<check-errors/>
<else>
- <make-value value-field="newEntity" entity-name="TechDataCalendarExcWeek"/>
+ <make-value entity-name="TechDataCalendarExcWeek" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
@@ -209,7 +209,7 @@ under the License.
<simple-method method-name="updateCalendarExceptionWeek" short-description="Update Calendar Exception Week">
<check-permission permission="MANUFACTURING" action="_UPDATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcWeek"/>
+ <make-value entity-name="TechDataCalendarExcWeek" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarExcWeek" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -219,7 +219,7 @@ under the License.
<simple-method method-name="removeCalendarExceptionWeek" short-description="Remove CalendarExceptionWeek">
<check-permission permission="MANUFACTURING" action="_DELETE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcWeek"/>
+ <make-value entity-name="TechDataCalendarExcWeek" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="TechDataCalendarExcWeek" map="lookupPKMap" value-field="lookedUpValue"/>
<if-not-empty field="lookedUpValue.calendarId">

Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml Wed Aug 23 20:44:44 2017
@@ -401,7 +401,7 @@ under the License.
<field-map field-name="fromDate" from-field="parameters.fromDate"/>
</entity-and>
<if-empty field="webSiteContactList">
- <make-value value-field="webSiteContactList" entity-name="WebSiteContactList"/>
+ <make-value entity-name="WebSiteContactList" value-field="webSiteContactList"/>
<set-pk-fields value-field="webSiteContactList" map="parameters"/>
<set-nonpk-fields map="parameters" value-field="webSiteContactList"/>
<create-value value-field="webSiteContactList"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml Wed Aug 23 20:44:44 2017
@@ -24,7 +24,7 @@ under the License.
<simple-method method-name="createTrackingCodeType" short-description="Create an TrackingCodeType">
<now-timestamp field="nowStamp"/>

- <make-value value-field="newEntity" entity-name="TrackingCodeType"/>
+ <make-value entity-name="TrackingCodeType" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>

@@ -42,7 +42,7 @@ under the License.

<simple-method method-name="createTrackingCodeOrder" short-description="Create an TrackingCodeOrder">
<now-timestamp field="nowStamp"/>
- <make-value value-field="newEntity" entity-name="TrackingCodeOrder"/>
+ <make-value entity-name="TrackingCodeOrder" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>

@@ -68,7 +68,7 @@ under the License.

<simple-method method-name="createTrackingCodeOrderReturn" short-description="Create an TrackingCodeOrderReturn">
<now-timestamp field="nowStamp"/>
- <make-value value-field="newEntity" entity-name="TrackingCodeOrderReturn"/>
+ <make-value entity-name="TrackingCodeOrderReturn" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/minilang/opportunity/OpportunityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/minilang/opportunity/OpportunityServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/minilang/opportunity/OpportunityServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/minilang/opportunity/OpportunityServices.xml Wed Aug 23 20:44:44 2017
@@ -28,7 +28,7 @@ This file contains basic services for Sa
<simple-method method-name="createSalesForecast" short-description="Creates a sales forecast and stores a copy in sales forecast history.">


- <make-value value-field="salesForecast" entity-name="SalesForecast"/>
+ <make-value entity-name="SalesForecast" value-field="salesForecast"/>
<sequenced-id sequence-name="SalesForecast" field="salesForecastId"/>
<set field="salesForecast.salesForecastId" from-field="salesForecastId"/>
<set-nonpk-fields map="parameters" value-field="salesForecast"/>
@@ -65,7 +65,7 @@ This file contains basic services for Sa
<simple-method method-name="saveSalesForecastHistory" short-description="Given a salesForecast map, saves the data in the history.">


- <make-value value-field="salesForecastHistory" entity-name="SalesForecastHistory"/>
+ <make-value entity-name="SalesForecastHistory" value-field="salesForecastHistory"/>
<sequenced-id sequence-name="SalesForecastHistory" field="salesForecastHistoryId"/>
<set field="salesForecastHistory.salesForecastHistoryId" from-field="salesForecastHistoryId"/>
<set-nonpk-fields map="salesForecast" value-field="salesForecastHistory"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderReturnServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderReturnServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderReturnServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderReturnServices.xml Wed Aug 23 20:44:44 2017
@@ -78,7 +78,7 @@ under the License.
<set field="parameters.needsInventoryReceive" value="N"/>
</if-empty>

- <make-value value-field="newEntity" entity-name="ReturnHeader"/>
+ <make-value entity-name="ReturnHeader" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>


@@ -314,7 +314,7 @@ under the License.


<if-not-empty field="parameters.orderItemSeqId">
- <make-value value-field="itemLookup" entity-name="OrderItem"/>
+ <make-value entity-name="OrderItem" value-field="itemLookup"/>
<set-pk-fields map="parameters" value-field="itemLookup"/>
<if-not-empty field="parameters.orderItemSeqId">
<find-by-primary-key entity-name="OrderItem" value-field="orderItem" map="itemLookup"/>
@@ -377,7 +377,7 @@ under the License.
</else>
</if-compare>

- <make-value value-field="newEntity" entity-name="ReturnItem"/>
+ <make-value entity-name="ReturnItem" value-field="newEntity"/>
<set from-field="parameters.returnId" field="newEntity.returnId"/>
<make-next-seq-id seq-field-name="returnItemSeqId" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -491,7 +491,7 @@ under the License.
</if>
<check-errors/>

- <make-value value-field="newEntity" entity-name="ReturnAdjustment"/>
+ <make-value entity-name="ReturnAdjustment" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id sequence-name="ReturnAdjustment" field="newEntity.returnAdjustmentId"/>
<field-to-result field="newEntity.returnAdjustmentId" result-name="returnAdjustmentId"/>
@@ -907,7 +907,7 @@ under the License.
</simple-method>

<simple-method method-name="createReturnItemShipment" short-description="Create a ReturnItemShipment">
- <make-value value-field="newEntity" entity-name="ReturnItemShipment"/>
+ <make-value entity-name="ReturnItemShipment" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
@@ -1090,7 +1090,7 @@ under the License.
</simple-method>

<simple-method method-name="updateReturnContactMech" short-description="Update ReturnContactMech">
- <make-value value-field="returnContactMechMap" entity-name="ReturnContactMech"/>
+ <make-value entity-name="ReturnContactMech" value-field="returnContactMechMap"/>

<set-pk-fields map="parameters" value-field="returnContactMechMap"/>
<entity-one entity-name="ReturnHeader" value-field="returnHeader"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml Wed Aug 23 20:44:44 2017
@@ -507,7 +507,7 @@ under the License.
</check-permission>
<check-errors/>

- <make-value value-field="newEntity" entity-name="OrderHeader"/>
+ <make-value entity-name="OrderHeader" value-field="newEntity"/>

<if-not-empty field="parameters.orderId">
<set field="newEntity.orderId" from-field="parameters.orderId"/>
@@ -606,7 +606,7 @@ under the License.
<if-empty field="orderItemSeqId">


- <make-value value-field="newOrderItem" entity-name="OrderItem"/>
+ <make-value entity-name="OrderItem" value-field="newOrderItem"/>
<set field="newOrderItem.orderId" from-field="parameters.orderId"/>
<call-object-method obj-field="item" method-name="getItemType" ret-field="newOrderItem.orderItemTypeId"/>
<call-object-method obj-field="item" method-name="getSelectedAmount" ret-field="newOrderItem.selectedAmount"/>
@@ -679,7 +679,7 @@ under the License.
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateOrderContactMech"/>
</check-permission>
<check-errors/>
- <make-value value-field="orderContactMechMap" entity-name="OrderContactMech"/>
+ <make-value entity-name="OrderContactMech" value-field="orderContactMechMap"/>
<set-pk-fields map="parameters" value-field="orderContactMechMap"/>
<set from-field="parameters.orderId" field="inputMap.orderId"/>
<set from-field="parameters.contactMechPurposeTypeId" field="inputMap.contactMechPurposeTypeId"/>
@@ -722,7 +722,7 @@ under the License.
<fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateOrderItemShipGroup"/>
</check-permission>
<check-errors/>
- <make-value value-field="lookupPKMap" entity-name="OrderItemShipGroup"/>
+ <make-value entity-name="OrderItemShipGroup" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="OrderItemShipGroup" map="lookupPKMap" value-field="lookedUpValue"/>

- <make-value value-field="newEntity" entity-name="Quote"/>
+ <make-value entity-name="Quote" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.statusId">
<set value="QUO_CREATED" field="newEntity.statusId"/>
@@ -302,7 +302,7 @@ under the License.

<check-errors/>

- <make-value value-field="newEntity" entity-name="QuoteItem"/>
+ <make-value entity-name="QuoteItem" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>

<set from-field="parameters.quoteId" field="newEntity.quoteId"/>
@@ -447,7 +447,7 @@ under the License.
</check-permission>
<check-errors/>

- <make-value value-field="newEntity" entity-name="QuoteAttribute"/>
+ <make-value entity-name="QuoteAttribute" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
@@ -486,7 +486,7 @@ under the License.
</check-permission>
<check-errors/>

- <make-value value-field="newEntity" entity-name="QuoteCoefficient"/>
+ <make-value entity-name="QuoteCoefficient" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
@@ -534,8 +534,8 @@ under the License.
</if-empty>
<check-errors/>

- <make-value value-field="newQuote" entity-name="Quote"/>
- <make-value value-field="newQuoteItem" entity-name="QuoteItem"/>
+ <make-value entity-name="Quote" value-field="newQuote"/>
+ <make-value entity-name="QuoteItem" value-field="newQuoteItem"/>
<set-nonpk-fields map="parameters" value-field="newQuote"/>
<set-nonpk-fields map="parameters" value-field="newQuoteItem"/>
<if-empty field="newQuote.statusId">
@@ -561,7 +561,7 @@ under the License.
<create-value value-field="newQuote"/>
<create-value value-field="newQuoteItem"/>

- <make-value value-field="lookupRequestRole" entity-name="CustRequestParty"/>
+ <make-value entity-name="CustRequestParty" value-field="lookupRequestRole"/>
<set from-field="parameters.custRequestId" field="lookupRequestRole.custRequestId"/>
<find-by-and entity-name="CustRequestParty" map="lookupRequestRole" list="roles"/>
<iterate list="roles" entry="role">
@@ -691,7 +691,7 @@ under the License.
</check-permission>
<check-errors/>

- <make-value value-field="newEntity" entity-name="QuoteAdjustment"/>
+ <make-value entity-name="QuoteAdjustment" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>

<sequenced-id sequence-name="QuoteAdjustment" field="quoteAdjustmentId"/>
@@ -955,7 +955,7 @@ under the License.
</add-error>
</if-empty>
<check-errors/>
- <make-value value-field="newQuoteNote" entity-name="QuoteNote"/>
+ <make-value entity-name="QuoteNote" value-field="newQuoteNote"/>
<set field="newQuoteNote.quoteId" from-field="parameters.quoteId"/>
<set field="newQuoteNote.noteId" from-field="noteId"/>
<create-value value-field="newQuoteNote"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/minilang/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/minilang/request/CustRequestServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/minilang/request/CustRequestServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/minilang/request/CustRequestServices.xml Wed Aug 23 20:44:44 2017
@@ -49,7 +49,7 @@ under the License.
</simple-method>

<simple-method method-name="createCustRequest" short-description="Create Customer Request">
- <make-value value-field="newEntity" entity-name="CustRequest"/>
+ <make-value entity-name="CustRequest" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<now-timestamp field="newEntity.lastModifiedDate"/>

@@ -214,7 +214,7 @@ under the License.
</simple-method>

<simple-method method-name="createCustRequestAttribute" short-description="Create Customer Request Attribute">
- <make-value value-field="newEntity" entity-name="CustRequestAttribute"/>
+ <make-value entity-name="CustRequestAttribute" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
@@ -231,7 +231,7 @@ under the License.

<simple-method method-name="createCustRequestItem" short-description="Create Customer Request Item">
<call-simple-method method-name="checkStatusCustRequest"/>
- <make-value value-field="newEntity" entity-name="CustRequestItem"/>
+ <make-value entity-name="CustRequestItem" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="parameters.custRequestItemSeqId">
@@ -261,11 +261,11 @@ under the License.
<set from-field="parameters.roleTypeId" field="lookupPKMap.roleTypeId"/>
<find-by-primary-key entity-name="PartyRole" map="lookupPKMap" value-field="partyRole"/>
<if-empty field="partyRole.partyId">
- <make-value value-field="partyRole" entity-name="PartyRole"/>
+ <make-value entity-name="PartyRole" value-field="partyRole"/>
<set-pk-fields map="lookupPKMap" value-field="partyRole"/>
<create-value value-field="partyRole"/>
</if-empty>
- <make-value value-field="newEntity" entity-name="CustRequestParty"/>
+ <make-value entity-name="CustRequestParty" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
@@ -296,7 +296,7 @@ under the License.
<call-simple-method method-name="updateCustRequestLastModifiedDate"/>
</simple-method>
<simple-method method-name="createCustRequestNote" short-description="Create Customer Request Note">
- <make-value value-field="newEntity" entity-name="CustRequestNote"/>
+ <make-value entity-name="CustRequestNote" value-field="newEntity"/>
<set from-field="parameters.custRequestId" field="newEntity.custRequestId"/>
<set from-field="parameters.noteInfo" field="newNoteMap.note"/>
<call-service service-name="createNote" in-map-name="newNoteMap">
@@ -320,7 +320,7 @@ under the License.
</simple-method>
<simple-method method-name="createCustRequestItemNote" short-description="Create Customer RequestItem Note">
<call-simple-method method-name="checkStatusCustRequest"/>
- <make-value value-field="newEntity" entity-name="CustRequestItemNote"/>
+ <make-value entity-name="CustRequestItemNote" value-field="newEntity"/>
<set from-field="parameters.custRequestId" field="newEntity.custRequestId"/>
<set from-field="parameters.custRequestItemSeqId" field="newEntity.custRequestItemSeqId"/>
<set from-field="parameters.note" field="newNoteMap.note"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/minilang/requirement/RequirementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/minilang/requirement/RequirementServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/minilang/requirement/RequirementServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/minilang/requirement/RequirementServices.xml Wed Aug 23 20:44:44 2017
@@ -21,7 +21,7 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="createRequirement" short-description="Create a new requirement">
- <make-value value-field="newEntity" entity-name="Requirement"/>
+ <make-value entity-name="Requirement" value-field="newEntity"/>
<sequenced-id sequence-name="Requirement" field="requirementId"/>
<set field="newEntity.requirementId" from-field="requirementId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -38,7 +38,7 @@ under the License.
</simple-method>

<simple-method method-name="updateRequirement" short-description="Update a requirement">
- <make-value value-field="lookupPKMap" entity-name="Requirement"/>
+ <make-value entity-name="Requirement" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="Requirement" map="lookupPKMap" value-field="lookedUpValue"/>
<field-to-result field="lookedUpValue.statusId" result-name="oldStatusId"/>
@@ -58,14 +58,14 @@ under the License.
</simple-method>

<simple-method method-name="associateRequirementWithRequestItem" short-description="Associate a requirement and CustRequestItem">
- <make-value value-field="newEntity" entity-name="RequirementCustRequest"/>
+ <make-value entity-name="RequirementCustRequest" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>

<simple-method method-name="addTaskToRequirement" short-description="Add a task to a requirement">
- <make-value value-field="newEntity" entity-name="WorkRequirementFulfillment"/>
+ <make-value entity-name="WorkRequirementFulfillment" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -87,7 +87,7 @@ under the License.
<filter-list-by-date list="supplierProducts" valid-date="requirement.requiredByDate" from-field-name="availableFromDate" thru-field-name="availableThruDate"/>
<first-from-list list="supplierProducts" entry="supplierProduct"/>
<if-not-empty field="supplierProduct.partyId">
- <make-value value-field="requirementSupplier" entity-name="RequirementRole"/>
+ <make-value entity-name="RequirementRole" value-field="requirementSupplier"/>
<set field="requirementSupplier.requirementId" from-field="requirement.requirementId"/>
<set field="requirementSupplier.partyId" from-field="supplierProduct.partyId"/>
<set field="requirementSupplier.roleTypeId" value="SUPPLIER"/>
@@ -116,12 +116,12 @@ under the License.
<fail-property resource="OrderErrorUiLabels" property="OrderErrorCreatePermissionError"/>
</check-permission>
<check-errors/>
- <make-value value-field="partyRole" entity-name="PartyRole"/>
+ <make-value entity-name="PartyRole" value-field="partyRole"/>
<set-pk-fields map="lookupPKMap" value-field="partyRole"/>
<create-value value-field="partyRole"/>
</if-empty>

- <make-value value-field="newEntity" entity-name="RequirementRole"/>
+ <make-value entity-name="RequirementRole" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">

Modified: ofbiz/ofbiz-framework/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml Wed Aug 23 20:44:44 2017
@@ -37,7 +37,7 @@ under the License.
</if>
<check-errors/>

- <make-value value-field="newEntity" entity-name="ShoppingList"/>
+ <make-value entity-name="ShoppingList" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>

<if-empty field="newEntity.partyId">
@@ -141,7 +141,7 @@ under the License.
<add-error> <fail-property resource="ProductUiLabels" property="ProductErrorProductNotFound"/> </add-error>
<check-errors/>
</if-empty>
- <make-value value-field="newEntity" entity-name="ShoppingListItem"/>
+ <make-value entity-name="ShoppingListItem" value-field="newEntity"/>
<set from-field="parameters.shoppingListId" field="newEntity.shoppingListId"/>
<make-next-seq-id value-field="newEntity" seq-field-name="shoppingListItemSeqId" numeric-padding="5"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/party/minilang/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/minilang/communication/CommunicationEventServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/minilang/communication/CommunicationEventServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/minilang/communication/CommunicationEventServices.xml Wed Aug 23 20:44:44 2017
@@ -49,7 +49,7 @@ under the License.
</if-compare>

<if-empty field="newEntity">
- <make-value value-field="newEntity" entity-name="CommunicationEvent"/>
+ <make-value entity-name="CommunicationEvent" value-field="newEntity"/>
</if-empty>

<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -195,13 +195,13 @@ under the License.
</if-compare>

<if-not-empty field="parameters.productId">
- <make-value value-field="eventProduct" entity-name="CommunicationEventProduct"/>
+ <make-value entity-name="CommunicationEventProduct" value-field="eventProduct"/>
<set from-field="parameters.productId" field="eventProduct.productId"/>
<set from-field="newEntity.communicationEventId" field="eventProduct.communicationEventId"/>
<create-value value-field="eventProduct"/>
</if-not-empty>
<if-not-empty field="parameters.orderId">
- <make-value value-field="eventOrder" entity-name="CommunicationEventOrder"/>
+ <make-value entity-name="CommunicationEventOrder" value-field="eventOrder"/>
<set from-field="parameters.orderId" field="eventOrder.orderId"/>
<set from-field="newEntity.communicationEventId" field="eventOrder.communicationEventId"/>
<create-value value-field="eventOrder"/>
@@ -426,7 +426,7 @@ under the License.
<set field="partyRole.userLogin" from-field="sysUserLogin"/>
<call-service service-name="ensurePartyRole" in-map-name="partyRole" include-user-login="false"/>

- <make-value value-field="newEntity" entity-name="CommunicationEventRole"/>
+ <make-value entity-name="CommunicationEventRole" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.statusId">

Modified: ofbiz/ofbiz-framework/trunk/applications/party/minilang/contact/ContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/minilang/contact/ContactMechServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/minilang/contact/ContactMechServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/minilang/contact/ContactMechServices.xml Wed Aug 23 20:44:44 2017
@@ -21,7 +21,7 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="createContactMech" short-description="Create Contact Mechanism">
- <make-value value-field="newValue" entity-name="ContactMech"/>
+ <make-value entity-name="ContactMech" value-field="newValue"/>
<if-empty field="parameters.contactMechId">
<sequenced-id sequence-name="ContactMech" field="newValue.contactMechId"/>
<else>

Modified: ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartyServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartyServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartyServices.xml Wed Aug 23 20:44:44 2017
@@ -27,7 +27,7 @@ under the License.
<set field="parameters.partyId" from-field="userLogin.partyId"/>
</if-empty>

- <make-value value-field="partyNameHistory" entity-name="PartyNameHistory"/>
+ <make-value entity-name="PartyNameHistory" value-field="partyNameHistory"/>
<set-pk-fields value-field="partyNameHistory" map="parameters"/>
<now-timestamp field="partyNameHistory.changeDate"/>

@@ -203,7 +203,7 @@ under the License.

<entity-one entity-name="PartyProfileDefault" value-field="partyProfileDefault"/>
<if-empty field="partyProfileDefault">
- <make-value value-field="partyProfileDefault" entity-name="PartyProfileDefault"/>
+ <make-value entity-name="PartyProfileDefault" value-field="partyProfileDefault"/>
<set-pk-fields value-field="partyProfileDefault" map="parameters"/>
<create-value value-field="partyProfileDefault"/>
</if-empty>
@@ -279,7 +279,7 @@ under the License.
<set value="OWNER" field="contentRole.roleTypeId"/>
<call-service service-name="createContentRole" in-map-name="contentRole" break-on-error="false"/>

- <make-value value-field="partyRole" entity-name="PartyRole"/>
+ <make-value entity-name="PartyRole" value-field="partyRole"/>
<set-pk-fields value-field="partyRole" map="contentRole"/>
<find-by-and entity-name="PartyRole" map="partyRole" list="pRoles"/>
<if-empty field="pRoles">
@@ -811,7 +811,7 @@ under the License.
</entity-and>

<if-empty field="partyRels">
- <make-value value-field="newEntity" entity-name="PartyRelationship"/>
+ <make-value entity-name="PartyRelationship" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartySimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartySimpleEvents.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartySimpleEvents.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartySimpleEvents.xml Wed Aug 23 20:44:44 2017
@@ -124,7 +124,7 @@ under the License.
</call-service>

<now field="nowTimestamp"/>
- <make-value value-field="partyGeoPoint" entity-name="PartyGeoPoint"/>
+ <make-value entity-name="PartyGeoPoint" value-field="partyGeoPoint"/>
<set field="partyGeoPoint.partyId" from-field="parameters.partyId"/>
<set field="partyGeoPoint.geoPointId" from-field="geoPointId"/>
<set field="partyGeoPoint.fromDate" from-field="nowTimestamp"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartySimpleMethods.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartySimpleMethods.xml?rev=1805956&r1=1805955&r2=1805956&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartySimpleMethods.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/minilang/party/PartySimpleMethods.xml Wed Aug 23 20:44:44 2017
@@ -21,7 +21,7 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="updateAVSOverride" short-description="Create/Update The AVS Override String">
- <make-value value-field="lookupPKMap" entity-name="PartyIcsAvsOverride"/>
+ <make-value entity-name="PartyIcsAvsOverride" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="PartyIcsAvsOverride" map="lookupPKMap" value-field="lookedUpValue"/>
<if-not-empty field="lookedUpValue.partyId">
@@ -35,7 +35,7 @@ under the License.
</simple-method>

<simple-method method-name="deleteAVSOverride" short-description="Delete The AVS Override String">
- <make-value value-field="lookupPKMap" entity-name="PartyIcsAvsOverride"/>
+ <make-value entity-name="PartyIcsAvsOverride" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="PartyIcsAvsOverride" map="lookupPKMap" value-field="lookedUpValue"/>
<if-not-empty field="lookedUpValue.partyId">
@@ -79,7 +79,7 @@ under the License.
<if-not-empty field="lookupPKMap.partyId">
<find-by-primary-key entity-name="PartyRole" map="lookupPKMap" value-field="lookedUpValue" use-cache="true"/>
<if-empty field="lookedUpValue">
- <make-value value-field="partyRole" entity-name="PartyRole" map="lookupPKMap"/>
+ <make-value entity-name="PartyRole" value-field="partyRole" map="lookupPKMap"/>
<create-value value-field="partyRole"/>
</if-empty>
</if-not-empty>