svn commit: r1805957 - in /ofbiz/ofbiz-plugins/trunk: bi/minilang/ ebaystore/minilang/ projectmgr/minilang/ scrum/minilang/ webpos/minilang/

[nmalin]

Author: nmalin
Date: Wed Aug 23 20:45:25 2017
New Revision: 1805957

URL: http://svn.apache.org/viewvc?rev=1805957&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-plugins/trunk/bi/minilang/DimensionServices.xml
    ofbiz/ofbiz-plugins/trunk/bi/minilang/FactServices.xml
    ofbiz/ofbiz-plugins/trunk/ebaystore/minilang/EbayServices.xml
    ofbiz/ofbiz-plugins/trunk/projectmgr/minilang/ProjectServices.xml
    ofbiz/ofbiz-plugins/trunk/scrum/minilang/ScrumEvents.xml
    ofbiz/ofbiz-plugins/trunk/scrum/minilang/ScrumServices.xml
    ofbiz/ofbiz-plugins/trunk/webpos/minilang/ManagerEvents.xml

Modified: ofbiz/ofbiz-plugins/trunk/bi/minilang/DimensionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/bi/minilang/DimensionServices.xml?rev=1805957&r1=1805956&r2=1805957&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/bi/minilang/DimensionServices.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/bi/minilang/DimensionServices.xml Wed Aug 23 20:45:25 2017
@@ -91,7 +91,7 @@ under the License.
                     <store-value value-field="currencyDim"/>
                 </iterate>
             <else>
-                <make-value value-field="currencyDim" entity-name="CurrencyDimension"/>
+                <make-value entity-name="CurrencyDimension" value-field="currencyDim"/>
                 <sequenced-id sequence-name="CurrencyDimension" field="currencyDim.dimensionId"/>
                 <set field="currencyDim.currencyId" from-field="currency.uomId"/>
                 <set field="currencyDim.description" from-field="currency.description"/>
@@ -109,7 +109,7 @@ under the License.
             </add-error>
         </if-empty>
         <check-errors/>
-        <make-value value-field="productDimension" entity-name="ProductDimension"/>
+        <make-value entity-name="ProductDimension" value-field="productDimension"/>
         <set-nonpk-fields map="product" value-field="productDimension"/>
 
         <get-related-one value-field="product" relation-name="ProductType" to-value-field="productType"/>

Modified: ofbiz/ofbiz-plugins/trunk/bi/minilang/FactServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/bi/minilang/FactServices.xml?rev=1805957&r1=1805956&r2=1805957&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/bi/minilang/FactServices.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/bi/minilang/FactServices.xml Wed Aug 23 20:45:25 2017
@@ -683,7 +683,7 @@ under the License.
             <field-map field-name="inventoryItemId" from-field="parameters.inventoryItemId"/>
         </entity-one>
         <if-empty field="fact">
-            <make-value value-field="fact" entity-name="InventoryItemFact"/>
+            <make-value entity-name="InventoryItemFact" value-field="fact"/>
             <set field="fact.inventoryItemId" from-field="inventory.inventoryItemId"/>
             <!-- conversion of the inventory date -->
             <if-not-empty field="inventory.createdStamp">

Modified: ofbiz/ofbiz-plugins/trunk/ebaystore/minilang/EbayServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebaystore/minilang/EbayServices.xml?rev=1805957&r1=1805956&r2=1805957&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebaystore/minilang/EbayServices.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ebaystore/minilang/EbayServices.xml Wed Aug 23 20:45:25 2017
@@ -155,7 +155,7 @@
         </entity-one>
         <if-empty field="ebayProductStoreInventory">
             <!-- add new reserved product  -->
-            <make-value value-field="newEbayProductStoreInven" entity-name="EbayProductStoreInventory"/>
+            <make-value entity-name="EbayProductStoreInventory" value-field="newEbayProductStoreInven"/>
             <set field="newEbayProductStoreInven.productStoreId" from-field="parameters.productStoreId"/>
             <set field="newEbayProductStoreInven.facilityId" from-field="parameters.facilityId"/>
             <set field="newEbayProductStoreInven.productId" from-field="parameters.productId"/>

Modified: ofbiz/ofbiz-plugins/trunk/projectmgr/minilang/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/projectmgr/minilang/ProjectServices.xml?rev=1805957&r1=1805956&r2=1805957&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/projectmgr/minilang/ProjectServices.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/projectmgr/minilang/ProjectServices.xml Wed Aug 23 20:45:25 2017
@@ -148,7 +148,7 @@
                 </or>
             </condition>
             <then>
