svn commit: r1768222 [4/8] - in /ofbiz/trunk: applications/accounting/minilang/ applications/accounting/minilang/admin/ applications/accounting/minilang/budget/ applications/accounting/minilang/finaccount/ applications/accounting/minilang/invoice/ appl...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1768222 [4/8] - in /ofbiz/trunk: applications/accounting/minilang/ applications/accounting/minilang/admin/ applications/accounting/minilang/budget/ applications/accounting/minilang/finaccount/ applications/accounting/minilang/invoice/ appl...

diveshdutta
Modified: ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml Sat Nov  5 14:34:00 2016
@@ -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>
         <!-- create new entity and create all the fields -->
-        <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/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml Sat Nov  5 14:34:00 2016
@@ -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/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sat Nov  5 14:34:00 2016
@@ -1291,7 +1291,7 @@ under the License.
 
     <request-map uri="deleteCustRequestContent">
         <security auth="true" https="true"/>
-        <event invoke="deleteCustRequestContent" type="service"/>
+        <event type="service" invoke="deleteCustRequestContent"/>
         <response name="success" type="request-redirect" value="EditCustRequestContent"><redirect-parameter name="custRequestId"/></response>
         <response name="error" type="view" value="EditCustRequestContent"/>
     </request-map>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml Sat Nov  5 14:34:00 2016
@@ -274,15 +274,15 @@ under the License.
         </field>
         <field name="priority">
             <drop-down allow-empty="true">
-                <option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/>
-                <option key="2" description="${uiLabelMap.WorkEffortPriorityTwo}"/>
-                <option key="3" description="${uiLabelMap.WorkEffortPriorityThree}"/>
-                <option key="4" description="${uiLabelMap.WorkEffortPriorityFour}"/>
-                <option key="5" description="${uiLabelMap.WorkEffortPriorityFive}"/>
-                <option key="6" description="${uiLabelMap.WorkEffortPrioritySix}"/>
-                <option key="7" description="${uiLabelMap.WorkEffortPrioritySeventh}"/>
-                <option key="8" description="${uiLabelMap.WorkEffortPriorityEight}"/>
-                <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/>
+                <option key="${uiLabelMap.WorkEffortPriorityOne}" description="1"/>
+                <option key="${uiLabelMap.WorkEffortPriorityTwo}" description="2"/>
+                <option key="${uiLabelMap.WorkEffortPriorityThree}" description="3"/>
+                <option key="${uiLabelMap.WorkEffortPriorityFour}" description="4"/>
+                <option key="${uiLabelMap.WorkEffortPriorityFive}" description="5"/>
+                <option key="${uiLabelMap.WorkEffortPrioritySix}" description="6"/>
+                <option key="${uiLabelMap.WorkEffortPrioritySeventh}" description="7"/>
+                <option key="${uiLabelMap.WorkEffortPriorityEight}" description="8"/>
+                <option key="${uiLabelMap.WorkEffortPriorityNine}" description="9"/>
             </drop-down>
         </field>
         <field name="story" use-when="custRequest==null" encode-output="false"><textarea cols="60" rows="12" default-value="${communicationEvent.content}"/></field>
@@ -488,10 +488,10 @@ under the License.
         <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
             <drop-down allow-empty="false">
-                <option key="REQ_REQUESTER" description="${uiLabelMap.WorkEffortRequestingParty}"/>
-                <option key="AGENT" description="${uiLabelMap.OrderAgent}"/>
-                <option key="REQ_TAKER" description="${uiLabelMap.WorkEffortRequestTaker}"/>
-                <option key="REQ_MANAGER" description="${uiLabelMap.WorkEffortRequestManager}"/>
+                <option key="${uiLabelMap.WorkEffortRequestingParty}" description="REQ_REQUESTER"/>
+                <option key="${uiLabelMap.OrderAgent}" description="AGENT"/>
+                <option key="${uiLabelMap.WorkEffortRequestTaker}" description="REQ_TAKER"/>
+                <option key="${uiLabelMap.WorkEffortRequestManager}" description="REQ_MANAGER"/>
             </drop-down>
         </field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time default-value="${nowTimestamp}"/></field>
@@ -651,12 +651,12 @@ under the License.
     <form name="EditCustReqStatusId" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml">
         <field name="statusGroup">
             <drop-down>
-                <option key="OPEN" description="Open"/>
-                <option key="COMPLETED" description="Completed"/>
-                <option key="CANCELLED" description="Cancelled"/>
+                <option key="Open" description="OPEN"/>
+                <option key="Completed" description="COMPLETED"/>
+                <option key="Cancelled" description="CANCELLED"/>
             </drop-down>
         </field>
-        <field name="otherContacts"><drop-down allow-empty="false"><option key="Y" description="Yes"/><option key="N" description="No"/></drop-down></field>
+        <field name="otherContacts"><drop-down allow-empty="false"><option key="Yes" description="Y"/><option key="No" description="N"/></drop-down></field>
         <field name="saveButton"><submit/></field>
     </form>
     <form name="ListCustRequests" type="list"  list-name="custRequests" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" target="updaterequest">
@@ -701,15 +701,15 @@ under the License.
         <field name="statusId"><display-entity entity-name="StatusItem"/></field>
         <field name="priority" use-when="!statusId.equals(&quot;CRQ_COMPLETED&quot;)">
             <drop-down allow-empty="true">
