Modified: ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml Tue Dec 6 12:37:42 2016 @@ -74,44 +74,44 @@ under the License. </field> <field name="manualAuthIsCapture"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="prorateShipping"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="prorateTaxes"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="viewCartOnAdd"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="autoSaveCart"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="autoApproveReviews"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="autoInvoiceDigitalItems"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="reqShipAddrForDigItems"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="isDemoStore"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="isImmediatelyFulfilled"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="checkInventory"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="requireInventory"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="reserveInventory"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="reserveOrderEnumId"> <drop-down allow-empty="true"> @@ -122,13 +122,13 @@ under the License. </drop-down> </field> <field name="balanceResOnOrderCreation"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="showOutOfStockProducts"> - <drop-down allow-empty="false"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="oneInventoryFacility"> - <drop-down allow-empty="true" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="true" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="requirementMethodEnumId"> <drop-down allow-empty="true"> @@ -141,7 +141,7 @@ under the License. <!-- <field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> --> <field name="defaultCurrencyUomId"> @@ -161,10 +161,10 @@ under the License. </drop-down> </field> <field name="allowPassword"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="retryFailedAuths"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="headerApprovedStatus"> <drop-down no-current-selected-key="ORDER_APPROVED"> @@ -240,8 +240,8 @@ under the License. <field name="oldStyleSheet"><hidden/></field> <field name="managedByLot" title="${uiLabelMap.ProductManagedByLot}"> <drop-down allow-empty="false" no-current-selected-key="N"> - <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="oldHeaderLogo"><hidden/></field> @@ -252,68 +252,68 @@ under the License. <field name="templatePathPrefix" tooltip="If specified will be prepended to template paths. Should start with a slash but not end with one."><text size="60" maxlength="250"/></field> --> <field name="explodeOrderItems"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="checkGcBalance"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="usePrimaryEmailUsername"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="requireCustomerRole"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="showCheckoutGiftOptions"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="selectPaymentTypePerItem"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="showPricesWithVatTax"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="showTaxIsExempt"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="vatTaxAuthGeoId"><lookup target-form-name="LookupGeo"/></field> <field name="vatTaxAuthPartyId"><lookup target-form-name="LookupPartyName"/></field> <field name="prodSearchExcludeVariants"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="enableDigProdUpload"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="digProdUploadCategoryId"><lookup target-form-name="LookupProductCategory"/></field> <field name="enableAutoSuggestionList"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="autoOrderCcTryExp"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="autoOrderCcTryOtherCards"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="autoOrderCcTryLaterNsf"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="autoApproveInvoice"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="autoApproveOrder"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="shipIfCaptureFails"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="setOwnerUponIssuance"> - <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="reqReturnInventoryReceive"> - <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="orderDecimalQuantity" tooltip="${uiLabelMap.ProductOrderDecimalQuantityExistsToOverride}"> - <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="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <sort-order> @@ -469,8 +469,8 @@ under the License. <field name="sequenceNum"><text/></field> <field name="manualOnly"> <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="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> @@ -487,8 +487,8 @@ under the License. <field name="thruDate"><date-time/></field> <field name="manualOnly"> <drop-down> - <option key="${uiLabelMap.CommonN}" description="N"/> - <option key="${uiLabelMap.CommonY}" description="Y"/> + <option key="N" description="${uiLabelMap.CommonN}"/> + <option key="Y" description="${uiLabelMap.CommonY}"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -849,8 +849,8 @@ under the License. <field name="paymentPropertiesPath" title="${uiLabelMap.ProductPaymentProps}"><text/></field> <field name="applyToAllProducts" title="${uiLabelMap.ProductApplyToAll} ${uiLabelMap.ProductProducts}"> <drop-down> - <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="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -1259,22 +1259,22 @@ under the License. <field name="minTotal" tooltip="${uiLabelMap.ProductMinTotalMessage}"><text/></field> <field name="maxTotal" tooltip="${uiLabelMap.ProductMaxTotalMessage}"><text/></field> <field name="allowUspsAddr" tooltip="${uiLabelMap.ProductAllowUSPSAddr}"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="requireUspsAddr" tooltip="${uiLabelMap.ProductRequireMessage}"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="allowCompanyAddr"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="requireCompanyAddr" tooltip="${uiLabelMap.ProductRequireMessage}"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="companyPartyId" tooltip="${uiLabelMap.ProductAllowMessage}"> <lookup target-form-name="LookupPartyName"/> </field> <field name="includeNoChargeItems" title="${uiLabelMap.ProductIncludeFreeship}" tooltip="${uiLabelMap.ProductIncludeFreeshipMessage}"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="includeGeoId" title="${uiLabelMap.ProductIncludeGeo}" tooltip="${uiLabelMap.ProductIncludeGeoMessage}"> <lookup target-form-name="LookupGeo"/>
Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml Tue Dec 6 12:37:42 2016 @@ -64,8 +64,8 @@ under the License. <field name="productCategoryId"><lookup target-form-name="LookupProductCategory"/></field> <field name="automaticExtend" title="Automatic Extend" ><!-- TODO: ${uiLabelMap.FormFieldTitle_automaticExtend} get overwritten with the description of the field from the entitymodel--> <drop-down allow-empty="true"> - <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> @@ -283,8 +283,8 @@ under the License. </field> <field name="automaticExtend" title="Automatic Extend" ><!-- TODO: ${uiLabelMap.FormFieldTitle_automaticExtend} get overwritten with the description of the field from the entitymodel--> <drop-down allow-empty="true"> - <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="canclAutmExtTime" title="Cancel time"></field> @@ -397,8 +397,8 @@ under the License. </field> <field name="automaticExtend"> <drop-down allow-empty="true"> - <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="canclAutmExtTimeUomId"> @@ -441,8 +441,8 @@ under the License. </field> <field name="automaticExtend"> <drop-down allow-empty="true"> - <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="canclAutmExtTimeUomId"> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml Tue Dec 6 12:37:42 2016 @@ -208,9 +208,9 @@ under the License. <field name="quantityOnHandDiff" tooltip="${uiLabelMap.ProductMessageQoh}"><text-find default-value="0" default-option="notEqual" ignore-case="false"/></field> <field name="reportType"> <drop-down allow-empty="false"> - <option key="${uiLabelMap.ProductByInventoryItem}" description="BY_ITEM"/> - <option key="${uiLabelMap.ProductByProduct}" description="BY_PRODUCT"/> - <option key="${uiLabelMap.ProductByDate}" description="BY_DATE"/> + <option key="BY_ITEM" description="${uiLabelMap.ProductByInventoryItem}"/> + <option key="BY_PRODUCT" description="${uiLabelMap.ProductByProduct}"/> + <option key="BY_DATE" description="${uiLabelMap.ProductByDate}"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonFind}" event="onclick" action="javascript:var field=document.SearchInventoryItemsParams.softIdentifier;var tmp=field.value;if (tmp.substring(0, 2) == '0x') {tmp=parseInt(tmp, 16)};if (!isNaN(tmp)) {field.value=tmp};return true;"> @@ -510,7 +510,7 @@ under the License. <field name="billingWeight" title="${uiLabelMap.CommonWeight}"><text size="10"/></field> <field name="billingWeightUomId" title="${uiLabelMap.ProductWeightUomId}"> <drop-down allow-empty="false"> - <option key="${defaultWeightUom.description}" description="${defaultWeightUom.uomId}"/> + <option key="${defaultWeightUom.uomId}" description="${defaultWeightUom.description}"/> <entity-options entity-name="Uom" key-field-name="uomId"> <entity-constraint name="uomTypeId" operator="equals" value="WEIGHT_MEASURE"/> </entity-options> Modified: ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelForms.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelForms.xml Tue Dec 6 12:37:42 2016 @@ -31,7 +31,7 @@ under the License. </drop-down> </field> <field name="hasTable"> - <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field> </form> Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigForms.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigForms.xml Tue Dec 6 12:37:42 2016 @@ -82,7 +82,7 @@ under the License. </field> <field name="headAction" title="${uiLabelMap.FacilityShipmentDhlHeadAction}"> <drop-down> - <option key="${uiLabelMap.FacilityShipmentDhlHeadActionRequest}" description="Request"/> + <option key="Request" description="${uiLabelMap.FacilityShipmentDhlHeadActionRequest}"/> </drop-down> </field> <field name="accessUserId" title="${uiLabelMap.FacilityShipmentDhlAccessUserId}"> @@ -99,12 +99,12 @@ under the License. </field> <field name="labelImageFormat" title="${uiLabelMap.FacilityShipmentDhlLabelImageFormat}"> <drop-down> - <option key="${uiLabelMap.FacilityShipmentDhlLabelImageFormatPng}" description="PNG"/> + <option key="PNG" description="${uiLabelMap.FacilityShipmentDhlLabelImageFormatPng}"/> </drop-down> </field> <field name="rateEstimateTemplate" title="${uiLabelMap.FacilityShipmentDhlRateEstimate}"> <drop-down> - <option key="${uiLabelMap.FacilityShipmentDhlRateEstimate}" description="api.schema.DHL"/> + <option key="api.schema.DHL" description="${uiLabelMap.FacilityShipmentDhlRateEstimate}"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> @@ -138,32 +138,32 @@ under the License. </field> <field name="labelImageType" title="${uiLabelMap.FacilityShipmentFedexLabelImageType}"> <drop-down> - <option key="${uiLabelMap.FacilityShipmentFedexLabelImageTypePdf}" description="PDF"/> - <option key="${uiLabelMap.FacilityShipmentFedexLabelImageTypePng}" description="PNG"/> + <option key="PDF" description="${uiLabelMap.FacilityShipmentFedexLabelImageTypePdf}"/> + <option key="PNG" description="${uiLabelMap.FacilityShipmentFedexLabelImageTypePng}"/> </drop-down> </field> <field name="defaultDropoffType" title="${uiLabelMap.FacilityShipmentFedexDropoffType}"> <drop-down> - <option key="${uiLabelMap.FacilityShipmentFedexDropoffTypeRegularPickup}" description="REGULARPICKUP"/> - <option key="${uiLabelMap.FacilityShipmentFedexDropoffTypeRequestCourier}" description="REQUESTCOURIER"/> - <option key="${uiLabelMap.FacilityShipmentFedexDropoffTypeDropBox}" description="DROPBOX"/> - <option key="${uiLabelMap.FacilityShipmentFedexDropoffTypeBusinessService}" description="BUSINESSSERVICECTR"/> - <option key="${uiLabelMap.FacilityShipmentFedexDropoffTypeStation}" description="STATION"/> + <option key="REGULARPICKUP" description="${uiLabelMap.FacilityShipmentFedexDropoffTypeRegularPickup}"/> + <option key="REQUESTCOURIER" description="${uiLabelMap.FacilityShipmentFedexDropoffTypeRequestCourier}"/> + <option key="DROPBOX" description="${uiLabelMap.FacilityShipmentFedexDropoffTypeDropBox}"/> + <option key="BUSINESSSERVICECTR" description="${uiLabelMap.FacilityShipmentFedexDropoffTypeBusinessService}"/> + <option key="STATION" description="${uiLabelMap.FacilityShipmentFedexDropoffTypeStation}"/> </drop-down> </field> <field name="defaultPackagingType" title="${uiLabelMap.FacilityShipmentFedexPackingType}"> <drop-down> - <option key="${uiLabelMap.FacilityShipmentFedexPackingEnveloper}" description="FXENV"/> - <option key="${uiLabelMap.FacilityShipmentFedexPackingEnveloperLegal}" description="FXENV_LGL"/> - <option key="${uiLabelMap.FacilityShipmentFedexPackingPakSmall}" description="FXPAK_SM"/> - <option key="${uiLabelMap.FacilityShipmentFedexPackingPakLarge}" description="FXPAK_LRG"/> - <option key="${uiLabelMap.FacilityShipmentFedexPackingBoxSmall}" description="FXBOX_SM"/> - <option key="${uiLabelMap.FacilityShipmentFedexPackingBoxMedium}" description="FXBOX_MED"/> - <option key="${uiLabelMap.FacilityShipmentFedexPackingBoxLarge}" description="FXBOX_LRG"/> - <option key="${uiLabelMap.FacilityShipmentFedexPackingTube}" description="FXTUBE"/> - <option key="${uiLabelMap.FacilityShipmentFedexPackingBox10Kg}" description="FX10KGBOX"/> - <option key="${uiLabelMap.FacilityShipmentFedexPackingBox25Kg}" description="FX25KGBOX"/> - <option key="${uiLabelMap.FacilityShipmentFedexPackingYour}" description="YOURPACKNG"/> + <option key="FXENV" description="${uiLabelMap.FacilityShipmentFedexPackingEnveloper}"/> + <option key="FXENV_LGL" description="${uiLabelMap.FacilityShipmentFedexPackingEnveloperLegal}"/> + <option key="FXPAK_SM" description="${uiLabelMap.FacilityShipmentFedexPackingPakSmall}"/> + <option key="FXPAK_LRG" description="${uiLabelMap.FacilityShipmentFedexPackingPakLarge}"/> + <option key="FXBOX_SM" description="${uiLabelMap.FacilityShipmentFedexPackingBoxSmall}"/> + <option key="FXBOX_MED" description="${uiLabelMap.FacilityShipmentFedexPackingBoxMedium}"/> + <option key="FXBOX_LRG" description="${uiLabelMap.FacilityShipmentFedexPackingBoxLarge}"/> + <option key="FXTUBE" description="${uiLabelMap.FacilityShipmentFedexPackingTube}"/> + <option key="FX10KGBOX" description="${uiLabelMap.FacilityShipmentFedexPackingBox10Kg}"/> + <option key="FX25KGBOX" description="${uiLabelMap.FacilityShipmentFedexPackingBox25Kg}"/> + <option key="YOURPACKNG" description="${uiLabelMap.FacilityShipmentFedexPackingYour}"/> </drop-down> </field> <field name="templateShipment" title="${uiLabelMap.FacilityShipmentFedexShipmentTemplateLocation}"> @@ -206,8 +206,8 @@ under the License. </field> <field name="saveCertInfo" title="${uiLabelMap.FacilityShipmentUpsSaveCertInfo}"> <drop-down> - <option key="${uiLabelMap.CommonTrue}" description="true"/> - <option key="${uiLabelMap.CommonFalse}" description="false"/> + <option key="true" description="${uiLabelMap.CommonTrue}"/> + <option key="false" description="${uiLabelMap.CommonFalse}"/> </drop-down> </field> <field name="saveCertPath" title="${uiLabelMap.FacilityShipmentUpsSaveCertPath}"> @@ -215,20 +215,20 @@ under the License. </field> <field name="shipperPickupType" title="${uiLabelMap.FacilityShipmentUpsShipperPickupType}"> <drop-down> - <option key="${uiLabelMap.FacilityShipmentUpsPickupDaily}" description="01"/> - <option key="${uiLabelMap.FacilityShipmentUpsPickupCustomerCounter}" description="03"/> - <option key="${uiLabelMap.FacilityShipmentUpsPickupOneTime}" description="06"/> - <option key="${uiLabelMap.FacilityShipmentUpsPickupOnCallAir}" description="07"/> - <option key="${uiLabelMap.FacilityShipmentUpsPickupSuggestedRetailRates}" description="11"/> - <option key="${uiLabelMap.FacilityShipmentUpsPickupLetterCenter}" description="19"/> - <option key="${uiLabelMap.FacilityShipmentUpsPickupAirServiceCenter}" description="20"/> + <option key="01" description="${uiLabelMap.FacilityShipmentUpsPickupDaily}"/> + <option key="03" description="${uiLabelMap.FacilityShipmentUpsPickupCustomerCounter}"/> + <option key="06" description="${uiLabelMap.FacilityShipmentUpsPickupOneTime}"/> + <option key="07" description="${uiLabelMap.FacilityShipmentUpsPickupOnCallAir}"/> + <option key="11" description="${uiLabelMap.FacilityShipmentUpsPickupSuggestedRetailRates}"/> + <option key="19" description="${uiLabelMap.FacilityShipmentUpsPickupLetterCenter}"/> + <option key="20" description="${uiLabelMap.FacilityShipmentUpsPickupAirServiceCenter}"/> </drop-down> </field> <field name="customerClassification" title="${uiLabelMap.FacilityShipmentUpsCustomerClassification}"> <drop-down> - <option key="${uiLabelMap.FacilityShipmentUpsCustomerClassificationWholesale}" description="01"/> - <option key="${uiLabelMap.FacilityShipmentUpsCustomerClassificationOccasional}" description="03"/> - <option key="${uiLabelMap.FacilityShipmentUpsCustomerClassificationRetail}" description="04"/> + <option key="01" description="${uiLabelMap.FacilityShipmentUpsCustomerClassificationWholesale}"/> + <option key="03" description="${uiLabelMap.FacilityShipmentUpsCustomerClassificationOccasional}"/> + <option key="04" description="${uiLabelMap.FacilityShipmentUpsCustomerClassificationRetail}"/> </drop-down> </field> <field name="maxEstimateWeight" title="${uiLabelMap.FacilityShipmentUpsMaxEstimateWeight}"> @@ -239,8 +239,8 @@ under the License. </field> <field name="codAllowCod" title="${uiLabelMap.FacilityShipmentUpsAllowCod}"> <drop-down> - <option key="${uiLabelMap.CommonTrue}" description="true"/> - <option key="${uiLabelMap.CommonFalse}" description="false"/> + <option key="true" description="${uiLabelMap.CommonTrue}"/> + <option key="false" description="${uiLabelMap.CommonFalse}"/> </drop-down> </field> <field name="codSurchargeAmount" title="${uiLabelMap.FacilityShipmentUpsSurchargeAmount}"> @@ -251,16 +251,16 @@ under the License. </field> <field name="codSurchargeApplyToPackage" title="${uiLabelMap.FacilityShipmentUpsSurchargeApplyToPackage}"> <drop-down> - <option key="${uiLabelMap.FacilityShipmentUpsSurchargeAll}" description="all"/> - <option key="${uiLabelMap.FacilityShipmentUpsSurchargeFirst}" description="first"/> - <option key="${uiLabelMap.FacilityShipmentUpsSurchargeSplit}" description="split"/> - <option key="${uiLabelMap.FacilityShipmentUpsSurchargeNone}" description="none"/> + <option key="all" description="${uiLabelMap.FacilityShipmentUpsSurchargeAll}"/> + <option key="first" description="${uiLabelMap.FacilityShipmentUpsSurchargeFirst}"/> + <option key="split" description="${uiLabelMap.FacilityShipmentUpsSurchargeSplit}"/> + <option key="none" description="${uiLabelMap.FacilityShipmentUpsSurchargeNone}"/> </drop-down> </field> <field name="codFundsCode" title="${uiLabelMap.FacilityShipmentUpsFundsCode}"> <drop-down> - <option key="${uiLabelMap.FacilityShipmentUpsUnsecuredFundsAllowed}" description="0"/> - <option key="${uiLabelMap.FacilityShipmentUpsSecuredFundsOnly}" description="8"/> + <option key="0" description="${uiLabelMap.FacilityShipmentUpsUnsecuredFundsAllowed}"/> + <option key="8" description="${uiLabelMap.FacilityShipmentUpsSecuredFundsOnly}"/> </drop-down> </field> <field name="defaultReturnLabelMemo" title="${uiLabelMap.FacilityShipmentUpsDefaultReturnLabelMemo}"> @@ -294,8 +294,8 @@ under the License. </field> <field name="test" title="${uiLabelMap.FacilityShipmentUspsTestMode}"> <drop-down> - <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="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> @@ -343,8 +343,8 @@ under the License. </field> <field name="hasTable"> <drop-down> - <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="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> Modified: ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml Tue Dec 6 12:37:42 2016 @@ -23,7 +23,7 @@ under the License. <!-- Timesheet Services --> <simple-method method-name="createTimesheet" short-description="Create Timesheet"> - <make-value entity-name="Timesheet" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="Timesheet"/> <sequenced-id sequence-name="Timesheet" field="newEntity.timesheetId"/> <field-to-result field="newEntity.timesheetId" result-name="timesheetId"/> @@ -311,7 +311,7 @@ under the License. <call-simple-method method-name="checkTimesheetStatus"/> <now-timestamp field="nowTimestamp"/> - <make-value entity-name="TimeEntry" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="TimeEntry"/> <sequenced-id sequence-name="TimeEntry" field="newEntity.timeEntryId"/> <field-to-result field="newEntity.timeEntryId" result-name="timeEntryId"/> Modified: ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Tue Dec 6 12:37:42 2016 @@ -27,7 +27,7 @@ under the License. <result-to-field result-name="workEffortId"/> </call-service> <check-errors /> - <make-value entity-name="WorkEffortPartyAssignment" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="WorkEffortPartyAssignment"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set field="newEntity.workEffortId" from-field="workEffortId"/> @@ -40,7 +40,7 @@ under the License. </simple-method> <simple-method method-name="createWorkEffort" short-description="Create Work Effort"> - <make-value entity-name="WorkEffort" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="WorkEffort"/> <if-empty field="parameters.workEffortId"> <sequenced-id sequence-name="WorkEffort" field="newEntity.workEffortId"/> <else> @@ -62,7 +62,7 @@ under the License. <create-value value-field="newEntity"/> <!-- create new status entry, and set lastStatusUpdate date --> - <make-value entity-name="WorkEffortStatus" value-field="newWorkEffortStatus"/> + <make-value value-field="newWorkEffortStatus" entity-name="WorkEffortStatus"/> <set from-field="newEntity.workEffortId" field="newWorkEffortStatus.workEffortId"/> <set from-field="newEntity.currentStatusId" field="newWorkEffortStatus.statusId"/> <set from-field="nowTimestamp" field="newWorkEffortStatus.statusDatetime"/> @@ -71,7 +71,7 @@ under the License. <!-- Attach the workeffort to a requirement if passed --> <if-not-empty field="parameters.requirementId"> - <make-value entity-name="WorkRequirementFulfillment" value-field="workFullfillment"/> + <make-value value-field="workFullfillment" entity-name="WorkRequirementFulfillment"/> <set from-field="newEntity.workEffortId" field="workFullfillment.workEffortId"/> <set from-field="parameters.requirementId" field="workFullfillment.requirementId"/> <create-value value-field="workFullfillment"/> @@ -90,7 +90,7 @@ under the License. <check-errors/> </if-compare-field> <!-- create customer request / work effort relation --> - <make-value entity-name="CustRequestWorkEffort" value-field="custRequestWorkEffort"/> + <make-value value-field="custRequestWorkEffort" entity-name="CustRequestWorkEffort"/> <set field="custRequestWorkEffort.workEffortId" from-field="newEntity.workEffortId"/> <set field="custRequestWorkEffort.custRequestId" from-field="parameters.custRequestId"/> <create-value value-field="custRequestWorkEffort"/> @@ -157,7 +157,7 @@ under the License. </if-not-empty> <set from-field="nowTimestamp" field="lookedUpValue.lastStatusUpdate"/> - <make-value entity-name="WorkEffortStatus" value-field="newWorkEffortStatus"/> + <make-value value-field="newWorkEffortStatus" entity-name="WorkEffortStatus"/> <set from-field="lookedUpValue.workEffortId" field="newWorkEffortStatus.workEffortId"/> <set from-field="parameters.currentStatusId" field="newWorkEffortStatus.statusId"/> <set from-field="parameters.reason" field="newWorkEffortStatus.reason"/> @@ -267,7 +267,7 @@ under the License. <iterate list="relationValues" entry="relatedValue"> <clone-value value-field="relatedValue" new-value-field="newRelatedValue" /> <set field="newRelatedValue[relatedIdFieldName]" from-field="targetWorkEffortId" /> - <make-value entity-name="${relatedEntityName}" value-field="newRelatedPks" /> + <make-value value-field="newRelatedPks" entity-name="${relatedEntityName}" /> <set-pk-fields value-field="newRelatedPks" map="newRelatedValue" /> <find-by-primary-key entity-name="${relatedEntityName}" map="newRelatedPks" value-field="duplicateCheck" /> <if-empty field="duplicateCheck"> @@ -346,7 +346,7 @@ under the License. </if-not-empty> <check-errors/> - <make-value entity-name="WorkEffortPartyAssignment" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="WorkEffortPartyAssignment"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -396,7 +396,7 @@ under the License. <!-- Create a WorkEffortContactMech --> <simple-method method-name="createWorkEffortContactMech" short-description="Create a WorkEffortContactMech"> - <make-value entity-name="WorkEffortContactMech" value-field="newValue"/> + <make-value value-field="newValue" entity-name="WorkEffortContactMech"/> <if-empty field="parameters.contactMechId"> <if-not-empty field="parameters.partyId"> <set-service-fields service-name="createPartyContactMech" map="parameters" to-map="context"/> @@ -482,7 +482,7 @@ under the License. <else> <call-map-processor xml-resource="component://party/minilang/contact/ContactMechMapProcs.xml" processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/> - <call-service service-name="createPostalAddress" in-map-name="context"> + <call-service in-map-name="context" service-name="createPostalAddress"> <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/> <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> @@ -493,7 +493,7 @@ under the License. processor-name="workEffortContactMech" in-map-name="parameters" out-map-name="context2"/> <set from-field="newValue.contactMechId" field="context2.contactMechId"/> <log level="info" message="Copied id to context2: ${context2.contactMechId}"/> - <call-service service-name="createWorkEffortContactMech" in-map-name="context2" break-on-error="true"> + <call-service in-map-name="context2" break-on-error="true" service-name="createWorkEffortContactMech"> <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyCreated"/> </call-service> <field-to-request field="newValue.contactMechId" request-name="contactMechId"/> @@ -504,7 +504,7 @@ under the License. <make-value entity-name="WorkEffortContactMech" value-field="newValue"/> <call-map-processor xml-resource="component://party/minilang/contact/ContactMechMapProcs.xml" processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/> - <call-service service-name="updatePostalAddress" in-map-name="context"> + <call-service in-map-name="context" service-name="updatePostalAddress"> <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/> <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> @@ -513,7 +513,7 @@ under the License. <set from-field="newValue.contactMechId" field="context2.newContactMechId"/> <set field="context2.contactMechTypeId" value="POSTAL_ADDRESS"/> <log level="info" message="Copied id to context2: ${context2.newContactMechId}"/> - <call-service service-name="updateWorkEffortContactMech" in-map-name="context2"> + <call-service in-map-name="context2" service-name="updateWorkEffortContactMech"> <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyUpdated"/> </call-service> <field-to-request field="newValue.contactMechId" request-name="contactMechId"/> @@ -534,7 +534,7 @@ under the License. <else> <call-map-processor xml-resource="component://party/minilang/contact/ContactMechMapProcs.xml" processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/> - <call-service service-name="createTelecomNumber" in-map-name="context"> + <call-service in-map-name="context" service-name="createTelecomNumber"> <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/> <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> @@ -544,7 +544,7 @@ under the License. processor-name="workEffortContactMech" in-map-name="parameters" out-map-name="context2"/> <set from-field="newValue.contactMechId" field="context2.contactMechId"/> <log level="info" message="Copied id to context2: ${context2.contactMechId}"/> - <call-service service-name="createWorkEffortContactMech" in-map-name="context2" break-on-error="true"> + <call-service in-map-name="context2" break-on-error="true" service-name="createWorkEffortContactMech"> <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyCreated"/> </call-service> <field-to-request field="newValue.contactMechId" request-name="contactMechId"/> @@ -555,7 +555,7 @@ under the License. <make-value entity-name="WorkEffortContactMech" value-field="newValue"/> <call-map-processor xml-resource="component://party/minilang/contact/ContactMechMapProcs.xml" processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/> - <call-service service-name="updateTelecomNumber" in-map-name="context"> + <call-service in-map-name="context" service-name="updateTelecomNumber"> <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/> <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> @@ -565,7 +565,7 @@ under the License. <set from-field="newValue.contactMechId" field="context2.newContactMechId"/> <set field="context2.contactMechTypeId" value="TELECOM_NUMBER"/> <log level="info" message="Copied id to context2: ${context2.newContactMechId}"/> - <call-service service-name="updateWorkEffortContactMech" in-map-name="context2"> + <call-service in-map-name="context2" service-name="updateWorkEffortContactMech"> <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyUpdated"/> </call-service> <log level="info" message="Setting result id: ${newValue.contactMechId}"/> @@ -600,13 +600,13 @@ under the License. <if-not-empty field="parameters.quickAssignPartyId"> <now-timestamp field="nowTimestamp"/> <!-- add a party assignment for the creator of the event, use the list method and let the EE do the update or create... --> - <make-value entity-name="PartyRole" value-field="newPartyRole"/> + <make-value value-field="newPartyRole" entity-name="PartyRole"/> <set from-field="parameters.quickAssignPartyId" field="newPartyRole.partyId"/> <set value="CAL_OWNER" field="newPartyRole.roleTypeId"/> <field-to-list field="newPartyRole" list="newPartyRoleList"/> <store-list list="newPartyRoleList"/> - <make-value entity-name="WorkEffortPartyAssignment" value-field="newWorkEffortPartyAssignment"/> + <make-value value-field="newWorkEffortPartyAssignment" entity-name="WorkEffortPartyAssignment"/> <set from-field="parameters.workEffortId" field="newWorkEffortPartyAssignment.workEffortId"/> <set from-field="parameters.quickAssignPartyId" field="newWorkEffortPartyAssignment.partyId"/> <set value="CAL_OWNER" field="newWorkEffortPartyAssignment.roleTypeId"/> @@ -618,13 +618,13 @@ under the License. <simple-method method-name="quickAssignPartyToWorkEffortWithRole" short-description="Quick Assign Party To WorkEffort"> <if-not-empty field="parameters.quickAssignPartyId"> <!-- add a party assignment for the creator of the event, use the list method and let the EE do the update or create... --> - <make-value entity-name="PartyRole" value-field="newPartyRole"/> + <make-value value-field="newPartyRole" entity-name="PartyRole"/> <set from-field="parameters.quickAssignPartyId" field="newPartyRole.partyId"/> <set from-field="parameters.roleTypeId" field="newPartyRole.roleTypeId"/> <set field="newPartyRoleList[]" from-field="newPartyRole"/> <store-list list="newPartyRoleList"/> - <make-value entity-name="WorkEffortPartyAssignment" value-field="newWorkEffortPartyAssignment"/> + <make-value value-field="newWorkEffortPartyAssignment" entity-name="WorkEffortPartyAssignment"/> <set from-field="parameters.workEffortId" field="newWorkEffortPartyAssignment.workEffortId"/> <set from-field="parameters.quickAssignPartyId" field="newWorkEffortPartyAssignment.partyId"/> <set from-field="parameters.roleTypeId" field="newWorkEffortPartyAssignment.roleTypeId"/> @@ -634,7 +634,7 @@ under the License. </if-not-empty> </simple-method> <simple-method method-name="createWorkEffortNote" short-description="Create Work Effort Note"> - <make-value entity-name="NoteData" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="NoteData"/> <sequenced-id sequence-name="NoteData" field="newEntity.noteId"/> <field-to-result field="newEntity.noteId" result-name="noteId"/> <set from-field="parameters.noteInfo" field="newEntity.noteInfo"/> @@ -649,7 +649,7 @@ under the License. <create-value value-field="newEntity"/> <!-- create new status entry, and set lastStatusUpdate date --> - <make-value entity-name="WorkEffortNote" value-field="newWorkEffortNote"/> + <make-value value-field="newWorkEffortNote" entity-name="WorkEffortNote"/> <set from-field="newEntity.noteId" field="newWorkEffortNote.noteId"/> <set from-field="parameters.workEffortId" field="newWorkEffortNote.workEffortId"/> <set from-field="parameters.internalNote" field="newWorkEffortNote.internalNote"/> @@ -678,14 +678,14 @@ under the License. <else> <if-empty field="parameters.workEffortIdTo"> <set-service-fields service-name="createWorkEffort" map="parameters" to-map="createWorkeEffortParams"/> - <call-service service-name="createWorkEffort" in-map-name="createWorkeEffortParams"> + <call-service in-map-name="createWorkeEffortParams" service-name="createWorkEffort"> <result-to-result result-name="workEffortId"/> <result-to-field result-name="workEffortId" field="workEffortIdTo"/> </call-service> <set field="parameters.workEffortIdTo" from-field="workEffortIdTo"/> </if-empty> <set-service-fields service-name="createWorkEffortAssoc" map="parameters" to-map="createWorkEffortAssocParams"/> - <call-service service-name="createWorkEffortAssoc" in-map-name="createWorkEffortAssocParams"/> + <call-service in-map-name="createWorkEffortAssocParams" service-name="createWorkEffortAssoc"/> </else> </if-not-empty> </simple-method> @@ -704,7 +704,7 @@ under the License. </add-error> <check-errors/> <else> - <make-value entity-name="WorkEffortAssoc" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="WorkEffortAssoc"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.sequenceNum"> @@ -755,7 +755,7 @@ under the License. </calculate> <store-value value-field="foundEntity"/> <else> - <make-value entity-name="WorkEffortInventoryAssign" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="WorkEffortInventoryAssign"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> @@ -787,7 +787,7 @@ under the License. <iterate list="existingAssignments" entry="existingAssignment"> <remove-value value-field="existingAssignment"/> </iterate> - <make-value entity-name="WorkEffortFixedAssetAssign" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="WorkEffortFixedAssetAssign"/> <set from-field="workEffort.workEffortId" field="newEntity.workEffortId"/> <set from-field="workEffort.fixedAssetId" field="newEntity.fixedAssetId"/> <set from-field="workEffort.currentStatusId" field="newEntity.statusId"/> @@ -904,7 +904,7 @@ under the License. <fail-property resource="WorkEffortUiLabels" property="WorkEffortKeywordAlreadyExist"/> </add-error> <else> - <make-value entity-name="WorkEffortKeyword" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="WorkEffortKeyword"/> <if-empty field="parameters.workEffortId"> <add-error> <fail-property resource="WorkEffortUiLabels" property="WorkEffortIdMissing"/> Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Tue Dec 6 12:37:42 2016 @@ -482,21 +482,21 @@ under the License. <request-map uri="createWorkEffortContent"> <security auth="true" https="true"/> - <event type="service" invoke="createWorkEffortContent" path=""/> + <event invoke="createWorkEffortContent" path="" type="service"/> <response name="success" type="view" value="EditWorkEffortContents"/> <response name="error" type="view" value="EditWorkEffortContents"/> </request-map> <request-map uri="updateWorkEffortContent"> <security auth="true" https="true"/> - <event type="service" invoke="updateWorkEffortContent" path=""/> + <event invoke="updateWorkEffortContent" path="" type="service"/> <response name="success" type="view" value="EditWorkEffortContents"/> <response name="error" type="view" value="EditWorkEffortContents"/> </request-map> <request-map uri="deleteWorkEffortContent"> <security auth="true" https="true"/> - <event type="service" invoke="deleteWorkEffortContent" path=""/> + <event invoke="deleteWorkEffortContent" path="" type="service"/> <response name="success" type="view" value="EditWorkEffortContents"/> <response name="error" type="view" value="EditWorkEffortContents"/> </request-map> @@ -509,21 +509,21 @@ under the License. <request-map uri="createWorkEffortGoodStandard"> <security auth="true" https="true"/> - <event type="service" invoke="createWorkEffortGoodStandard" path=""/> + <event invoke="createWorkEffortGoodStandard" path="" type="service"/> <response name="success" type="view" value="EditWorkEffortGoodStandards"/> <response name="error" type="view" value="EditWorkEffortGoodStandards"/> </request-map> <request-map uri="updateWorkEffortGoodStandard"> <security auth="true" https="true"/> - <event type="service" invoke="updateWorkEffortGoodStandard" path=""/> + <event invoke="updateWorkEffortGoodStandard" path="" type="service"/> <response name="success" type="view" value="EditWorkEffortGoodStandards"/> <response name="error" type="view" value="EditWorkEffortGoodStandards"/> </request-map> <request-map uri="removeWorkEffortGoodStandard"> <security auth="true" https="true"/> - <event type="service" invoke="removeWorkEffortGoodStandard" path=""/> + <event invoke="removeWorkEffortGoodStandard" path="" type="service"/> <response name="success" type="view" value="EditWorkEffortGoodStandards"/> <response name="error" type="view" value="EditWorkEffortGoodStandards"/> </request-map> Modified: ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml Tue Dec 6 12:37:42 2016 @@ -62,9 +62,9 @@ under the License. <form name="EditCalendar" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml"> <field name="initialView"> <drop-down> - <option key="${uiLabelMap.WorkEffortDayView}" description="day"/> - <option key="${uiLabelMap.WorkEffortWeekView}" description="week"/> - <option key="${uiLabelMap.WorkEffortMonthView}" description="month"/> + <option key="day" description="${uiLabelMap.WorkEffortDayView}"/> + <option key="week" description="${uiLabelMap.WorkEffortWeekView}"/> + <option key="month" description="${uiLabelMap.WorkEffortMonthView}"/> </drop-down> </field> <field name="updateButton"><submit/></field> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Tue Dec 6 12:37:42 2016 @@ -93,15 +93,15 @@ under the License. <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="scopeEnumId" position="2"> @@ -980,8 +980,8 @@ under the License. <field name="noteInfo" title="${uiLabelMap.CommonNote}"><textarea cols="70" rows="5"/></field> <field name="internalNote" title="${uiLabelMap.WorkEffortInternalNote}"> <drop-down no-current-selected-key=""> - <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="noteParty"><hidden/></field> Modified: ofbiz/trunk/framework/common/minilang/CommonServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/CommonServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/framework/common/minilang/CommonServices.xml (original) +++ ofbiz/trunk/framework/common/minilang/CommonServices.xml Tue Dec 6 12:37:42 2016 @@ -30,7 +30,7 @@ under the License. <fail-property resource="CommonUiLabels" property="CommonGenericPermissionError"/> </check-permission> <check-errors/> - <make-value entity-name="KeywordThesaurus" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="KeywordThesaurus"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <call-object-method obj-field="newEntity.enteredKeyword" method-name="toLowerCase" ret-field="newEntity.enteredKeyword"/> @@ -42,7 +42,7 @@ under the License. <fail-property resource="CommonUiLabels" property="CommonGenericPermissionError"/> </check-permission> <check-errors/> - <make-value entity-name="KeywordThesaurus" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="KeywordThesaurus"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <store-value value-field="newEntity"/> @@ -52,14 +52,14 @@ under the License. <fail-property resource="CommonUiLabels" property="CommonGenericPermissionError"/> </check-permission> <check-errors/> - <make-value entity-name="KeywordThesaurus" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="KeywordThesaurus"/> <set-pk-fields map="parameters" value-field="newEntity"/> <remove-by-and entity-name="KeywordThesaurus" map="newEntity"/> </simple-method> <!-- Uom Conversion service --> <simple-method method-name="createUomConversionDated" short-description="Create a new dated UOM conversion entity"> - <make-value entity-name="UomConversionDated" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="UomConversionDated"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> @@ -285,7 +285,7 @@ under the License. </entity-one> <if-empty field="oldGeoAssoc"> <!-- Add as it does not exist --> - <make-value entity-name="GeoAssoc" value-field="newGeoAssoc"/> + <make-value value-field="newGeoAssoc" entity-name="GeoAssoc"/> <set field="newGeoAssoc.geoId" from-field="parameters.geoId"/> <set field="newGeoAssoc.geoIdTo" from-field="geoIdTo"/> <set field="newGeoAssoc.geoAssocTypeId" from-field="parameters.geoAssocTypeId"/> Modified: ofbiz/trunk/framework/common/minilang/PortalPageServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/PortalPageServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/framework/common/minilang/PortalPageServices.xml (original) +++ ofbiz/trunk/framework/common/minilang/PortalPageServices.xml Tue Dec 6 12:37:42 2016 @@ -27,7 +27,7 @@ under the License. <set field="parameters.portalPageId" from-field="parameters.newPortalPageId"/> <call-simple-method method-name="copyIfRequiredSystemPage" xml-resource="component://common/minilang/PortalPageMethods.xml"/> <set field="parameters.newPortalPageId" from-field="portalPageId"/> - <make-value entity-name="PortalPagePortlet" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="PortalPagePortlet"/> <set field="newEntity.portalPortletId" from-field="parameters.portalPortletId"/> <set field="newEntity.portalPageId" from-field="parameters.newPortalPageId"/> <set field="newEntity.columnNum" value="1"/> @@ -99,7 +99,7 @@ under the License. <call-simple-method method-name="checkOwnerShip"/> <entity-one entity-name="PortalPagePortlet" value-field="portlet" auto-field-map="true"/> <if-not-empty field="portlet"> - <make-value entity-name="PortletAttribute" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="PortletAttribute"/> <set field="newEntity.portalPageId" from-field="portlet.portalPageId"/> <set field="newEntity.portalPortletId" from-field="portlet.portalPortletId"/> <set field="newEntity.portletSeqId" from-field="portlet.portletSeqId"/> Modified: ofbiz/trunk/framework/common/minilang/period/PeriodServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/period/PeriodServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/framework/common/minilang/period/PeriodServices.xml (original) +++ ofbiz/trunk/framework/common/minilang/period/PeriodServices.xml Tue Dec 6 12:37:42 2016 @@ -27,7 +27,7 @@ under the License. </check-permission> <check-errors/> - <make-value entity-name="CustomTimePeriod" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="CustomTimePeriod"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="CustomTimePeriod" field="customTimePeriodId"/> @@ -42,7 +42,7 @@ under the License. </check-permission> <check-errors/> - <make-value entity-name="CustomTimePeriod" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="CustomTimePeriod"/> <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"/> @@ -54,7 +54,7 @@ under the License. </check-permission> <check-errors/> - <make-value entity-name="CustomTimePeriod" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="CustomTimePeriod"/> <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/framework/common/widget/SecurityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/SecurityForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/SecurityForms.xml (original) +++ ofbiz/trunk/framework/common/widget/SecurityForms.xml Tue Dec 6 12:37:42 2016 @@ -71,8 +71,8 @@ under the License. <field name="currentPasswordVerify"><password/></field> <field name="requirePasswordChange"> <drop-down allow-empty="false" no-current-selected-key="N"> - <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="securityQuestion"> Modified: ofbiz/trunk/framework/webtools/widget/CacheForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CacheForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/CacheForms.xml (original) +++ ofbiz/trunk/framework/webtools/widget/CacheForms.xml Tue Dec 6 12:37:42 2016 @@ -68,8 +68,8 @@ under the License. <field name="UTIL_CACHE_EXPIRE_TIME" entry-name="expireTime" title="${uiLabelMap.WebtoolsExpireTime}"><text/></field> <field name="UTIL_CACHE_USE_SOFT_REFERENCE" entry-name="useSoftReference" title="${uiLabelMap.WebtoolsUseSoftRef}"> <drop-down allow-empty="false"> - <option key="${uiLabelMap.CommonFalse}" description="false"/> - <option key="${uiLabelMap.CommonTrue}" description="true"/> + <option key="false" description="${uiLabelMap.CommonFalse}"/> + <option key="true" description="${uiLabelMap.CommonTrue}"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonApply}"><submit button-type="button"/></field> Modified: ofbiz/trunk/framework/webtools/widget/LogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LogScreens.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/LogScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/LogScreens.xml Tue Dec 6 12:37:42 2016 @@ -33,7 +33,7 @@ under the License. <if-has-permission permission="WEBTOOLS" action="_VIEW"/> </condition> <widgets> - <include-menu name="LoggingTabBar" location="component://webtools/widget/Menus.xml"/> + <include-menu location="component://webtools/widget/Menus.xml" name="LoggingTabBar"/> </widgets> </section> </decorator-section> Modified: ofbiz/trunk/framework/webtools/widget/MiscForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/MiscForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/MiscForms.xml (original) +++ ofbiz/trunk/framework/webtools/widget/MiscForms.xml Tue Dec 6 12:37:42 2016 @@ -34,8 +34,8 @@ under the License. <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field> <field name="dropDown" title="${uiLabelMap.CommonEnabled}"> <drop-down> - <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="checkBox" title="${uiLabelMap.CommonEnabled}"> @@ -43,8 +43,8 @@ under the License. </field> <field name="radioButton" title="${uiLabelMap.CommonEnabled}"> <radio> - <option key="${uiLabelMap.CommonYes}" description="Y" /> - <option key="${uiLabelMap.CommonNo}" description="N" /> + <option key="Y" description="${uiLabelMap.CommonYes}" /> + <option key="N" description="${uiLabelMap.CommonNo}" /> </radio> </field> <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field> @@ -59,8 +59,8 @@ under the License. <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field> <field name="dropDown" title="${uiLabelMap.CommonEnabled}"> <drop-down> - <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="checkBox" title="${uiLabelMap.CommonEnabled}"> @@ -68,8 +68,8 @@ under the License. </field> <field name="radioButton" title="${uiLabelMap.CommonEnabled}"> <radio> - <option key="${uiLabelMap.CommonYes}" description="Y" /> - <option key="${uiLabelMap.CommonNo}" description="N" /> + <option key="Y" description="${uiLabelMap.CommonYes}" /> + <option key="N" description="${uiLabelMap.CommonNo}" /> </radio> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="button-col"> Modified: ofbiz/trunk/framework/webtools/widget/ServiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/ServiceForms.xml (original) +++ ofbiz/trunk/framework/webtools/widget/ServiceForms.xml Tue Dec 6 12:37:42 2016 @@ -31,13 +31,13 @@ under the License. <field name="SERVICE_FREQUENCY" title="${uiLabelMap.WebtoolsFrequency}"> <drop-down> <option key="" description="${uiLabelMap.CommonNone}"/> - <option key="${uiLabelMap.CommonDaily}" description="4"/> - <option key="${uiLabelMap.CommonWeekly}" description="5"/> - <option key="${uiLabelMap.CommonMonthly}" description="6"/> - <option key="${uiLabelMap.CommonYearly}" description="7"/> - <option key="${uiLabelMap.CommonHourly}" description="3"/> - <option key="${uiLabelMap.CommonMinutely}" description="2"/> - <option key="${uiLabelMap.CommonSecondly}" description="1"/> + <option key="4" description="${uiLabelMap.CommonDaily}"/> + <option key="5" description="${uiLabelMap.CommonWeekly}"/> + <option key="6" description="${uiLabelMap.CommonMonthly}"/> + <option key="7" description="${uiLabelMap.CommonYearly}"/> + <option key="3" description="${uiLabelMap.CommonHourly}"/> + <option key="2" description="${uiLabelMap.CommonMinutely}"/> + <option key="1" description="${uiLabelMap.CommonSecondly}"/> </drop-down> </field> <field name="SERVICE_INTERVAL" title="${uiLabelMap.WebtoolsInterval}" tooltip="${uiLabelMap.WebtoolsForUseWithFrequency}"><text/></field> Modified: ofbiz/trunk/specialpurpose/bi/minilang/DimensionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/minilang/DimensionServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/bi/minilang/DimensionServices.xml (original) +++ ofbiz/trunk/specialpurpose/bi/minilang/DimensionServices.xml Tue Dec 6 12:37:42 2016 @@ -91,7 +91,7 @@ under the License. <store-value value-field="currencyDim"/> </iterate> <else> - <make-value entity-name="CurrencyDimension" value-field="currencyDim"/> + <make-value value-field="currencyDim" entity-name="CurrencyDimension"/> <sequenced-id sequence-name="CurrencyDimension" field="currencyDim.dimensionId"/> <set field="currencyDim.currencyId" from-field="currency.uomId"/> <set field="currencyDim.description" from-field="currency.description"/> @@ -109,7 +109,7 @@ under the License. </add-error> </if-empty> <check-errors/> - <make-value entity-name="ProductDimension" value-field="productDimension"/> + <make-value value-field="productDimension" entity-name="ProductDimension"/> <set-nonpk-fields map="product" value-field="productDimension"/> <get-related-one value-field="product" relation-name="ProductType" to-value-field="productType"/> Modified: ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml (original) +++ ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml Tue Dec 6 12:37:42 2016 @@ -683,7 +683,7 @@ under the License. <field-map field-name="inventoryItemId" from-field="parameters.inventoryItemId"/> </entity-one> <if-empty field="fact"> - <make-value entity-name="InventoryItemFact" value-field="fact"/> + <make-value value-field="fact" entity-name="InventoryItemFact"/> <set field="fact.inventoryItemId" from-field="inventory.inventoryItemId"/> <!-- conversion of the inventory date --> <if-not-empty field="inventory.createdStamp">