-                <make-value value-field="workEffortPartyAssignment" entity-name="WorkEffortPartyAssignment"/>
+                <make-value entity-name="WorkEffortPartyAssignment" value-field="workEffortPartyAssignment"/>
                 <set field="workEffortPartyAssignment.workEffortId" from-field="parameters.workEffortId"/>
                 <set field="workEffortPartyAssignment.partyId" from-field="updProjectRole.newPartyId"/>
                 <set field="workEffortPartyAssignment.roleTypeId" from-field="updProjectRole.roleTypeId"/>
@@ -236,7 +236,7 @@
                 <now-timestamp field="workEffortPartyAssignment.thruDate"/>
                 <store-value value-field="workEffortPartyAssignment"/>
                 <!-- create a new one -->
-                <make-value value-field="newAssign" entity-name="WorkEffortPartyAssignment"/>
+                <make-value entity-name="WorkEffortPartyAssignment" value-field="newAssign"/>
                 <set field="newAssign.workEffortId" from-field="parameters.workEffortId"/>
                 <set field="newAssign.partyId" from-field="parameters.newPartyId"/>
                 <set field="newAssign.roleTypeId" from-field="parameters.newRoleTypeId"/>
@@ -1546,7 +1546,7 @@
                 <set field="addAssign.workEffortId" from-field="parameters.workEffortId"/>
                 <set field="addAssign.statusId" value="PAS_ASSIGNED"/>
                 <iterate list="assigns" entry="assign">
-                    <make-value value-field="newAssign" entity-name="WorkEffortPartyAssignment"/>
+                    <make-value entity-name="WorkEffortPartyAssignment" value-field="newAssign"/>
                     <set field="newAssign.workEffortId" from-field="parameters.workEffortId"/>
                     <set field="newAssign.partyId" from-field="assign.partyId"/>
                     <set field="newAssign.roleTypeId" from-field="assign.roleTypeId"/>

Modified: ofbiz/ofbiz-plugins/trunk/scrum/minilang/ScrumEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/minilang/ScrumEvents.xml?rev=1805957&r1=1805956&r2=1805957&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/scrum/minilang/ScrumEvents.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/scrum/minilang/ScrumEvents.xml Wed Aug 23 20:45:25 2017
@@ -117,7 +117,7 @@
                      <field-map field-name="workEffortId" from-field="parameters.projectId"/>
                 </entity-and>
                 <first-from-list list="workEffortList" entry="workEffortMap"/>
-                <make-value value-field="backlogMeeting" entity-name="CustRequest"/>
+                <make-value entity-name="CustRequest" value-field="backlogMeeting"/>
                 <sequenced-id sequence-name="CustRequest" field="custRequestId"/>
                 <set field="backlogMeeting.custRequestId" from-field="custRequestId"/>
                 <set field="backlogMeeting.custRequestTypeId" value="RF_SCRUM_MEETINGS"/>
@@ -460,7 +460,7 @@
                 <field-to-request field="workEffortId" request-name="projectId"/>
                 <log level="info" message="Creating new project, projectId=${workEffortId}"/>
                 <!-- Create workeffort associate with product -->
-                <make-value value-field="goodStandardMap" entity-name="WorkEffortGoodStandard"/>
+                <make-value entity-name="WorkEffortGoodStandard" value-field="goodStandardMap"/>
                 <set field="goodStandardMap.workEffortId" from-field="workEffortId"/>
                 <set field="goodStandardMap.productId" from-field="parameters.productId"/>
                 <set field="goodStandardMap.workEffortGoodStdTypeId" value="SCRUM_PRO_WORKEFF"/>
@@ -469,7 +469,7 @@
                 <create-value value-field="goodStandardMap"/>
                 <!-- Create project billed options -->
                 <if-not-empty field="parameters.billed">
-                    <make-value value-field="workEffortAttMap" entity-name="WorkEffortAttribute"/>
+                    <make-value entity-name="WorkEffortAttribute" value-field="workEffortAttMap"/>
                     <set field="workEffortAttMap.workEffortId" from-field="workEffortId"/>
                     <set field="workEffortAttMap.attrName" value="PROJECT_BILLED"/>
                     <set field="workEffortAttMap.attrValue" from-field="parameters.billed"/>