-                <option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/>
-                <option key="2" description="${uiLabelMap.WorkEffortPriorityTwo}"/>
-                <option key="3" description="${uiLabelMap.WorkEffortPriorityThree}"/>
-                <option key="4" description="${uiLabelMap.WorkEffortPriorityFour}"/>
-                <option key="5" description="${uiLabelMap.WorkEffortPriorityFive}"/>
-                <option key="6" description="${uiLabelMap.WorkEffortPrioritySix}"/>
-                <option key="7" description="${uiLabelMap.WorkEffortPrioritySeventh}"/>
-                <option key="8" description="${uiLabelMap.WorkEffortPriorityEight}"/>
-                <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/>
+                <option key="${uiLabelMap.WorkEffortPriorityOne}" description="1"/>
+                <option key="${uiLabelMap.WorkEffortPriorityTwo}" description="2"/>
+                <option key="${uiLabelMap.WorkEffortPriorityThree}" description="3"/>
+                <option key="${uiLabelMap.WorkEffortPriorityFour}" description="4"/>
+                <option key="${uiLabelMap.WorkEffortPriorityFive}" description="5"/>
+                <option key="${uiLabelMap.WorkEffortPrioritySix}" description="6"/>
+                <option key="${uiLabelMap.WorkEffortPrioritySeventh}" description="7"/>
+                <option key="${uiLabelMap.WorkEffortPriorityEight}" description="8"/>
+                <option key="${uiLabelMap.WorkEffortPriorityNine}" description="9"/>
             </drop-down>
         </field>
         <field name="priority" use-when="statusId.equals(&quot;CRQ_COMPLETED&quot;)"><display/></field>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml Sat Nov  5 14:34:00 2016
@@ -206,10 +206,10 @@ under the License.
         </field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <option key="REQ_REQUESTER" description="${uiLabelMap.WorkEffortRequestingParty}"/>
-                <option key="AGENT" description="${uiLabelMap.OrderAgent}"/>
-                <option key="REQ_TAKER" description="${uiLabelMap.WorkEffortRequestTaker}"/>
-                <option key="REQ_MANAGER" description="${uiLabelMap.WorkEffortRequestManager}"/>
+                <option key="${uiLabelMap.WorkEffortRequestingParty}" description="REQ_REQUESTER"/>
+                <option key="${uiLabelMap.OrderAgent}" description="AGENT"/>
+                <option key="${uiLabelMap.WorkEffortRequestTaker}" description="REQ_TAKER"/>
+                <option key="${uiLabelMap.WorkEffortRequestManager}" description="REQ_MANAGER"/>
             </drop-down>
         </field>
         <!--
@@ -398,8 +398,8 @@ under the License.
         <!--
         <field name="isPromo" title="${uiLabelMap.OrderOrderIsPromo}">
             <drop-down allow-empty="true">
-                <option key="N" description="${uiLabelMap.CommonN}"/>
-                <option key="Y" description="${uiLabelMap.CommonY}"/>
+                <option key="${uiLabelMap.CommonN}" description="N"/>
+                <option key="${uiLabelMap.CommonY}" description="Y"/>
             </drop-down>
         </field>
          -->

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml Sat Nov  5 14:34:00 2016
@@ -188,22 +188,22 @@ under the License.
     <form name="EditOrderByCustomer" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml">
         <field name="statusId">
             <drop-down>
-                <option key="ORDER_CREATED" description="${uiLabelMap.CommonCreated}"/>
-                <option key="ORDER_PROCESSING" description="${uiLabelMap.CommonProcessing}"/>
-                <option key="ORDER_APPROVED" description="${uiLabelMap.CommonApproved}"/>
-                <option key="ORDER_SENT" description="${uiLabelMap.CommonSent}"/>
-                <option key="ORDER_HELD" description="${uiLabelMap.CommonHeld}"/>
-                <option key="ORDER_COMPLETED" description="${uiLabelMap.CommonCompleted}"/>
-                <option key="ORDER_REJECTED" description="${uiLabelMap.CommonRejected}"/>
-                <option key="ORDER_CANDELLED" description="${uiLabelMap.CommonCancelled}"/>
+                <option key="${uiLabelMap.CommonCreated}" description="ORDER_CREATED"/>
+                <option key="${uiLabelMap.CommonProcessing}" description="ORDER_PROCESSING"/>
+                <option key="${uiLabelMap.CommonApproved}" description="ORDER_APPROVED"/>
+                <option key="${uiLabelMap.CommonSent}" description="ORDER_SENT"/>
+                <option key="${uiLabelMap.CommonHeld}" description="ORDER_HELD"/>
+                <option key="${uiLabelMap.CommonCompleted}" description="ORDER_COMPLETED"/>
+                <option key="${uiLabelMap.CommonRejected}" description="ORDER_REJECTED"/>
+                <option key="${uiLabelMap.CommonCancelled}" description="ORDER_CANDELLED"/>
             </drop-down>
         </field>
         <field name="roleTypeId">
             <drop-down>
-                <option key="PLACING_CUSTOMER" description="${uiLabelMap.MyPortalPlacingCustomer}"/>
-                <option key="SHIP_TO_CUSTOMER" description="${uiLabelMap.MyPortalShipToCustomer}"/>
-                <option key="END_USER_CUSTOMER" description="${uiLabelMap.MyPortalEndUserCustomer}"/>
-                <option key="BILL_TO_CUSTOMER" description="${uiLabelMap.MyPortalBillToCustomer}"/>
+                <option key="${uiLabelMap.MyPortalPlacingCustomer}" description="PLACING_CUSTOMER"/>
+                <option key="${uiLabelMap.MyPortalShipToCustomer}" description="SHIP_TO_CUSTOMER"/>
+                <option key="${uiLabelMap.MyPortalEndUserCustomer}" description="END_USER_CUSTOMER"/>
+                <option key="${uiLabelMap.MyPortalBillToCustomer}" description="BILL_TO_CUSTOMER"/>
             </drop-down>
         </field>
         <field name="updateButton"><submit/></field>
@@ -262,8 +262,8 @@ under the License.
         <field name="note" title="${uiLabelMap.OrderNote}"><textarea rows="5" cols="70"/></field>
         <field name="internalNote" title="${uiLabelMap.OrderInternalNote}" tooltip="${uiLabelMap.OrderInternalNoteMessage}">
             <drop-down allow-empty="true" no-current-selected-key="Y">
-                <option key="Y" description="${uiLabelMap.CommonYes}"/>
-                <option key="N" description="${uiLabelMap.CommonNo}"/>
+                <option key="${uiLabelMap.CommonYes}" description="Y"/>
+                <option key="${uiLabelMap.CommonNo}" description="N"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml Sat Nov  5 14:34:00 2016
@@ -272,8 +272,8 @@ under the License.
         <!--
         <field name="isPromo" title="${uiLabelMap.OrderOrderIsPromo}">
             <drop-down allow-empty="true">
