Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original) +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Tue Dec 6 12:37:42 2016 @@ -28,10 +28,10 @@ under the License. <field name="contentName"><text-find/></field> <field name="contentTypeId"> <drop-down no-current-selected-key="COMPDOC_TEMPLATE"> - <option key="${uiLabelMap.ContentTemplateRoot}" description="COMPDOC_TEMPLATE"/> - <option key="${uiLabelMap.ContentTemplateRootInstance}" description="COMPDOC_INSTANCE"/> - <option key="${uiLabelMap.ContentTemplateChild}" description="TEMPLATE"/> - <option key="${uiLabelMap.ContentTemplateInstanceChild}" description="DOCUMENT"/> + <option key="COMPDOC_TEMPLATE" description="${uiLabelMap.ContentTemplateRoot}"/> + <option key="COMPDOC_INSTANCE" description="${uiLabelMap.ContentTemplateRootInstance}"/> + <option key="TEMPLATE" description="${uiLabelMap.ContentTemplateChild}"/> + <option key="DOCUMENT" description="${uiLabelMap.ContentTemplateInstanceChild}"/> </drop-down> </field> <!-- <field name="rootonly" map-name="dummy" title="Root CompDocs Only"><check/></field> --> @@ -239,9 +239,9 @@ under the License. </field> <field name="approvalStatusId" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.ContentSoftRejected}" description="SOFT_REJ"/> - <option key="${uiLabelMap.ContentRejected}" description="REJECTED"/> - <option key="${uiLabelMap.CommonApproved}" description="APPROVED"/> + <option key="SOFT_REJ" description="${uiLabelMap.ContentSoftRejected}"/> + <option key="REJECTED" description="${uiLabelMap.ContentRejected}"/> + <option key="APPROVED" description="${uiLabelMap.CommonApproved}"/> </drop-down> </field> <field name="approvalDate" widget-style="inputBox"><date-time/></field> @@ -288,9 +288,9 @@ under the License. </field> <field name="approvalStatusId" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.ContentSoftRejected}" description="SOFT_REJ"/> - <option key="${uiLabelMap.ContentRejected}" description="REJECTED"/> - <option key="${uiLabelMap.CommonApproved}" description="APPROVED"/> + <option key="SOFT_REJ" description="${uiLabelMap.ContentSoftRejected}"/> + <option key="REJECTED" description="${uiLabelMap.ContentRejected}"/> + <option key="APPROVED" description="${uiLabelMap.CommonApproved}"/> </drop-down> </field> <field name="approvalDate" widget-style="inputBox" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)"><date-time/></field> @@ -322,9 +322,9 @@ under the License. </field> <field name="approvalStatusId" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.ContentSoftRejected}" description="SOFT_REJ"/> - <option key="${uiLabelMap.ContentRejected}" description="REJECTED"/> - <option key="${uiLabelMap.CommonApproved}" description="APPROVED"/> + <option key="SOFT_REJ" description="${uiLabelMap.ContentSoftRejected}"/> + <option key="REJECTED" description="${uiLabelMap.ContentRejected}"/> + <option key="APPROVED" description="${uiLabelMap.CommonApproved}"/> </drop-down> </field> <field name="approvalDate" widget-style="inputBox"><date-time/></field> @@ -397,16 +397,16 @@ under the License. </field> <field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}" use-when=""TEMPLATE".equals(contentTypeId)" widget-style="smallSelect"> <drop-down allow-empty="false"> - <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"/> + <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}"/> </drop-down> </field> <field name="rootContentId"><hidden/></field> @@ -429,16 +429,16 @@ under the License. <field name="mimeTypeId" map-name="dataResource" use-when=""TEMPLATE".equals(contentTypeId)"> <drop-down allow-empty="false"> - <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"/> + <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}"/> </drop-down> </field> <field name="mimeTypeId" map-name="dataResource"
Modified: ofbiz/trunk/applications/content/widget/forum/BlogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/BlogForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/BlogForms.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/BlogForms.xml Tue Dec 6 12:37:42 2016 @@ -75,14 +75,14 @@ under the License. <field name="uploadedFile" title="${uiLabelMap.ContentImage}"><file size="25"/></field> <field name="templateDataResourceId" title="${uiLabelMap.ContentTemplate}"> <drop-down> - <option key="${uiLabelMap.ContentBlogTopLeft}" description="BLOG_TPL_TOPLEFT"/> - <option key="${uiLabelMap.ContentBlogTopCenter}" description="BLOG_TPL_TOPCENTER"/> + <option key="BLOG_TPL_TOPLEFT" description="${uiLabelMap.ContentBlogTopLeft}"/> + <option key="BLOG_TPL_TOPCENTER" description="${uiLabelMap.ContentBlogTopCenter}"/> </drop-down> </field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> <drop-down no-current-selected-key="CTNT_INITIAL_DRAFT"> - <option key="${uiLabelMap.ContentBlogPublish}" description="CTNT_PUBLISHED"/> - <option key="${uiLabelMap.ContentBlogPreview}" description="CTNT_INITIAL_DRAFT"/> + <option key="CTNT_PUBLISHED" description="${uiLabelMap.ContentBlogPublish}"/> + <option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.ContentBlogPreview}"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> Modified: ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml (original) +++ ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml Tue Dec 6 12:37:42 2016 @@ -105,30 +105,30 @@ under the License. </field> <field name="drDataResourceTypeId" > <drop-down no-current-selected-key="LOCAL_FILE"> - <option key="${uiLabelMap.ContentAbsoluteFile}" description="LOCAL_FILE"/> - <option key="${uiLabelMap.ContentFileRelToOFBizHome}" description="OFBIZ_FILE"/> - <option key="${uiLabelMap.ContentFileRelToWebappRoot}" description="CONTEXT_FILE"/> - <option key="${uiLabelMap.ContentDataBaseText}" description="ELECTRONIC_TEXT"/> + <option key="LOCAL_FILE" description="${uiLabelMap.ContentAbsoluteFile}"/> + <option key="OFBIZ_FILE" description="${uiLabelMap.ContentFileRelToOFBizHome}"/> + <option key="CONTEXT_FILE" description="${uiLabelMap.ContentFileRelToWebappRoot}"/> + <option key="ELECTRONIC_TEXT" description="${uiLabelMap.ContentDataBaseText}"/> </drop-down> </field> <field name="drMimeTypeId" > <drop-down no-current-selected-key="text/html"> - <option key="${uiLabelMap.ContentHtmlText}" description="text/html"/> - <option key="${uiLabelMap.ContentPlainText}" description="text/plain"/> + <option key="text/html" description="${uiLabelMap.ContentHtmlText}"/> + <option key="text/plain" description="${uiLabelMap.ContentPlainText}"/> </drop-down> </field> <field name="drDataResourceTypeId" > <drop-down no-current-selected-key="LOCAL_FILE"> - <option key="${uiLabelMap.ContentAbsoluteFile}" description="LOCAL_FILE"/> - <option key="${uiLabelMap.ContentFileRelToOFBizHome}" description="OFBIZ_FILE"/> - <option key="${uiLabelMap.ContentFileRelToWebappRoot}" description="CONTEXT_FILE"/> - <option key="${uiLabelMap.ContentDataBaseText}" description="ELECTRONIC_TEXT"/> + <option key="LOCAL_FILE" description="${uiLabelMap.ContentAbsoluteFile}"/> + <option key="OFBIZ_FILE" description="${uiLabelMap.ContentFileRelToOFBizHome}"/> + <option key="CONTEXT_FILE" description="${uiLabelMap.ContentFileRelToWebappRoot}"/> + <option key="ELECTRONIC_TEXT" description="${uiLabelMap.ContentDataBaseText}"/> </drop-down> </field> <field name="drMimeTypeId" > <drop-down no-current-selected-key="text/html"> - <option key="${uiLabelMap.ContentHtmlText}" description="text/html"/> - <option key="${uiLabelMap.ContentPlainText}" description="text/plain"/> + <option key="text/html" description="${uiLabelMap.ContentHtmlText}"/> + <option key="text/plain" description="${uiLabelMap.ContentPlainText}"/> </drop-down> </field> <field name="drObjectInfo" title="${uiLabelMap.ContentFilePath}"> @@ -302,10 +302,10 @@ under the License. </field> <field name="drMimeTypeId" > <drop-down> - <option key="${uiLabelMap.ContentGIF}" description="image/gif"/> - <option key="${uiLabelMap.ContentJPEG}" description="image/jpeg"/> - <option key="${uiLabelMap.ContentPNG}" description="image/png"/> - <option key="${uiLabelMap.ContentTIFF}" description="image/tiff"/> + <option key="image/gif" description="${uiLabelMap.ContentGIF}"/> + <option key="image/jpeg" description="${uiLabelMap.ContentJPEG}"/> + <option key="image/png" description="${uiLabelMap.ContentPNG}"/> + <option key="image/tiff" description="${uiLabelMap.ContentTIFF}"/> </drop-down> </field> <field name="drObjectInfo" title="${uiLabelMap.FormFieldTitle_imageFileName}"> @@ -340,10 +340,10 @@ under the License. </field> <field name="drMimeTypeId" > <drop-down> - <option key="${uiLabelMap.ContentGIF}" description="image/gif"/> - <option key="${uiLabelMap.ContentJPEG}" description="image/jpeg"/> - <option key="${uiLabelMap.ContentPNG}" description="image/png"/> - <option key="${uiLabelMap.ContentTIFF}" description="image/tiff"/> + <option key="image/gif" description="${uiLabelMap.ContentGIF}"/> + <option key="image/jpeg" description="${uiLabelMap.ContentJPEG}"/> + <option key="image/png" description="${uiLabelMap.ContentPNG}"/> + <option key="image/tiff" description="${uiLabelMap.ContentTIFF}"/> </drop-down> </field> <field name="drObjectInfo" title="${uiLabelMap.FormFieldTitle_imageFileName}"> @@ -419,10 +419,10 @@ under the License. </field> <field name="drDataResourceTypeId" > <drop-down no-current-selected-key="ELECTRONIC_TEXT"> - <option key="${uiLabelMap.ContentAbsoluteFile}" description="LOCAL_FILE"/> - <option key="${uiLabelMap.ContentFileRelToOFBizHome}" description="OFBIZ_FILE"/> - <option key="${uiLabelMap.ContentFileRelToWebappRoot}" description="CONTEXT_FILE"/> - <option key="${uiLabelMap.ContentDataBaseText}" description="ELECTRONIC_TEXT"/> + <option key="LOCAL_FILE" description="${uiLabelMap.ContentAbsoluteFile}"/> + <option key="OFBIZ_FILE" description="${uiLabelMap.ContentFileRelToOFBizHome}"/> + <option key="CONTEXT_FILE" description="${uiLabelMap.ContentFileRelToWebappRoot}"/> + <option key="ELECTRONIC_TEXT" description="${uiLabelMap.ContentDataBaseText}"/> </drop-down> </field> <field name="drDataTemplateTypeId" > @@ -432,8 +432,8 @@ under the License. </field> <field name="drMimeTypeId"> <drop-down no-current-selected-key="text/html"> - <option key="${uiLabelMap.ContentHtmlText}" description="text/html"/> - <option key="${uiLabelMap.ContentPlainText}" description="text/plain"/> + <option key="text/html" description="${uiLabelMap.ContentHtmlText}"/> + <option key="text/plain" description="${uiLabelMap.ContentPlainText}"/> </drop-down> </field> <field name="drObjectInfo" title="${uiLabelMap.ContentFilePath}"> Modified: ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml (original) +++ ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml Tue Dec 6 12:37:42 2016 @@ -25,9 +25,9 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="Survey" default-field-type="find"/> - <field name="isAnonymous"><drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field> - <field name="allowMultiple"><drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field> - <field name="allowUpdate"><drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field> + <field name="isAnonymous"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> + <field name="allowMultiple"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> + <field name="allowUpdate"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> <field name="acroFormContentId"> <lookup target-form-name="LookupContent"/> </field> @@ -64,9 +64,9 @@ under the License. <field use-when="survey==null&&surveyId!=null" name="surveyId" tooltip="${uiLabelMap.CommonCannotBeFound}: [${surveyId}]"><display description="" also-hidden="false"/></field> <field use-when="survey==null&&surveyId==null" name="surveyId"><ignored/></field> - <field name="isAnonymous"><drop-down no-current-selected-key="N" allow-empty="false"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field> - <field name="allowMultiple"><drop-down no-current-selected-key="N" allow-empty="false"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field> - <field name="allowUpdate"><drop-down no-current-selected-key="N" allow-empty="false"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field> + <field name="isAnonymous"><drop-down no-current-selected-key="N" allow-empty="false"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> + <field name="allowMultiple"><drop-down no-current-selected-key="N" allow-empty="false"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> + <field name="allowUpdate"><drop-down no-current-selected-key="N" allow-empty="false"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> <field name="acroFormContentId" use-when="survey!=null"> <lookup target-form-name="LookupContent"/> @@ -280,9 +280,9 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="Survey" default-field-type="find"/> <field name="surveyId" title="${uiLabelMap.ContentSurveySurveyId}"><text-find/></field> - <field name="isAnonymous"><drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field> - <field name="allowMultiple"><drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field> - <field name="allowUpdate"><drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field> + <field name="isAnonymous"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> + <field name="allowMultiple"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> + <field name="allowUpdate"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> Modified: ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml (original) +++ ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml Tue Dec 6 12:37:42 2016 @@ -35,7 +35,7 @@ under the License. <field name="siteName"><text size="30" maxlength="60"/></field> <field name="enableHttps"> - <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="productStoreId"> @@ -253,7 +253,7 @@ under the License. <field name="webSiteId"><hidden/></field> <field name="prodCatalogId" title="${uiLabelMap.Catalog}"> <drop-down> - <option key="All" description="all"/> + <option key="all" description="All"/> <entity-options description="${prodCatalogId}" entity-name="ProductStoreCatalog"> <entity-constraint name="productStoreId" value="${webSite.productStoreId}"/> </entity-options> @@ -261,9 +261,9 @@ under the License. </field> <field name="typeGenerate" title="Generate Type"> <check all-checked="false"> - <option key="Category" description="category"/> - <option key="Product" description="product"/> - <option key="Content" description="content"/> + <option key="category" description="Category"/> + <option key="product" description="Product"/> + <option key="content" description="Content"/> </check> </field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> Modified: ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml (original) +++ ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml Tue Dec 6 12:37:42 2016 @@ -101,7 +101,7 @@ <store-value value-field="emplPositionTypeRate"/> </if-not-empty> - <make-value entity-name="EmplPositionTypeRate" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="EmplPositionTypeRate"/> <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty> <set-nonpk-fields map="parameters" value-field="newEntity"/> Modified: ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml Tue Dec 6 12:37:42 2016 @@ -130,7 +130,7 @@ </not> </condition> <widgets> - <include-menu name="EmplPositionTypeTabBar" location="component://humanres/widget/HumanresMenus.xml"/> + <include-menu location="component://humanres/widget/HumanresMenus.xml" name="EmplPositionTypeTabBar"/> </widgets> </section> <screenlet title="${uiLabelMap.HumanResEditEmplPositionType}"> @@ -158,7 +158,7 @@ <widgets> <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-menu name="EmplPositionTypeTabBar" location="component://humanres/widget/HumanresMenus.xml"/> + <include-menu location="component://humanres/widget/HumanresMenus.xml" name="EmplPositionTypeTabBar"/> <screenlet id="AddEmplPositionTypeRatePanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResEmplPositionType} ${uiLabelMap.CommonRate}" collapsible="true"> <include-form name="AddEmplPositionTypeRate" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/> </screenlet> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Tue Dec 6 12:37:42 2016 @@ -277,26 +277,26 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="salaryFlag"> <drop-down allow-empty="false" current="selected"> - <option key="${uiLabelMap.CommonYes}" description="Y"/> - <option key="${uiLabelMap.CommonNo}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonYes}"/> + <option key="N" description="${uiLabelMap.CommonNo}"/> </drop-down> </field> <field name="exemptFlag"> <drop-down allow-empty="false" current="selected"> - <option key="${uiLabelMap.CommonYes}" description="Y"/> - <option key="${uiLabelMap.CommonNo}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonYes}"/> + <option key="N" description="${uiLabelMap.CommonNo}"/> </drop-down> </field> <field name="fulltimeFlag"> <drop-down allow-empty="false" current="selected"> - <option key="${uiLabelMap.CommonYes}" description="Y"/> - <option key="${uiLabelMap.CommonNo}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonYes}"/> + <option key="N" description="${uiLabelMap.CommonNo}"/> </drop-down> </field> <field name="temporaryFlag"> <drop-down allow-empty="false" current="selected"> - <option key="${uiLabelMap.CommonYes}" description="Y"/> - <option key="${uiLabelMap.CommonNo}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonYes}"/> + <option key="N" description="${uiLabelMap.CommonNo}"/> </drop-down> </field> <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml Tue Dec 6 12:37:42 2016 @@ -31,7 +31,7 @@ <entity-options entity-name="PartyRoleNameDetail" key-field-name="partyId" description="${groupName}"> <entity-constraint name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/> </entity-options> - <option key="${uiLabelMap.HumanResEmplPartyIdFromNotSpecified}" description="null"/> + <option key="null" description="${uiLabelMap.HumanResEmplPartyIdFromNotSpecified}"/> </drop-down> </field> <field name="fromDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><date-time/></field> Modified: ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml Tue Dec 6 12:37:42 2016 @@ -106,8 +106,8 @@ under the License. <field name="noOfResources" required-field="true"><text/></field> <field name="gender"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.CommonMale}" description="M"/> - <option key="${uiLabelMap.CommonFemale}" description="F"/> + <option key="M" description="${uiLabelMap.CommonMale}"/> + <option key="F" description="${uiLabelMap.CommonFemale}"/> </drop-down> </field> <field name="durationMonths"><text/></field> Modified: ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml (original) +++ ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml Tue Dec 6 12:37:42 2016 @@ -47,7 +47,7 @@ under the License. </simple-method> <simple-method method-name="copyBOMAssocs" short-description="Copy BOM associations from one product to another"> - <make-value entity-name="ProductAssoc" value-field="lookupMap"/> + <make-value value-field="lookupMap" entity-name="ProductAssoc"/> <set-pk-fields map="parameters" value-field="lookupMap"/> <find-by-and entity-name="ProductAssoc" map="lookupMap" list="assocs"/> <filter-list-by-date list="assocs"/> @@ -105,7 +105,7 @@ under the License. <fail-property resource="ManufacturingUiLabels" property="ManufacturingMachineGroupPermissionError"/> </check-permission> <check-errors/> - <make-value entity-name="ProductManufacturingRule" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="ProductManufacturingRule"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductManufacturingRule" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> @@ -117,7 +117,7 @@ under the License. <fail-property resource="ManufacturingUiLabels" property="ManufacturingMachineGroupPermissionError"/> </check-permission> <check-errors/> - <make-value entity-name="ProductManufacturingRule" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="ProductManufacturingRule"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductManufacturingRule" map="lookupPKMap" value-field="newEntity"/> <if-not-empty field="newEntity.ruleId"> @@ -126,7 +126,7 @@ under the License. </add-error> <check-errors/> <else> - <make-value entity-name="ProductManufacturingRule" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ProductManufacturingRule"/> <if-empty field="parameters.ruleId"> <sequenced-id sequence-name="ProductManufacturingRule" field="parameters.ruleId"/> </if-empty> @@ -142,7 +142,7 @@ under the License. <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/> </check-permission> <check-errors/> - <make-value entity-name="ProductManufacturingRule" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="ProductManufacturingRule"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductManufacturingRule" map="lookupPKMap" value-field="lookedUpValue"/> <if-not-empty field="lookedUpValue.ruleId"> Modified: ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml (original) +++ ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml Tue Dec 6 12:37:42 2016 @@ -23,7 +23,7 @@ under the License. <simple-method method-name="addRoutingTaskAssoc" short-description="If copyTask field = Y create a copy of the routingTask, in all the case add a RoutingTaskAssociation"> <if-compare field="parameters.copyTask" operator="equals" value="Y"> - <make-value entity-name="WorkEffort" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="WorkEffort"/> <set field="lookupPKMap.workEffortId" from-field="parameters.workEffortIdTo"/> <find-by-primary-key entity-name="WorkEffort" map="lookupPKMap" value-field="lookedUpValue"/> <call-map-processor xml-resource="component://manufacturing/minilang/techdata/RoutingMapProcs.xml" Modified: ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml (original) +++ ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml Tue Dec 6 12:37:42 2016 @@ -23,7 +23,7 @@ under the License. <simple-method method-name="createCalendar" short-description="Create Calendar"> <check-permission permission="MANUFACTURING" action="_CREATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission> <check-errors/> - <make-value entity-name="TechDataCalendar" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="TechDataCalendar"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendar" map="lookupPKMap" value-field="newEntity"/> <if-not-empty field="newEntity.calendarId"> @@ -32,7 +32,7 @@ under the License. </add-error> <check-errors/> <else> - <make-value entity-name="TechDataCalendarWeek" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarWeek" map="lookupPKMap" value-field="newEntity"/> <if-empty field="newEntity.calendarWeekId"> @@ -41,7 +41,7 @@ under the License. </add-error> <check-errors/> <else> - <make-value entity-name="TechDataCalendar" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="TechDataCalendar"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> @@ -54,7 +54,7 @@ under the License. <simple-method method-name="updateCalendar" short-description="Update Calendar"> <check-permission permission="MANUFACTURING" action="_UPDATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission> <check-errors/> - <make-value entity-name="TechDataCalendar" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="TechDataCalendar"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendar" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> @@ -64,7 +64,7 @@ under the License. <simple-method method-name="removeCalendar" short-description="Remove Calendar"> <check-permission permission="MANUFACTURING" action="_DELETE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission> <check-errors/> - <make-value entity-name="TechDataCalendar" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="TechDataCalendar"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <get-related value-field="lookupPKMap" relation-name="TechDataCalendarExcDay" list="relatedResultList"/> <first-from-list list="relatedResultList" entry="relatedResult"/> @@ -91,7 +91,7 @@ under the License. <simple-method method-name="createCalendarWeek" short-description="Create Calendar Week"> <check-permission permission="MANUFACTURING" action="_CREATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission> <check-errors/> - <make-value entity-name="TechDataCalendarWeek" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarWeek" map="lookupPKMap" value-field="newEntity"/> <if-not-empty field="newEntity.calendarWeekId"> @@ -100,7 +100,7 @@ under the License. </add-error> <check-errors/> <else> - <make-value entity-name="TechDataCalendarWeek" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="TechDataCalendarWeek"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> @@ -111,7 +111,7 @@ under the License. <simple-method method-name="updateCalendarWeek" short-description="Update CalendarWeek"> <check-permission permission="MANUFACTURING" action="_UPDATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission> <check-errors/> - <make-value entity-name="TechDataCalendarWeek" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarWeek" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> @@ -121,7 +121,7 @@ under the License. <simple-method method-name="removeCalendarWeek" short-description="Remove CalendarWeek"> <check-permission permission="MANUFACTURING" action="_DELETE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission> <check-errors/> - <make-value entity-name="TechDataCalendarWeek" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <get-related value-field="lookupPKMap" relation-name="TechDataCalendar" list="relatedResultList"/> <first-from-list list="relatedResultList" entry="relatedResult"/> @@ -148,7 +148,7 @@ under the License. <simple-method method-name="createCalendarExceptionDay" short-description="Create Calendar Exception Day"> <check-permission permission="MANUFACTURING" action="_CREATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission> <check-errors/> - <make-value entity-name="TechDataCalendarExcDay" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcDay"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarExcDay" map="lookupPKMap" value-field="newEntity"/> <if-not-empty field="newEntity.calendarId"> @@ -157,7 +157,7 @@ under the License. </add-error> <check-errors/> <else> - <make-value entity-name="TechDataCalendarExcDay" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="TechDataCalendarExcDay"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> @@ -168,7 +168,7 @@ under the License. <simple-method method-name="updateCalendarExceptionDay" short-description="Update CalendarExceptionDay"> <check-permission permission="MANUFACTURING" action="_UPDATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission> <check-errors/> - <make-value entity-name="TechDataCalendarExcDay" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcDay"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarExcDay" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> @@ -178,7 +178,7 @@ under the License. <simple-method method-name="removeCalendarExceptionDay" short-description="Remove CalendarExceptionDay"> <check-permission permission="MANUFACTURING" action="_DELETE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission> <check-errors/> - <make-value entity-name="TechDataCalendarExcDay" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcDay"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarExcDay" map="lookupPKMap" value-field="lookedUpValue"/> <if-not-empty field="lookedUpValue.calendarId"> @@ -189,7 +189,7 @@ under the License. <simple-method method-name="createCalendarExceptionWeek" short-description="Create Calendar Exception Week"> <check-permission permission="MANUFACTURING" action="_CREATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission> <check-errors/> - <make-value entity-name="TechDataCalendarExcWeek" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcWeek"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarExcWeek" map="lookupPKMap" value-field="newEntity"/> <if-not-empty field="newEntity.calendarId"> @@ -198,7 +198,7 @@ under the License. </add-error> <check-errors/> <else> - <make-value entity-name="TechDataCalendarExcWeek" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="TechDataCalendarExcWeek"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> @@ -209,7 +209,7 @@ under the License. <simple-method method-name="updateCalendarExceptionWeek" short-description="Update Calendar Exception Week"> <check-permission permission="MANUFACTURING" action="_UPDATE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission> <check-errors/> - <make-value entity-name="TechDataCalendarExcWeek" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcWeek"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarExcWeek" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> @@ -219,7 +219,7 @@ under the License. <simple-method method-name="removeCalendarExceptionWeek" short-description="Remove CalendarExceptionWeek"> <check-permission permission="MANUFACTURING" action="_DELETE"><fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarPermissionError"/></check-permission> <check-errors/> - <make-value entity-name="TechDataCalendarExcWeek" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcWeek"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarExcWeek" map="lookupPKMap" value-field="lookedUpValue"/> <if-not-empty field="lookedUpValue.calendarId"> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml Tue Dec 6 12:37:42 2016 @@ -121,8 +121,8 @@ under the License. </field> <field name="ruleOperator"> <drop-down> - <option key="${uiLabelMap.CommonOr}" description="OR"/> - <option key="${uiLabelMap.CommonAnd}" description="AND"/> + <option key="OR" description="${uiLabelMap.CommonOr}"/> + <option key="AND" description="${uiLabelMap.CommonAnd}"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"> @@ -134,8 +134,8 @@ under the License. <field name="productIdTo" title="${uiLabelMap.ProductProductIdTo}"><lookup target-form-name="LookupProduct"/></field> <field name="productAssocTypeId" title="${uiLabelMap.ManufacturingBomType}"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.ManufacturingBillOfMaterials}" description="MANUF_COMPONENT"/> - <option key="${uiLabelMap.ManufacturingEngineeringBillOfMaterials}" description="ENGINEER_COMPONENT"/> + <option key="MANUF_COMPONENT" description="${uiLabelMap.ManufacturingBillOfMaterials}"/> + <option key="ENGINEER_COMPONENT" description="${uiLabelMap.ManufacturingEngineeringBillOfMaterials}"/> </drop-down> </field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml Tue Dec 6 12:37:42 2016 @@ -61,8 +61,8 @@ under the License. <field name="description" title="${uiLabelMap.CommonDescription}"><text size="50"/></field> <field name="createDependentProductionRuns" title="${uiLabelMap.ManufacturingCreateDependentProductionRuns}"> <drop-down allow-empty="false"> - <option key="${uiLabelMap.CommonNo}" description="N"/> - <option key="${uiLabelMap.CommonYes}" description="Y"/> + <option key="N" description="${uiLabelMap.CommonNo}"/> + <option key="Y" description="${uiLabelMap.CommonYes}"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit/></field> @@ -360,8 +360,8 @@ under the License. </field> <field name="failIfItemsAreNotAvailable" use-when="estimatedQuantity != issuedQuantity"> <drop-down allow-empty="false"> - <option key="${uiLabelMap.CommonYes}" description="Y"/> - <option key="${uiLabelMap.CommonNo}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonYes}"/> + <option key="N" description="${uiLabelMap.CommonNo}"/> </drop-down> </field> <field name="_rowSubmit"><hidden value="Y"/></field> @@ -427,8 +427,8 @@ under the License. <field name="fromDate"><hidden/></field> <field name="failIfItemsAreNotAvailable"> <drop-down allow-empty="false"> - <option key="${uiLabelMap.CommonYes}" description="Y"/> - <option key="${uiLabelMap.CommonNo}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonYes}"/> + <option key="N" description="${uiLabelMap.CommonNo}"/> </drop-down> </field> <field name="task" entry-name="workEffortId" title="${uiLabelMap.ManufacturingRoutingTaskId}"> Modified: ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml (original) +++ ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml Tue Dec 6 12:37:42 2016 @@ -401,7 +401,7 @@ under the License. <field-map field-name="fromDate" from-field="parameters.fromDate"/> </entity-and> <if-empty field="webSiteContactList"> - <make-value entity-name="WebSiteContactList" value-field="webSiteContactList"/> + <make-value value-field="webSiteContactList" entity-name="WebSiteContactList"/> <set-pk-fields value-field="webSiteContactList" map="parameters"/> <set-nonpk-fields map="parameters" value-field="webSiteContactList"/> <create-value value-field="webSiteContactList"/> Modified: ofbiz/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml (original) +++ ofbiz/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml Tue Dec 6 12:37:42 2016 @@ -24,7 +24,7 @@ under the License. <simple-method method-name="createTrackingCodeType" short-description="Create an TrackingCodeType"> <now-timestamp field="nowStamp"/> - <make-value entity-name="TrackingCodeType" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="TrackingCodeType"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> @@ -42,7 +42,7 @@ under the License. <simple-method method-name="createTrackingCodeOrder" short-description="Create an TrackingCodeOrder"> <now-timestamp field="nowStamp"/> - <make-value entity-name="TrackingCodeOrder" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="TrackingCodeOrder"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> @@ -68,7 +68,7 @@ under the License. <!-- add service for tracking code return --> <simple-method method-name="createTrackingCodeOrderReturn" short-description="Create an TrackingCodeOrderReturn"> <now-timestamp field="nowStamp"/> - <make-value entity-name="TrackingCodeOrderReturn" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="TrackingCodeOrderReturn"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> Modified: ofbiz/trunk/applications/marketing/widget/ContactListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/ContactListForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/ContactListForms.xml Tue Dec 6 12:37:42 2016 @@ -38,12 +38,12 @@ under the License. </field> <field name="isPublic" title="${uiLabelMap.MarketingContactListIsPublic}"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/> </drop-down> </field> <field name="singleUse" title="${uiLabelMap.MarketingContactListIsSingleUse}"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/> </drop-down> </field> Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Tue Dec 6 12:37:42 2016 @@ -269,7 +269,7 @@ under the License. <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditContactList}"> - <include-menu name="ContactListCommBar" location="component://marketing/widget/ContactListMenus.xml"/> + <include-menu location="component://marketing/widget/ContactListMenus.xml" name="ContactListCommBar"/> <container style="button-bar"> <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent" style="buttontext create"> <parameter param-name="contactListId"/> Modified: ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml Tue Dec 6 12:37:42 2016 @@ -87,7 +87,7 @@ under the License. </and> </condition> <widgets> - <include-menu name="SegmentGroupTabBar" location="component://marketing/widget/SegmentMenus.xml"/> + <include-menu location="component://marketing/widget/SegmentMenus.xml" name="SegmentGroupTabBar"/> </widgets> </section> </decorator-section> Modified: ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml Tue Dec 6 12:37:42 2016 @@ -110,7 +110,7 @@ under the License. <field name="isBillable" title="${uiLabelMap.MarketingTrackingCodeOrderIsBilliable}"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/> </drop-down> </field> Modified: ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml Tue Dec 6 12:37:42 2016 @@ -148,8 +148,8 @@ under the License. <widgets> <decorator-screen name="CommonOpportunityDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-menu name="CommEventTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/> - <include-menu name="CommSubTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/> + <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="CommEventTabBar"/> + <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="CommSubTabBar"/> <screenlet title="${uiLabelMap.PageTitleListCommunications} ${partyId}"> <include-form name="ListCommEvents" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml Tue Dec 6 12:37:42 2016 @@ -80,15 +80,15 @@ under the License. <field name="actualCompletionDate"><hidden/></field> <field name="priority" position="1"> <drop-down allow-empty="true"> - <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"/> + <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}"/> </drop-down> </field> <field name="estimatedStartDate"><date-time input-method="time-dropdown" default-value="${nowTimestamp}"/></field> Modified: ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml Tue Dec 6 12:37:42 2016 @@ -28,7 +28,7 @@ This file contains basic services for Sa <simple-method method-name="createSalesForecast" short-description="Creates a sales forecast and stores a copy in sales forecast history."> <!-- make the value and set the fields from the parameters --> - <make-value entity-name="SalesForecast" value-field="salesForecast"/> + <make-value value-field="salesForecast" entity-name="SalesForecast"/> <sequenced-id sequence-name="SalesForecast" field="salesForecastId"/> <set field="salesForecast.salesForecastId" from-field="salesForecastId"/> <set-nonpk-fields map="parameters" value-field="salesForecast"/> @@ -65,7 +65,7 @@ This file contains basic services for Sa <simple-method method-name="saveSalesForecastHistory" short-description="Given a salesForecast map, saves the data in the history."> <!-- make the value and set the fields from the salesForecast map --> - <make-value entity-name="SalesForecastHistory" value-field="salesForecastHistory"/> + <make-value value-field="salesForecastHistory" entity-name="SalesForecastHistory"/> <sequenced-id sequence-name="SalesForecastHistory" field="salesForecastHistoryId"/> <set field="salesForecastHistory.salesForecastHistoryId" from-field="salesForecastHistoryId"/> <set-nonpk-fields map="salesForecast" value-field="salesForecastHistory"/> Modified: ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml Tue Dec 6 12:37:42 2016 @@ -78,7 +78,7 @@ under the License. <set field="parameters.needsInventoryReceive" value="N"/> </if-empty> - <make-value entity-name="ReturnHeader" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ReturnHeader"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <!-- If PartyAcctgPreference.useInvoiceIdForReturns is Y, get the ID from the getNextInvoiceId service --> @@ -314,7 +314,7 @@ under the License. <!-- if an orderItemSeqId is provided, then find the corresponding orderItem --> <if-not-empty field="parameters.orderItemSeqId"> - <make-value entity-name="OrderItem" value-field="itemLookup"/> + <make-value value-field="itemLookup" entity-name="OrderItem"/> <set-pk-fields map="parameters" value-field="itemLookup"/> <if-not-empty field="parameters.orderItemSeqId"> <find-by-primary-key entity-name="OrderItem" value-field="orderItem" map="itemLookup"/> @@ -377,7 +377,7 @@ under the License. </else> </if-compare> - <make-value entity-name="ReturnItem" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ReturnItem"/> <set from-field="parameters.returnId" field="newEntity.returnId"/> <make-next-seq-id seq-field-name="returnItemSeqId" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -491,7 +491,7 @@ under the License. </if> <check-errors/> - <make-value entity-name="ReturnAdjustment" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ReturnAdjustment"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="ReturnAdjustment" field="newEntity.returnAdjustmentId"/> <field-to-result field="newEntity.returnAdjustmentId" result-name="returnAdjustmentId"/> Modified: ofbiz/trunk/applications/order/minilang/order/OrderServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/OrderServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/order/OrderServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/order/OrderServices.xml Tue Dec 6 12:37:42 2016 @@ -507,7 +507,7 @@ under the License. </check-permission> <check-errors/> - <make-value entity-name="OrderHeader" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="OrderHeader"/> <if-not-empty field="parameters.orderId"> <set field="newEntity.orderId" from-field="parameters.orderId"/> @@ -606,7 +606,7 @@ under the License. <if-empty field="orderItemSeqId"> <!-- this is a new (promo) item --> <!-- a new order item is created --> - <make-value entity-name="OrderItem" value-field="newOrderItem"/> + <make-value value-field="newOrderItem" entity-name="OrderItem"/> <set field="newOrderItem.orderId" from-field="parameters.orderId"/> <call-object-method obj-field="item" method-name="getItemType" ret-field="newOrderItem.orderItemTypeId"/> <call-object-method obj-field="item" method-name="getSelectedAmount" ret-field="newOrderItem.selectedAmount"/> @@ -679,7 +679,7 @@ under the License. <fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateOrderContactMech"/> </check-permission> <check-errors/> - <make-value entity-name="OrderContactMech" value-field="orderContactMechMap"/> + <make-value value-field="orderContactMechMap" entity-name="OrderContactMech"/> <set-pk-fields map="parameters" value-field="orderContactMechMap"/> <set from-field="parameters.orderId" field="inputMap.orderId"/> <set from-field="parameters.contactMechPurposeTypeId" field="inputMap.contactMechPurposeTypeId"/> @@ -722,7 +722,7 @@ under the License. <fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunUpdateOrderItemShipGroup"/> </check-permission> <check-errors/> - <make-value entity-name="OrderItemShipGroup" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="OrderItemShipGroup"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="OrderItemShipGroup" map="lookupPKMap" value-field="lookedUpValue"/> <!-- splitting shipmentMethod request parameter value that contains "@" symbol @@ -835,7 +835,7 @@ under the License. </simple-method> <simple-method method-name="createOrderItemChange" short-description="Creates a new Order Item Change record"> - <make-value entity-name="OrderItemChange" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="OrderItemChange"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="parameters.changeDatetime"> <now-timestamp field="nowTimestamp"/> @@ -1185,7 +1185,7 @@ under the License. <if-compare-field field="orderItem.unitPrice" to-field="supplierProduct.lastPrice" operator="not-equals" type="BigDecimal"/> </condition> <then> - <make-value entity-name="SupplierProduct" value-field="newSupplierProduct"/> + <make-value value-field="newSupplierProduct" entity-name="SupplierProduct"/> <clone-value value-field="supplierProduct" new-value-field="newSupplierProduct"/> <set from-field="nowTimestamp" field="newSupplierProduct.availableFromDate"/> <set from-field="orderItem.unitPrice" field="newSupplierProduct.lastPrice"/> @@ -1217,7 +1217,7 @@ under the License. <if-compare-field field="orderItem.unitPrice" to-field="supplierProduct.lastPrice" operator="not-equals" type="BigDecimal"/> </condition> <then> - <make-value entity-name="SupplierProduct" value-field="newSupplierProduct"/> + <make-value value-field="newSupplierProduct" entity-name="SupplierProduct"/> <clone-value value-field="supplierProduct" new-value-field="newSupplierProduct"/> <set from-field="nowTimestamp" field="newSupplierProduct.availableFromDate"/> <set from-field="orderItem.unitPrice" field="newSupplierProduct.lastPrice" type="BigDecimal"/> Modified: ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml Tue Dec 6 12:37:42 2016 @@ -112,7 +112,7 @@ under the License. </if> <check-errors/> <!-- create new entity and create all the fields --> - <make-value entity-name="Quote" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="Quote"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.statusId"> <set value="QUO_CREATED" field="newEntity.statusId"/> @@ -298,12 +298,12 @@ under the License. <fail-property resource="OrderErrorUiLabels" property="OrderErrorCreatePermissionError"/> </check-permission> <check-errors/> - <make-value entity-name="PartyRole" value-field="partyRole"/> + <make-value value-field="partyRole" entity-name="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 entity-name="QuoteRole" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="QuoteRole"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> <property-to-field resource="OrderUiLabels" property="OrderOrderQuoteRoleAddedSuccessfully" field="successMessage"/> @@ -342,7 +342,7 @@ under the License. <check-errors/> <!-- create new entity and create all the fields --> - <make-value entity-name="QuoteItem" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="QuoteItem"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set from-field="parameters.quoteId" field="newEntity.quoteId"/> @@ -487,7 +487,7 @@ under the License. </check-permission> <check-errors/> <!-- create new entity and create all the fields --> - <make-value entity-name="QuoteAttribute" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="QuoteAttribute"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> @@ -526,7 +526,7 @@ under the License. </check-permission> <check-errors/> <!-- create new entity and create all the fields --> - <make-value entity-name="QuoteCoefficient" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="QuoteCoefficient"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> @@ -574,8 +574,8 @@ under the License. </if-empty> <check-errors/> <!-- create new entity and create all the fields --> - <make-value entity-name="Quote" value-field="newQuote"/> - <make-value entity-name="QuoteItem" value-field="newQuoteItem"/> + <make-value value-field="newQuote" entity-name="Quote"/> + <make-value value-field="newQuoteItem" entity-name="QuoteItem"/> <set-nonpk-fields map="parameters" value-field="newQuote"/> <set-nonpk-fields map="parameters" value-field="newQuoteItem"/> <if-empty field="newQuote.statusId"> @@ -601,7 +601,7 @@ under the License. <create-value value-field="newQuote"/> <create-value value-field="newQuoteItem"/> <!-- copy the roles from the request to the quote--> - <make-value entity-name="CustRequestParty" value-field="lookupRequestRole"/> + <make-value value-field="lookupRequestRole" entity-name="CustRequestParty"/> <set from-field="parameters.custRequestId" field="lookupRequestRole.custRequestId"/> <find-by-and entity-name="CustRequestParty" map="lookupRequestRole" list="roles"/> <iterate list="roles" entry="role"> @@ -731,7 +731,7 @@ under the License. </check-permission> <check-errors/> - <make-value entity-name="QuoteAdjustment" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="QuoteAdjustment"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="QuoteAdjustment" field="quoteAdjustmentId"/> @@ -983,7 +983,7 @@ under the License. </if-not-empty> </simple-method> <simple-method method-name="createQuoteTerm" short-description="Create a QuoteTerm"> - <make-value entity-name="QuoteTerm" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="QuoteTerm"/> <if-empty field="parameters.quoteItemSeqId"> <set field="parameters.quoteItemSeqId" value="_NA_"/> </if-empty> @@ -992,7 +992,7 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="deleteQuoteTerm" short-description="Delete a QuoteTerm"> - <make-value entity-name="QuoteTerm" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="QuoteTerm"/> <set-pk-fields map="parameters" value-field="newEntity"/> <remove-value value-field="newEntity"/> </simple-method> @@ -1009,7 +1009,7 @@ under the License. </add-error> </if-empty> <check-errors/> - <make-value entity-name="QuoteNote" value-field="newQuoteNote"/> + <make-value value-field="newQuoteNote" entity-name="QuoteNote"/> <set field="newQuoteNote.quoteId" from-field="parameters.quoteId"/> <set field="newQuoteNote.noteId" from-field="noteId"/> <create-value value-field="newQuoteNote"/> Modified: ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml Tue Dec 6 12:37:42 2016 @@ -49,7 +49,7 @@ under the License. </simple-method> <simple-method method-name="createCustRequest" short-description="Create Customer Request"> - <make-value entity-name="CustRequest" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="CustRequest"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <now-timestamp field="newEntity.lastModifiedDate"/> @@ -214,7 +214,7 @@ under the License. </simple-method> <simple-method method-name="createCustRequestAttribute" short-description="Create Customer Request Attribute"> - <make-value entity-name="CustRequestAttribute" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="CustRequestAttribute"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> @@ -231,7 +231,7 @@ under the License. <simple-method method-name="createCustRequestItem" short-description="Create Customer Request Item"> <call-simple-method method-name="checkStatusCustRequest"/> - <make-value entity-name="CustRequestItem" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="CustRequestItem"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="parameters.custRequestItemSeqId"> @@ -261,11 +261,11 @@ under the License. <set from-field="parameters.roleTypeId" field="lookupPKMap.roleTypeId"/> <find-by-primary-key entity-name="PartyRole" map="lookupPKMap" value-field="partyRole"/> <if-empty field="partyRole.partyId"> - <make-value entity-name="PartyRole" value-field="partyRole"/> + <make-value value-field="partyRole" entity-name="PartyRole"/> <set-pk-fields map="lookupPKMap" value-field="partyRole"/> <create-value value-field="partyRole"/> </if-empty> - <make-value entity-name="CustRequestParty" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="CustRequestParty"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> @@ -296,7 +296,7 @@ under the License. <call-simple-method method-name="updateCustRequestLastModifiedDate"/> </simple-method> <simple-method method-name="createCustRequestNote" short-description="Create Customer Request Note"> - <make-value entity-name="CustRequestNote" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="CustRequestNote"/> <set from-field="parameters.custRequestId" field="newEntity.custRequestId"/> <set from-field="parameters.noteInfo" field="newNoteMap.note"/> <call-service service-name="createNote" in-map-name="newNoteMap"> @@ -320,7 +320,7 @@ under the License. </simple-method> <simple-method method-name="createCustRequestItemNote" short-description="Create Customer RequestItem Note"> <call-simple-method method-name="checkStatusCustRequest"/> - <make-value entity-name="CustRequestItemNote" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="CustRequestItemNote"/> <set from-field="parameters.custRequestId" field="newEntity.custRequestId"/> <set from-field="parameters.custRequestItemSeqId" field="newEntity.custRequestItemSeqId"/> <set from-field="parameters.note" field="newNoteMap.note"/>