@@ -530,7 +530,7 @@
                     <remove-list list="workEffGSDList"/>
                 </if-not-empty>
                 <!-- create old workeffort associate with product -->
-                <make-value value-field="goodStandardMap" entity-name="WorkEffortGoodStandard"/>
+                <make-value entity-name="WorkEffortGoodStandard" value-field="goodStandardMap"/>
                 <set field="goodStandardMap.workEffortId" from-field="parameters.workEffortId"/>
                 <set field="goodStandardMap.productId" from-field="parameters.productId"/>
                 <set field="goodStandardMap.workEffortGoodStdTypeId" value="SCRUM_PRO_WORKEFF"/>
@@ -546,7 +546,7 @@
                     <set field="workEffortAttMap.attrValue" from-field="parameters.billed"/>
                     <store-value value-field="workEffortAttMap"/>
                     <else>
-                        <make-value value-field="workEffortAttMap" entity-name="WorkEffortAttribute"/>
+                        <make-value entity-name="WorkEffortAttribute" value-field="workEffortAttMap"/>
                         <set field="workEffortAttMap.workEffortId" from-field="parameters.workEffortId"/>
                         <set field="workEffortAttMap.attrName" value="PROJECT_BILLED"/>
                         <set field="workEffortAttMap.attrValue" from-field="parameters.billed"/>
@@ -596,7 +596,7 @@
         <remove-by-and entity-name="CustRequestItemNote" map="custRequestItemCtx"/>
         <remove-by-and entity-name="CustRequestItemWorkEffort" map="custRequestItemCtx"/>
         
-        <make-value value-field="deleteCustRequestItem" entity-name="CustRequestItem"/>
+        <make-value entity-name="CustRequestItem" value-field="deleteCustRequestItem"/>
         <set-pk-fields value-field="deleteCustRequestItem" map="parameters"/>
         <set-nonpk-fields map="parameters" value-field="deleteCustRequestItem"/>
         <remove-value value-field="deleteCustRequestItem"/>
@@ -1015,7 +1015,7 @@
                     <call-service service-name="createNote" in-map-name="newNoteMap">
                         <result-to-field result-name="noteId" field="noteId"/>
                     </call-service>
-                    <make-value value-field="newEntity" entity-name="CustRequestNote"/>
+                    <make-value entity-name="CustRequestNote" value-field="newEntity"/>
                     <set from-field="custRequestId" field="newEntity.custRequestId"/>
                     <set from-field="noteId" field="newEntity.noteId"/>
                     <create-value value-field="newEntity"/>
@@ -1605,7 +1605,7 @@
             </condition>
             <then>
                 <entity-one entity-name="Product" value-field="product"/>
-                <make-value value-field="product" entity-name="Product"/>
+                <make-value entity-name="Product" value-field="product"/>
                 <set field="product.productId" from-field="parameters.productId"/>
                 <set field="product.productTypeId" value="SCRUM_ITEM"/>
                 <!--<remove-related relation-name="CustRequestItem" value-field="product"/>-->
@@ -1671,7 +1671,7 @@
                 <if-empty field="custRequestNoteViews">
                     <!-- create CustRequestNote -->
                     <if-not-empty field="parameters.noteInfo">
-                        <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 field="newNoteMap.note" from-field="parameters.noteInfo"/>
                         <set field="newNoteMap.noteName" value="How to test"/>
@@ -1749,12 +1749,12 @@
                 <field-map field-name="roleTypeId" value="PRODUCT_OWNER"/>
             </entity-one>
             <if-empty field="partyRoles">
-                <make-value value-field="partyRole" entity-name="PartyRole"/>
+                <make-value entity-name="PartyRole" value-field="partyRole"/>
                 <set field="partyRole.partyId" value="${parameters.partyId}"/>
                 <set field="partyRole.roleTypeId" value="PRODUCT_OWNER"/>
                 <create-value value-field="partyRole"/>
             </if-empty>
-            <make-value value-field="productRole" entity-name="ProductRole" />
+            <make-value entity-name="ProductRole" value-field="productRole"/>
             <set field="productRole.productId" from-field="parameters.productId" />
                 <set field="productRole.partyId" value="${parameters.partyId}"/>
             <set field="productRole.roleTypeId" value="PRODUCT_OWNER"/>