-                <option key="N" description="${uiLabelMap.CommonN}"/>
-                <option key="Y" description="${uiLabelMap.CommonY}"/>
+                <option key="${uiLabelMap.CommonN}" description="N"/>
+                <option key="${uiLabelMap.CommonY}" description="Y"/>
             </drop-down>
         </field>
          -->

Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml Sat Nov  5 14:34:00 2016
@@ -109,8 +109,8 @@ under the License.
         </field>
         <field name="orderTypeId">
             <drop-down allow-empty="false">
-                <option key="SALES_ORDER" description="${uiLabelMap.OrderSalesOrder}"/>
-                <option key="PURCHASE_ORDER" description="${uiLabelMap.OrderPurchaseOrder}"/>
+                <option key="${uiLabelMap.OrderSalesOrder}" description="SALES_ORDER"/>
+                <option key="${uiLabelMap.OrderPurchaseOrder}" description="PURCHASE_ORDER"/>
             </drop-down>
         </field>
         <field name="orderStatusId">

Modified: ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml Sat Nov  5 14:34:00 2016
@@ -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/trunk/applications/party/minilang/contact/ContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/contact/ContactMechServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/minilang/contact/ContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/minilang/contact/ContactMechServices.xml Sat Nov  5 14:34:00 2016
@@ -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/trunk/applications/party/minilang/contact/PartyContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/contact/PartyContactMechServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/minilang/contact/PartyContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/minilang/contact/PartyContactMechServices.xml Sat Nov  5 14:34:00 2016
@@ -169,7 +169,7 @@ under the License.
         </if-empty>
 
         <set-service-fields service-name="createPostalAddress" map="parameters" to-map="createPostalAddressMap"/>
-        <call-service in-map-name="createPostalAddressMap" service-name="createPostalAddress">
+        <call-service service-name="createPostalAddress" in-map-name="createPostalAddressMap">
             <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/>
             <result-to-field result-name="contactMechId" field="newPartyContactMech.contactMechId"/>
         </call-service>
@@ -193,7 +193,7 @@ under the License.
         </if-empty>
 
         <set-service-fields service-name="updatePostalAddress" map="parameters" to-map="updatePostalAddressMap"/>
-        <call-service in-map-name="updatePostalAddressMap" service-name="updatePostalAddress">
+        <call-service service-name="updatePostalAddress" in-map-name="updatePostalAddressMap">
             <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
             <result-to-field result-name="contactMechId" field="newPartyContactMech.contactMechId"/>
         </call-service>
@@ -216,7 +216,7 @@ under the License.
 
         <log level="info" message="Creating telecom number"/>
         <set-service-fields service-name="createTelecomNumber" map="parameters" to-map="createTelecomNumberMap"/>
-        <call-service in-map-name="createTelecomNumberMap" service-name="createTelecomNumber">
+        <call-service service-name="createTelecomNumber" in-map-name="createTelecomNumberMap">
             <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/>
             <result-to-field result-name="contactMechId" field="newPartyContactMech.contactMechId"/>
         </call-service>
@@ -250,7 +250,7 @@ under the License.
         <set field="updatePartyContactMechMap.contactMechTypeId" value="TELECOM_NUMBER"/>
         <log level="info" message="Copied id to updatePartyContactMechMap: ${updatePartyContactMechMap.newContactMechId}"/>
 
-        <call-service in-map-name="updatePartyContactMechMap" service-name="updatePartyContactMech">
+        <call-service service-name="updatePartyContactMech" in-map-name="updatePartyContactMechMap">
             <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/>
         </call-service>
         <log level="info" message="Setting result id: ${newPartyContactMech.contactMechId}"/>

Modified: ofbiz/trunk/applications/party/minilang/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/party/PartyServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/minilang/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/minilang/party/PartyServices.xml Sat Nov  5 14:34:00 2016
@@ -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.
         <!-- lookup existing value -->
         <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"/>
             <!-- check party role -->
-            <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/trunk/applications/party/minilang/party/PartySimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/party/PartySimpleEvents.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/minilang/party/PartySimpleEvents.xml (original)
+++ ofbiz/trunk/applications/party/minilang/party/PartySimpleEvents.xml Sat Nov  5 14:34:00 2016
@@ -137,7 +137,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/trunk/applications/party/minilang/party/PartySimpleMethods.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/party/PartySimpleMethods.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/minilang/party/PartySimpleMethods.xml (original)
+++ ofbiz/trunk/applications/party/minilang/party/PartySimpleMethods.xml Sat Nov  5 14:34:00 2016
@@ -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>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat Nov  5 14:34:00 2016
@@ -922,7 +922,7 @@ under the License.
     </request-map>
     <request-map uri="uploadParty">
         <security auth="true" https="true"/>
-        <event invoke="importParty" path="" type="service"/>
+        <event type="service" invoke="importParty" path=""/>
         <response name="success" type="request" value="ImportExport"/>
         <response name="error" type="view" value="ImportExport"/>
     </request-map>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Sat Nov  5 14:34:00 2016
@@ -75,7 +75,7 @@ under the License.
                                 </and>
                             </condition>
                             <widgets>
-                                <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
+                                <include-menu name="ProfileTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
                             </widgets>
                         </section>
                     </decorator-section>
@@ -89,7 +89,7 @@ under the License.
                                 <section>
                                     <condition><not><if-empty field="partyId"/></not></condition>
                                     <widgets>
-                                        <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileSubTabBar"/>
+                                        <include-menu name="ProfileSubTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
                                         <container style="clear"/>
                                         <container style="page-title">
                                             <section>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml Sat Nov  5 14:34:00 2016
@@ -755,22 +755,22 @@ under the License.
         <field name="sequenceNum"><text/></field>
         <field name="drMimeTypeId" widget-style="smallSelect">
             <drop-down allow-empty="false">
-                <option key="application/msword" description="${uiLabelMap.ContentMSWord}"/>
-                <option key="application/pdf" description="${uiLabelMap.ContentPDFFile}"/>
-                <option key="application/vnd.ofbiz.survey" description="${uiLabelMap.ContentSurvey}"/>
-                <option key="text/html" description="${uiLabelMap.ContentHtmlText}"/>
-                <option key="text/plain" description="${uiLabelMap.ContentPlainText}"/>
-                <option key="image/jpeg" description="${uiLabelMap.ContentJPEG}"/>
-                <option key="image/gif" description="${uiLabelMap.ContentGIF}"/>
-                <option key="image/tiff" description="${uiLabelMap.ContentTIFF}"/>
-                <option key="image/png" description="${uiLabelMap.ContentPNG}"/>
-                <option key="application/octet-stream" description="${uiLabelMap.ContentResourceOther}"/>
+                <option key="${uiLabelMap.ContentMSWord}" description="application/msword"/>
+                <option key="${uiLabelMap.ContentPDFFile}" description="application/pdf"/>
+                <option key="${uiLabelMap.ContentSurvey}" description="application/vnd.ofbiz.survey"/>
+                <option key="${uiLabelMap.ContentHtmlText}" description="text/html"/>
+                <option key="${uiLabelMap.ContentPlainText}" description="text/plain"/>
+                <option key="${uiLabelMap.ContentJPEG}" description="image/jpeg"/>
+                <option key="${uiLabelMap.ContentGIF}" description="image/gif"/>
+                <option key="${uiLabelMap.ContentTIFF}" description="image/tiff"/>
+                <option key="${uiLabelMap.ContentPNG}" description="image/png"/>
+                <option key="${uiLabelMap.ContentResourceOther}" description="application/octet-stream"/>
             </drop-down>
         </field>
         <field name="drIsPublic" title="${uiLabelMap.PartyIsPublic}">
             <drop-down allow-empty="true">
-                <option key="Y" description="${uiLabelMap.CommonY}"/>
-                <option key="N" description="${uiLabelMap.CommonN}"/>
+                <option key="${uiLabelMap.CommonY}" description="Y"/>
+                <option key="${uiLabelMap.CommonN}" description="N"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
@@ -788,22 +788,22 @@ under the License.
         <field name="sequenceNum"><text/></field>
         <field name="drMimeTypeId">
             <drop-down allow-empty="false">
-                <option key="application/msword" description="${uiLabelMap.ContentMSWord}"/>
-                <option key="application/pdf" description="${uiLabelMap.ContentPDFFile}"/>
-                <option key="application/vnd.ofbiz.survey" description="${uiLabelMap.ContentSurvey}"/>
-                <option key="text/html" description="${uiLabelMap.ContentHtmlText}"/>
-                <option key="text/plain" description="${uiLabelMap.ContentPlainText}"/>
-                <option key="image/jpeg" description="${uiLabelMap.ContentJPEG}"/>
-                <option key="image/gif" description="${uiLabelMap.ContentGIF}"/>
-                <option key="image/tiff" description="${uiLabelMap.ContentTIFF}"/>
-                <option key="image/png" description="${uiLabelMap.ContentPNG}"/>
-                <option key="application/octet-stream" description="${uiLabelMap.ContentResourceOther}"/>
+                <option key="${uiLabelMap.ContentMSWord}" description="application/msword"/>
+                <option key="${uiLabelMap.ContentPDFFile}" description="application/pdf"/>
+                <option key="${uiLabelMap.ContentSurvey}" description="application/vnd.ofbiz.survey"/>
+                <option key="${uiLabelMap.ContentHtmlText}" description="text/html"/>
+                <option key="${uiLabelMap.ContentPlainText}" description="text/plain"/>
+                <option key="${uiLabelMap.ContentJPEG}" description="image/jpeg"/>
+                <option key="${uiLabelMap.ContentGIF}" description="image/gif"/>
+                <option key="${uiLabelMap.ContentTIFF}" description="image/tiff"/>
+                <option key="${uiLabelMap.ContentPNG}" description="image/png"/>
+                <option key="${uiLabelMap.ContentResourceOther}" description="application/octet-stream"/>
             </drop-down>
         </field>
         <field name="drIsPublic" title="${uiLabelMap.PartyIsPublic}">
             <drop-down allow-empty="true">
-                <option key="Y" description="${uiLabelMap.CommonY}"/>
-                <option key="N" description="${uiLabelMap.CommonN}"/>
+                <option key="${uiLabelMap.CommonY}" description="Y"/>
+                <option key="${uiLabelMap.CommonN}" description="N"/>
             </drop-down>
         </field>
         <field name="dataResourceTypeId" entry-name="drDataResourceTypeId">
@@ -974,8 +974,8 @@ under the License.
         </field>
         <field name="internalNotesOnly">
             <drop-down>
-                <option key="false" description="${uiLabelMap.CommonFalse}"/>
-                <option key="true" description="${uiLabelMap.CommonTrue}"/>
+                <option key="${uiLabelMap.CommonFalse}" description="false"/>
+                <option key="${uiLabelMap.CommonTrue}" description="true"/>
             </drop-down></field>
         <field name="updateButton"><submit/></field>
     </form>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml Sat Nov  5 14:34:00 2016
@@ -34,8 +34,8 @@ under the License.
                                 <if-has-permission permission="PARTYMGR" action="_VIEW"/>
                             </condition>
                             <widgets>
-                                <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="CommEventTabBar"/>
-                                <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="CommSubTabBar"/>
+                                <include-menu name="CommEventTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
+                                <include-menu name="CommSubTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
                             </widgets>
                         </section>
                     </decorator-section>
@@ -65,8 +65,8 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
-                                <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="CommEventTabBar"/>
-                                <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="CommSubTabBar"/>
+                                <include-menu name="CommEventTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
+                                <include-menu name="CommSubTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
                     </decorator-section>
                     <decorator-section name="body">
                         <section>
@@ -110,10 +110,10 @@ under the License.
                                         <not><if-empty field="partyId"/></not>
                                     </condition>
                                     <widgets>
-                                        <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
+                                        <include-menu name="ProfileTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
                                     </widgets>
                                 </section>