@@ -1766,12 +1766,12 @@
                 <field-map field-name="roleTypeId" value="PRODUCT_OWNER_COMP"/>
             </entity-one>
             <if-empty field="partyRoles">
-                <make-value value-field="partyRole" entity-name="PartyRole"/>
+                <make-value entity-name="PartyRole" value-field="partyRole"/>
                 <set field="partyRole.partyId" value="${companyId}"/>
                 <set field="partyRole.roleTypeId" value="PRODUCT_OWNER_COMP"/>
                 <create-value value-field="partyRole"/>
             </if-empty>
-            <make-value value-field="productRole" entity-name="ProductRole" />
+            <make-value entity-name="ProductRole" value-field="productRole"/>
             <set field="productRole.productId" from-field="parameters.productId" />
             <set field="productRole.partyId" value="${companyId}"/>
             <set field="productRole.roleTypeId" value="PRODUCT_OWNER_COMP"/>
@@ -1828,7 +1828,7 @@
                             <field-map field-name="roleTypeId" value="PRODUCT_OWNER_COMP"/>
                         </entity-and>  
                         <if-empty field="partyRoleList">
-                            <make-value value-field="partyRole" entity-name="PartyRole"/>
+                            <make-value entity-name="PartyRole" value-field="partyRole"/>
                             <set field="partyRole.partyId" value="${companyId}"/>
                             <set field="partyRole.roleTypeId" value="PRODUCT_OWNER_COMP"/>
                             <create-value value-field="partyRole"/>
@@ -1836,7 +1836,7 @@
                         <call-class-method class-name="org.apache.ofbiz.base.util.UtilDateTime" method-name="getDayStart" ret-field="formDate">
                             <field field="nowTimestamp" type="java.sql.Timestamp"/>
                         </call-class-method>
-                        <make-value value-field="productRole" entity-name="ProductRole" />
+                        <make-value entity-name="ProductRole" value-field="productRole"/>
                         <set field="productRole.productId" from-field="parameters.productId" />
                         <set field="productRole.partyId" value="${companyId}"/>
                         <set field="productRole.roleTypeId" value="PRODUCT_OWNER_COMP"/>
@@ -1879,7 +1879,7 @@
                             <field-map field-name="roleTypeId" value="PRODUCT_OWNER_COMP"/>
                         </entity-and>
                         <if-empty field="productCompList">
-                            <make-value value-field="productComp" entity-name="ProductRole" />
+                            <make-value entity-name="ProductRole" value-field="productComp"/>
                             <set field="productComp.productId" from-field="parameters.productId" />
                             <set field="productComp.partyId" value="${companyId}"/>
                             <set field="productComp.roleTypeId" value="PRODUCT_OWNER_COMP"/>
@@ -1954,7 +1954,7 @@
                 </call-class-method>
     
                 <if-not-empty field="parameters.noteInfo1">
-                    <make-value value-field="noteData" entity-name="NoteData"/>
+                    <make-value entity-name="NoteData" value-field="noteData"/>
                     <sequenced-id sequence-name="NoteData" field="noteId"/>
                     <set field="noteData.noteId" from-field="noteId"/>
                     <set field="noteData.noteName" from-field="parameters.noteName1"/>
@@ -1963,16 +1963,16 @@
                     <set field="noteData.noteDateTime" from-field="noteDateTime" type="Timestamp"/>
                     <create-value value-field="noteData"/>
                     
-                    <make-value value-field="newWorkEffortNote" entity-name="WorkEffortNote"/>
+                    <make-value entity-name="WorkEffortNote" value-field="newWorkEffortNote"/>
                     <set from-field="noteId" field="newWorkEffortNote.noteId"/>
                     <set from-field="parameters.workEffortId" field="newWorkEffortNote.workEffortId"/>
                     <create-value value-field="newWorkEffortNote"/>
                     
-                    <make-value value-field="noteData" entity-name="NoteData"/>
+                    <make-value entity-name="NoteData" value-field="noteData"/>
                 </if-not-empty>
                 
                 <if-not-empty field="parameters.noteInfo2">
-                    <make-value value-field="noteData" entity-name="NoteData"/>
+                    <make-value entity-name="NoteData" value-field="noteData"/>
                     <sequenced-id sequence-name="NoteData" field="noteId"/>
                     <set field="noteData.noteId" from-field="noteId"/>
                     <set field="noteData.noteName" from-field="parameters.noteName2"/>