-                                <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="CommFindTabBar"/>
+                                <include-menu name="CommFindTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
                                 <container><label style="h1" text="${uiLabelMap.PartyPendingCommunicationEvents}"/></container>
                                 <container>
                                     <link style="smallSubmit" target="ViewCommunicationEvent" text="${uiLabelMap.PartyNewCommunication}">
@@ -769,7 +769,7 @@ under the License.
                                         <not><if-empty field="partyId"/></not>
                                     </condition>
                                     <widgets>
-                                        <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
+                                        <include-menu name="ProfileTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
                                     </widgets>
                                 </section>
                                 <container style="h1"><label text="${uiLabelMap.PageTitleEditCommContent}"/></container>
@@ -868,7 +868,7 @@ under the License.
                             <set field="partyIdFrom" from-field="parameters.partyId" default-value="${userLogin.partyId}"/>
                         </actions>
                         <widgets>
-                            <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="MyCommSubTabBar"/>
+                            <include-menu name="MyCommSubTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
                             <include-screen name="commOverview"/>
                         </widgets>
                     </section>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml Sat Nov  5 14:34:00 2016
@@ -65,7 +65,7 @@ under the License.
                                 <if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/>
                             </condition>
                             <widgets>
-                                <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="PartyClassificationTabBar"/>
+                                <include-menu name="PartyClassificationTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
                             </widgets>
                         </section>
                     </decorator-section>
@@ -136,7 +136,7 @@ under the License.
                                 <if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/>
                             </condition>
                             <widgets>
-                                <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="PartyClassificationTabBar"/>
+                                <include-menu name="PartyClassificationTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
                             </widgets>
                         </section>
                     </decorator-section>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Sat Nov  5 14:34:00 2016
@@ -32,10 +32,10 @@ under the License.
         <field name="noConditionFind"><hidden value="Y"/></field>
         <field name="extInfo" event="onClick" action="javascript:$('#ListParty' + this.value +'_body').toggle(true);collapseFindPartyOptions('ListParty' + this.value +'_body');" title="${uiLabelMap.PartyContactInformation}">
             <radio>
-                <option key="N" description="${uiLabelMap.CommonNone}"/>
-                <option key="P" description="${uiLabelMap.PartyPostal}"/>
-                <option key="T" description="${uiLabelMap.PartyTelecom}"/>
-                <option key="O" description="${uiLabelMap.CommonOther}"/>
+                <option key="${uiLabelMap.CommonNone}" description="N"/>
+                <option key="${uiLabelMap.PartyPostal}" description="P"/>
+                <option key="${uiLabelMap.PartyTelecom}" description="T"/>
+                <option key="${uiLabelMap.CommonOther}" description="O"/>
             </radio>
         </field>
         <field name="hideFields"><hidden value="Y"/></field>
@@ -197,17 +197,17 @@ under the License.
         <field name="lastName" title="${uiLabelMap.PartyLastName}" required-field="true"><text size="40" maxlength="60"/></field>
         <field name="gender">
             <drop-down allow-empty="true">
-                <option key="M" description="${uiLabelMap.CommonMale}"/>
-                <option key="F" description="${uiLabelMap.CommonFemale}"/>
+                <option key="${uiLabelMap.CommonMale}" description="M"/>
+                <option key="${uiLabelMap.CommonFemale}" description="F"/>
             </drop-down>
         </field>
         <field name="maritalStatus">
             <drop-down allow-empty="true">
-                <option key="S" description="${uiLabelMap.PartyMaritalStatusSingle}"/>
-                <option key="M" description="${uiLabelMap.PartyMaritalStatusMarried}"/>
-                <option key="P" description="${uiLabelMap.PartyMaritalStatusSeparated}"/>
-                <option key="D" description="${uiLabelMap.PartyMaritalStatusDivorced}"/>
-                <option key="W" description="${uiLabelMap.PartyMaritalStatusWidowed}"/>
+                <option key="${uiLabelMap.PartyMaritalStatusSingle}" description="S"/>
+                <option key="${uiLabelMap.PartyMaritalStatusMarried}" description="M"/>
+                <option key="${uiLabelMap.PartyMaritalStatusSeparated}" description="P"/>
+                <option key="${uiLabelMap.PartyMaritalStatusDivorced}" description="D"/>
+                <option key="${uiLabelMap.PartyMaritalStatusWidowed}" description="W"/>
             </drop-down>
         </field>
         <field name="employmentStatusEnumId">
@@ -227,7 +227,7 @@ under the License.
             </drop-down>
         </field>
         <field name="existingCustomer">
-            <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+            <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
         </field>
         <field name="preferredCurrencyUomId">
             <drop-down allow-empty="true" no-current-selected-key="${defaultOrganizationPartyCurrencyUomId}">
@@ -352,7 +352,7 @@ under the License.
         <field name="currentPassword"><password/></field>
         <field name="currentPasswordVerify"><password/></field>
         <field name="requirePasswordChange">
-            <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+            <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
         <field name="cancelLink" title=" " widget-style="smallSubmit"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="backHome" also-hidden="false"/></field>
@@ -479,10 +479,10 @@ under the License.
         </field>
         <field name="taxAuthPartyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="isExempt">
-            <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+            <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
         </field>
         <field name="isNexus">
-            <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+            <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
     </form>
@@ -510,10 +510,10 @@ under the License.
             </hyperlink>
         </field>
         <field name="isExempt">
-            <drop-down allow-empty="false"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+            <drop-down allow-empty="false"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
         </field>
         <field name="isNexus">
-            <drop-down allow-empty="false"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+            <drop-down allow-empty="false"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
         </field>
     </form>
 
@@ -620,35 +620,35 @@ under the License.
             </drop-down>
         </field>
         <field name="USER_ADDRESS_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowAddressSolicitation}?">
-            <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
+            <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
         </field>
         <field name="HomePhoneTitle" title="${uiLabelMap.PartyHomePhone}" title-area-style="group-label" widget-style="tooltip"><display description="${uiLabelMap.PartyPhoneNumberRequired}" also-hidden="false"/></field>
         <field name="USER_HOME_COUNTRY" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
         <field name="USER_HOME_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
         <field name="USER_HOME_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
         <field name="USER_HOME_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
-        <field name="USER_HOME_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
+        <field name="USER_HOME_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field>
         <field name="WorkPhoneTitle" title="${uiLabelMap.PartyContactWorkPhoneNumber}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
         <field name="USER_WORK_COUNTRY" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
         <field name="USER_WORK_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
         <field name="USER_WORK_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
         <field name="USER_WORK_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
-        <field name="USER_WORK_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
+        <field name="USER_WORK_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field>
         <field name="FaxPhoneTitle" title="${uiLabelMap.PartyContactFaxPhoneNumber}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
         <field name="USER_FAX_COUNTRY" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
         <field name="USER_FAX_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
         <field name="USER_FAX_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
         <field name="USER_FAX_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
-        <field name="USER_FAX_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
+        <field name="USER_FAX_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field>
         <field name="MobilePhoneTitle" title="${uiLabelMap.PartyContactMobilePhoneNumber}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
         <field name="USER_MOBILE_COUNTRY" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
         <field name="USER_MOBILE_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
         <field name="USER_MOBILE_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
-        <field name="USER_MOBILE_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
+        <field name="USER_MOBILE_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field>
         <field name="EmailAddressTitle" title="${uiLabelMap.PartyEmailAddress}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
         <field use-when="require_email!=null" name="USER_EMAIL" title="${uiLabelMap.CommonEmail}" required-field="true"><text size="60" maxlength="250"/></field>
         <field use-when="require_email==null" name="USER_EMAIL" title="${uiLabelMap.CommonEmail}" required-field="true"><text size="60" maxlength="250"/></field>
-        <field name="USER_EMAIL_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
+        <field name="USER_EMAIL_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field>
         <!-- <field name="USER_ORDER_EMAIL" title="Order Emails (comma separated)" ><text size="60" maxlength="250"/></field> -->
         <field use-when="displayPassword=='Y'" name="USERNAME" title="${uiLabelMap.CommonUsername}" required-field="true"><text size="30" maxlength="250"/></field>
         <field use-when="displayPassword=='Y'" name="PASSWORD" title="${uiLabelMap.CommonPassword}" required-field="true"><password size="15" maxlength="250"/></field>
@@ -812,8 +812,8 @@ under the License.
         </field>
         <field name="isPublic" title="${uiLabelMap.PartyIsPublic}" map-name="dataResource">
             <drop-down no-current-selected-key="N">
-                <option key="N" description="${uiLabelMap.CommonNo}"/>
-                <option key="Y" description="${uiLabelMap.CommonYes}"/>
+                <option key="${uiLabelMap.CommonNo}" description="N"/>
+                <option key="${uiLabelMap.CommonYes}" description="Y"/>
             </drop-down>
         </field>
         <field name="createButton" use-when="content==null"><submit button-type="button"/></field>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Sat Nov  5 14:34:00 2016
@@ -42,7 +42,7 @@ under the License.
                             <widgets>
                                 <screenlet id="FindPartyPanel" title="${uiLabelMap.PartyFindParty}" navigation-menu-name="CreateNewParty"
                                            navigation-form-name="LookupParty" save-collapsed="false" collapsible="true" initially-collapsed="${initialyCollapsed}">
-                                    <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="CreateNewParty"/>
+                                    <include-menu name="CreateNewParty" location="component://party/widget/partymgr/PartyMenus.xml"/>
                                     <include-form name="LookupParty" location="component://party/widget/partymgr/PartyForms.xml"/>
                                 </screenlet>
                                 <screenlet title="${uiLabelMap.CommonSearchResults}" navigation-form-name="ListParty">

Modified: ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml Sat Nov  5 14:34:00 2016
@@ -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">
     <!-- ProductCategoryContent -->
     <simple-method method-name="createCategoryContent" short-description="Create Content For Product Category">
-        <make-value value-field="newEntity" entity-name="ProductCategoryContent"/>
+        <make-value entity-name="ProductCategoryContent" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
@@ -41,7 +41,7 @@ under the License.
         <field-to-result field="newEntity.prodCatContentTypeId" result-name="prodCatContentTypeId"/>
     </simple-method>
     <simple-method method-name="updateCategoryContent" short-description="Update Content For Category">
-        <make-value value-field="lookupPKMap" entity-name="ProductCategoryContent"/>
+        <make-value entity-name="ProductCategoryContent" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryContent" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>

Modified: ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml Sat Nov  5 14:34:00 2016
@@ -33,7 +33,7 @@ under the License.
         <check-errors/>
 
         <now-timestamp field="nowTimestamp"/>
-        <make-value value-field="newEntity" entity-name="ProductCategory"/>
+        <make-value entity-name="ProductCategory" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <if-empty field="parameters.productCategoryId">
@@ -67,7 +67,7 @@ under the License.
             </entity-and>
             <iterate list="productCategoryRoles" entry="productCategoryRole">
                 <!-- add this new product to the category -->
-                <make-value value-field="newLimitRollup" entity-name="ProductCategoryRollup"/>
+                <make-value entity-name="ProductCategoryRollup" value-field="newLimitRollup"/>
                 <set field="newLimitRollup.productCategoryId" from-field="newEntity.productCategoryId"/>
                 <set field="newLimitRollup.parentProductCategoryId" from-field="productCategoryRole.productCategoryId"/>
                 <set field="newLimitRollup.fromDate" from-field="nowTimestamp"/>
@@ -145,7 +145,7 @@ under the License.
             <store-value value-field="product"/>
         </if-compare-field>
 
-        <make-value value-field="lookupPKMap" entity-name="ProductCategoryMember"/>
+        <make-value entity-name="ProductCategoryMember" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryMember" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-field="lookedUpValue"/>
@@ -161,7 +161,7 @@ under the License.
         <call-simple-method method-name="checkCategoryRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-field="newEntity" entity-name="ProductCategoryRole"/>