@@ -1981,16 +1981,16 @@
                     <set field="noteData.noteDateTime" from-field="noteDateTime" type="Timestamp"/>
                     <create-value value-field="noteData"/>
                     
-                    <make-value value-field="newWorkEffortNote" entity-name="WorkEffortNote"/>
+                    <make-value entity-name="WorkEffortNote" value-field="newWorkEffortNote"/>
                     <set from-field="noteId" field="newWorkEffortNote.noteId"/>
                     <set from-field="parameters.workEffortId" field="newWorkEffortNote.workEffortId"/>
                     <create-value value-field="newWorkEffortNote"/>
                     
-                    <make-value value-field="noteData" entity-name="NoteData"/>
+                    <make-value entity-name="NoteData" value-field="noteData"/>
                 </if-not-empty>
                 
                 <if-not-empty field="parameters.noteInfo3">
-                    <make-value value-field="noteData" entity-name="NoteData"/>
+                    <make-value entity-name="NoteData" value-field="noteData"/>
                     <sequenced-id sequence-name="NoteData" field="noteId"/>
                     <set field="noteData.noteId" from-field="noteId"/>
                     <set field="noteData.noteName" from-field="parameters.noteName3"/>
@@ -1999,12 +1999,12 @@
                     <set field="noteData.noteDateTime" from-field="noteDateTime" type="Timestamp"/>
                     <create-value value-field="noteData"/>
                     
-                    <make-value value-field="newWorkEffortNote" entity-name="WorkEffortNote"/>
+                    <make-value entity-name="WorkEffortNote" value-field="newWorkEffortNote"/>
                     <set from-field="noteId" field="newWorkEffortNote.noteId"/>
                     <set from-field="parameters.workEffortId" field="newWorkEffortNote.workEffortId"/>
                     <create-value value-field="newWorkEffortNote"/>
                     
-                    <make-value value-field="noteData" entity-name="NoteData"/>
+                    <make-value entity-name="NoteData" value-field="noteData"/>
                 </if-not-empty>
                 <field-to-request field="parameters.workEffortId" request-name="projectId"/>
             </then>
@@ -2176,7 +2176,7 @@
             <call-service service-name="createNote" in-map-name="newNoteMap">
                 <result-to-field result-name="noteId" field="noteId"/>
             </call-service>
-            <make-value value-field="newEntity" entity-name="WorkEffortNote"/>
+            <make-value entity-name="WorkEffortNote" value-field="newEntity"/>
             <set field="newEntity.workEffortId" from-field="parameters.workEffortId" />
             <set field="newEntity.noteId" from-field="noteId" />
             <set field="newEntity.internalNote" value="Y"/>
@@ -2392,7 +2392,7 @@
                             </if-compare>
                         </iterate>
                     </if-not-empty>
-                    <make-value value-field="custRequestMap" entity-name="CustRequest"/>
+                    <make-value entity-name="CustRequest" value-field="custRequestMap"/>
                     <set field="custRequestMap.custRequestId" from-field="formInput.formInput.custRequestId"/>
                     <set field="custRequestMap.custRequestTypeId" value="RF_UNPLAN_BACKLOG"/>
                     <store-value value-field="custRequestMap"/>
@@ -2653,7 +2653,7 @@
                    <result-to-field result-name="workEffortId"/>
                 </call-service>
                 <if-compare field="parameters.workEffortPurposeTypeId" operator="not-equals" value="SYSTEM_DEFAULT_TASK" >
-                    <make-value value-field="goodStandardMap" entity-name="WorkEffortGoodStandard"/>
+                    <make-value entity-name="WorkEffortGoodStandard" value-field="goodStandardMap"/>
                     <set field="goodStandardMap.workEffortId" from-field="workEffortId"/>
                     <set field="goodStandardMap.productId" from-field="parameters.productId"/>
                     <set field="goodStandardMap.workEffortGoodStdTypeId" value="SCRUM_PRO_WORKEFF"/>
@@ -2971,7 +2971,7 @@
             <call-service service-name="createNote" in-map-name="newNoteMap">
                 <result-to-field result-name="noteId" field="noteId"/>
             </call-service>
-            <make-value value-field="newEntity" entity-name="CustRequestNote"/>
+            <make-value entity-name="CustRequestNote" value-field="newEntity"/>
             <set field="newEntity.custRequestId" from-field="parameters.custRequestId" />
             <set field="newEntity.noteId" from-field="noteId" />
             <create-value value-field="newEntity"/>
@@ -3603,7 +3603,7 @@
                     <call-service service-name="createNote" in-map-name="newNoteMap">
                         <result-to-field result-name="noteId" field="noteId"/>
                     </call-service>
-                    <make-value value-field="newEntity" entity-name="CustRequestNote"/>
+                    <make-value entity-name="CustRequestNote" value-field="newEntity"/>
                     <set from-field="custRequestId" field="newEntity.custRequestId"/>
                     <set from-field="noteId" field="newEntity.noteId"/>
                     <log level="always" message=">>>>>>>>>>>>>>>>>> newEntity : ${newEntity}"></log>
@@ -4321,13 +4321,13 @@
                 <field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/>
             </entity-and>  
             <if-empty field="partyRoleList">
-                <make-value value-field="partyRole" entity-name="PartyRole"/>
+                <make-value entity-name="PartyRole" value-field="partyRole"/>
                 <set field="partyRole.partyId" from-field="parameters.partyId"/>
                 <set field="partyRole.roleTypeId" from-field="parameters.roleTypeId"/>
                 <create-value value-field="partyRole"/>
             </if-empty>
             <now-timestamp field="nowTimestamp"/>
-            <make-value value-field="productRoleMap" entity-name="ProductRole" />
+            <make-value entity-name="ProductRole" value-field="productRoleMap"/>
             <set field="productRoleMap.productId" from-field="parameters.productId" />
             <set field="productRoleMap.partyId" from-field="parameters.partyId"/>
             <set field="productRoleMap.roleTypeId" from-field="parameters.roleTypeId"/>

Modified: ofbiz/ofbiz-plugins/trunk/scrum/minilang/ScrumServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/minilang/ScrumServices.xml?rev=1805957&r1=1805956&r2=1805957&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/scrum/minilang/ScrumServices.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/scrum/minilang/ScrumServices.xml Wed Aug 23 20:45:25 2017
@@ -1141,7 +1141,7 @@
                 <now-timestamp field="workEffortPartyAssignment.thruDate" />
                 <store-value value-field="workEffortPartyAssignment" />
                 <!-- create a new one -->
-                <make-value value-field="newAssign" entity-name="WorkEffortPartyAssignment" />
+                <make-value entity-name="WorkEffortPartyAssignment" value-field="newAssign"/>
                 <set field="newAssign.workEffortId" from-field="parameters.workEffortId" />
                 <set field="newAssign.partyId" from-field="parameters.newPartyId" />
                 <set field="newAssign.roleTypeId" from-field="parameters.newRoleTypeId" />

Modified: ofbiz/ofbiz-plugins/trunk/webpos/minilang/ManagerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/webpos/minilang/ManagerEvents.xml?rev=1805957&r1=1805956&r2=1805957&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/webpos/minilang/ManagerEvents.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/webpos/minilang/ManagerEvents.xml Wed Aug 23 20:45:25 2017
@@ -45,7 +45,7 @@ under the License.
                         <add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerOpenTerminalDrawingAmountNotValid"/></add-error>
                         <check-errors/>
                     <else>
-                        <make-value value-field="terminalState" entity-name="PosTerminalState"/>
+                        <make-value entity-name="PosTerminalState" value-field="terminalState"/>
                         <call-object-method obj-field="webPosSession" method-name="getId" ret-field="terminalState.posTerminalId"/>
                         <call-class-method class-name="org.apache.ofbiz.base.util.UtilDateTime" method-name="nowTimestamp" ret-field="terminalState.openedDate"/>
                         <call-object-method obj-field="webPosSession" method-name="getUserLoginId" ret-field="terminalState.openedByUserLoginId"/>
@@ -310,7 +310,7 @@ under the License.
                         </simple-map-processor>
                     </call-map-processor>
                     <if-not-empty field="context.amountInOut">
-                        <make-value value-field="internTx" entity-name="PosTerminalInternTx"/>
+                        <make-value entity-name="PosTerminalInternTx" value-field="internTx"/>
                         <call-object-method obj-field="webPosTransaction" method-name="getTerminalLogId" ret-field="internTx.posTerminalLogId"/>
                         <set field="internTx.paidAmount" from-field="context.amountInOut" type="BigDecimal"/>
                         <set field="internTx.reasonComment" from-field="parameters.reasonCommentInOut"/>