+        <make-value entity-name="ProductCategoryRole" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
@@ -177,7 +177,7 @@ under the License.
         <call-simple-method method-name="checkCategoryRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-field="lookupPKMap" entity-name="ProductCategoryRole"/>
+        <make-value entity-name="ProductCategoryRole" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryRole" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -189,7 +189,7 @@ under the License.
         <call-simple-method method-name="checkCategoryRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-field="lookupPKMap" entity-name="ProductCategoryRole"/>
+        <make-value entity-name="ProductCategoryRole" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryRole" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-field="lookedUpValue"/>
@@ -207,7 +207,7 @@ under the License.
         <call-simple-method method-name="checkCategoryRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/>
+        <make-value entity-name="ProductCategoryRollup" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
@@ -227,7 +227,7 @@ under the License.
                 <call-simple-method method-name="checkCategoryRelatedPermission"/>
                 <check-errors/>
 
-                <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/>
+                <make-value entity-name="ProductCategoryRollup" value-field="newEntity"/>
                 <set field="newEntity.parentProductCategoryId" from-field="category"/>
                 <set-pk-fields map="parameters" value-field="newEntity"/>
                 <set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -246,7 +246,7 @@ under the License.
                 <call-simple-method method-name="checkCategoryRelatedPermission"/>
                 <check-errors/>
 
-                <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/>
+                <make-value entity-name="ProductCategoryRollup" value-field="newEntity"/>
                 <set field="newEntity.parentProductCategoryId" from-field="parameters.categories"/>
                 <set-pk-fields map="parameters" value-field="newEntity"/>
                 <set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -267,7 +267,7 @@ under the License.
         <call-simple-method method-name="checkCategoryRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-field="lookupPKMap" entity-name="ProductCategoryRollup"/>
+        <make-value entity-name="ProductCategoryRollup" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryRollup" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -282,7 +282,7 @@ under the License.
         <call-simple-method method-name="checkCategoryRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-field="lookupPKMap" entity-name="ProductCategoryRollup"/>
+        <make-value entity-name="ProductCategoryRollup" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryRollup" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-field="lookedUpValue"/>
@@ -577,7 +577,7 @@ under the License.
         </check-permission>
         <check-errors/>
 
-        <make-value value-field="newEntity" entity-name="ProductCategoryAttribute"/>
+        <make-value entity-name="ProductCategoryAttribute" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
 
@@ -590,7 +590,7 @@ under the License.
         </check-permission>
         <check-errors/>
 
-        <make-value value-field="lookupPKMap" entity-name="ProductCategoryAttribute"/>
+        <make-value entity-name="ProductCategoryAttribute" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryAttribute" map="lookupPKMap" value-field="ProductCategoryAttributeInstance"/>
         <set-nonpk-fields map="parameters" value-field="ProductCategoryAttributeInstance"/>
@@ -603,7 +603,7 @@ under the License.
         </check-permission>
         <check-errors/>
 
-        <make-value value-field="lookupPKMap" entity-name="ProductCategoryAttribute"/>
+        <make-value entity-name="ProductCategoryAttribute" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryAttribute" map="lookupPKMap" value-field="ProductCategoryAttributeInstance"/>
         <remove-value value-field="ProductCategoryAttributeInstance"/>

Modified: ofbiz/trunk/applications/product/minilang/product/config/ConfigServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/config/ConfigServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/config/ConfigServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/config/ConfigServices.xml Sat Nov  5 14:34:00 2016
@@ -23,7 +23,7 @@ under the License.
     <!-- ProductConfig methods -->
     <!-- Methods for Config Options -->
     <simple-method method-name="createProductConfigOption" short-description="Create a Config Option">
-        <check-permission action="_CREATE" permission="CATALOG">
+        <check-permission permission="CATALOG" action ="_CREATE">
             <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
         </check-permission>
         <check-errors/>

Modified: ofbiz/trunk/applications/product/minilang/product/config/ProductConfigItemContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/config/ProductConfigItemContentServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/config/ProductConfigItemContentServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/config/ProductConfigItemContentServices.xml Sat Nov  5 14:34:00 2016
@@ -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">
     <!-- ProductConfigItemContent -->
     <simple-method method-name="createProductConfigItemContent" short-description="Create Content For ProductConfigItem">
-        <make-value value-field="newEntity" entity-name="ProdConfItemContent"/>
+        <make-value entity-name="ProdConfItemContent" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
@@ -41,7 +41,7 @@ under the License.
         <field-to-result field="newEntity.confItemContentTypeId" result-name="confItemContentTypeId"/>
     </simple-method>
     <simple-method method-name="updateProductConfigItemContent" short-description="Update Content For ProductConfigItem">
-        <make-value value-field="lookupPKMap" entity-name="ProdConfItemContent"/>
+        <make-value entity-name="ProdConfItemContent" 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/trunk/applications/product/minilang/product/cost/CostServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/cost/CostServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/cost/CostServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/cost/CostServices.xml Sat Nov  5 14:34:00 2016
@@ -45,7 +45,7 @@ under the License.
             <store-value value-field="existingCost"/>
         </iterate>
         <!-- The new cost is created -->
-        <make-value value-field="newEntity" entity-name="CostComponent"/>
+        <make-value entity-name="CostComponent" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <sequenced-id sequence-name="CostComponent" field="newEntity.costComponentId"/>
         <if-empty field="newEntity.fromDate">

Modified: ofbiz/trunk/applications/product/minilang/product/feature/ProductFeatureServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/feature/ProductFeatureServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/feature/ProductFeatureServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/feature/ProductFeatureServices.xml Sat Nov  5 14:34:00 2016
@@ -75,7 +75,7 @@ under the License.
         </if>
         <check-errors/>
 
-        <make-value value-field="newEntity" entity-name="ProductFeatureType"/>
+        <make-value entity-name="ProductFeatureType" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
 
@@ -88,7 +88,7 @@ under the License.
             <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
         </check-permission>
         <check-errors/>
-        <make-value value-field="newEntity" entity-name="ProductFeatureApplAttr"/>
+        <make-value entity-name="ProductFeatureApplAttr" 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/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml Sat Nov  5 14:34:00 2016
@@ -147,7 +147,7 @@ under the License.
                 </iterate>
             </if-not-empty>
             
-            <make-value value-field="lookupPKMap" entity-name="ProductContent"/>
+            <make-value entity-name="ProductContent" value-field="lookupPKMap"/>
             <set-pk-fields map="parameters" value-field="lookupPKMap"/>
             <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
             <remove-value value-field="lookedUpValue"/>

Modified: ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml Sat Nov  5 14:34:00 2016
@@ -158,14 +158,14 @@ under the License.
                       <field-map field-name="lotId" from-field="parameters.lotId" />
                   </entity-and>
                   <if-empty field="lotList">
-                      <make-value value-field="lot" entity-name="Lot"/>
+                      <make-value entity-name="Lot" value-field="lot"/>
                       <set field="lot.lotId" from-field="parameters.lotId"/>
                       <create-value value-field="lot"/>
                   </if-empty>
               </if-not-empty>
           </if-compare>
           
-        <make-value value-field="inventoryItem" entity-name="InventoryItem"/>
+        <make-value entity-name="InventoryItem" value-field="inventoryItem"/>
         <!-- TODO: make sure availableToPromiseTotal and quantityOnHandTotal are not changed -->
         <set-nonpk-fields map="parameters" value-field="inventoryItem"/>
 
@@ -308,7 +308,7 @@ under the License.
                   <field-map field-name="lotId" from-field="parameters.lotId" />
             </entity-and>
             <if-empty field="lotList">
-                <make-value value-field="lot" entity-name="Lot"/>
+                <make-value entity-name="Lot" value-field="lot"/>
                 <set field="lot.lotId" from-field="parameters.lotId"/>
                 <create-value value-field="lot"/>
             </if-empty>
@@ -339,7 +339,7 @@ under the License.
             <store-value value-field="oldInventoryItemStatus"/>
         </if-not-empty>
 
-        <make-value value-field="inventoryItemStatus" entity-name="InventoryItemStatus"/>
+        <make-value entity-name="InventoryItemStatus" value-field="inventoryItemStatus"/>
         <set-nonpk-fields map="parameters" value-field="inventoryItemStatus"/>
         <set-pk-fields map="parameters" value-field="inventoryItemStatus"/>
         <set field="inventoryItemStatus.statusDatetime" from-field="nowTimestamp"/>
@@ -355,7 +355,7 @@ under the License.
     </simple-method>
 
     <simple-method method-name="createInventoryItemDetail" short-description="Create an InventoryItemDetail">
-        <make-value value-field="newEntity" entity-name="InventoryItemDetail"/>
+        <make-value entity-name="InventoryItemDetail" value-field="newEntity"/>
 
         <set from-field="parameters.inventoryItemId" field="newEntity.inventoryItemId"/>
         <!-- NOTE DEJ20070927: not using make-next-seq-id because a single InventoryItem may see traffic from lots of threads at the same time, and make-next-seq-id doesn't do well with that <make-next-seq-id seq-field-name="inventoryItemDetailSeqId" value-field="newEntity" increment-by="1" numeric-padding="4"/> -->
@@ -548,7 +548,7 @@ under the License.
     <simple-method method-name="createInventoryItemVariance" short-description="Create an InventoryItemVariance">
 
         <!-- add changes to availableToPromise and quantityOnHand -->
-        <make-value value-field="inventoryItemLookup" entity-name="InventoryItem"/>
+        <make-value entity-name="InventoryItem" value-field="inventoryItemLookup"/>
         <set-pk-fields map="parameters" value-field="inventoryItemLookup"/>
         <find-by-primary-key map="inventoryItemLookup" value-field="inventoryItem"/>
 
@@ -566,7 +566,7 @@ under the License.
         <set from-field="parameters.comments" field="createDetailMap.description"/>
         <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
 
-        <make-value value-field="newEntity" entity-name="InventoryItemVariance"/>
+        <make-value entity-name="InventoryItemVariance" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-field="newEntity"/>
@@ -899,7 +899,7 @@ under the License.
     <!-- Inventory Transfer Services -->
     <simple-method method-name="createInventoryTransfer" short-description="Create an Inventory Transfer">
 
-        <make-value value-field="newEntity" entity-name="InventoryTransfer"/>
+        <make-value entity-name="InventoryTransfer" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <sequenced-id sequence-name="InventoryTransfer" field="newEntity.inventoryTransferId"/>
         <field-to-result field="newEntity.inventoryTransferId" result-name="inventoryTransferId"/>

Modified: ofbiz/trunk/applications/product/minilang/product/price/PriceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/price/PriceServices.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/price/PriceServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/price/PriceServices.xml Sat Nov  5 14:34:00 2016
@@ -32,7 +32,7 @@ under the License.
 
         <call-simple-method method-name="inlineHandlePriceWithTaxIncluded"/>
 
-        <make-value value-field="newEntity" entity-name="ProductPrice"/>
+        <make-value entity-name="ProductPrice" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
 
@@ -167,7 +167,7 @@ under the License.
     <!-- TODO NMA convert to entity auto when changed fileds are managed -->
     <simple-method method-name="saveProductPriceChange" short-description="Save History of ProductPrice Change">
         <!-- Note that this is kept pretty simple: if a price is specific but no oldPrice, then it is generally a create, if both are specified it is generally an update, if only the oldPrice is specified it is generally a delete -->
-        <make-value value-field="newEntity" entity-name="ProductPriceChange"/>
+        <make-value entity-name="ProductPriceChange" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <sequenced-id sequence-name="ProductPriceChange" field="productPriceChangeId"/>
@@ -192,7 +192,7 @@ under the License.
         <if-not-empty field="parameters.condValueInput">
             <set field="parameters.condValue" from-field="parameters.condValueInput"/>
         </if-not-empty>
-        <make-value value-field="newEntity" entity-name="ProductPriceCond"/>
+        <make-value entity-name="ProductPriceCond" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <make-next-seq-id value-field="newEntity" seq-field-name="productPriceCondSeqId" numeric-padding="2"/>