Reverted: Minilang code readability and consistency improvements done at r#1768222, this commit reversed key and description of drop-down in the code.
(OFBIZ-9114)
Thanks Wei Zhang for reporting the issue.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1772880 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/applications/accounting/minilang/UpgradeServices.xml b/applications/accounting/minilang/UpgradeServices.xml
index 951c4d7..28247fc 100644
--- a/applications/accounting/minilang/UpgradeServices.xml
+++ b/applications/accounting/minilang/UpgradeServices.xml
@@ -53,7 +53,7 @@
<simple-method method-name="migrateFixedAssetMaintMeter" short-description="Copy FixedAssetMaintMeter To FixedAssetMeter">
<entity-condition entity-name="FixedAssetMaintMeter" list="maintMeterList"/>
<iterate list="maintMeterList" entry="maintMeter">
- <make-value entity-name="FixedAssetMeter" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="FixedAssetMeter"/>
<set-pk-fields map="maintMeter" value-field="newEntity"/>
<set-nonpk-fields map="maintMeter" value-field="newEntity"/>
<set field="newEntity.readingDate" from-field="maintMeter.createdStamp"/>
@@ -72,7 +72,7 @@
<simple-method method-name="migrateAgreementWorkEffortAppl" short-description="Copy AgreementWorkEffortAppl To AgreementWorkEffortApplic">
<entity-condition entity-name="OldAgreementWorkEffortAppl" list="agreementWorkEffortApplList"/>
<iterate list="agreementWorkEffortApplList" entry="agreementWorkEffortAppl">
- <make-value entity-name="AgreementWorkEffortApplic" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="AgreementWorkEffortApplic"/>
<set-pk-fields map="agreementWorkEffortAppl" value-field="newEntity"/>
<create-value value-field="newEntity"/>
<check-errors/>
diff --git a/applications/accounting/minilang/admin/AcctgAdminServices.xml b/applications/accounting/minilang/admin/AcctgAdminServices.xml
index b78c9f8..bc234dc 100644
--- a/applications/accounting/minilang/admin/AcctgAdminServices.xml
+++ b/applications/accounting/minilang/admin/AcctgAdminServices.xml
@@ -35,7 +35,7 @@
<!-- Does not check if the Party is actually a company because real people have to pay taxes too -->
<!-- TODO: maybe check to make sure that all fields are not null -->
- <make-value entity-name="PartyAcctgPreference" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="PartyAcctgPreference"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
diff --git a/applications/accounting/minilang/budget/BudgetServices.xml b/applications/accounting/minilang/budget/BudgetServices.xml
index 77fe74d..942fd3d 100644
--- a/applications/accounting/minilang/budget/BudgetServices.xml
+++ b/applications/accounting/minilang/budget/BudgetServices.xml
@@ -24,7 +24,7 @@
<!-- create a new Budget header record -->
<simple-method method-name="createBudget" short-description="Create an Budget">
<!-- create new entity and create all the fields -->
- <make-value entity-name="Budget" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="Budget"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<!-- create a non existing ID if not supplied -->
diff --git a/applications/accounting/minilang/finaccount/FinAccountServices.xml b/applications/accounting/minilang/finaccount/FinAccountServices.xml
index c59e298..12ad4d2 100644
--- a/applications/accounting/minilang/finaccount/FinAccountServices.xml
+++ b/applications/accounting/minilang/finaccount/FinAccountServices.xml
@@ -35,7 +35,7 @@
<set field="parameters.statusId" value="FNACT_ACTIVE"/>
</if-empty>
- <make-value entity-name="FinAccount" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="FinAccount"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -211,7 +211,7 @@
</add-error>
</if-compare>
<check-errors/>
- <make-value entity-name="FinAccountRole" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="FinAccountRole"/>
<set-pk-fields value-field="newEntity" map="parameters"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -756,7 +756,7 @@
</if-compare>
<iterate list="acctgTransEntries" entry="oldAcctgTransEntry">
<if-compare field="oldAcctgTransEntry.debitCreditFlag" operator="equals" value="D">
- <make-value entity-name="AcctgTransEntry" value-field="newAcctgTransEntry"/>
+ <make-value value-field="newAcctgTransEntry" entity-name="AcctgTransEntry"/>
<set field="newAcctgTransEntry.glAccountId" from-field="oldAcctgTransEntry.glAccountId"/>
<set field="organizationPartyId" from-field="oldAcctgTransEntry.organizationPartyId"/>
<set field="newAcctgTransEntry.organizationPartyId" from-field="organizationPartyId"/>
@@ -775,7 +775,7 @@
<clear-field field="createAcctgTransAndEntriesMap.acctgTransId"/>
<set field="createAcctgTransAndEntriesMap.transactionDate" from-field="nowTimestamp"/>
<set field="createAcctgTransAndEntriesMap.postedDate" from-field="nowTimestamp"/>
- <make-value entity-name="AcctgTransEntry" value-field="newAcctgTransEntry"/>
+ <make-value value-field="newAcctgTransEntry" entity-name="AcctgTransEntry"/>
<set field="newAcctgTransEntry.glAccountId" from-field="finAccount.postToGlAccountId"/>
<set field="newAcctgTransEntry.organizationPartyId" from-field="organizationPartyId"/>
<set field="newAcctgTransEntry.partyId" from-field="oldAcctgTransEntry.partyId"/>
@@ -839,7 +839,7 @@
</if-compare>
<iterate list="acctgTransEntries" entry="oldAcctgTransEntry">
<if-compare field="oldAcctgTransEntry.debitCreditFlag" operator="equals" value="C">
- <make-value entity-name="AcctgTransEntry" value-field="newAcctgTransEntry"/>
+ <make-value value-field="newAcctgTransEntry" entity-name="AcctgTransEntry"/>
<set field="newAcctgTransEntry.glAccountId" from-field="oldAcctgTransEntry.glAccountId"/>
<set field="organizationPartyId" from-field="oldAcctgTransEntry.organizationPartyId"/>
<set field="newAcctgTransEntry.organizationPartyId" from-field="organizationPartyId"/>
@@ -858,7 +858,7 @@
<clear-field field="createAcctgTransAndEntriesMap.acctgTransId"/>
<set field="createAcctgTransAndEntriesMap.transactionDate" from-field="nowTimestamp"/>
<set field="createAcctgTransAndEntriesMap.postedDate" from-field="nowTimestamp"/>
- <make-value entity-name="AcctgTransEntry" value-field="newAcctgTransEntry"/>
+ <make-value value-field="newAcctgTransEntry" entity-name="AcctgTransEntry"/>
<set field="newAcctgTransEntry.glAccountId" from-field="finAccount.postToGlAccountId"/>
<set field="newAcctgTransEntry.organizationPartyId" from-field="organizationPartyId"/>
<set field="newAcctgTransEntry.partyId" from-field="oldAcctgTransEntry.partyId"/>
diff --git a/applications/accounting/minilang/invoice/InvoiceServices.xml b/applications/accounting/minilang/invoice/InvoiceServices.xml
index e50ca79..6de926d 100644
--- a/applications/accounting/minilang/invoice/InvoiceServices.xml
+++ b/applications/accounting/minilang/invoice/InvoiceServices.xml
@@ -145,7 +145,7 @@
<simple-method method-name="createInvoice" short-description="Create a new Invoice">
<now-timestamp field="nowTimestamp"/>
- <make-value entity-name="Invoice" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="Invoice"/>
<!-- call getNextInvoiceId service with the parameters.partyIdFrom when invoice Id is not suplied
else use it from the input -->
@@ -213,7 +213,7 @@
<simple-method method-name="getInvoice" short-description="Retrieve an invoice and the items">
<!-- find the invoice record -->
- <make-value entity-name="Invoice" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="Invoice"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="Invoice" map="lookupPKMap" value-field="invoiceValue"/>
<field-to-result field="invoiceValue" result-name="invoice"/>
@@ -225,7 +225,7 @@
<simple-method method-name="updateInvoice" short-description="Update the header of an existing Invoice">
<call-simple-method method-name="InvoiceStatusInProgress"/>
<!-- find the current record -->
- <make-value entity-name="Invoice" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="Invoice"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="Invoice" map="lookupPKMap" value-field="lookedUpValue"/>
@@ -272,7 +272,7 @@
<simple-method method-name="createInvoiceItem" short-description="Create a new Invoice Item">
<set field="invoiceId" from-field="parameters.invoiceId"/>
<call-simple-method method-name="InvoiceStatusInProgress"/>
- <make-value entity-name="InvoiceItem" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="InvoiceItem"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.invoiceItemSeqId">
@@ -306,7 +306,7 @@
<simple-method method-name="updateInvoiceItem"
short-description="Update an existing Invoice Item">
<call-simple-method method-name="InvoiceStatusInProgress"/>
- <make-value entity-name="InvoiceItem" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="InvoiceItem"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="InvoiceItem" map="lookupPKMap" value-field="lookedUpValue"/>
@@ -450,7 +450,7 @@
<simple-method method-name="createInvoiceRole" short-description="Create a Invoice Role">
<call-simple-method method-name="InvoiceStatusInProgress"/>
- <make-value entity-name="InvoiceRole" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="InvoiceRole"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.datetimePerformed"><now-timestamp field="newEntity.datetimePerformed"/></if-empty>
@@ -556,7 +556,7 @@
<simple-method method-name="createInvoiceTerm" short-description="Create a Invoice Term">
<call-simple-method method-name="InvoiceStatusInProgress"/>
- <make-value entity-name="InvoiceTerm" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="InvoiceTerm"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id sequence-name="InvoiceTerm" field="newEntity.invoiceTermId"/>
@@ -942,7 +942,7 @@
<!-- InvoiceContent -->
<simple-method method-name="createInvoiceContent" short-description="Create Content For Invoice">
- <make-value entity-name="InvoiceContent" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="InvoiceContent"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -961,7 +961,7 @@
<field-to-result field="newEntity.invoiceContentTypeId" result-name="invoiceContentTypeId"/>
</simple-method>
<simple-method method-name="updateInvoiceContent" short-description="Update Content For Invoice">
- <make-value entity-name="InvoiceContent" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="InvoiceContent"/>
<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"/>
diff --git a/applications/accounting/minilang/payment/PaymentMethodServices.xml b/applications/accounting/minilang/payment/PaymentMethodServices.xml
index 938dd4e..406df9c 100644
--- a/applications/accounting/minilang/payment/PaymentMethodServices.xml
+++ b/applications/accounting/minilang/payment/PaymentMethodServices.xml
@@ -22,7 +22,7 @@
xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="setPaymentMethodAddress" short-description="Set the initial payment method address">
- <make-value entity-name="PaymentMethod" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="PaymentMethod"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="PaymentMethod" map="lookupPKMap" value-field="lookedUpValue"/>
<if-compare field="lookedUpValue.paymentMethodTypeId" operator="equals" value="CREDIT_CARD">
@@ -82,7 +82,7 @@
</simple-method>
<simple-method method-name="createPayPalPaymentMethod" short-description="Create a PayPal Payment Method">
- <make-value entity-name="PaymentMethod" value-field="newPaymentMethod"/>
+ <make-value value-field="newPaymentMethod" entity-name="PaymentMethod"/>
<set-pk-fields value-field="newPaymentMethod" map="parameters"/>
<if-empty field="newPaymentMethod.paymentMethodId">
<sequenced-id sequence-name="PaymentMethod" field="newPaymentMethod.paymentMethodId"/>
@@ -91,7 +91,7 @@
<set field="newPaymentMethod.paymentMethodTypeId" value="EXT_PAYPAL"/>
<create-value value-field="newPaymentMethod"/>
- <make-value entity-name="PayPalPaymentMethod" value-field="newPayPalPaymentMethod"/>
+ <make-value value-field="newPayPalPaymentMethod" entity-name="PayPalPaymentMethod"/>
<set field="newPayPalPaymentMethod.paymentMethodId" from-field="newPaymentMethod.paymentMethodId"/>
<set-nonpk-fields map="parameters" value-field="newPayPalPaymentMethod"/>
<create-value value-field="newPayPalPaymentMethod"/>
diff --git a/applications/accounting/minilang/payment/PaymentServices.xml b/applications/accounting/minilang/payment/PaymentServices.xml
index aa137e1..8c09e91 100644
--- a/applications/accounting/minilang/payment/PaymentServices.xml
+++ b/applications/accounting/minilang/payment/PaymentServices.xml
@@ -988,7 +988,7 @@
<set field="convertUomInMap.originalValue" from-field="orderHeader.grandTotal" />
<set field="convertUomInMap.uomId" from-field="orderHeader.currencyUom" />
<set field="convertUomInMap.uomIdTo" from-field="partyAcctgPreference.baseCurrencyUomId" />
- <log level="info" message="convertUomInMap = ${convertUomInMap}" />
+ <log message="convertUomInMap = ${convertUomInMap}" level="info" />
<call-service service-name="convertUom" in-map-name="convertUomInMap">
<result-to-field result-name="convertedValue" field="parameters.amount" />
</call-service>
@@ -1161,7 +1161,7 @@
<!-- PaymentContent -->
<simple-method method-name="createPaymentContent" short-description="Create Content For Payment">
- <make-value entity-name="PaymentContent" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="PaymentContent"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -1180,7 +1180,7 @@
<field-to-result field="newEntity.paymentContentTypeId" result-name="paymentContentTypeId"/>
</simple-method>
<simple-method method-name="updatePaymentContent" short-description="Update Content For Payment">
- <make-value entity-name="PaymentContent" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="PaymentContent"/>
<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"/>
diff --git a/applications/accounting/minilang/rate/RateServices.xml b/applications/accounting/minilang/rate/RateServices.xml
index 14eb197..9063feb 100644
--- a/applications/accounting/minilang/rate/RateServices.xml
+++ b/applications/accounting/minilang/rate/RateServices.xml
@@ -346,7 +346,7 @@
<store-value value-field="partyRate"/>
</if-not-empty>
- <make-value entity-name="PartyRate" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="PartyRate"/>
<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"/>
diff --git a/applications/accounting/servicedef/secas_invoice.xml b/applications/accounting/servicedef/secas_invoice.xml
index d5128e4..0bb63ff 100644
--- a/applications/accounting/servicedef/secas_invoice.xml
+++ b/applications/accounting/servicedef/secas_invoice.xml
@@ -37,13 +37,13 @@
</eca>
<eca service="setInvoiceStatus" event="commit">
- <condition field-name="statusId" operator="equals" value="INVOICE_APPROVED"/>
- <condition field-name="oldStatusId" operator="not-equals" value="INVOICE_APPROVED"/>
+ <condition operator="equals" field-name="statusId" value="INVOICE_APPROVED"/>
+ <condition operator="not-equals" field-name="oldStatusId" value="INVOICE_APPROVED"/>
<action service="createMatchingPaymentApplication" mode="sync"/>
</eca>
<eca service="setInvoiceStatus" event="return">
- <condition field-name="statusId" operator="equals" value="INVOICE_READY"/>
- <condition field-name="oldStatusId" operator="equals" value="INVOICE_IN_PROCESS"/>
+ <condition operator="equals" field-name="statusId" value="INVOICE_READY"/>
+ <condition operator="equals" field-name="oldStatusId" value="INVOICE_IN_PROCESS"/>
<action service="createMatchingPaymentApplication" mode="sync"/>
</eca>
diff --git a/applications/accounting/servicedef/secas_payment.xml b/applications/accounting/servicedef/secas_payment.xml
index 3541843..c82be64 100644
--- a/applications/accounting/servicedef/secas_payment.xml
+++ b/applications/accounting/servicedef/secas_payment.xml
@@ -69,14 +69,14 @@
</eca>
<eca service="setPaymentStatus" event="commit">
- <condition field-name="statusId" operator="equals" value="PMNT_RECEIVED"/>
- <condition field-name="oldStatusId" operator="not-equals" value="PMNT_RECEIVED"/>
+ <condition operator="equals" field-name="statusId" value="PMNT_RECEIVED"/>
+ <condition operator="not-equals" field-name="oldStatusId" value="PMNT_RECEIVED"/>
<action service="createMatchingPaymentApplication" mode="sync"/>
</eca>
<eca service="setPaymentStatus" event="commit">
- <condition field-name="statusId" operator="equals" value="PMNT_SENT"/>
- <condition field-name="oldStatusId" operator="not-equals" value="PMNT_SENT"/>
+ <condition operator="equals" field-name="statusId" value="PMNT_SENT"/>
+ <condition operator="not-equals" field-name="oldStatusId" value="PMNT_SENT"/>
<action service="createMatchingPaymentApplication" mode="sync"/>
</eca>
diff --git a/applications/accounting/webapp/accounting/WEB-INF/controller.xml b/applications/accounting/webapp/accounting/WEB-INF/controller.xml
index 284403b..d97866f 100644
--- a/applications/accounting/webapp/accounting/WEB-INF/controller.xml
+++ b/applications/accounting/webapp/accounting/WEB-INF/controller.xml
@@ -771,7 +771,7 @@
</request-map>
<request-map uri="ImportInvoice">
<security auth="true" https="true"/>
- <event type="service" invoke="importInvoice" path=""/>
+ <event invoke="importInvoice" path="" type="service"/>
<response name="success" type="request" value="ImportExport"/>
<response name="error" type="view" value="ImportExport"/>
</request-map>
diff --git a/applications/accounting/widget/AgreementForms.xml b/applications/accounting/widget/AgreementForms.xml
index d4d62b0..b7cccc0 100644
--- a/applications/accounting/widget/AgreementForms.xml
+++ b/applications/accounting/widget/AgreementForms.xml
@@ -287,7 +287,7 @@
<field name="agreementId"><hidden value="${agreement.agreementId}"/></field>
<field name="agreementItemSeqId">
<drop-down allow-empty="false">
- <option key=" " description="_NA_"/>
+ <option key="_NA_" description=" "/>
<entity-options entity-name="AgreementItem" description="${agreementItemSeqId}">
<entity-constraint name="agreementId" env-name="agreement.agreementId"/>
<entity-order-by field-name="agreementItemSeqId"/>
@@ -661,7 +661,7 @@
<field name="agreementId"><hidden value="${agreementId}"/></field>
<field name="agreementItemSeqId">
<drop-down allow-empty="false">
- <option key="${uiLabelMap.CommonNA}" description="_NA_"/>
+ <option key="_NA_" description="${uiLabelMap.CommonNA}"/>
<entity-options entity-name="AgreementItem" description="${agreementItemSeqId}">
<entity-constraint name="agreementId" operator="equals" env-name="agreementId"/>
<entity-order-by field-name="agreementItemSeqId"/>
diff --git a/applications/accounting/widget/FieldLookupForms.xml b/applications/accounting/widget/FieldLookupForms.xml
index 924c2cd..8e629f1 100644
--- a/applications/accounting/widget/FieldLookupForms.xml
+++ b/applications/accounting/widget/FieldLookupForms.xml
@@ -359,8 +359,8 @@
<field name="thruDate"><date-time/></field>
<field name="isClosed">
<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="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
diff --git a/applications/accounting/widget/FinAccountForms.xml b/applications/accounting/widget/FinAccountForms.xml
index d8eb464..2a6f88d 100644
--- a/applications/accounting/widget/FinAccountForms.xml
+++ b/applications/accounting/widget/FinAccountForms.xml
@@ -131,7 +131,7 @@
</drop-down>
</field>
<field name="isRefundable">
- <drop-down no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
+ <drop-down no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
</field>
<field name="fromDate"><date-time default-value="${nowTimestamp}"/></field>
<field name="submitButton" use-when="finAccountId==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -335,7 +335,7 @@
</field>
<field name="glReconciliationId" position="2">
<drop-down allow-empty="true">
- <option key="${uiLabelMap.CommonNotAssigned}" description="_NA_"/>
+ <option key="_NA_" description="${uiLabelMap.CommonNotAssigned}"/>
<list-options list-name="glReconciliations" key-name="glReconciliationId"
description="${glReconciliationName}[[${glReconciliationId}] [${reconciledDate}] [${reconciledBalance}]]"/>
</drop-down>
diff --git a/applications/accounting/widget/GlForms.xml b/applications/accounting/widget/GlForms.xml
index 86a56a7..b4d36b9 100644
--- a/applications/accounting/widget/GlForms.xml
+++ b/applications/accounting/widget/GlForms.xml
@@ -51,8 +51,8 @@
</field>
<field name="isPosted" position="1">
<drop-down allow-empty="true">
- <option key="${uiLabelMap.CommonNo}" description="N"/>
- <option key="${uiLabelMap.CommonYes}" description="Y"/>
+ <option description="${uiLabelMap.CommonNo}" key="N"/>
+ <option description="${uiLabelMap.CommonYes}" key="Y"/>
</drop-down>
</field>
<field name="invoiceId" position="2"><lookup target-form-name="LookupInvoice" size="20" maxlength="20"/></field>
@@ -228,8 +228,8 @@
</field>
<field name="isPosted">
<drop-down allow-empty="true">
- <option key="${uiLabelMap.CommonNo}" description="N"/>
- <option key="${uiLabelMap.CommonYes}" description="Y"/>
+ <option description="${uiLabelMap.CommonNo}" key="N"/>
+ <option description="${uiLabelMap.CommonYes}" key="Y"/>
</drop-down>
</field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
@@ -245,8 +245,8 @@
<field name="performSearch"><hidden value="Y"/></field>
<field name="reportType">
<drop-down allow-empty="false">
- <option key="${uiLabelMap.AccountingByAccount}" description="byAccount"/>
- <option key="${uiLabelMap.AccountingByDate}" description="byDate"/>
+ <option description="${uiLabelMap.AccountingByAccount}" key="byAccount"/>
+ <option description="${uiLabelMap.AccountingByDate}" key="byDate"/>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field>
@@ -587,8 +587,8 @@
</field>
<field name="debitCreditFlag" position="1" entry-name="resetFieldValue">
<drop-down current="selected">
- <option key="${uiLabelMap.FormFieldTitle_credit}" description="C"/>
- <option key="${uiLabelMap.FormFieldTitle_debit}" description="D"/>
+ <option description="${uiLabelMap.FormFieldTitle_credit}" key="C"/>
+ <option description="${uiLabelMap.FormFieldTitle_debit}" key="D"/>
</drop-down>
</field>
<field name="partyId" position="2"><text size="30"/></field>
@@ -673,8 +673,8 @@
<field name="isSummary"><display/></field>
<field name="debitCreditFlag">
<drop-down current="selected">
- <option key="${uiLabelMap.FormFieldTitle_credit}" description="C"/>
- <option key="${uiLabelMap.FormFieldTitle_debit}" description="D"/>
+ <option description="${uiLabelMap.FormFieldTitle_credit}" key="C"/>
+ <option description="${uiLabelMap.FormFieldTitle_debit}" key="D"/>
</drop-down>
</field>
<field name="origAmount"><display type="currency" currency="${origCurrencyUomId}"/></field>
@@ -737,8 +737,8 @@
<field name="scheduledPostingDate" position="2"></field>
<field name="isPosted" position="1">
<drop-down allow-empty="true">
- <option key="${uiLabelMap.CommonNo}" description="N"/>
- <option key="${uiLabelMap.CommonYes}" description="Y"/>
+ <option description="${uiLabelMap.CommonNo}" key="N"/>
+ <option description="${uiLabelMap.CommonYes}" key="Y"/>
</drop-down>
</field>
<field name="postedDate" position="2"><date-time/></field>
diff --git a/applications/accounting/widget/GlScreens.xml b/applications/accounting/widget/GlScreens.xml
index bd849ee..8c7fc0b 100644
--- a/applications/accounting/widget/GlScreens.xml
+++ b/applications/accounting/widget/GlScreens.xml
@@ -57,7 +57,7 @@
<section>
<widgets>
<screenlet title="${uiLabelMap.AccountingPartyAccountsSummary}">
- <include-menu name="PartyGlShortCuts" location="component://accounting/widget/AccountingMenus.xml"/>
+ <include-menu location="component://accounting/widget/AccountingMenus.xml" name="PartyGlShortCuts"/>
</screenlet>
</widgets>
</section>
@@ -311,7 +311,7 @@
<not><if-empty field="acctgTransId"/></not>
</condition>
<widgets>
- <include-menu name="EditGlAcctgTransSubTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
+ <include-menu location="component://accounting/widget/AccountingMenus.xml" name="EditGlAcctgTransSubTabBar"/>
<section>
<condition>
<if-compare field="acctgTrans.isPosted" operator="equals" value="Y"/>
diff --git a/applications/accounting/widget/GlSetupForms.xml b/applications/accounting/widget/GlSetupForms.xml
index 7a3a4f3..aae00b3 100644
--- a/applications/accounting/widget/GlSetupForms.xml
+++ b/applications/accounting/widget/GlSetupForms.xml
@@ -163,18 +163,18 @@
<field name="fiscalYearStartMonth" use-when="partyAcctgPreference==null"
tooltip="${groovy: import org.apache.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('fiscalYearStartMonth')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
<drop-down>
- <option key="${uiLabelMap.AccountingFiscalMonth01}" description="1"/>
- <option key="${uiLabelMap.AccountingFiscalMonth02}" description="2"/>
- <option key="${uiLabelMap.AccountingFiscalMonth03}" description="3"/>
- <option key="${uiLabelMap.AccountingFiscalMonth04}" description="4"/>
- <option key="${uiLabelMap.AccountingFiscalMonth05}" description="5"/>
- <option key="${uiLabelMap.AccountingFiscalMonth06}" description="6"/>
- <option key="${uiLabelMap.AccountingFiscalMonth07}" description="7"/>
- <option key="${uiLabelMap.AccountingFiscalMonth08}" description="8"/>
- <option key="${uiLabelMap.AccountingFiscalMonth09}" description="9"/>
- <option key="${uiLabelMap.AccountingFiscalMonth10}" description="10"/>
- <option key="${uiLabelMap.AccountingFiscalMonth11}" description="11"/>
- <option key="${uiLabelMap.AccountingFiscalMonth12}" description="12"/>
+ <option key="1" description="${uiLabelMap.AccountingFiscalMonth01}"/>
+ <option key="2" description="${uiLabelMap.AccountingFiscalMonth02}"/>
+ <option key="3" description="${uiLabelMap.AccountingFiscalMonth03}"/>
+ <option key="4" description="${uiLabelMap.AccountingFiscalMonth04}"/>
+ <option key="5" description="${uiLabelMap.AccountingFiscalMonth05}"/>
+ <option key="6" description="${uiLabelMap.AccountingFiscalMonth06}"/>
+ <option key="7" description="${uiLabelMap.AccountingFiscalMonth07}"/>
+ <option key="8" description="${uiLabelMap.AccountingFiscalMonth08}"/>
+ <option key="9" description="${uiLabelMap.AccountingFiscalMonth09}"/>
+ <option key="10" description="${uiLabelMap.AccountingFiscalMonth10}"/>
+ <option key="11" description="${uiLabelMap.AccountingFiscalMonth11}"/>
+ <option key="12" description="${uiLabelMap.AccountingFiscalMonth12}"/>
</drop-down>
</field>
<field name="fiscalYearStartDay" use-when="partyAcctgPreference==null"
@@ -237,7 +237,7 @@
tooltip="${groovy: import org.apache.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('useInvoiceIdForReturns')!=null)return
(UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
<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="quoteIdPrefix" use-when="partyAcctgPreference==null"
@@ -716,8 +716,8 @@
<field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
<field name="isClosed">
<drop-down>
- <option key="${uiLabelMap.CommonNo}" description="N"/>
- <option key="${uiLabelMap.CommonYes}" description="Y"/>
+ <option description="${uiLabelMap.CommonNo}" key="N"/>
+ <option description="${uiLabelMap.CommonYes}" key="Y"/>
</drop-down>
</field>
<field name="parentPeriodId">
@@ -1193,7 +1193,7 @@
<auto-fields-service service-name="createFixedAssetTypeGlAccount" default-field-type="edit"/>
<field name="fixedAssetId">
<drop-down allow-empty="false">
- <option key="${uiLabelMap.CommonAll}" description="_NA_"/>
+ <option key="_NA_" description="${uiLabelMap.CommonAll}"/>
<entity-options entity-name="FixedAsset" description="${fixedAssetId} - ${fixedAssetName}">
<entity-constraint name="partyId" operator="equals" env-name="organizationPartyId"/>
<entity-order-by field-name="fixedAssetId"/>
@@ -1202,7 +1202,7 @@
</field>
<field name="fixedAssetTypeId">
<drop-down allow-empty="false">
- <option key="${uiLabelMap.CommonAll}" description="_NA_"/>
+ <option key="_NA_" description="${uiLabelMap.CommonAll}"/>
<entity-options entity-name="FixedAssetType">
<entity-order-by field-name="description"/>
</entity-options>
diff --git a/applications/accounting/widget/GlSetupScreens.xml b/applications/accounting/widget/GlSetupScreens.xml
index 5ca121c..8e9c624 100644
--- a/applications/accounting/widget/GlSetupScreens.xml
+++ b/applications/accounting/widget/GlSetupScreens.xml
@@ -68,7 +68,7 @@
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.AccountingAvailableInternalOrganizations}" navigation-menu-name="NewAccountOrganization">
- <include-menu name="NewAccountOrganization" location="component://accounting/widget/AccountingMenus.xml"/>
+ <include-menu location="component://accounting/widget/AccountingMenus.xml" name="NewAccountOrganization"/>
<include-form name="ListCompanies" location="component://accounting/widget/GlSetupForms.xml"/>
</screenlet>
</decorator-section>
diff --git a/applications/accounting/widget/PaymentForms.xml b/applications/accounting/widget/PaymentForms.xml
index 2a84f35..c555ede 100644
--- a/applications/accounting/widget/PaymentForms.xml
+++ b/applications/accounting/widget/PaymentForms.xml
@@ -131,7 +131,7 @@
<field name="currencyUomId"><hidden value="${defaultOrganizationPartyCurrencyUomId}"/></field>
<field position="1" name="organizationPartyId" parameter-name="partyIdFrom" event="onchange" action="javascript:(document.NewPaymentOut.action = 'newPayment'),(document.NewPaymentOut.submit())">
<drop-down allow-empty="false" no-current-selected-key="${defaultOrganizationPartyId}">
- <option key="${partyGroupName}" description="${parameters.partyIdFrom}"/>
+ <option key="${parameters.partyIdFrom}" description="${partyGroupName}"/>
<entity-options description="${groupName}" entity-name="PartyAcctgPrefAndGroup" key-field-name="partyId">
<entity-order-by field-name="groupName"/>
</entity-options>
diff --git a/applications/accounting/widget/PaymentGatewayConfigForms.xml b/applications/accounting/widget/PaymentGatewayConfigForms.xml
index 104830f..a4c6050 100644
--- a/applications/accounting/widget/PaymentGatewayConfigForms.xml
+++ b/applications/accounting/widget/PaymentGatewayConfigForms.xml
@@ -82,8 +82,8 @@
</field>
<field name="sagePayMode" title="${uiLabelMap.AccountingSagePayMode}">
<drop-down>
- <option key="${uiLabelMap.AccountingSagePayTest}" description="TEST"/>
- <option key="${uiLabelMap.AccountingSagePayProduction}" description="PRODUCTION"/>
+ <option key="TEST" description="${uiLabelMap.AccountingSagePayTest}"/>
+ <option key="PRODUCTION" description="${uiLabelMap.AccountingSagePayProduction}"/>
</drop-down>
</field>
<field name="protocolVersion" title="${uiLabelMap.AccountingSagePayProtocolVersion}">
@@ -91,9 +91,9 @@
</field>
<field name="authenticationTransType" title="${uiLabelMap.AccountingSagePayAuthenticationTransType}">
<drop-down>
- <option key="${uiLabelMap.CommonPayment}" description="PAYMENT"/>
- <option key="${uiLabelMap.CommonAuthenticate}" description="AUTHENTICATE"/>
- <option key="${uiLabelMap.CommonDeferred}" description="DEFERRED"/>
+ <option key="PAYMENT" description="${uiLabelMap.CommonPayment}"/>
+ <option key="AUTHENTICATE" description="${uiLabelMap.CommonAuthenticate}"/>
+ <option key="DEFERRED" description="${uiLabelMap.CommonDeferred}"/>
</drop-down>
</field>
<field name="authenticationUrl" title="${uiLabelMap.AccountingSagePayAuthenticationUrl}">
@@ -101,8 +101,8 @@
</field>
<field name="authoriseTransType" title="${uiLabelMap.AccountingSagePayAuthorisationTransType}">
<drop-down>
- <option key="${uiLabelMap.CommonAuthorise}" description="AUTHORISE"/>
- <option key="${uiLabelMap.CommonRelease}" description="RELEASE"/>
+ <option key="AUTHORISE" description="${uiLabelMap.CommonAuthorise}"/>
+ <option key="RELEASE" description="${uiLabelMap.CommonRelease}"/>
</drop-down>
</field>
<field name="authoriseUrl" title="${uiLabelMap.AccountingSagePayAuthorisationUrl}">
@@ -110,8 +110,8 @@
</field>
<field name="releaseTransType" title="${uiLabelMap.AccountingSagePayReleaseTransType}">
<drop-down>
- <option key="${uiLabelMap.CommonCancel}" description="CANCEL"/>
- <option key="${uiLabelMap.CommonAbort}" description="ABORT"/>
+ <option key="CANCEL" description="${uiLabelMap.CommonCancel}"/>
+ <option key="ABORT" description="${uiLabelMap.CommonAbort}"/>
</drop-down>
</field>
<field name="releaseUrl" title="${uiLabelMap.AccountingSagePayReleaseUrl}">
@@ -139,8 +139,8 @@
</field>
<field name="delimitedData" title="${uiLabelMap.AccountingAuthorizeNetDelimitedData}">
<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="delimiterChar" title="${uiLabelMap.AccountingAuthorizeNetDelimiterChar}">
@@ -148,31 +148,31 @@
</field>
<field name="method" title="${uiLabelMap.AccountingAuthorizeNetMethod}">
<drop-down>
- <option key="${uiLabelMap.AccountingAuthorizeNetMethodCC}" description="CC"/>
+ <option key="CC" description="${uiLabelMap.AccountingAuthorizeNetMethodCC}"/>
</drop-down>
</field>
<field name="emailCustomer" title="${uiLabelMap.AccountingAuthorizeNetEmailCustomer}">
<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="emailMerchant" title="${uiLabelMap.AccountingAuthorizeNetEmailMerchant}">
<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="testMode" title="${uiLabelMap.AccountingAuthorizeNetTestMode}">
<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="relayResponse" title="${uiLabelMap.AccountingAuthorizeNetRelayResponse}">
<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="cpVersion" title="${uiLabelMap.AccountingAuthorizeNetCpVersion}">
@@ -200,16 +200,16 @@
</field>
<field name="production" title="${uiLabelMap.AccountingCyberSourceProduction}">
<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="keysDir" title="${uiLabelMap.AccountingCyberSourceKeysDir}"><text size="80" maxlength="80"/></field>
<field name="keysFile" title="${uiLabelMap.AccountingCyberSourceKeysFile}"><text size="80" maxlength="80"/></field>
<field name="logEnabled" title="${uiLabelMap.AccountingCyberSourceLogEnable}">
<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="logDir" title="${uiLabelMap.AccountingCyberSourceLogDir}"><text size="80" maxlength="80"/></field>
@@ -219,32 +219,32 @@
<field name="merchantContact" title="${uiLabelMap.AccountingCyberSourceMerchantContact}"><text size="80" maxlength="80"/></field>
<field name="autoBill" title="${uiLabelMap.AccountingCyberSourceAutoBill}">
<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="ignoreAvs" title="${uiLabelMap.AccountingCyberSourceIgnoreAvs}">
<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="enableDav" title="${uiLabelMap.AccountingCyberSourceEnableDav}">
<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="fraudScore" title="${uiLabelMap.AccountingCyberSourceFraudScore}">
<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="disableBillAvs" title="${uiLabelMap.AccountingCyberSourceDisableBillAvs}">
<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="avsDeclineCodes" title="${uiLabelMap.AccountingCyberSourceAvsDeclineCodes}"><text size="20" maxlength="20"/></field>
@@ -259,43 +259,43 @@
<field name="paymentGatewayConfigId"><hidden/></field>
<field name="checkAvs">
<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="checkCvv2">
<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="preAuth">
<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="enableTransmit">
<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="loggingLevel">
<drop-down>
- <option key="${uiLabelMap.AccountingPayflowProLoggingOff}" description="6"/>
- <option key="${uiLabelMap.AccountingPayflowProLoggingSeverityFatal}" description="5"/>
- <option key="${uiLabelMap.AccountingPayflowProLoggingSeverityError}" description="4"/>
- <option key="${uiLabelMap.AccountingPayflowProLoggingSeverityWarn}" description="3"/>
- <option key="${uiLabelMap.AccountingPayflowProLoggingSeverityInfo}" description="2"/>
- <option key="${uiLabelMap.AccountingPayflowProLoggingSeverityDebug}" description="1"/>
+ <option key="6" description="${uiLabelMap.AccountingPayflowProLoggingOff}"/>
+ <option key="5" description="${uiLabelMap.AccountingPayflowProLoggingSeverityFatal}"/>
+ <option key="4" description="${uiLabelMap.AccountingPayflowProLoggingSeverityError}"/>
+ <option key="3" description="${uiLabelMap.AccountingPayflowProLoggingSeverityWarn}"/>
+ <option key="2" description="${uiLabelMap.AccountingPayflowProLoggingSeverityInfo}"/>
+ <option key="1" description="${uiLabelMap.AccountingPayflowProLoggingSeverityDebug}"/>
</drop-down>
</field>
<field name="maxLogFileSize"><text size="20" maxlength="20"/></field>
<field name="stackTraceOn">
<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">
@@ -308,16 +308,16 @@
<field name="paymentGatewayConfigId"><hidden/></field>
<field name="enableCVM">
<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="processMode">
<drop-down>
- <option key="${uiLabelMap.AccountingPaymentGatewayApprove}" description="Y"/>
- <option key="${uiLabelMap.AccountingPaymentGatewayDecline}" description="N"/>
- <option key="${uiLabelMap.AccountingPaymentGatewayRandom}" description="R"/>
- <option key="${uiLabelMap.AccountingPaymentGatewayProduction}" description="P"/>
+ <option key="Y" description="${uiLabelMap.AccountingPaymentGatewayApprove}"/>
+ <option key="N" description="${uiLabelMap.AccountingPaymentGatewayDecline}"/>
+ <option key="R" description="${uiLabelMap.AccountingPaymentGatewayRandom}"/>
+ <option key="P" description="${uiLabelMap.AccountingPaymentGatewayProduction}"/>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
@@ -330,20 +330,20 @@
<field name="paymentGatewayConfigId"><hidden/></field>
<field name="testMode">
<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="enableBeagle">
<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="enableCvn">
<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">
@@ -358,26 +358,26 @@
<field name="instId" title="${uiLabelMap.AccountingWorldPayInstId}"><text size="10" maxlength="10"/></field>
<field name="authMode" title="${uiLabelMap.AccountingWorldPayAuthMode}">
<drop-down>
- <option key="${uiLabelMap.AccountingWorldPayFullAuth}" description="A"/>
- <option key="${uiLabelMap.AccountingWorldPayPreAuth}" description="E"/>
+ <option key="A" description="${uiLabelMap.AccountingWorldPayFullAuth}"/>
+ <option key="E" description="${uiLabelMap.AccountingWorldPayPreAuth}"/>
</drop-down>
</field>
<field name="fixContact" title="${uiLabelMap.AccountingWorldPayFixContact}">
<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="hideContact" title="${uiLabelMap.AccountingWorldPayHideContact}">
<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="hideCurrency" title="${uiLabelMap.AccountingWorldPayHideCurrency}">
<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="langId" title="${uiLabelMap.AccountingWorldPayLangId}">
@@ -385,21 +385,21 @@
</field>
<field name="noLanguageMenu" title="${uiLabelMap.AccountingWorldPayNoLanguageMenu}">
<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="withDelivery" title="${uiLabelMap.AccountingWorldPayWithDelivery}">
<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="testMode" title="${uiLabelMap.AccountingWorldPayTestMode}">
<drop-down>
- <option key="${uiLabelMap.AccountingWorldPayApprove}" description="100"/>
- <option key="${uiLabelMap.AccountingWorldPayCancelled}" description="101"/>
- <option key="${uiLabelMap.AccountingWorldPayLive}" description="0"/>
+ <option key="100" description="${uiLabelMap.AccountingWorldPayApprove}"/>
+ <option key="101" description="${uiLabelMap.AccountingWorldPayCancelled}"/>
+ <option key="0" description="${uiLabelMap.AccountingWorldPayLive}"/>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
@@ -447,8 +447,8 @@
</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">
diff --git a/applications/accounting/widget/ReportFinancialSummaryForms.xml b/applications/accounting/widget/ReportFinancialSummaryForms.xml
index 7076975..a0ee7e8 100644
--- a/applications/accounting/widget/ReportFinancialSummaryForms.xml
+++ b/applications/accounting/widget/ReportFinancialSummaryForms.xml
@@ -24,18 +24,18 @@
<form name="BaseSummaryOptions" type="single" header-row-style="header-row" default-table-style="basic-table">
<field name="month" title="${uiLabelMap.CommonMonth}" required-field="true">
<drop-down allow-empty="false">
- <option key="${uiLabelMap.CommonJanuary}" description="01"/>
- <option key="${uiLabelMap.CommonFebruary}" description="02"/>
- <option key="${uiLabelMap.CommonMarch}" description="03"/>
- <option key="${uiLabelMap.CommonApril}" description="04"/>
- <option key="${uiLabelMap.CommonMay}" description="05"/>
- <option key="${uiLabelMap.CommonJune}" description="06"/>
- <option key="${uiLabelMap.CommonJuly}" description="07"/>
- <option key="${uiLabelMap.CommonAugust}" description="08"/>
- <option key="${uiLabelMap.CommonSeptember}" description="09"/>
- <option key="${uiLabelMap.CommonOctober}" description="10"/>
- <option key="${uiLabelMap.CommonNovember}" description="11"/>
- <option key="${uiLabelMap.CommonDecember}" description="12"/>
+ <option key="01" description="${uiLabelMap.CommonJanuary}"/>
+ <option key="02" description="${uiLabelMap.CommonFebruary}"/>
+ <option key="03" description="${uiLabelMap.CommonMarch}"/>
+ <option key="04" description="${uiLabelMap.CommonApril}"/>
+ <option key="05" description="${uiLabelMap.CommonMay}"/>
+ <option key="06" description="${uiLabelMap.CommonJune}"/>
+ <option key="07" description="${uiLabelMap.CommonJuly}"/>
+ <option key="08" description="${uiLabelMap.CommonAugust}"/>
+ <option key="09" description="${uiLabelMap.CommonSeptember}"/>
+ <option key="10" description="${uiLabelMap.CommonOctober}"/>
+ <option key="11" description="${uiLabelMap.CommonNovember}"/>
+ <option key="12" description="${uiLabelMap.CommonDecember}"/>
</drop-down>
</field>
<field name="year" title="${uiLabelMap.CommonYear}" required-field="true"><text size="4"/></field>
@@ -503,9 +503,9 @@
</field>
<field name="isPosted">
<drop-down>
- <option key="${uiLabelMap.CommonYes}" description="Y"/>
- <option key="${uiLabelMap.CommonNo}" description="N"/>
- <option key="${uiLabelMap.CommonAll}" description="ALL"/>
+ <option description="${uiLabelMap.CommonYes}" key="Y"/>
+ <option description="${uiLabelMap.CommonNo}" key="N"/>
+ <option description="${uiLabelMap.CommonAll}" key="ALL"/>
</drop-down>
</field>
<field name="submitButton" widget-style="buttontext" action=""><submit button-type="text-link"/></field>
diff --git a/applications/accounting/widget/TaxAuthorityForms.xml b/applications/accounting/widget/TaxAuthorityForms.xml
index 3d13fe8..82c052c 100644
--- a/applications/accounting/widget/TaxAuthorityForms.xml
+++ b/applications/accounting/widget/TaxAuthorityForms.xml
@@ -61,10 +61,10 @@
<field use-when="taxAuthority==null&&taxAuthGeoId!=null" name="taxAuthGeoId" title="${uiLabelMap.CommonGeo}" tooltip="${uiLabelMap.CommonCannotBeFound}:[${taxAuthGeoId}]"><lookup target-form-name="LookupGeo"/></field>
<field name="requireTaxIdForExemption" widget-style="smallSelect">
- <drop-down no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
+ <drop-down no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
</field>
<field name="includeTaxInPrice" widget-style="smallSelect">
- <drop-down no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down>
+ <drop-down no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
</field>
<field name="taxIdFormatPattern" tooltip="${uiLabelMap.AccountingValidationPattern}"></field>
@@ -307,7 +307,7 @@
</drop-down>
</field>
<field name="taxShipping">
- <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="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -324,10 +324,10 @@
<field name="partyTaxId"><text-find/></field>
<field name="isExempt" widget-style="smallSelect">
- <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="isNexus" widget-style="smallSelect">
- <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.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field>
@@ -400,7 +400,7 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
<field name="partyTaxId"><text/></field>
<field name="isExempt" widget-style="smallSelect"><drop-down no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
- <field name="isNexus" widget-style="smallSelect"><drop-down no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field>
+ <field name="isNexus" widget-style="smallSelect"><drop-down no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
<field use-when="partyTaxAuthInfo!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
<field use-when="partyTaxAuthInfo==null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
diff --git a/applications/accounting/widget/ap/CommonScreens.xml b/applications/accounting/widget/ap/CommonScreens.xml
index 205550a..a0de913 100644
--- a/applications/accounting/widget/ap/CommonScreens.xml
+++ b/applications/accounting/widget/ap/CommonScreens.xml
@@ -151,7 +151,7 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-body">
- <include-menu name="ApInvoiceTabBar" location="component://accounting/widget/ap/ApMenus.xml"/>
+ <include-menu location="component://accounting/widget/ap/ApMenus.xml" name="ApInvoiceTabBar"/>
</decorator-section>
<decorator-section name="body">
<decorator-section-include name="body"/>
diff --git a/applications/commonext/minilang/setup/SetupEvents.xml b/applications/commonext/minilang/setup/SetupEvents.xml
index da66ea7..faab9a6 100644
--- a/applications/commonext/minilang/setup/SetupEvents.xml
+++ b/applications/commonext/minilang/setup/SetupEvents.xml
@@ -257,12 +257,12 @@
<!-- Create partyId for UserLogin -->
<session-to-field field="userLoginCtx" session-name="userLogin"/>
<if-empty field="userLoginCtx.partyId">
- <make-value entity-name="Party" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="Party"/>
<set field="newEntity.partyId" from-field="userLoginCtx.userLoginId"/>
<set field="newEntity.partyTypeId" value="PERSON"/>
<create-value value-field="newEntity"/>
<clear-field field="newEntity"/>
- <make-value entity-name="Person" value-field="newPerson"/>
+ <make-value value-field="newPerson" entity-name="Person"/>
<set field="newPerson.partyId" from-field="userLoginCtx.userLoginId"/>
<create-value value-field="newPerson"/>
<clear-field field="newPerson"/>
@@ -345,7 +345,7 @@
</if-empty>
<check-errors/>
- <make-value entity-name="Facility" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="Facility"/>
<set field="defaultDaysToShip" from-field="parameters.defaultDaysToShip" type="Long"/>
<clear-field field="parameters.defaultDaysToShip"/>
@@ -426,7 +426,7 @@
<!-- create the ProductStoreFacility record -->
<now-timestamp field="nowTimestamp"/>
<if-not-empty field="newEntity.inventoryFacilityId">
- <make-value entity-name="ProductStoreFacility" value-field="storeFacility"/>
+ <make-value value-field="storeFacility" entity-name="ProductStoreFacility"/>
<set from-field="newEntity.inventoryFacilityId" field="storeFacility.facilityId"/>
<set from-field="newEntity.productStoreId" field="storeFacility.productStoreId"/>
<set from-field="nowTimestamp" field="storeFacility.fromDate"/>
@@ -505,7 +505,7 @@
<result-to-request result-name="productCategoryId" request-name="productCategoryId"/>
</call-service>
- <make-value entity-name="ProductCategoryRollup" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/>
<set field="newEntity.parentProductCategoryId" from-field="parameters.primaryParentCategoryId"/>
<set field="newEntity.productCategoryId" from-field="productCategoryId"/>
<set field="newEntity.sequenceNum" value="1" type="Long"/>
diff --git a/applications/commonext/widget/ofbizsetup/CommonScreens.xml b/applications/commonext/widget/ofbizsetup/CommonScreens.xml
index 5959e6f..eac44ef 100644
--- a/applications/commonext/widget/ofbizsetup/CommonScreens.xml
+++ b/applications/commonext/widget/ofbizsetup/CommonScreens.xml
@@ -77,7 +77,7 @@
</and>
</condition>
<widgets>
- <include-menu name="SetupSubTabBar" location="component://commonext/widget/ofbizsetup/Menus.xml"/>
+ <include-menu location="component://commonext/widget/ofbizsetup/Menus.xml" name="SetupSubTabBar"/>
</widgets>
</section>
<section>
diff --git a/applications/content/minilang/compdoc/CompDocServices.xml b/applications/content/minilang/compdoc/CompDocServices.xml
index b9f630b..fa9eee9 100644
--- a/applications/content/minilang/compdoc/CompDocServices.xml
+++ b/applications/content/minilang/compdoc/CompDocServices.xml
@@ -25,7 +25,7 @@
<entity-one entity-name="Content" value-field="rootTemplateContent">
<field-map field-name="contentId" from-field="parameters.instanceOfContentId"/>
</entity-one>
- <log level="info" message="genCompDocInstance> rootTemplateContent: ${rootTemplateContent}"/>
+ <log message="genCompDocInstance> rootTemplateContent: ${rootTemplateContent}" level="info"/>
<!-- if not passed in, get latest template contentRevisionSeqId from db -->
<if-empty field="parameters.contentRevisionSeqId">
@@ -45,7 +45,7 @@
<set from-field="parameters.contentRevisionSeqId" field="contentRevisionSeqId"/>
</else>
</if-empty>
- <log level="info" message="genCompDocInstance> contentRevisionSeqId: ${contentRevisionSeqId}"/>
+ <log message="genCompDocInstance> contentRevisionSeqId: ${contentRevisionSeqId}" level="info"/>
<make-value entity-name="Content" value-field="rootInstanceContent"/>
<if-empty field="parameters.rootInstanceContentId">
@@ -107,8 +107,8 @@
<simple-method method-name="genInstanceChildCompDocs" short-description="Create CompDoc">
<set from-field="parentTemplateContentId" field="thisTemplateContentId"/>
<set from-field="parentInstanceContentId" field="thisInstanceContentId"/>
- <log level="info" message="genInstanceChildCompDocs 0> thisTemplateContentId: ${thisTemplateContentId}"/>
- <log level="info" message="genInstanceChildCompDocs 1> thisInstanceContentId: ${thisInstanceContentId}"/>
+ <log message="genInstanceChildCompDocs 0> thisTemplateContentId: ${thisTemplateContentId}" level="info"/>
+ <log message="genInstanceChildCompDocs 1> thisInstanceContentId: ${thisInstanceContentId}" level="info"/>
<entity-condition entity-name="ContentAssoc" list="contentAssocList">
<condition-list combine="and">
<condition-expr field-name="contentIdTo" operator="equals" from-field="thisTemplateContentId"/>
@@ -119,7 +119,7 @@
</condition-list>
</condition-list>
</entity-condition>
- <log level="info" message="genInstanceChildCompDocs 1> contentAssocList: ${contentAssocList}"/>
+ <log message="genInstanceChildCompDocs 1> contentAssocList: ${contentAssocList}" level="info"/>
<iterate list="contentAssocList" entry="templateContentAssoc">
<clone-value value-field="templateContent" new-value-field="instanceContent"/>
diff --git a/applications/content/minilang/content/ContentEvents.xml b/applications/content/minilang/content/ContentEvents.xml
index 9e6ffa4..265beac 100644
--- a/applications/content/minilang/content/ContentEvents.xml
+++ b/applications/content/minilang/content/ContentEvents.xml
@@ -131,7 +131,7 @@
<set field="context3.contentPurposeList" from-field="contentPurposeList"/>
<string-to-list list="targetOperationList" string="ASSOC_CONTENT"/>
<set field="context3.targetOperationList" from-field="targetOperationList"/>
- <call-service service-name="assocContent" in-map-name="context3"></call-service>
+ <call-service in-map-name="context3" service-name="assocContent"></call-service>
</simple-method>
<simple-method method-name="createDocument" short-description="Create Document Tree">
diff --git a/applications/content/minilang/content/ContentServices.xml b/applications/content/minilang/content/ContentServices.xml
index 35bc7dc..3c35eb3 100644
--- a/applications/content/minilang/content/ContentServices.xml
+++ b/applications/content/minilang/content/ContentServices.xml
@@ -414,7 +414,7 @@
</if-not-empty>
</simple-method>
<simple-method method-name="createTopic" short-description="Create TOPIC type Content">
- <make-value entity-name="Content" value-field="content"/>
+ <make-value value-field="content" entity-name="Content"/>
<set from-field="parameters.newTopicId" field="content.contentId"/>
<set from-field="parameters.newTopicId" field="content.contentName"/>
<set from-field="parameters.newTopicDescription" field="content.description"/>
diff --git a/applications/content/minilang/layout/LayoutEvents.xml b/applications/content/minilang/layout/LayoutEvents.xml
index 22b4b5c..b076cda 100644
--- a/applications/content/minilang/layout/LayoutEvents.xml
+++ b/applications/content/minilang/layout/LayoutEvents.xml
@@ -165,7 +165,7 @@
<set field="context.textData" from-field="parameters.textData"/>
<session-to-field field="context.userLogin" session-name="userLogin"/>
- <call-service service-name="persistContentAndAssoc" in-map-name="context">
+ <call-service in-map-name="context" service-name="persistContentAndAssoc">
<result-to-field result-name="contentId" field="contentId"/>
<result-to-field result-name="dataResourceId" field="dataResourceId"/>
</call-service>
@@ -318,7 +318,7 @@
<set field="context.contentIdTo" from-field="parameters.contentIdTo"/>
<session-to-field field="context.userLogin" session-name="userLogin"/>
- <call-service service-name="persistContentAndAssoc" in-map-name="context">
+ <call-service in-map-name="context" service-name="persistContentAndAssoc">
<result-to-field result-name="contentId" field="contentId"/>
<result-to-field result-name="dataResourceId" field="dataResourceId"/>
</call-service>
diff --git a/applications/content/minilang/survey/SurveyServices.xml b/applications/content/minilang/survey/SurveyServices.xml
index 7af86a5..89c5392 100644
--- a/applications/content/minilang/survey/SurveyServices.xml
+++ b/applications/content/minilang/survey/SurveyServices.xml
@@ -191,7 +191,7 @@
</if-compare>
<if-empty field="surveyResponse">
- <make-value entity-name="SurveyResponse" value-field="surveyResponse"/>
+ <make-value value-field="surveyResponse" entity-name="SurveyResponse"/>
<sequenced-id sequence-name="SurveyResponse" field="surveyResponse.surveyResponseId"/>
<set-nonpk-fields map="parameters" value-field="surveyResponse"/>
<create-value value-field="surveyResponse"/>
diff --git a/applications/content/minilang/website/WebSiteServices.xml b/applications/content/minilang/website/WebSiteServices.xml
index 16db007..c7a44d6 100644
--- a/applications/content/minilang/website/WebSiteServices.xml
+++ b/applications/content/minilang/website/WebSiteServices.xml
@@ -24,7 +24,7 @@
<!-- WebSite Path Alias -->
<simple-method method-name="getWebSitePathAlias" short-description="Returns a WebSite Path Alias">
- <make-value entity-name="WebSitePathAlias" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="WebSitePathAlias"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="WebSitePathAlias" map="lookupPKMap" value-field="alias" use-cache="true"/>
<field-to-result field="alias.pathTo" result-name="pathTo"/>
diff --git a/applications/content/webapp/content/WEB-INF/controller.xml b/applications/content/webapp/content/WEB-INF/controller.xml
index 27543b3..8aab9bb 100644
--- a/applications/content/webapp/content/WEB-INF/controller.xml
+++ b/applications/content/webapp/content/WEB-INF/controller.xml
@@ -169,13 +169,13 @@
</request-map>
<request-map uri="createForumGroup">
<security https="true" auth="true"/>
- <event type="service" invoke="createContent"/>
+ <event invoke="createContent" type="service"/>
<response name="success" type="view" value="FindForumGroups"/>
<response name="error" type="view" value="FindForumGroups"/>
</request-map>
<request-map uri="updateForumGroup">
<security https="true" auth="true"/>
- <event type="service" invoke="updateContent"/>
+ <event invoke="updateContent" type="service"/>
<response name="success" type="view" value="FindForumGroups"/>
<response name="error" type="view" value="FindForumGroups"/>
</request-map>
@@ -186,19 +186,19 @@
</request-map>
<request-map uri="createForumGroupRole">
<security https="true" auth="true"/>
- <event type="service" invoke="createContentRole"/>
+ <event invoke="createContentRole" type="service"/>
<response name="success" type="view" value="ForumGroupRoles"/>
<response name="error" type="view" value="ForumGroupRoles"/>
</request-map>
<request-map uri="updateForumGroupRole">
<security https="true" auth="true"/>
- <event type="service" invoke="updateContentRole"/>
+ <event invoke="updateContentRole" type="service"/>
<response name="success" type="view" value="ForumGroupRoles"/>
<response name="error" type="view" value="ForumGroupRoles"/>
</request-map>
<request-map uri="deleteForumGroupRole">
<security https="true" auth="true"/>
- <event type="service" invoke="removeContentRole"/>
+ <event invoke="removeContentRole" type="service"/>
<response name="success" type="view" value="ForumGroupRoles"/>
<response name="error" type="view" value="ForumGroupRoles"/>
</request-map>
@@ -209,13 +209,13 @@
</request-map>
<request-map uri="createForumGroupPurpose">
<security https="true" auth="true"/>
- <event type="service" invoke="createContentPurpose"/>
+ <event invoke="createContentPurpose" type="service"/>
<response name="success" type="view" value="ForumGroupPurposes"/>
<response name="error" type="view" value="ForumGroupPurposes"/>
</request-map>
<request-map uri="deleteForumGroupPurpose">
<security https="true" auth="true"/>
- <event type="service" invoke="removeContentPurpose"/>
+ <event invoke="removeContentPurpose" type="service"/>
<response name="success" type="view" value="ForumGroupPurposes"/>
<response name="error" type="view" value="ForumGroupPurposes"/>
</request-map>
@@ -226,13 +226,13 @@
</request-map>
<request-map uri="createForum">
<security https="true" auth="true"/>
- <event type="service" invoke="persistContentAndAssoc"/>
+ <event invoke="persistContentAndAssoc" type="service"/>
<response name="success" type="view" value="FindForums"/>
<response name="error" type="view" value="FindForums"/>
</request-map>
<request-map uri="updateForum">
<security https="true" auth="true"/>
- <event type="service" invoke="persistContentAndAssoc"/>
+ <event invoke="persistContentAndAssoc" type="service"/>
<response name="success" type="view" value="FindForums"/>
<response name="error" type="view" value="FindForums"/>
</request-map>
@@ -259,13 +259,13 @@
</request-map>
<request-map uri="updateForumMessage">
<security https="true" auth="true"/>
- <event type="service" invoke="persistContentAndAssoc"/>
+ <event invoke="persistContentAndAssoc" type="service"/>
<response name="success" type="view" value="FindForumMessages"/>
<response name="error" type="view" value="FindForumMessages"/>
</request-map>
<request-map uri="updateForumThreadMessage">
<security https="true" auth="true"/>
- <event type="service" invoke="persistContentAndAssoc"/>
+ <event invoke="persistContentAndAssoc" type="service"/>
<response name="success" type="view" value="FindForumThreads"/>
<response name="error" type="view" value="FindForumThreads"/>
</request-map>
@@ -464,19 +464,19 @@
</request-map>
<request-map uri="addContentType">
<security auth="true" https="true"/>
- <event type="service" invoke="createContentType" path=""/>
+ <event invoke="createContentType" path="" type="service"/>
<response name="success" type="view" value="EditContentType"/>
<response name="error" type="view" value="EditContentType"/>
</request-map>
<request-map uri="updateContentType">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContentType" path=""/>
+ <event invoke="updateContentType" path="" type="service"/>
<response name="success" type="view" value="EditContentType"/>
<response name="error" type="view" value="EditContentType"/>
</request-map>
<request-map uri="removeContentType">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentType" path=""/>
+ <event invoke="removeContentType" path="" type="service"/>
<response name="success" type="view" value="EditContentType"/>
<response name="error" type="view" value="EditContentType"/>
</request-map>
@@ -488,19 +488,19 @@
</request-map>
<request-map uri="addContentRole">
<security auth="true" https="true"/>
- <event type="service" invoke="createContentRole" path=""/>
+ <event invoke="createContentRole" path="" type="service"/>
<response name="success" type="view" value="EditContentRole"/>
<response name="error" type="view" value="EditContentRole"/>
</request-map>
<request-map uri="updateContentRole">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContentRole" path=""/>
+ <event invoke="updateContentRole" path="" type="service"/>
<response name="success" type="view" value="EditContentRole"/>
<response name="error" type="view" value="EditContentRole"/>
</request-map>
<request-map uri="removeContentRole">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentRole" path=""/>
+ <event invoke="removeContentRole" path="" type="service"/>
<response name="success" type="view" value="EditContentRole"/>
<response name="error" type="view" value="EditContentRole"/>
</request-map>
@@ -512,19 +512,19 @@
</request-map>
<request-map uri="addContentAssocType">
<security auth="true" https="true"/>
- <event type="service" invoke="createContentAssocType" path=""/>
+ <event invoke="createContentAssocType" path="" type="service"/>
<response name="success" type="view" value="EditContentAssocType"/>
<response name="error" type="view" value="EditContentAssocType"/>
</request-map>
<request-map uri="updateContentAssocType">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContentAssocType" path=""/>
+ <event invoke="updateContentAssocType" path="" type="service"/>
<response name="success" type="view" value="EditContentAssocType"/>
<response name="error" type="view" value="EditContentAssocType"/>
</request-map>
<request-map uri="removeContentAssocType">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentAssocType" path=""/>
+ <event invoke="removeContentAssocType" path="" type="service"/>
<response name="success" type="view" value="EditContentAssocType"/>
<response name="error" type="view" value="EditContentAssocType"/>
</request-map>
@@ -536,19 +536,19 @@
</request-map>
<request-map uri="addContentPurposeType">
<security auth="true" https="true"/>
- <event type="service" invoke="createContentPurposeType" path=""/>
+ <event invoke="createContentPurposeType" path="" type="service"/>
<response name="success" type="view" value="EditContentPurposeType"/>
<response name="error" type="view" value="EditContentPurposeType"/>
</request-map>
<request-map uri="updateContentPurposeType">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContentPurposeType" path=""/>
+ <event invoke="updateContentPurposeType" path="" type="service"/>
<response name="success" type="view" value="EditContentPurposeType"/>
<response name="error" type="view" value="EditContentPurposeType"/>
</request-map>
<request-map uri="removeContentPurposeType">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentPurposeType" path=""/>
+ <event invoke="removeContentPurposeType" path="" type="service"/>
<response name="success" type="view" value="EditContentPurposeType"/>
<response name="error" type="view" value="EditContentPurposeType"/>
</request-map>
@@ -560,13 +560,13 @@
</request-map>
<request-map uri="addContentTypeAttr">
<security auth="true" https="true"/>
- <event type="service" invoke="createContentTypeAttr" path=""/>
+ <event invoke="createContentTypeAttr" path="" type="service"/>
<response name="success" type="view" value="EditContentTypeAttr"/>
<response name="error" type="view" value="EditContentTypeAttr"/>
</request-map>
<request-map uri="removeContentTypeAttr">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentTypeAttr" path=""/>
+ <event invoke="removeContentTypeAttr" path="" type="service"/>
<response name="success" type="view" value="EditContentTypeAttr"/>
<response name="error" type="view" value="EditContentTypeAttr"/>
</request-map>
@@ -578,19 +578,19 @@
</request-map>
<request-map uri="addContentAssocPredicate">
<security auth="true" https="true"/>
- <event type="service" invoke="createContentAssocPredicate" path=""/>
+ <event invoke="createContentAssocPredicate" path="" type="service"/>
<response name="success" type="view" value="EditContentAssocPredicate"/>
<response name="error" type="view" value="EditContentAssocPredicate"/>
</request-map>
<request-map uri="updateContentAssocPredicate">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContentAssocPredicate" path=""/>
+ <event invoke="updateContentAssocPredicate" path="" type="service"/>
<response name="success" type="view" value="EditContentAssocPredicate"/>
<response name="error" type="view" value="EditContentAssocPredicate"/>
</request-map>
<request-map uri="removeContentAssocPredicate">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentAssocPredicate" path=""/>
+ <event invoke="removeContentAssocPredicate" path="" type="service"/>
<response name="success" type="view" value="EditContentAssocPredicate"/>
<response name="error" type="view" value="EditContentAssocPredicate"/>
</request-map>
@@ -602,19 +602,19 @@
</request-map>
<request-map uri="addCharacterSet">
<security auth="true" https="true"/>
- <event type="service" invoke="createCharacterSet" path=""/>
+ <event invoke="createCharacterSet" path="" type="service"/>
<response name="success" type="view" value="EditCharacterSet"/>
<response name="error" type="view" value="EditCharacterSet"/>
</request-map>
<request-map uri="updateCharacterSet">
<security auth="true" https="true"/>
- <event type="service" invoke="updateCharacterSet" path=""/>
+ <event invoke="updateCharacterSet" path="" type="service"/>
<response name="success" type="view" value="EditCharacterSet"/>
<response name="error" type="view" value="EditCharacterSet"/>
</request-map>
<request-map uri="removeCharacterSet">
<security auth="true" https="true"/>
- <event type="service" invoke="removeCharacterSet" path=""/>
+ <event invoke="removeCharacterSet" path="" type="service"/>
<response name="success" type="view" value="EditCharacterSet"/>
<response name="error" type="view" value="EditCharacterSet"/>
</request-map>
@@ -626,19 +626,19 @@
</request-map>
<request-map uri="addDataCategory">
<security auth="true" https="true"/>
- <event type="service" invoke="createDataCategory" path=""/>
+ <event invoke="createDataCategory" path="" type="service"/>
<response name="success" type="view" value="EditDataCategory"/>
<response name="error" type="view" value="EditDataCategory"/>
</request-map>
<request-map uri="updateDataCategory">
<security auth="true" https="true"/>
- <event type="service" invoke="updateDataCategory" path=""/>
+ <event invoke="updateDataCategory" path="" type="service"/>
<response name="success" type="view" value="EditDataCategory"/>
<response name="error" type="view" value="EditDataCategory"/>
</request-map>
<request-map uri="removeDataCategory">
<security auth="true" https="true"/>
- <event type="service" invoke="removeDataCategory" path=""/>
+ <event invoke="removeDataCategory" path="" type="service"/>
<response name="success" type="view" value="EditDataCategory"/>
<response name="error" type="view" value="EditDataCategory"/>
</request-map>
@@ -669,19 +669,19 @@
</request-map>
<request-map uri="addDataResourceType">
<security auth="true" https="true"/>
- <event type="service" invoke="createDataResourceType" path=""/>
+ <event invoke="createDataResourceType" path="" type="service"/>
<response name="success" type="view" value="EditDataResourceType"/>
<response name="error" type="view" value="EditDataResourceType"/>
</request-map>
<request-map uri="updateDataResourceType">
<security auth="true" https="true"/>
- <event type="service" invoke="updateDataResourceType" path=""/>
+ <event invoke="updateDataResourceType" path="" type="service"/>
<response name="success" type="view" value="EditDataResourceType"/>
<response name="error" type="view" value="EditDataResourceType"/>
</request-map>
<request-map uri="removeDataResourceType">
<security auth="true" https="true"/>
- <event type="service" invoke="removeDataResourceType" path=""/>
+ <event invoke="removeDataResourceType" path="" type="service"/>
<response name="success" type="view" value="EditDataResourceType"/>
<response name="error" type="view" value="EditDataResourceType"/>
</request-map>
@@ -693,19 +693,19 @@
</request-map>
<request-map uri="addDataResourceAttribute">
<security auth="true" https="true"/>
- <event type="service" invoke="createDataResourceAttribute" path=""/>
+ <event invoke="createDataResourceAttribute" path="" type="service"/>
<response name="success" type="view" value="EditDataResourceAttribute"/>
<response name="error" type="view" value="EditDataResourceAttribute"/>
</request-map>
<request-map uri="updateDataResourceAttribute">
<security auth="true" https="true"/>
- <event type="service" invoke="updateDataResourceAttribute" path=""/>
+ <event invoke="updateDataResourceAttribute" path="" type="service"/>
<response name="success" type="view" value="EditDataResourceAttribute"/>
<response name="error" type="view" value="EditDataResourceAttribute"/>
</request-map>
<request-map uri="removeDataResourceAttribute">
<security auth="true" https="true"/>
- <event type="service" invoke="removeDataResourceAttribute" path=""/>
+ <event invoke="removeDataResourceAttribute" path="" type="service"/>
<response name="success" type="view" value="EditDataResourceAttribute"/>
<response name="error" type="view" value="EditDataResourceAttribute"/>
</request-map>
@@ -721,31 +721,31 @@
</request-map>
<request-map uri="addElectronicText">
<security auth="true" https="true"/>
- <event type="service" invoke="createElectronicText" path=""/>
+ <event invoke="createElectronicText" path="" type="service"/>
<response name="success" type="view" value="EditElectronicText"/>
<response name="error" type="view" value="EditElectronicText"/>
</request-map>
<request-map uri="updateElectronicText">
<security auth="true" https="true"/>
- <event type="service" invoke="updateElectronicText" path=""/>
+ <event invoke="updateElectronicText" path="" type="service"/>
<response name="success" type="view" value="EditElectronicText"/>
<response name="error" type="view" value="EditElectronicText"/>
</request-map>
<request-map uri="addHtmlText">
<security auth="true" https="true"/>
- <event type="service" invoke="createElectronicText" path=""/>
+ <event invoke="createElectronicText" path="" type="service"/>
<response name="success" type="view" value="EditHtmlText"/>
<response name="error" type="view" value="EditHtmlText"/>
</request-map>
<request-map uri="updateHtmlText">
<security auth="true" https="true"/>
- <event type="service" invoke="updateElectronicText" path=""/>
+ <event invoke="updateElectronicText" path="" type="service"/>
<response name="success" type="view" value="EditHtmlText"/>
<response name="error" type="view" value="EditHtmlText"/>
</request-map>
<request-map uri="removeElectronicText">
<security auth="true" https="true"/>
- <event type="service" invoke="removeElectronicText" path=""/>
+ <event invoke="removeElectronicText" path="" type="service"/>
<response name="success" type="view" value="EditElectronicText"/>
<response name="error" type="view" value="EditElectronicText"/>
</request-map>
@@ -757,19 +757,19 @@
</request-map>
<request-map uri="addDataResourceRole">
<security auth="true" https="true"/>
- <event type="service" invoke="createDataResourceRole" path=""/>
+ <event invoke="createDataResourceRole" path="" type="service"/>
<response name="success" type="view" value="EditDataResourceRole"/>
<response name="error" type="view" value="EditDataResourceRole"/>
</request-map>
<request-map uri="updateDataResourceRole">
<security auth="true" https="true"/>
- <event type="service" invoke="updateDataResourceRole" path=""/>
+ <event invoke="updateDataResourceRole" path="" type="service"/>
<response name="success" type="view" value="EditDataResourceRole"/>
<response name="error" type="view" value="EditDataResourceRole"/>
</request-map>
<request-map uri="removeDataResourceRole">
<security auth="true" https="true"/>
- <event type="service" invoke="removeDataResourceRole" path=""/>
+ <event invoke="removeDataResourceRole" path="" type="service"/>
<response name="success" type="view" value="EditDataResourceRole"/>
<response name="error" type="view" value="EditDataResourceRole"/>
</request-map>
@@ -781,13 +781,13 @@
</request-map>
<request-map uri="createDataResourceProductFeature">
<security auth="true" https="true"/>
- <event type="service" invoke="createProductFeatureDataResource" path=""/>
+ <event invoke="createProductFeatureDataResource" path="" type="service"/>
<response name="success" type="view" value="EditDataResourceProductFeatures"/>
<response name="error" type="view" value="EditDataResourceProductFeatures"/>
</request-map>
<request-map uri="removeDataResourceProductFeature">
<security auth="true" https="true"/>
- <event type="service" invoke="removeProductFeatureDataResource" path=""/>
+ <event invoke="removeProductFeatureDataResource" path="" type="service"/>
<response name="success" type="view" value="EditDataResourceProductFeatures"/>
<response name="error" type="view" value="EditDataResourceProductFeatures"/>
</request-map>
@@ -799,13 +799,13 @@
</request-map>
<request-map uri="addDataResourceTypeAttr">
<security auth="true" https="true"/>
- <event type="service" invoke="createDataResourceTypeAttr" path=""/>
+ <event invoke="createDataResourceTypeAttr" path="" type="service"/>
<response name="success" type="view" value="EditDataResourceTypeAttr"/>
<response name="error" type="view" value="EditDataResourceTypeAttr"/>
</request-map>
<request-map uri="removeDataResourceTypeAttr">
<security auth="true" https="true"/>
- <event type="service" invoke="removeDataResourceTypeAttr" path=""/>
+ <event invoke="removeDataResourceTypeAttr" path="" type="service"/>
<response name="success" type="view" value="EditDataResourceTypeAttr"/>
<response name="error" type="view" value="EditDataResourceTypeAttr"/>
</request-map>
@@ -817,19 +817,19 @@
</request-map>
<request-map uri="addFileExtension">
<security auth="true" https="true"/>
- <event type="service" invoke="createFileExtension" path=""/>
+ <event invoke="createFileExtension" path="" type="service"/>
<response name="success" type="view" value="EditFileExtension"/>
<response name="error" type="view" value="EditFileExtension"/>
</request-map>
<request-map uri="updateFileExtension">
<security auth="true" https="true"/>
- <event type="service" invoke="updateFileExtension" path=""/>
+ <event invoke="updateFileExtension" path="" type="service"/>
<response name="success" type="view" value="EditFileExtension"/>
<response name="error" type="view" value="EditFileExtension"/>
</request-map>
<request-map uri="removeFileExtension">
<security auth="true" https="true"/>
- <event type="service" invoke="removeFileExtension" path=""/>
+ <event invoke="removeFileExtension" path="" type="service"/>
<response name="success" type="view" value="EditFileExtension"/>
<response name="error" type="view" value="EditFileExtension"/>
</request-map>
@@ -841,19 +841,19 @@
</request-map>
<request-map uri="addMetaDataPredicate">
<security auth="true" https="true"/>
- <event type="service" invoke="createMetaDataPredicate" path=""/>
+ <event invoke="createMetaDataPredicate" path="" type="service"/>
<response name="success" type="view" value="EditMetaDataPredicate"/>
<response name="error" type="view" value="EditMetaDataPredicate"/>
</request-map>
<request-map uri="updateMetaDataPredicate">
<security auth="true" https="true"/>
- <event type="service" invoke="updateMetaDataPredicate" path=""/>
+ <event invoke="updateMetaDataPredicate" path="" type="service"/>
<response name="success" type="view" value="EditMetaDataPredicate"/>
<response name="error" type="view" value="EditMetaDataPredicate"/>
</request-map>
<request-map uri="removeMetaDataPredicate">
<security auth="true" https="true"/>
- <event type="service" invoke="removeMetaDataPredicate" path=""/>
+ <event invoke="removeMetaDataPredicate" path="" type="service"/>
<response name="success" type="view" value="EditMetaDataPredicate"/>
<response name="error" type="view" value="EditMetaDataPredicate"/>
</request-map>
@@ -865,19 +865,19 @@
</request-map>
<request-map uri="addMimeType">
<security auth="true" https="true"/>
- <event type="service" invoke="createMimeType" path=""/>
+ <event invoke="createMimeType" path="" type="service"/>
<response name="success" type="view" value="EditMimeType"/>
<response name="error" type="view" value="EditMimeType"/>
</request-map>
<request-map uri="updateMimeType">
<security auth="true" https="true"/>
- <event type="service" invoke="updateMimeType" path=""/>
+ <event invoke="updateMimeType" path="" type="service"/>
<response name="success" type="view" value="EditMimeType"/>
<response name="error" type="view" value="EditMimeType"/>
</request-map>
<request-map uri="removeMimeType">
<security auth="true" https="true"/>
- <event type="service" invoke="removeMimeType" path=""/>
+ <event invoke="removeMimeType" path="" type="service"/>
<response name="success" type="view" value="EditMimeType"/>
<response name="error" type="view" value="EditMimeType"/>
</request-map>
@@ -889,19 +889,19 @@
</request-map>
<request-map uri="createMimeTypeHtmlTemplate">
<security auth="true" https="true"/>
- <event type="service" invoke="createMimeTypeHtmlTemplate" path=""/>
+ <event invoke="createMimeTypeHtmlTemplate" path="" type="service"/>
<response name="success" type="view" value="EditMimeTypeHtmlTemplate"/>
<response name="error" type="view" value="EditMimeTypeHtmlTemplate"/>
</request-map>
<request-map uri="updateMimeTypeHtmlTemplate">
<security auth="true" https="true"/>
- <event type="service" invoke="updateMimeTypeHtmlTemplate" path=""/>
+ <event invoke="updateMimeTypeHtmlTemplate" path="" type="service"/>
<response name="success" type="view" value="EditMimeTypeHtmlTemplate"/>
<response name="error" type="view" value="EditMimeTypeHtmlTemplate"/>
</request-map>
<request-map uri="removeMimeTypeHtmlTemplate">
<security auth="true" https="true"/>
- <event type="service" invoke="removeMimeTypeHtmlTemplate" path=""/>
+ <event invoke="removeMimeTypeHtmlTemplate" path="" type="service"/>
<response name="success" type="view" value="EditMimeTypeHtmlTemplate"/>
<response name="error" type="view" value="EditMimeTypeHtmlTemplate"/>
</request-map>
@@ -926,13 +926,13 @@
</request-map>
<request-map uri="updateContent">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContent"/>
+ <event invoke="updateContent" type="service"/>
<response name="success" type="view" value="EditContent"/>
<response name="error" type="view" value="EditContent"/>
</request-map>
<request-map uri="createContent">
<security auth="true" https="true"/>
- <event type="service" invoke="createContent"/>
+ <event invoke="createContent" type="service"/>
<response name="success" type="view" value="EditContent"/>
<response name="error" type="view" value="EditContent"/>
</request-map>
@@ -948,19 +948,19 @@
</request-map>
<request-map uri="updateContentAssoc">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContentAssoc" path=""/>
+ <event invoke="updateContentAssoc" path="" type="service"/>
<response name="success" type="view" value="EditContentAssoc"/>
<response name="error" type="view" value="EditContentAssoc"/>
</request-map>
<request-map uri="createContentAssoc">
<security auth="true" https="true"/>
- <event type="service" invoke="createContentAssoc" path=""/>
+ <event invoke="createContentAssoc" path="" type="service"/>
<response name="success" type="view" value="EditContentAssoc"/>
<response name="error" type="view" value="EditContentAssoc"/>
</request-map>
<request-map uri="removeContentAssoc">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentAssoc" path=""/>
+ <event invoke="removeContentAssoc" path="" type="service"/>
<response name="success" type="view" value="EditContentAssoc"/>
<response name="error" type="view" value="EditContentAssoc"/>
</request-map>
@@ -977,13 +977,13 @@
<request-map uri="AddDataResourceFromContent"><security auth="true" https="true"/><response name="success" type="view" value="AddDataResourceFromContent"/></request-map>
<request-map uri="updateDataResourceText">
<security auth="true" https="true"/>
- <event type="service" invoke="updateDataResource" path=""/>
+ <event invoke="updateDataResource" path="" type="service"/>
<response name="success" type="request" value="EditDataResource"/>
<response name="error" type="view" value="EditDataResource"/>
</request-map>
<request-map uri="updateDataResource">
<security auth="true" https="true"/>
- <event type="service" invoke="updateDataResource" path=""/>
+ <event invoke="updateDataResource" path="" type="service"/>
<response name="success" type="view" value="EditDataResource"/>
<response name="error" type="view" value="EditDataResource"/>
</request-map>
@@ -997,7 +997,7 @@
</request-map>
<request-map uri="createDataResourceAndAssocToContent">
<security auth="true" https="true"/>
- <event type="service" invoke="createDataResourceAndAssocToContent" path=""/>
+ <event invoke="createDataResourceAndAssocToContent" path="" type="service"/>
<response name="success" type="view" value="EditContent"/>
<response name="ELECTRONIC_TEXT" type="view" value="EditElectronicText"/>
<response name="IMAGE_OBJECT" type="view" value="UploadImage"/>
@@ -1005,13 +1005,13 @@
</request-map>
<request-map uri="createDataResourceUpload">
<security auth="true" https="true"/>
- <event type="service" invoke="createDataResource" path=""/>
+ <event invoke="createDataResource" path="" type="service"/>
<response name="success" type="request" value="EditDataResourceUpload"/>
<response name="error" type="view" value="AddDataResourceUpload"/>
</request-map>
<request-map uri="createDataResourceAndText">
<security auth="true" https="true"/>
- <event type="service" invoke="createDataResourceAndText" path=""/>
+ <event invoke="createDataResourceAndText" path="" type="service"/>
<response name="success" type="view" value="EditDataResourceText"/>
<response name="error" type="view" value="AddDataResourceText"/>
</request-map>
@@ -1023,7 +1023,7 @@
<!--
<event type="java" path="org.apache.ofbiz.content.data.DataEvents" invoke="uploadImage"/>
-->
- <event type="service" invoke="persistContentAndAssoc" path=""/>
+ <event invoke="persistContentAndAssoc" path="" type="service"/>
<response name="success" type="request" value="UploadImage"/>
<response name="error" type="view" value="UploadImage"/>
</request-map>
@@ -1038,19 +1038,19 @@
<request-map uri="EditContentOperation"><security auth="true" https="true"/><response name="success" type="view" value="EditContentOperation"/></request-map>
<request-map uri="addContentOperation">
<security auth="true" https="true"/>
- <event type="service" invoke="createContentOperation" path=""/>
+ <event invoke="createContentOperation" path="" type="service"/>
<response name="success" type="view" value="EditContentOperation"/>
<response name="error" type="view" value="EditContentOperation"/>
</request-map>
<request-map uri="updateContentOperation">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContentOperation" path=""/>
+ <event invoke="updateContentOperation" path="" type="service"/>
<response name="success" type="view" value="EditContentOperation"/>
<response name="error" type="view" value="EditContentOperation"/>
</request-map>
<request-map uri="removeContentOperation">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentOperation" path=""/>
+ <event invoke="removeContentOperation" path="" type="service"/>
<response name="success" type="view" value="EditContentOperation"/>
<response name="error" type="view" value="EditContentOperation"/>
</request-map>
@@ -1059,19 +1059,19 @@
<request-map uri="EditContentAttribute"><security auth="true" https="true"/><response name="success" type="view" value="EditContentAttribute"/></request-map>
<request-map uri="addContentAttribute">
<security auth="true" https="true"/>
- <event type="service" invoke="createContentAttribute" path=""/>
+ <event invoke="createContentAttribute" path="" type="service"/>
<response name="success" type="view" value="EditContentAttribute"/>
<response name="error" type="view" value="EditContentAttribute"/>
</request-map>
<request-map uri="updateContentAttribute">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContentAttribute" path=""/>
+ <event invoke="updateContentAttribute" path="" type="service"/>
<response name="success" type="view" value="EditContentAttribute"/>
<response name="error" type="view" value="EditContentAttribute"/>
</request-map>
<request-map uri="removeContentAttribute">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentAttribute" path=""/>
+ <event invoke="removeContentAttribute" path="" type="service"/>
<response name="success" type="view" value="EditContentAttribute"/>
<response name="error" type="view" value="EditContentAttribute"/>
</request-map>
@@ -1081,19 +1081,19 @@
<request-map uri="EditContentMetaData"><security auth="true" https="true"/><response name="success" type="view" value="EditContentMetaData"/></request-map>
<request-map uri="addContentMetaData">
<security auth="true" https="true"/>
- <event type="service" invoke="createContentMetaData" path=""/>
+ <event invoke="createContentMetaData" path="" type="service"/>
<response name="success" type="view" value="EditContentMetaData"/>
<response name="error" type="view" value="EditContentMetaData"/>
</request-map>
<request-map uri="updateContentMetaData">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContentMetaData" path=""/>
+ <event invoke="updateContentMetaData" path="" type="service"/>
<response name="success" type="view" value="EditContentMetaData"/>
<response name="error" type="view" value="EditContentMetaData"/>
</request-map>
<request-map uri="removeContentMetaData">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentMetaData" path=""/>
+ <event invoke="removeContentMetaData" path="" type="service"/>
<response name="success" type="view" value="EditContentMetaData"/>
<response name="error" type="view" value="EditContentMetaData"/>
</request-map>
@@ -1103,19 +1103,19 @@
<request-map uri="EditContentPurpose"><security auth="true" https="true"/><response name="success" type="view" value="EditContentPurpose"/></request-map>
<request-map uri="addContentPurpose">
<security auth="true" https="true"/>
- <event type="service" invoke="createContentPurpose" path=""/>
+ <event invoke="createContentPurpose" path="" type="service"/>
<response name="success" type="view" value="EditContentPurpose"/>
<response name="error" type="view" value="EditContentPurpose"/>
</request-map>
<request-map uri="updateContentPurpose">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContentPurpose" path=""/>
+ <event invoke="updateContentPurpose" path="" type="service"/>
<response name="success" type="view" value="EditContentPurpose"/>
<response name="error" type="view" value="EditContentPurpose"/>
</request-map>
<request-map uri="removeContentPurpose">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentPurpose" path=""/>
+ <event invoke="removeContentPurpose" path="" type="service"/>
<response name="success" type="view" value="EditContentPurpose"/>
<response name="error" type="view" value="EditContentPurpose"/>
</request-map>
@@ -1125,19 +1125,19 @@
<request-map uri="EditContentPurposeOperation"><security auth="true" https="true"/><response name="success" type="view" value="EditContentPurposeOperation"/></request-map>
<request-map uri="addContentPurposeOperation">
<security auth="true" https="true"/>
- <event type="service" invoke="createContentPurposeOperation" path=""/>
+ <event invoke="createContentPurposeOperation" path="" type="service"/>
<response name="success" type="view" value="EditContentPurposeOperation"/>
<response name="error" type="view" value="EditContentPurposeOperation"/>
</request-map>
<request-map uri="updateContentPurposeOperation">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContentPurposeOperation" path=""/>
+ <event invoke="updateContentPurposeOperation" path="" type="service"/>
<response name="success" type="view" value="EditContentPurposeOperation"/>
<response name="error" type="view" value="EditContentPurposeOperation"/>
</request-map>
<request-map uri="removeContentPurposeOperation">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentPurposeOperation" path=""/>
+ <event invoke="removeContentPurposeOperation" path="" type="service"/>
<response name="success" type="view" value="EditContentPurposeOperation"/>
<response name="error" type="view" value="EditContentPurposeOperation"/>
</request-map>
@@ -1149,21 +1149,21 @@
</request-map>
<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="EditContentWorkEfforts"/>
<response name="error" type="view" value="EditContentWorkEfforts"/>
</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="EditContentWorkEfforts"/>
<response name="error" type="view" value="EditContentWorkEfforts"/>
</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="EditContentWorkEfforts"/>
<response name="error" type="view" value="EditContentWorkEfforts"/>
</request-map>
@@ -1186,61 +1186,61 @@
<request-map uri="createCompDocTemplate">
<security auth="true" https="true"/>
- <event type="service" invoke="persistContentAndAssoc" path=""/>
+ <event invoke="persistContentAndAssoc" path="" type="service"/>
<response name="success" type="view" value="EditRootCompDoc"/>
<response name="error" type="view" value="EditRootCompDoc"/>
</request-map>
<request-map uri="updateCompDoc">
<security auth="true" https="true"/>
- <event type="service" invoke="persistContentAndAssoc" path=""/>
+ <event invoke="persistContentAndAssoc" path="" type="service"/>
<response name="success" type="view" value="EditChildCompDoc"/>
<response name="error" type="view" value="EditChildCompDoc"/>
</request-map>
<request-map uri="persistCompDocPdf2Survey">
<security auth="true" https="true"/>
- <event type="service" invoke="persistCompDocPdf2Survey" path=""/>
+ <event invoke="persistCompDocPdf2Survey" path="" type="service"/>
<response name="success" type="view" value="EditChildCompDoc"/>
<response name="error" type="view" value="EditChildCompDoc"/>
</request-map>
<request-map uri="createCompDoc">
<security auth="true" https="true"/>
- <event type="service" invoke="persistContentAndAssoc" path=""/>
+ <event invoke="persistContentAndAssoc" path="" type="service"/>
<response name="success" type="view" value="EditChildCompDoc"/>
<response name="error" type="view" value="EditChildCompDoc"/>
</request-map>
<request-map uri="updateRootCompDocTemplate">
<security auth="true" https="true"/>
- <event type="service" invoke="persistCompDoc" path=""/>
+ <event invoke="persistCompDoc" path="" type="service"/>
<response name="success" type="view" value="EditRootCompDoc"/>
<response name="error" type="view" value="EditRootCompDoc"/>
</request-map>
<request-map uri="createRootCompDocTemplate">
<security auth="true" https="true"/>
- <event type="service" invoke="persistCompDoc" path=""/>
+ <event invoke="persistCompDoc" path="" type="service"/>
<response name="success" type="view" value="EditRootCompDoc"/>
<response name="error" type="view" value="AddRootCompDocTemplate"/>
</request-map>
<request-map uri="createChildCompDocTemplate">
<security auth="true" https="true"/>
- <event type="service" invoke="persistCompDoc" path=""/>
+ <event invoke="persistCompDoc" path="" type="service"/>
<response name="success" type="view" value="EditChildCompDoc"/>
<response name="error" type="view" value="AddChildCompDocTemplate"/>
</request-map>
<request-map uri="createChildCompDocInstance">
<security auth="true" https="true"/>
- <event type="service" invoke="persistCompDoc" path=""/>
+ <event invoke="persistCompDoc" path="" type="service"/>
<response name="success" type="view" value="EditChildCompDoc"/>
<response name="error" type="view" value="AddChildCompDocInstance"/>
</request-map>
<request-map uri="updateChildCompDocTemplate">
<security auth="true" https="true"/>
- <event type="service" invoke="persistCompDoc" path=""/>
+ <event invoke="persistCompDoc" path="" type="service"/>
<response name="success" type="view" value="EditChildCompDoc"/>
<response name="error" type="view" value="EditChildCompDoc"/>
</request-map>
<request-map uri="uploadCompDocContent">
<security auth="true" https="true"/>
- <event type="service" invoke="persistCompDocContent" path=""/>
+ <event invoke="persistCompDocContent" path="" type="service"/>
<response name="success" type="view" value="EditChildCompDoc"/>
<response name="error" type="view" value="EditChildCompDoc"/>
</request-map>
@@ -1250,33 +1250,33 @@
</request-map>
<request-map uri="updateChildCompDocInstance">
<security auth="true" https="true"/>
- <event type="service" invoke="persistCompDoc" path=""/>
+ <event invoke="persistCompDoc" path="" type="service"/>
<response name="success" type="view" value="EditChildCompDoc"/>
<response name="error" type="view" value="EditChildCompDoc"/>
</request-map>
<request-map uri="genCompDocInstance">
<security auth="true" https="true"/>
- <event type="service" invoke="genCompDocInstance" path=""/>
+ <event invoke="genCompDocInstance" path="" type="service"/>
<response name="success" type="view" value="EditRootCompDoc"/>
<response name="error" type="view" value="AddRootCompDocInstance"/>
</request-map>
<request-map uri="resequenceCompDocPart">
<security auth="true" https="true"/>
- <event type="service" invoke="resequence" path=""/>
+ <event invoke="resequence" path="" type="service"/>
<response name="success" type="view" value="ViewCompDocTemplateTree"/>
<response name="error" type="view" value="ViewCompDocTemplateTree"/>
</request-map>
<request-map uri="GenCompDocPdf">
<security auth="true" https="true"/>
- <event type="java" invoke="genCompDocPdf" path="org.apache.ofbiz.content.compdoc.CompDocEvents"/>
+ <event invoke="genCompDocPdf" path="org.apache.ofbiz.content.compdoc.CompDocEvents" type="java"/>
<response name="success" type="none" value=""/>
<response name="error" type="view" value="error"/>
</request-map>
<request-map uri="GenContentPdf">
<security auth="true" https="true"/>
- <event type="java" invoke="genContentPdf" path="org.apache.ofbiz.content.compdoc.CompDocEvents"/>
+ <event invoke="genContentPdf" path="org.apache.ofbiz.content.compdoc.CompDocEvents" type="java"/>
<response name="success" type="none" value=""/>
<response name="error" type="view" value="error"/>
</request-map>
@@ -1284,19 +1284,19 @@
<request-map uri="EditCompDocContentRole"><security auth="true" https="true"/><response name="success" type="view" value="EditCompDocContentRole"/></request-map>
<request-map uri="addCompDocContentRole">
<security auth="true" https="true"/>
- <event type="service" invoke="createContentRole" path=""/>
+ <event invoke="createContentRole" path="" type="service"/>
<response name="success" type="view" value="EditCompDocContentRole"/>
<response name="error" type="view" value="EditCompDocContentRole"/>
</request-map>
<request-map uri="updateCompDocContentRole">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContentRole" path=""/>
+ <event invoke="updateContentRole" path="" type="service"/>
<response name="success" type="view" value="EditCompDocContentRole"/>
<response name="error" type="view" value="EditCompDocContentRole"/>
</request-map>
<request-map uri="removeCompDocContentRole">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentRole" path=""/>
+ <event invoke="removeContentRole" path="" type="service"/>
<response name="success" type="view" value="EditCompDocContentRole"/>
<response name="error" type="view" value="EditCompDocContentRole"/>
</request-map>
@@ -1308,38 +1308,38 @@
<request-map uri="EditContentApproval"><security auth="true" https="true"/><response name="success" type="view" value="EditContentApproval"/></request-map>
<request-map uri="createContentApproval">
<security auth="true" https="true"/>
- <event type="service" invoke="createContentApproval" path=""/>
+ <event invoke="createContentApproval" path="" type="service"/>
<response name="success" type="view" value="ListContentApproval"/>
<response name="error" type="view" value="ListContentApproval"/>
</request-map>
<request-map uri="updateContentApproval">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContentApproval" path=""/>
+ <event invoke="updateContentApproval" path="" type="service"/>
<response name="success" type="view" value="ListContentApproval"/>
<response name="error" type="view" value="ListContentApproval"/>
</request-map>
<request-map uri="updateContentApprovalStatus">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContentApproval" path=""/>
+ <event invoke="updateContentApproval" path="" type="service"/>
<response name="success" type="view" value="ListContentApproval"/>
<response name="error" type="view" value="ListContentApproval"/>
</request-map>
<request-map uri="updateWaitingContentApproval">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContentApproval" path=""/>
+ <event invoke="updateContentApproval" path="" type="service"/>
<response name="success" type="view" value="ListWaitingContentApproval"/>
<response name="error" type="view" value="ListWaitingContentApproval"/>
</request-map>
<request-map uri="removeContentApproval">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentApproval" path=""/>
+ <event invoke="removeContentApproval" path="" type="service"/>
<response name="success" type="view" value="ListContentApproval"/>
<response name="error" type="view" value="ListContentApproval"/>
</request-map>
<request-map uri="prepForApproval">
<security auth="true" https="true"/>
- <event type="service" invoke="prepForApproval" path=""/>
+ <event invoke="prepForApproval" path="" type="service"/>
<response name="success" type="view" value="ViewCompDocInstanceTree"/>
<response name="error" type="view" value="ViewCompDocInstanceTree"/>
</request-map>
@@ -1349,19 +1349,19 @@
<request-map uri="EditContentRevision"><security auth="true" https="true"/><response name="success" type="view" value="EditContentRevision"/></request-map>
<request-map uri="createContentRevision">
<security auth="true" https="true"/>
- <event type="service" invoke="createContentRevision" path=""/>
+ <event invoke="createContentRevision" path="" type="service"/>
<response name="success" type="view" value="EditContentRevision"/>
<response name="error" type="view" value="EditContentRevision"/>
</request-map>
<request-map uri="updateContentRevision">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContentRevision" path=""/>
+ <event invoke="updateContentRevision" path="" type="service"/>
<response name="success" type="view" value="EditContentRevision"/>
<response name="error" type="view" value="EditContentRevision"/>
</request-map>
<request-map uri="removeContentRevision">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentRevision" path=""/>
+ <event invoke="removeContentRevision" path="" type="service"/>
<response name="success" type="view" value="EditContentRevision"/>
<response name="error" type="view" value="EditContentRevision"/>
</request-map>
@@ -1371,19 +1371,19 @@
<request-map uri="EditContentRevisionItem"><security auth="true" https="true"/><response name="success" type="view" value="EditContentRevisionItem"/></request-map>
<request-map uri="createContentRevisionItem">
<security auth="true" https="true"/>
- <event type="service" invoke="createContentRevisionItem" path=""/>
+ <event invoke="createContentRevisionItem" path="" type="service"/>
<response name="success" type="view" value="EditContentRevisionItem"/>
<response name="error" type="view" value="EditContentRevisionItem"/>
</request-map>
<request-map uri="updateContentRevisionItem">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContentRevisionItem" path=""/>
+ <event invoke="updateContentRevisionItem" path="" type="service"/>
<response name="success" type="view" value="EditContentRevisionItem"/>
<response name="error" type="view" value="EditContentRevisionItem"/>
</request-map>
<request-map uri="removeContentRevisionItem">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentRevisionItem" path=""/>
+ <event invoke="removeContentRevisionItem" path="" type="service"/>
<response name="success" type="view" value="EditContentRevisionItem"/>
<response name="error" type="view" value="EditContentRevisionItem"/>
</request-map>
@@ -1397,31 +1397,31 @@
<request-map uri="EditSurvey"><security auth="true" https="true"/><response name="success" type="view" value="EditSurvey"/></request-map>
<request-map uri="createSurvey">
<security auth="true" https="true"/>
- <event type="service" invoke="createSurvey" path=""/>
+ <event invoke="createSurvey" path="" type="service"/>
<response name="success" type="view" value="EditSurvey"/>
<response name="error" type="view" value="EditSurvey"/>
</request-map>
<request-map uri="updateSurvey">
<security auth="true" https="true"/>
- <event type="service" invoke="updateSurvey" path=""/>
+ <event invoke="updateSurvey" path="" type="service"/>
<response name="success" type="view" value="EditSurvey"/>
<response name="error" type="view" value="EditSurvey"/>
</request-map>
<request-map uri="buildSurveyFromPdf">
<security auth="true" https="true"/>
- <event type="service" invoke="buildSurveyFromPdf" path=""/>
+ <event invoke="buildSurveyFromPdf" path="" type="service"/>
<response name="success" type="view" value="EditSurvey"/>
<response name="error" type="view" value="EditSurvey"/>
</request-map>
<request-map uri="buildSurveyResponseFromPdf">
<security auth="true" https="true"/>
- <event type="service" invoke="buildSurveyResponseFromPdf" path=""/>
+ <event invoke="buildSurveyResponseFromPdf" path="" type="service"/>
<response name="success" type="view" value="EditSurveyResponse"/>
<response name="error" type="view" value="EditSurveyResponse"/>
</request-map>
<request-map uri="deleteSurvey">
<security auth="true" https="true"/>
- <event type="service" invoke="deleteSurvey" path=""/>
+ <event invoke="deleteSurvey" path="" type="service"/>
<response name="success" type="view" value="EditSurvey"/>
<response name="error" type="view" value="EditSurvey"/>
</request-map>
@@ -1430,37 +1430,37 @@
<request-map uri="EditSurveyMultiResps"><security auth="true" https="true"/><response name="success" type="view" value="EditSurveyMultiResps"/></request-map>
<request-map uri="createSurveyMultiResp">
<security auth="true" https="true"/>
- <event type="service" invoke="createSurveyMultiResp" path=""/>
+ <event invoke="createSurveyMultiResp" path="" type="service"/>
<response name="success" type="view" value="EditSurveyMultiResps"/>
<response name="error" type="view" value="EditSurveyMultiResps"/>
</request-map>
<request-map uri="updateSurveyMultiResp">
<security auth="true" https="true"/>
- <event type="service" invoke="updateSurveyMultiResp" path=""/>
+ <event invoke="updateSurveyMultiResp" path="" type="service"/>
<response name="success" type="view" value="EditSurveyMultiResps"/>
<response name="error" type="view" value="EditSurveyMultiResps"/>
</request-map>
<request-map uri="deleteSurveyMultiResp">
<security auth="true" https="true"/>
- <event type="service" invoke="deleteSurveyMultiResp" path=""/>
+ <event invoke="deleteSurveyMultiResp" path="" type="service"/>
<response name="success" type="view" value="EditSurveyMultiResps"/>
<response name="error" type="view" value="EditSurveyMultiResps"/>
</request-map>
<request-map uri="createSurveyMultiRespColumn">
<security auth="true" https="true"/>
- <event type="service" invoke="createSurveyMultiRespColumn" path=""/>
+ <event invoke="createSurveyMultiRespColumn" path="" type="service"/>
<response name="success" type="view" value="EditSurveyMultiResps"/>
<response name="error" type="view" value="EditSurveyMultiResps"/>
</request-map>
<request-map uri="updateSurveyMultiRespColumn">
<security auth="true" https="true"/>
- <event type="service" invoke="updateSurveyMultiRespColumn" path=""/>
+ <event invoke="updateSurveyMultiRespColumn" path="" type="service"/>
<response name="success" type="view" value="EditSurveyMultiResps"/>
<response name="error" type="view" value="EditSurveyMultiResps"/>
</request-map>
<request-map uri="deleteSurveyMultiRespColumn">
<security auth="true" https="true"/>
- <event type="service" invoke="deleteSurveyMultiRespColumn" path=""/>
+ <event invoke="deleteSurveyMultiRespColumn" path="" type="service"/>
<response name="success" type="view" value="EditSurveyMultiResps"/>
<response name="error" type="view" value="EditSurveyMultiResps"/>
</request-map>
@@ -1469,19 +1469,19 @@
<request-map uri="EditSurveyQuestions"><security auth="true" https="true"/><response name="success" type="view" value="EditSurveyQuestions"/></request-map>
<request-map uri="createSurveyQuestion">
<security auth="true" https="true"/>
- <event type="service" invoke="createSurveyQuestion"/>
+ <event invoke="createSurveyQuestion" type="service"/>
<response name="success" type="view" value="EditSurveyQuestions"/>
<response name="error" type="view" value="EditSurveyQuestions"/>
</request-map>
<request-map uri="updateSurveyQuestion">
<security auth="true" https="true"/>
- <event type="service" invoke="updateSurveyQuestion"/>
+ <event invoke="updateSurveyQuestion" type="service"/>
<response name="success" type="view" value="EditSurveyQuestions"/>
<response name="error" type="view" value="EditSurveyQuestions"/>
</request-map>
<request-map uri="deleteSurveyQuestion">
<security auth="true" https="true"/>
- <event type="service" invoke="deleteSurveyQuestion"/>
+ <event invoke="deleteSurveyQuestion" type="service"/>
<response name="success" type="view" value="EditSurveyQuestions"/>
<response name="error" type="view" value="EditSurveyQuestions"/>
</request-map>
@@ -1489,19 +1489,19 @@
<!-- SurveyQuestionOption Requests -->
<request-map uri="createSurveyQuestionOption">
<security auth="true" https="true"/>
- <event type="service" invoke="createSurveyQuestionOption"/>
+ <event invoke="createSurveyQuestionOption" type="service"/>
<response name="success" type="view" value="EditSurveyQuestions"/>
<response name="error" type="view" value="EditSurveyQuestions"/>
</request-map>
<request-map uri="updateSurveyQuestionOption">
<security auth="true" https="true"/>
- <event type="service" invoke="updateSurveyQuestionOption"/>
+ <event invoke="updateSurveyQuestionOption" type="service"/>
<response name="success" type="view" value="EditSurveyQuestions"/>
<response name="error" type="view" value="EditSurveyQuestions"/>
</request-map>
<request-map uri="deleteSurveyQuestionOption">
<security auth="true" https="true"/>
- <event type="service" invoke="deleteSurveyQuestionOption"/>
+ <event invoke="deleteSurveyQuestionOption" type="service"/>
<response name="success" type="view" value="EditSurveyQuestions"/>
<response name="error" type="view" value="EditSurveyQuestions"/>
</request-map>
@@ -1509,44 +1509,44 @@
<!-- SurveyQuestionCategory Requests -->
<request-map uri="createSurveyQuestionCategory">
<security auth="true" https="true"/>
- <event type="service" invoke="createSurveyQuestionCategory"/>
+ <event invoke="createSurveyQuestionCategory" type="service"/>
<response name="success" type="view" value="EditSurveyQuestions"/>
<response name="error" type="view" value="EditSurveyQuestions"/>
</request-map>
<request-map uri="createSurveyQuestionAppl">
<security auth="true" https="true"/>
- <event type="service" invoke="createSurveyQuestionAppl"/>
+ <event invoke="createSurveyQuestionAppl" type="service"/>
<response name="success" type="view" value="EditSurveyQuestions"/>
<response name="error" type="view" value="EditSurveyQuestions"/>
</request-map>
<request-map uri="updateSurveyQuestionAppl">
<security auth="true" https="true"/>
- <event type="service" invoke="updateSurveyQuestionAppl"/>
+ <event invoke="updateSurveyQuestionAppl" type="service"/>
<response name="success" type="view" value="EditSurveyQuestions"/>
<response name="error" type="view" value="EditSurveyQuestions"/>
</request-map>
<request-map uri="removeSurveyQuestionAppl">
<security auth="true" https="true"/>
- <event type="service" invoke="deleteSurveyQuestionAppl"/>
+ <event invoke="deleteSurveyQuestionAppl" type="service"/>
<response name="success" type="view" value="EditSurveyQuestions"/>
<response name="error" type="view" value="EditSurveyQuestions"/>
</request-map>
<request-map uri="createSurveyPage">
<security auth="true" https="true"/>
- <event type="service" invoke="createSurveyPage"/>
+ <event invoke="createSurveyPage" type="service"/>
<response name="success" type="view" value="EditSurveyQuestions"/>
<response name="error" type="view" value="EditSurveyQuestions"/>
</request-map>
<request-map uri="updateSurveyPage">
<security auth="true" https="true"/>
- <event type="service" invoke="updateSurveyPage"/>
+ <event invoke="updateSurveyPage" type="service"/>
<response name="success" type="view" value="EditSurveyQuestions"/>
<response name="error" type="view" value="EditSurveyQuestions"/>
</request-map>
<request-map uri="removeSurveyPage">
<security auth="true" https="true"/>
- <event type="service" invoke="deleteSurveyPage"/>
+ <event invoke="deleteSurveyPage" type="service"/>
<response name="success" type="view" value="EditSurveyQuestions"/>
<response name="error" type="view" value="EditSurveyQuestions"/>
</request-map>
@@ -1566,7 +1566,7 @@
<request-map uri="ListLayout"><security auth="true" https="true"/><response name="success" type="view" value="ListLayout"/></request-map>
<request-map uri="clipFindLayout">
<security auth="true" https="true"/>
- <event type="java" invoke="copyToClip" path="org.apache.ofbiz.content.layout.LayoutEvents"/>
+ <event invoke="copyToClip" path="org.apache.ofbiz.content.layout.LayoutEvents" type="java"/>
<response name="success" type="view" value="FindLayout"/>
<response name="error" type="view" value="FindLayout"/>
</request-map>
@@ -1575,43 +1575,43 @@
<request-map uri="AddLayout"><security auth="true" https="true"/><response name="success" type="view" value="AddLayout"/></request-map>
<request-map uri="createLayout">
<security auth="true" https="true"/>
- <event type="simple" invoke="createLayout" path="component://content/minilang/layout/LayoutEvents.xml"/>
+ <event invoke="createLayout" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/>
<response name="success" type="view" value="EditLayout"/>
<response name="error" type="view" value="AddLayout"/>
</request-map>
<request-map uri="updateLayout">
<security auth="true" https="true"/>
- <event type="simple" invoke="updateLayout" path="component://content/minilang/layout/LayoutEvents.xml"/>
+ <event invoke="updateLayout" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/>
<response name="success" type="view" value="EditLayout"/>
<response name="error" type="view" value="EditLayout"/>
</request-map>
<request-map uri="createLayoutSubContent">
<security auth="true" https="true"/>
- <event type="java" invoke="createLayoutSubContent" path="org.apache.ofbiz.content.layout.LayoutEvents"/>
+ <event invoke="createLayoutSubContent" path="org.apache.ofbiz.content.layout.LayoutEvents" type="java"/>
<response name="success" type="view" value="EditLayoutSubContent"/>
<response name="error" type="view" value="EditLayoutSubContent"/>
</request-map>
<request-map uri="updateLayoutSubContent">
<security auth="true" https="true"/>
- <event type="java" invoke="updateLayoutSubContent" path="org.apache.ofbiz.content.layout.LayoutEvents"/>
+ <event invoke="updateLayoutSubContent" path="org.apache.ofbiz.content.layout.LayoutEvents" type="java"/>
<response name="success" type="view" value="EditLayoutSubContent"/>
<response name="error" type="view" value="EditLayoutSubContent"/>
</request-map>
<request-map uri="replaceSubContent">
<security auth="true" https="true"/>
- <event type="java" invoke="replaceSubContent" path="org.apache.ofbiz.content.layout.LayoutEvents"/>
+ <event invoke="replaceSubContent" path="org.apache.ofbiz.content.layout.LayoutEvents" type="java"/>
<response name="success" type="view" value="EditLayout"/>
<response name="error" type="view" value="EditLayout"/>
</request-map>
<request-map uri="pasteSubContent">
<security auth="true" https="true"/>
- <event type="simple" invoke="pasteSubContent" path="component://content/minilang/layout/LayoutEvents.xml"/>
+ <event invoke="pasteSubContent" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/>
<response name="success" type="view" value="EditLayout"/>
<response name="error" type="view" value="EditLayout"/>
</request-map>
<request-map uri="removeLayout">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentAssoc" path=""/>
+ <event invoke="removeContentAssoc" path="" type="service"/>
<response name="success" type="view" value="ListLayout"/>
<response name="error" type="view" value="main"/>
</request-map>
@@ -1621,62 +1621,62 @@
<request-map uri="EditLayoutUrl"><security auth="true" https="true"/><response name="success" type="view" value="EditLayoutUrl"/></request-map>
<request-map uri="createLayoutText">
<security auth="true" https="true"/>
- <event type="simple" invoke="createLayoutText" path="component://content/minilang/layout/LayoutEvents.xml"/>
+ <event invoke="createLayoutText" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/>
<response name="success" type="view" value="EditLayoutText"/>
<response name="error" type="view" value="EditLayoutText"/>
</request-map>
<request-map uri="EditLayoutSubContent"><security auth="true" https="true"/><response name="success" type="view" value="EditLayoutSubContent"/></request-map>
<request-map uri="updateLayoutText">
<security auth="true" https="true"/>
- <event type="simple" invoke="updateLayoutText" path="component://content/minilang/layout/LayoutEvents.xml"/>
+ <event invoke="updateLayoutText" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/>
<response name="success" type="view" value="EditLayoutText"/>
<response name="error" type="view" value="EditLayoutText"/>
</request-map>
<request-map uri="createLayoutHtml">
<security auth="true" https="true"/>
- <event type="simple" invoke="createLayoutText" path="component://content/minilang/layout/LayoutEvents.xml"/>
+ <event invoke="createLayoutText" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/>
<response name="success" type="view" value="EditLayoutHtml"/>
<response name="error" type="view" value="EditLayoutHtml"/>
</request-map>
<request-map uri="updateLayoutHtml">
<security auth="true" https="true"/>
- <event type="simple" invoke="updateLayoutText" path="component://content/minilang/layout/LayoutEvents.xml"/>
+ <event invoke="updateLayoutText" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/>
<response name="success" type="view" value="EditLayoutHtml"/>
<response name="error" type="view" value="EditLayoutHtml"/>
</request-map>
<request-map uri="createLayoutUrl">
<security auth="true" https="true"/>
- <event type="simple" invoke="createLayoutUrl" path="component://content/minilang/layout/LayoutEvents.xml"/>
+ <event invoke="createLayoutUrl" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/>
<response name="success" type="view" value="EditLayoutUrl"/>
<response name="error" type="view" value="EditLayoutUrl"/>
</request-map>
<request-map uri="updateLayoutUrl">
<security auth="true" https="true"/>
- <event type="simple" invoke="updateLayoutUrl" path="component://content/minilang/layout/LayoutEvents.xml"/>
+ <event invoke="updateLayoutUrl" path="component://content/minilang/layout/LayoutEvents.xml" type="simple"/>
<response name="success" type="view" value="EditLayoutUrl"/>
<response name="error" type="view" value="EditLayoutUrl"/>
</request-map>
<request-map uri="createLayoutImage">
<security auth="true" https="true"/>
- <event type="java" invoke="createLayoutImage" path="org.apache.ofbiz.content.layout.LayoutEvents"/>
+ <event invoke="createLayoutImage" path="org.apache.ofbiz.content.layout.LayoutEvents" type="java"/>
<response name="success" type="view" value="EditLayoutImage"/>
<response name="error" type="view" value="EditLayoutImage"/>
</request-map>
<request-map uri="updateLayoutImage">
<security auth="true" https="true"/>
- <event type="java" invoke="updateLayoutImage" path="org.apache.ofbiz.content.layout.LayoutEvents"/>
+ <event invoke="updateLayoutImage" path="org.apache.ofbiz.content.layout.LayoutEvents" type="java"/>
<response name="success" type="view" value="EditLayoutImage"/>
<response name="error" type="view" value="EditLayoutImage"/>
</request-map>
<request-map uri="updateLayoutImageOnly">
<security auth="true" https="true"/>
- <event type="java" invoke="updateLayoutImageOnly" path="org.apache.ofbiz.content.layout.LayoutEvents"/>
+ <event invoke="updateLayoutImageOnly" path="org.apache.ofbiz.content.layout.LayoutEvents" type="java"/>
<response name="success" type="view" value="EditLayoutImage"/>
<response name="error" type="view" value="EditLayoutImage"/>
</request-map>
<request-map uri="cloneLayout">
<security auth="true" https="true"/>
- <event type="java" invoke="cloneLayout" path="org.apache.ofbiz.content.layout.LayoutEvents"/>
+ <event invoke="cloneLayout" path="org.apache.ofbiz.content.layout.LayoutEvents" type="java"/>
<response name="success" type="view" value="EditLayout"/>
<response name="error" type="view" value="EditLayout"/>
</request-map>
@@ -1728,20 +1728,20 @@
<request-map uri="EditAddContent"><security https="true" auth="true"/><response name="success" type="view" value="EditAddContent"/></request-map>
<request-map uri="persistContentStuff">
<security auth="true" https="true"/>
- <event type="service" invoke="persistContentAndAssoc" path=""/>
+ <event invoke="persistContentAndAssoc" path="" type="service"/>
<response name="success" type="view" value="EditAddContent"/>
<response name="error" type="view" value="EditAddContent"/>
</request-map>
<request-map uri="EditAddSubContent"><security https="true" auth="true"/><response name="success" type="view" value="EditAddSubContent"/></request-map>
<request-map uri="persistSubContentStuff">
<security auth="true" https="true"/>
- <event type="service" invoke="persistContentAndAssoc" path=""/>
+ <event invoke="persistContentAndAssoc" path="" type="service"/>
<response name="success" type="view" value="EditAddContent"/>
<response name="error" type="view" value="EditAddSubContent"/>
</request-map>
<request-map uri="persistContent">
<security auth="true" https="true"/>
- <event type="service" invoke="persistContentAndAssoc" path=""/>
+ <event invoke="persistContentAndAssoc" path="" type="service"/>
<response name="success" type="view" value="CMSContentEdit"/>
<response name="error" type="view" value="EditAddContent"/>
</request-map>
@@ -1809,19 +1809,19 @@
</request-map>
<request-map uri="updateDocumentTree">
<security auth="true" https="true"/>
- <event type="service" invoke="updateContent"/>
+ <event invoke="updateContent" type="service"/>
<response name="success" type="request-redirect" value="navigateContent"/>
<response name="error" type="view" value="navigateContent"/>
</request-map>
<request-map uri="removeDocumentFromTree">
<security auth="true" https="true"/>
- <event type="service" invoke="removeContentAssoc" path=""/>
+ <event invoke="removeContentAssoc" path="" type="service"/>
<response name="success" type="request-redirect" value="navigateContent"/>
<response name="error" type="view" value="navigateContent"/>
</request-map>
<request-map uri="addDocumentToTree">
<security auth="true" https="true"/>
- <event type="simple" invoke="createDocument" path="component://content/minilang/content/ContentEvents.xml"/>
+ <event invoke="createDocument" path="component://content/minilang/content/ContentEvents.xml" type="simple"/>
<response name="success" type="request-redirect" value="navigateContent"/>
<response name="error" type="request" value="navigateContent"/>
</request-map>
@@ -1836,7 +1836,7 @@
<request-map uri="WebSiteCmsPreview">
<security auth="true" https="true"/>
- <event type="java" invoke="execute" path="org.apache.ofbiz.content.content.WebSiteCmsPreviewEvent"/>
+ <event invoke="execute" path="org.apache.ofbiz.content.content.WebSiteCmsPreviewEvent" type="java"/>
<response name="success" type="none"/>
</request-map>
diff --git a/applications/content/widget/cms/CMSForms.xml b/applications/content/widget/cms/CMSForms.xml
index 9781bea..e206184 100644
--- a/applications/content/widget/cms/CMSForms.xml
+++ b/applications/content/widget/cms/CMSForms.xml
@@ -79,9 +79,9 @@
</field>
<field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" >
<drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY">
- <option key="${uiLabelMap.ContentTemplateTextOnly}" description="TEMPLATE_TEXT_ONLY"/>
- <option key="${uiLabelMap.ContentTemplateImageCentered}" description="TEMPLATE_IMAGE_CENTERED"/>
- <option key="${uiLabelMap.ContentTemplateImageLeft}" description="TEMPLATE_IMAGE_LEFT"/>
+ <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.ContentTemplateTextOnly}"/>
+ <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.ContentTemplateImageCentered}"/>
+ <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.ContentTemplateImageLeft}"/>
</drop-down>
</field>
<field name="ftlContentId" position="1">
@@ -209,13 +209,13 @@
</field>
<field name="roleTypeId">
<drop-down allow-empty="false">
- <option key="${uiLabelMap.CommonNA}" description="_NA_"/>
+ <option key="_NA_" description="${uiLabelMap.CommonNA}"/>
<entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
</drop-down>
</field>
<field name="statusId">
<drop-down allow-empty="false">
- <option key="${uiLabelMap.CommonNA}" description="_NA_"/>
+ <option key="_NA_" description="${uiLabelMap.CommonNA}"/>
<entity-options
entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="PUBLISH_STATUS"/>
@@ -224,7 +224,7 @@
</field>
<field name="privilegeEnumId">
<drop-down allow-empty="false">
- <option key="${uiLabelMap.CommonNA}" description="_NA_"/>
+ <option key="_NA_" description="${uiLabelMap.CommonNA}"/>
<entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" value="SUBSCRIPTION_TYPE"/>
</entity-options>
diff --git a/applications/content/widget/compdoc/CompDocForms.xml b/applications/content/widget/compdoc/CompDocForms.xml
index 6279eb7..b5f0c77 100644
--- a/applications/content/widget/compdoc/CompDocForms.xml
+++ b/applications/content/widget/compdoc/CompDocForms.xml
@@ -28,10 +28,10 @@
<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 @@
</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 @@
</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 @@
</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 @@
</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 @@
<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"
diff --git a/applications/content/widget/forum/BlogForms.xml b/applications/content/widget/forum/BlogForms.xml
index e0e4ea5..596199c 100644
--- a/applications/content/widget/forum/BlogForms.xml
+++ b/applications/content/widget/forum/BlogForms.xml
@@ -75,14 +75,14 @@
<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>
diff --git a/applications/content/widget/layout/LayoutForms.xml b/applications/content/widget/layout/LayoutForms.xml
index 3a2e8d2..a5d07a2 100644
--- a/applications/content/widget/layout/LayoutForms.xml
+++ b/applications/content/widget/layout/LayoutForms.xml
@@ -105,30 +105,30 @@
</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 @@
</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 @@
</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 @@
</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 @@
</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}">
diff --git a/applications/content/widget/survey/SurveyForms.xml b/applications/content/widget/survey/SurveyForms.xml
index 64382cb..94bf01a 100644
--- a/applications/content/widget/survey/SurveyForms.xml
+++ b/applications/content/widget/survey/SurveyForms.xml
@@ -25,9 +25,9 @@
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 @@
<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 @@
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>
diff --git a/applications/content/widget/website/WebSiteForms.xml b/applications/content/widget/website/WebSiteForms.xml
index 47371bd..2a2f786 100644
--- a/applications/content/widget/website/WebSiteForms.xml
+++ b/applications/content/widget/website/WebSiteForms.xml
@@ -35,7 +35,7 @@
<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 @@
<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 @@
</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>
diff --git a/applications/humanres/minilang/HumanResServices.xml b/applications/humanres/minilang/HumanResServices.xml
index 6bd60c0..5d31c85 100644
--- a/applications/humanres/minilang/HumanResServices.xml
+++ b/applications/humanres/minilang/HumanResServices.xml
@@ -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"/>
diff --git a/applications/humanres/widget/GlobalHRSettingScreens.xml b/applications/humanres/widget/GlobalHRSettingScreens.xml
index 62c09f4..9f2be61 100644
--- a/applications/humanres/widget/GlobalHRSettingScreens.xml
+++ b/applications/humanres/widget/GlobalHRSettingScreens.xml
@@ -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>
diff --git a/applications/humanres/widget/forms/EmplPositionForms.xml b/applications/humanres/widget/forms/EmplPositionForms.xml
index 3459d76..c435b66 100644
--- a/applications/humanres/widget/forms/EmplPositionForms.xml
+++ b/applications/humanres/widget/forms/EmplPositionForms.xml
@@ -277,26 +277,26 @@
<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>
diff --git a/applications/humanres/widget/forms/EmployeeForms.xml b/applications/humanres/widget/forms/EmployeeForms.xml
index c8f4bbe..3ef981a 100644
--- a/applications/humanres/widget/forms/EmployeeForms.xml
+++ b/applications/humanres/widget/forms/EmployeeForms.xml
@@ -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>
diff --git a/applications/humanres/widget/forms/RecruitmentForms.xml b/applications/humanres/widget/forms/RecruitmentForms.xml
index 5f131bf..7447a11 100644
--- a/applications/humanres/widget/forms/RecruitmentForms.xml
+++ b/applications/humanres/widget/forms/RecruitmentForms.xml
@@ -106,8 +106,8 @@
<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>
diff --git a/applications/manufacturing/minilang/bom/BomSimpleMethods.xml b/applications/manufacturing/minilang/bom/BomSimpleMethods.xml
index 9fb5f64..daaa1a0 100644
--- a/applications/manufacturing/minilang/bom/BomSimpleMethods.xml
+++ b/applications/manufacturing/minilang/bom/BomSimpleMethods.xml
@@ -47,7 +47,7 @@
</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 @@
<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 @@
<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 @@
</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 @@
<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">
diff --git a/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml b/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml
index d87453c..e1a96f1 100644
--- a/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml
+++ b/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml
@@ -23,7 +23,7 @@
<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"
diff --git a/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml b/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml
index 8dba701..8967fcd 100644
--- a/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml
+++ b/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml
@@ -23,7 +23,7 @@
<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 @@
</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 @@
</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 @@
<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 @@
<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 @@
<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 @@
</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 @@
<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 @@
<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 @@
<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 @@
</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 @@
<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 @@
<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 @@
<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 @@
</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 @@
<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 @@
<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">
diff --git a/applications/manufacturing/widget/manufacturing/BomForms.xml b/applications/manufacturing/widget/manufacturing/BomForms.xml
index 5377fca..e6c28cc 100644
--- a/applications/manufacturing/widget/manufacturing/BomForms.xml
+++ b/applications/manufacturing/widget/manufacturing/BomForms.xml
@@ -121,8 +121,8 @@
</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 @@
<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>
diff --git a/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml b/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
index 6a45d03..ae91b28 100644
--- a/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
+++ b/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
@@ -61,8 +61,8 @@
<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 @@
</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 @@
<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}">
diff --git a/applications/marketing/minilang/marketing/contact/ContactListServices.xml b/applications/marketing/minilang/marketing/contact/ContactListServices.xml
index 63eaf90..ee4a51e 100644
--- a/applications/marketing/minilang/marketing/contact/ContactListServices.xml
+++ b/applications/marketing/minilang/marketing/contact/ContactListServices.xml
@@ -401,7 +401,7 @@
<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"/>
diff --git a/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml b/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml
index d66b1a2..dad5eb4 100644
--- a/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml
+++ b/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml
@@ -24,7 +24,7 @@
<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 @@
<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 @@
<!-- 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"/>
diff --git a/applications/marketing/widget/ContactListForms.xml b/applications/marketing/widget/ContactListForms.xml
index 06f608d..c4f6c1a 100644
--- a/applications/marketing/widget/ContactListForms.xml
+++ b/applications/marketing/widget/ContactListForms.xml
@@ -38,12 +38,12 @@
</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>
diff --git a/applications/marketing/widget/ContactListScreens.xml b/applications/marketing/widget/ContactListScreens.xml
index 3f7e0ef..8fe475e 100644
--- a/applications/marketing/widget/ContactListScreens.xml
+++ b/applications/marketing/widget/ContactListScreens.xml
@@ -269,7 +269,7 @@
<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"/>
diff --git a/applications/marketing/widget/SegmentScreens.xml b/applications/marketing/widget/SegmentScreens.xml
index 0c17795..f9b78d7 100644
--- a/applications/marketing/widget/SegmentScreens.xml
+++ b/applications/marketing/widget/SegmentScreens.xml
@@ -87,7 +87,7 @@
</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>
diff --git a/applications/marketing/widget/TrackingCodeForms.xml b/applications/marketing/widget/TrackingCodeForms.xml
index 38ef7da..723fe01 100644
--- a/applications/marketing/widget/TrackingCodeForms.xml
+++ b/applications/marketing/widget/TrackingCodeForms.xml
@@ -110,7 +110,7 @@
<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>
diff --git a/applications/marketing/widget/sfa/OpportunityScreens.xml b/applications/marketing/widget/sfa/OpportunityScreens.xml
index 8c1ad13..feeb976 100644
--- a/applications/marketing/widget/sfa/OpportunityScreens.xml
+++ b/applications/marketing/widget/sfa/OpportunityScreens.xml
@@ -148,8 +148,8 @@
<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>
diff --git a/applications/marketing/widget/sfa/forms/EventForms.xml b/applications/marketing/widget/sfa/forms/EventForms.xml
index ef9e5e1..9c77565 100644
--- a/applications/marketing/widget/sfa/forms/EventForms.xml
+++ b/applications/marketing/widget/sfa/forms/EventForms.xml
@@ -80,15 +80,15 @@
<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>
diff --git a/applications/order/minilang/opportunity/OpportunityServices.xml b/applications/order/minilang/opportunity/OpportunityServices.xml
index c9b0085..2f5196f 100644
--- a/applications/order/minilang/opportunity/OpportunityServices.xml
+++ b/applications/order/minilang/opportunity/OpportunityServices.xml
@@ -28,7 +28,7 @@
<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 @@
<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"/>
diff --git a/applications/order/minilang/order/OrderReturnServices.xml b/applications/order/minilang/order/OrderReturnServices.xml
index 45046d4..28d779f 100644
--- a/applications/order/minilang/order/OrderReturnServices.xml
+++ b/applications/order/minilang/order/OrderReturnServices.xml
@@ -78,7 +78,7 @@
<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 @@
<!-- 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 @@
</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 @@
</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"/>
diff --git a/applications/order/minilang/order/OrderServices.xml b/applications/order/minilang/order/OrderServices.xml
index 3fd92ed..c9b4ef4 100644
--- a/applications/order/minilang/order/OrderServices.xml
+++ b/applications/order/minilang/order/OrderServices.xml
@@ -507,7 +507,7 @@
</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 @@
<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 @@
<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 @@
<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 @@
</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 @@
<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 @@
<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"/>
diff --git a/applications/order/minilang/quote/QuoteServices.xml b/applications/order/minilang/quote/QuoteServices.xml
index c9909da..fb6313d 100644
--- a/applications/order/minilang/quote/QuoteServices.xml
+++ b/applications/order/minilang/quote/QuoteServices.xml
@@ -112,7 +112,7 @@
</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 @@
<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 @@
<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 @@
</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 @@
</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 @@
</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 @@
<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 @@
</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 @@
</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 @@
<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 @@
</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"/>
diff --git a/applications/order/minilang/request/CustRequestServices.xml b/applications/order/minilang/request/CustRequestServices.xml
index 822ed4e..41888f9 100644
--- a/applications/order/minilang/request/CustRequestServices.xml
+++ b/applications/order/minilang/request/CustRequestServices.xml
@@ -49,7 +49,7 @@
</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 @@
</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 @@
<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 @@
<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 @@
<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 @@
</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"/>
diff --git a/applications/order/minilang/requirement/RequirementServices.xml b/applications/order/minilang/requirement/RequirementServices.xml
index 3d35441..0c0d30f 100644
--- a/applications/order/minilang/requirement/RequirementServices.xml
+++ b/applications/order/minilang/requirement/RequirementServices.xml
@@ -21,7 +21,7 @@
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="createRequirement" short-description="Create a new requirement">
- <make-value entity-name="Requirement" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="Requirement"/>
<sequenced-id sequence-name="Requirement" field="requirementId"/>
<set field="newEntity.requirementId" from-field="requirementId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -38,7 +38,7 @@
</simple-method>
<simple-method method-name="updateRequirement" short-description="Update a requirement">
- <make-value entity-name="Requirement" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="Requirement"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="Requirement" map="lookupPKMap" value-field="lookedUpValue"/>
<field-to-result field="lookedUpValue.statusId" result-name="oldStatusId"/>
@@ -58,14 +58,14 @@
</simple-method>
<simple-method method-name="associateRequirementWithRequestItem" short-description="Associate a requirement and CustRequestItem">
- <make-value entity-name="RequirementCustRequest" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="RequirementCustRequest"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="addTaskToRequirement" short-description="Add a task to a requirement">
- <make-value entity-name="WorkRequirementFulfillment" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="WorkRequirementFulfillment"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -87,7 +87,7 @@
<filter-list-by-date list="supplierProducts" valid-date="requirement.requiredByDate" from-field-name="availableFromDate" thru-field-name="availableThruDate"/>
<first-from-list list="supplierProducts" entry="supplierProduct"/>
<if-not-empty field="supplierProduct.partyId">
- <make-value entity-name="RequirementRole" value-field="requirementSupplier"/>
+ <make-value value-field="requirementSupplier" entity-name="RequirementRole"/>
<set field="requirementSupplier.requirementId" from-field="requirement.requirementId"/>
<set field="requirementSupplier.partyId" from-field="supplierProduct.partyId"/>
<set field="requirementSupplier.roleTypeId" value="SUPPLIER"/>
@@ -116,12 +116,12 @@
<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="RequirementRole" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="RequirementRole"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
diff --git a/applications/order/minilang/shoppinglist/ShoppingListServices.xml b/applications/order/minilang/shoppinglist/ShoppingListServices.xml
index 813d9e5..8e7e563 100644
--- a/applications/order/minilang/shoppinglist/ShoppingListServices.xml
+++ b/applications/order/minilang/shoppinglist/ShoppingListServices.xml
@@ -37,7 +37,7 @@
</if>
<check-errors/>
- <make-value entity-name="ShoppingList" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ShoppingList"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.partyId">
@@ -141,7 +141,7 @@
<add-error> <fail-property resource="ProductUiLabels" property="ProductErrorProductNotFound"/> </add-error>
<check-errors/>
</if-empty>
- <make-value entity-name="ShoppingListItem" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ShoppingListItem"/>
<set from-field="parameters.shoppingListId" field="newEntity.shoppingListId"/>
<make-next-seq-id value-field="newEntity" seq-field-name="shoppingListItemSeqId" numeric-padding="5"/>
diff --git a/applications/order/webapp/ordermgr/WEB-INF/controller.xml b/applications/order/webapp/ordermgr/WEB-INF/controller.xml
index 3683211..dcb9b9e 100644
--- a/applications/order/webapp/ordermgr/WEB-INF/controller.xml
+++ b/applications/order/webapp/ordermgr/WEB-INF/controller.xml
@@ -1291,7 +1291,7 @@
<request-map uri="deleteCustRequestContent">
<security auth="true" https="true"/>
- <event type="service" invoke="deleteCustRequestContent"/>
+ <event invoke="deleteCustRequestContent" type="service"/>
<response name="success" type="request-redirect" value="EditCustRequestContent"><redirect-parameter name="custRequestId"/></response>
<response name="error" type="view" value="EditCustRequestContent"/>
</request-map>
diff --git a/applications/order/widget/ordermgr/CustRequestForms.xml b/applications/order/widget/ordermgr/CustRequestForms.xml
index f2651b0..b5fa011 100644
--- a/applications/order/widget/ordermgr/CustRequestForms.xml
+++ b/applications/order/widget/ordermgr/CustRequestForms.xml
@@ -274,15 +274,15 @@
</field>
<field name="priority">
<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="story" use-when="custRequest==null" encode-output="false"><textarea cols="60" rows="12" default-value="${communicationEvent.content}"/></field>
@@ -488,10 +488,10 @@
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
<drop-down allow-empty="false">
- <option key="${uiLabelMap.WorkEffortRequestingParty}" description="REQ_REQUESTER"/>
- <option key="${uiLabelMap.OrderAgent}" description="AGENT"/>
- <option key="${uiLabelMap.WorkEffortRequestTaker}" description="REQ_TAKER"/>
- <option key="${uiLabelMap.WorkEffortRequestManager}" description="REQ_MANAGER"/>
+ <option key="REQ_REQUESTER" description="${uiLabelMap.WorkEffortRequestingParty}"/>
+ <option key="AGENT" description="${uiLabelMap.OrderAgent}"/>
+ <option key="REQ_TAKER" description="${uiLabelMap.WorkEffortRequestTaker}"/>
+ <option key="REQ_MANAGER" description="${uiLabelMap.WorkEffortRequestManager}"/>
</drop-down>
</field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time default-value="${nowTimestamp}"/></field>
@@ -651,12 +651,12 @@
<form name="EditCustReqStatusId" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml">
<field name="statusGroup">
<drop-down>
- <option key="Open" description="OPEN"/>
- <option key="Completed" description="COMPLETED"/>
- <option key="Cancelled" description="CANCELLED"/>
+ <option key="OPEN" description="Open"/>
+ <option key="COMPLETED" description="Completed"/>
+ <option key="CANCELLED" description="Cancelled"/>
</drop-down>
</field>
- <field name="otherContacts"><drop-down allow-empty="false"><option key="Yes" description="Y"/><option key="No" description="N"/></drop-down></field>
+ <field name="otherContacts"><drop-down allow-empty="false"><option key="Y" description="Yes"/><option key="N" description="No"/></drop-down></field>
<field name="saveButton"><submit/></field>
</form>
<form name="ListCustRequests" type="list" list-name="custRequests" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" target="updaterequest">
@@ -701,15 +701,15 @@
<field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="priority" use-when="!statusId.equals("CRQ_COMPLETED")">
<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="priority" use-when="statusId.equals("CRQ_COMPLETED")"><display/></field>
diff --git a/applications/order/widget/ordermgr/FieldLookupForms.xml b/applications/order/widget/ordermgr/FieldLookupForms.xml
index ce5bf8f..dae633e 100644
--- a/applications/order/widget/ordermgr/FieldLookupForms.xml
+++ b/applications/order/widget/ordermgr/FieldLookupForms.xml
@@ -206,10 +206,10 @@
</field>
<field name="roleTypeId">
<drop-down allow-empty="true">
- <option key="${uiLabelMap.WorkEffortRequestingParty}" description="REQ_REQUESTER"/>
- <option key="${uiLabelMap.OrderAgent}" description="AGENT"/>
- <option key="${uiLabelMap.WorkEffortRequestTaker}" description="REQ_TAKER"/>
- <option key="${uiLabelMap.WorkEffortRequestManager}" description="REQ_MANAGER"/>
+ <option key="REQ_REQUESTER" description="${uiLabelMap.WorkEffortRequestingParty}"/>
+ <option key="AGENT" description="${uiLabelMap.OrderAgent}"/>
+ <option key="REQ_TAKER" description="${uiLabelMap.WorkEffortRequestTaker}"/>
+ <option key="REQ_MANAGER" description="${uiLabelMap.WorkEffortRequestManager}"/>
</drop-down>
</field>
<!--
@@ -398,8 +398,8 @@
<!--
<field name="isPromo" title="${uiLabelMap.OrderOrderIsPromo}">
<drop-down allow-empty="true">
- <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>
-->
diff --git a/applications/order/widget/ordermgr/OrderForms.xml b/applications/order/widget/ordermgr/OrderForms.xml
index faf3cb4..6c5630e 100644
--- a/applications/order/widget/ordermgr/OrderForms.xml
+++ b/applications/order/widget/ordermgr/OrderForms.xml
@@ -188,22 +188,22 @@
<form name="EditOrderByCustomer" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml">
<field name="statusId">
<drop-down>
- <option key="${uiLabelMap.CommonCreated}" description="ORDER_CREATED"/>
- <option key="${uiLabelMap.CommonProcessing}" description="ORDER_PROCESSING"/>
- <option key="${uiLabelMap.CommonApproved}" description="ORDER_APPROVED"/>
- <option key="${uiLabelMap.CommonSent}" description="ORDER_SENT"/>
- <option key="${uiLabelMap.CommonHeld}" description="ORDER_HELD"/>
- <option key="${uiLabelMap.CommonCompleted}" description="ORDER_COMPLETED"/>
- <option key="${uiLabelMap.CommonRejected}" description="ORDER_REJECTED"/>
- <option key="${uiLabelMap.CommonCancelled}" description="ORDER_CANDELLED"/>
+ <option key="ORDER_CREATED" description="${uiLabelMap.CommonCreated}"/>
+ <option key="ORDER_PROCESSING" description="${uiLabelMap.CommonProcessing}"/>
+ <option key="ORDER_APPROVED" description="${uiLabelMap.CommonApproved}"/>
+ <option key="ORDER_SENT" description="${uiLabelMap.CommonSent}"/>
+ <option key="ORDER_HELD" description="${uiLabelMap.CommonHeld}"/>
+ <option key="ORDER_COMPLETED" description="${uiLabelMap.CommonCompleted}"/>
+ <option key="ORDER_REJECTED" description="${uiLabelMap.CommonRejected}"/>
+ <option key="ORDER_CANDELLED" description="${uiLabelMap.CommonCancelled}"/>
</drop-down>
</field>
<field name="roleTypeId">
<drop-down>
- <option key="${uiLabelMap.MyPortalPlacingCustomer}" description="PLACING_CUSTOMER"/>
- <option key="${uiLabelMap.MyPortalShipToCustomer}" description="SHIP_TO_CUSTOMER"/>
- <option key="${uiLabelMap.MyPortalEndUserCustomer}" description="END_USER_CUSTOMER"/>
- <option key="${uiLabelMap.MyPortalBillToCustomer}" description="BILL_TO_CUSTOMER"/>
+ <option key="PLACING_CUSTOMER" description="${uiLabelMap.MyPortalPlacingCustomer}"/>
+ <option key="SHIP_TO_CUSTOMER" description="${uiLabelMap.MyPortalShipToCustomer}"/>
+ <option key="END_USER_CUSTOMER" description="${uiLabelMap.MyPortalEndUserCustomer}"/>
+ <option key="BILL_TO_CUSTOMER" description="${uiLabelMap.MyPortalBillToCustomer}"/>
</drop-down>
</field>
<field name="updateButton"><submit/></field>
@@ -262,8 +262,8 @@
<field name="note" title="${uiLabelMap.OrderNote}"><textarea rows="5" cols="70"/></field>
<field name="internalNote" title="${uiLabelMap.OrderInternalNote}" tooltip="${uiLabelMap.OrderInternalNoteMessage}">
<drop-down allow-empty="true" no-current-selected-key="Y">
- <option key="${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.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
diff --git a/applications/order/widget/ordermgr/QuoteForms.xml b/applications/order/widget/ordermgr/QuoteForms.xml
index 45ab1e2..1a72272 100644
--- a/applications/order/widget/ordermgr/QuoteForms.xml
+++ b/applications/order/widget/ordermgr/QuoteForms.xml
@@ -272,8 +272,8 @@
<!--
<field name="isPromo" title="${uiLabelMap.OrderOrderIsPromo}">
<drop-down allow-empty="true">
- <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>
-->
diff --git a/applications/order/widget/ordermgr/ReportForms.xml b/applications/order/widget/ordermgr/ReportForms.xml
index f185b4b..b81d585 100644
--- a/applications/order/widget/ordermgr/ReportForms.xml
+++ b/applications/order/widget/ordermgr/ReportForms.xml
@@ -109,8 +109,8 @@
</field>
<field name="orderTypeId">
<drop-down allow-empty="false">
- <option key="${uiLabelMap.OrderSalesOrder}" description="SALES_ORDER"/>
- <option key="${uiLabelMap.OrderPurchaseOrder}" description="PURCHASE_ORDER"/>
+ <option key="SALES_ORDER" description="${uiLabelMap.OrderSalesOrder}"/>
+ <option key="PURCHASE_ORDER" description="${uiLabelMap.OrderPurchaseOrder}"/>
</drop-down>
</field>
<field name="orderStatusId">
diff --git a/applications/party/minilang/communication/CommunicationEventServices.xml b/applications/party/minilang/communication/CommunicationEventServices.xml
index 595a2f4..de048df 100644
--- a/applications/party/minilang/communication/CommunicationEventServices.xml
+++ b/applications/party/minilang/communication/CommunicationEventServices.xml
@@ -49,7 +49,7 @@
</if-compare>
<if-empty field="newEntity">
- <make-value entity-name="CommunicationEvent" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="CommunicationEvent"/>
</if-empty>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -195,13 +195,13 @@
</if-compare>
<if-not-empty field="parameters.productId">
- <make-value entity-name="CommunicationEventProduct" value-field="eventProduct"/>
+ <make-value value-field="eventProduct" entity-name="CommunicationEventProduct"/>
<set from-field="parameters.productId" field="eventProduct.productId"/>
<set from-field="newEntity.communicationEventId" field="eventProduct.communicationEventId"/>
<create-value value-field="eventProduct"/>
</if-not-empty>
<if-not-empty field="parameters.orderId">
- <make-value entity-name="CommunicationEventOrder" value-field="eventOrder"/>
+ <make-value value-field="eventOrder" entity-name="CommunicationEventOrder"/>
<set from-field="parameters.orderId" field="eventOrder.orderId"/>
<set from-field="newEntity.communicationEventId" field="eventOrder.communicationEventId"/>
<create-value value-field="eventOrder"/>
@@ -426,7 +426,7 @@
<set field="partyRole.userLogin" from-field="sysUserLogin"/>
<call-service service-name="ensurePartyRole" in-map-name="partyRole" include-user-login="false"/>
- <make-value entity-name="CommunicationEventRole" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="CommunicationEventRole"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.statusId">
diff --git a/applications/party/minilang/contact/ContactMechServices.xml b/applications/party/minilang/contact/ContactMechServices.xml
index 66cb7a1..f81acaf 100644
--- a/applications/party/minilang/contact/ContactMechServices.xml
+++ b/applications/party/minilang/contact/ContactMechServices.xml
@@ -21,7 +21,7 @@
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="createContactMech" short-description="Create Contact Mechanism">
- <make-value entity-name="ContactMech" value-field="newValue"/>
+ <make-value value-field="newValue" entity-name="ContactMech"/>
<if-empty field="parameters.contactMechId">
<sequenced-id sequence-name="ContactMech" field="newValue.contactMechId"/>
<else>
diff --git a/applications/party/minilang/contact/PartyContactMechServices.xml b/applications/party/minilang/contact/PartyContactMechServices.xml
index 97059b7..c12c273 100644
--- a/applications/party/minilang/contact/PartyContactMechServices.xml
+++ b/applications/party/minilang/contact/PartyContactMechServices.xml
@@ -169,7 +169,7 @@
</if-empty>
<set-service-fields service-name="createPostalAddress" map="parameters" to-map="createPostalAddressMap"/>
- <call-service service-name="createPostalAddress" in-map-name="createPostalAddressMap">
+ <call-service in-map-name="createPostalAddressMap" service-name="createPostalAddress">
<default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/>
<result-to-field result-name="contactMechId" field="newPartyContactMech.contactMechId"/>
</call-service>
@@ -193,7 +193,7 @@
</if-empty>
<set-service-fields service-name="updatePostalAddress" map="parameters" to-map="updatePostalAddressMap"/>
- <call-service service-name="updatePostalAddress" in-map-name="updatePostalAddressMap">
+ <call-service in-map-name="updatePostalAddressMap" service-name="updatePostalAddress">
<default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
<result-to-field result-name="contactMechId" field="newPartyContactMech.contactMechId"/>
</call-service>
@@ -216,7 +216,7 @@
<log level="info" message="Creating telecom number"/>
<set-service-fields service-name="createTelecomNumber" map="parameters" to-map="createTelecomNumberMap"/>
- <call-service service-name="createTelecomNumber" in-map-name="createTelecomNumberMap">
+ <call-service in-map-name="createTelecomNumberMap" service-name="createTelecomNumber">
<default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/>
<result-to-field result-name="contactMechId" field="newPartyContactMech.contactMechId"/>
</call-service>
@@ -250,7 +250,7 @@
<set field="updatePartyContactMechMap.contactMechTypeId" value="TELECOM_NUMBER"/>
<log level="info" message="Copied id to updatePartyContactMechMap: ${updatePartyContactMechMap.newContactMechId}"/>
- <call-service service-name="updatePartyContactMech" in-map-name="updatePartyContactMechMap">
+ <call-service in-map-name="updatePartyContactMechMap" service-name="updatePartyContactMech">
<default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/>
</call-service>
<log level="info" message="Setting result id: ${newPartyContactMech.contactMechId}"/>
diff --git a/applications/party/minilang/party/PartyServices.xml b/applications/party/minilang/party/PartyServices.xml
index e60ff89..dfc8d1f 100644
--- a/applications/party/minilang/party/PartyServices.xml
+++ b/applications/party/minilang/party/PartyServices.xml
@@ -27,7 +27,7 @@
<set field="parameters.partyId" from-field="userLogin.partyId"/>
</if-empty>
- <make-value entity-name="PartyNameHistory" value-field="partyNameHistory"/>
+ <make-value value-field="partyNameHistory" entity-name="PartyNameHistory"/>
<set-pk-fields value-field="partyNameHistory" map="parameters"/>
<now-timestamp field="partyNameHistory.changeDate"/>
@@ -203,7 +203,7 @@
<!-- lookup existing value -->
<entity-one entity-name="PartyProfileDefault" value-field="partyProfileDefault"/>
<if-empty field="partyProfileDefault">
- <make-value entity-name="PartyProfileDefault" value-field="partyProfileDefault"/>
+ <make-value value-field="partyProfileDefault" entity-name="PartyProfileDefault"/>
<set-pk-fields value-field="partyProfileDefault" map="parameters"/>
<create-value value-field="partyProfileDefault"/>
</if-empty>
@@ -279,7 +279,7 @@
<set value="OWNER" field="contentRole.roleTypeId"/>
<call-service service-name="createContentRole" in-map-name="contentRole" break-on-error="false"/>
<!-- check party role -->
- <make-value entity-name="PartyRole" value-field="partyRole"/>
+ <make-value value-field="partyRole" entity-name="PartyRole"/>
<set-pk-fields value-field="partyRole" map="contentRole"/>
<find-by-and entity-name="PartyRole" map="partyRole" list="pRoles"/>
<if-empty field="pRoles">
@@ -811,7 +811,7 @@
</entity-and>
<if-empty field="partyRels">
- <make-value entity-name="PartyRelationship" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="PartyRelationship"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
diff --git a/applications/party/minilang/party/PartySimpleEvents.xml b/applications/party/minilang/party/PartySimpleEvents.xml
index febeb11..482929e 100644
--- a/applications/party/minilang/party/PartySimpleEvents.xml
+++ b/applications/party/minilang/party/PartySimpleEvents.xml
@@ -137,7 +137,7 @@
</call-service>
<now field="nowTimestamp"/>
- <make-value entity-name="PartyGeoPoint" value-field="partyGeoPoint"/>
+ <make-value value-field="partyGeoPoint" entity-name="PartyGeoPoint"/>
<set field="partyGeoPoint.partyId" from-field="parameters.partyId"/>
<set field="partyGeoPoint.geoPointId" from-field="geoPointId"/>
<set field="partyGeoPoint.fromDate" from-field="nowTimestamp"/>
diff --git a/applications/party/minilang/party/PartySimpleMethods.xml b/applications/party/minilang/party/PartySimpleMethods.xml
index a874f11..72150f3 100644
--- a/applications/party/minilang/party/PartySimpleMethods.xml
+++ b/applications/party/minilang/party/PartySimpleMethods.xml
@@ -21,7 +21,7 @@
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="updateAVSOverride" short-description="Create/Update The AVS Override String">
- <make-value entity-name="PartyIcsAvsOverride" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="PartyIcsAvsOverride"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="PartyIcsAvsOverride" map="lookupPKMap" value-field="lookedUpValue"/>
<if-not-empty field="lookedUpValue.partyId">
@@ -35,7 +35,7 @@
</simple-method>
<simple-method method-name="deleteAVSOverride" short-description="Delete The AVS Override String">
- <make-value entity-name="PartyIcsAvsOverride" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="PartyIcsAvsOverride"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="PartyIcsAvsOverride" map="lookupPKMap" value-field="lookedUpValue"/>
<if-not-empty field="lookedUpValue.partyId">
@@ -79,7 +79,7 @@
<if-not-empty field="lookupPKMap.partyId">
<find-by-primary-key entity-name="PartyRole" map="lookupPKMap" value-field="lookedUpValue" use-cache="true"/>
<if-empty field="lookedUpValue">
- <make-value entity-name="PartyRole" value-field="partyRole" map="lookupPKMap"/>
+ <make-value value-field="partyRole" entity-name="PartyRole" map="lookupPKMap"/>
<create-value value-field="partyRole"/>
</if-empty>
</if-not-empty>
diff --git a/applications/party/webapp/partymgr/WEB-INF/controller.xml b/applications/party/webapp/partymgr/WEB-INF/controller.xml
index 5338c48..316eedf 100644
--- a/applications/party/webapp/partymgr/WEB-INF/controller.xml
+++ b/applications/party/webapp/partymgr/WEB-INF/controller.xml
@@ -922,7 +922,7 @@
</request-map>
<request-map uri="uploadParty">
<security auth="true" https="true"/>
- <event type="service" invoke="importParty" path=""/>
+ <event invoke="importParty" path="" type="service"/>
<response name="success" type="request" value="ImportExport"/>
<response name="error" type="view" value="ImportExport"/>
</request-map>
diff --git a/applications/party/widget/partymgr/CommonScreens.xml b/applications/party/widget/partymgr/CommonScreens.xml
index 321a839..5fd5309 100644
--- a/applications/party/widget/partymgr/CommonScreens.xml
+++ b/applications/party/widget/partymgr/CommonScreens.xml
@@ -75,7 +75,7 @@
</and>
</condition>
<widgets>
- <include-menu name="ProfileTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
</widgets>
</section>
</decorator-section>
@@ -89,7 +89,7 @@
<section>
<condition><not><if-empty field="partyId"/></not></condition>
<widgets>
- <include-menu name="ProfileSubTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileSubTabBar"/>
<container style="clear"/>
<container style="page-title">
<section>
diff --git a/applications/party/widget/partymgr/CommunicationEventForms.xml b/applications/party/widget/partymgr/CommunicationEventForms.xml
index d2b347c..3028165 100644
--- a/applications/party/widget/partymgr/CommunicationEventForms.xml
+++ b/applications/party/widget/partymgr/CommunicationEventForms.xml
@@ -755,22 +755,22 @@
<field name="sequenceNum"><text/></field>
<field name="drMimeTypeId" 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="drIsPublic" title="${uiLabelMap.PartyIsPublic}">
<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.CommonSubmit}"><submit button-type="button"/></field>
@@ -788,22 +788,22 @@
<field name="sequenceNum"><text/></field>
<field name="drMimeTypeId">
<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="drIsPublic" title="${uiLabelMap.PartyIsPublic}">
<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="dataResourceTypeId" entry-name="drDataResourceTypeId">
@@ -974,8 +974,8 @@
</field>
<field name="internalNotesOnly">
<drop-down>
- <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="updateButton"><submit/></field>
</form>
diff --git a/applications/party/widget/partymgr/CommunicationEventScreens.xml b/applications/party/widget/partymgr/CommunicationEventScreens.xml
index 93af3e5..fa2239a 100644
--- a/applications/party/widget/partymgr/CommunicationEventScreens.xml
+++ b/applications/party/widget/partymgr/CommunicationEventScreens.xml
@@ -34,8 +34,8 @@
<if-has-permission permission="PARTYMGR" action="_VIEW"/>
</condition>
<widgets>
- <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"/>
</widgets>
</section>
</decorator-section>
@@ -65,8 +65,8 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="pre-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"/>
</decorator-section>
<decorator-section name="body">
<section>
@@ -110,10 +110,10 @@
<not><if-empty field="partyId"/></not>
</condition>
<widgets>
- <include-menu name="ProfileTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
</widgets>
</section>
- <include-menu name="CommFindTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="CommFindTabBar"/>
<container><label style="h1" text="${uiLabelMap.PartyPendingCommunicationEvents}"/></container>
<container>
<link style="smallSubmit" target="ViewCommunicationEvent" text="${uiLabelMap.PartyNewCommunication}">
@@ -769,7 +769,7 @@
<not><if-empty field="partyId"/></not>
</condition>
<widgets>
- <include-menu name="ProfileTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
</widgets>
</section>
<container style="h1"><label text="${uiLabelMap.PageTitleEditCommContent}"/></container>
@@ -868,7 +868,7 @@
<set field="partyIdFrom" from-field="parameters.partyId" default-value="${userLogin.partyId}"/>
</actions>
<widgets>
- <include-menu name="MyCommSubTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="MyCommSubTabBar"/>
<include-screen name="commOverview"/>
</widgets>
</section>
diff --git a/applications/party/widget/partymgr/PartyClassificationScreens.xml b/applications/party/widget/partymgr/PartyClassificationScreens.xml
index 9799595..ba63472 100644
--- a/applications/party/widget/partymgr/PartyClassificationScreens.xml
+++ b/applications/party/widget/partymgr/PartyClassificationScreens.xml
@@ -65,7 +65,7 @@
<if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
- <include-menu name="PartyClassificationTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="PartyClassificationTabBar"/>
</widgets>
</section>
</decorator-section>
@@ -136,7 +136,7 @@
<if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
- <include-menu name="PartyClassificationTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="PartyClassificationTabBar"/>
</widgets>
</section>
</decorator-section>
diff --git a/applications/party/widget/partymgr/PartyForms.xml b/applications/party/widget/partymgr/PartyForms.xml
index 54c38ee..76c4a09 100644
--- a/applications/party/widget/partymgr/PartyForms.xml
+++ b/applications/party/widget/partymgr/PartyForms.xml
@@ -32,10 +32,10 @@
<field name="noConditionFind"><hidden value="Y"/></field>
<field name="extInfo" event="onClick" action="javascript:$('#ListParty' + this.value +'_body').toggle(true);collapseFindPartyOptions('ListParty' + this.value +'_body');" title="${uiLabelMap.PartyContactInformation}">
<radio>
- <option key="${uiLabelMap.CommonNone}" description="N"/>
- <option key="${uiLabelMap.PartyPostal}" description="P"/>
- <option key="${uiLabelMap.PartyTelecom}" description="T"/>
- <option key="${uiLabelMap.CommonOther}" description="O"/>
+ <option key="N" description="${uiLabelMap.CommonNone}"/>
+ <option key="P" description="${uiLabelMap.PartyPostal}"/>
+ <option key="T" description="${uiLabelMap.PartyTelecom}"/>
+ <option key="O" description="${uiLabelMap.CommonOther}"/>
</radio>
</field>
<field name="hideFields"><hidden value="Y"/></field>
@@ -197,17 +197,17 @@
<field name="lastName" title="${uiLabelMap.PartyLastName}" required-field="true"><text size="40" maxlength="60"/></field>
<field name="gender">
<drop-down allow-empty="true">
- <option key="${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="maritalStatus">
<drop-down allow-empty="true">
- <option key="${uiLabelMap.PartyMaritalStatusSingle}" description="S"/>
- <option key="${uiLabelMap.PartyMaritalStatusMarried}" description="M"/>
- <option key="${uiLabelMap.PartyMaritalStatusSeparated}" description="P"/>
- <option key="${uiLabelMap.PartyMaritalStatusDivorced}" description="D"/>
- <option key="${uiLabelMap.PartyMaritalStatusWidowed}" description="W"/>
+ <option key="S" description="${uiLabelMap.PartyMaritalStatusSingle}"/>
+ <option key="M" description="${uiLabelMap.PartyMaritalStatusMarried}"/>
+ <option key="P" description="${uiLabelMap.PartyMaritalStatusSeparated}"/>
+ <option key="D" description="${uiLabelMap.PartyMaritalStatusDivorced}"/>
+ <option key="W" description="${uiLabelMap.PartyMaritalStatusWidowed}"/>
</drop-down>
</field>
<field name="employmentStatusEnumId">
@@ -227,7 +227,7 @@
</drop-down>
</field>
<field name="existingCustomer">
- <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="preferredCurrencyUomId">
<drop-down allow-empty="true" no-current-selected-key="${defaultOrganizationPartyCurrencyUomId}">
@@ -352,7 +352,7 @@
<field name="currentPassword"><password/></field>
<field name="currentPasswordVerify"><password/></field>
<field name="requirePasswordChange">
- <drop-down allow-empty="false" no-current-selected-key="N"><option key="${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.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="backHome" also-hidden="false"/></field>
@@ -479,10 +479,10 @@
</field>
<field name="taxAuthPartyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="isExempt">
- <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${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="isNexus">
- <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="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
</form>
@@ -510,10 +510,10 @@
</hyperlink>
</field>
<field name="isExempt">
- <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="isNexus">
- <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>
</form>
@@ -620,35 +620,35 @@
</drop-down>
</field>
<field name="USER_ADDRESS_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowAddressSolicitation}?">
- <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="HomePhoneTitle" title="${uiLabelMap.PartyHomePhone}" title-area-style="group-label" widget-style="tooltip"><display description="${uiLabelMap.PartyPhoneNumberRequired}" also-hidden="false"/></field>
<field name="USER_HOME_COUNTRY" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
<field name="USER_HOME_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
<field name="USER_HOME_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
<field name="USER_HOME_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
- <field name="USER_HOME_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field>
+ <field name="USER_HOME_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
<field name="WorkPhoneTitle" title="${uiLabelMap.PartyContactWorkPhoneNumber}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="USER_WORK_COUNTRY" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
<field name="USER_WORK_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
<field name="USER_WORK_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
<field name="USER_WORK_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
- <field name="USER_WORK_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field>
+ <field name="USER_WORK_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
<field name="FaxPhoneTitle" title="${uiLabelMap.PartyContactFaxPhoneNumber}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="USER_FAX_COUNTRY" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
<field name="USER_FAX_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
<field name="USER_FAX_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
<field name="USER_FAX_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
- <field name="USER_FAX_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field>
+ <field name="USER_FAX_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
<field name="MobilePhoneTitle" title="${uiLabelMap.PartyContactMobilePhoneNumber}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field name="USER_MOBILE_COUNTRY" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
<field name="USER_MOBILE_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
<field name="USER_MOBILE_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
- <field name="USER_MOBILE_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field>
+ <field name="USER_MOBILE_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
<field name="EmailAddressTitle" title="${uiLabelMap.PartyEmailAddress}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
<field use-when="require_email!=null" name="USER_EMAIL" title="${uiLabelMap.CommonEmail}" required-field="true"><text size="60" maxlength="250"/></field>
<field use-when="require_email==null" name="USER_EMAIL" title="${uiLabelMap.CommonEmail}" required-field="true"><text size="60" maxlength="250"/></field>
- <field name="USER_EMAIL_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field>
+ <field name="USER_EMAIL_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
<!-- <field name="USER_ORDER_EMAIL" title="Order Emails (comma separated)" ><text size="60" maxlength="250"/></field> -->
<field use-when="displayPassword=='Y'" name="USERNAME" title="${uiLabelMap.CommonUsername}" required-field="true"><text size="30" maxlength="250"/></field>
<field use-when="displayPassword=='Y'" name="PASSWORD" title="${uiLabelMap.CommonPassword}" required-field="true"><password size="15" maxlength="250"/></field>
@@ -812,8 +812,8 @@
</field>
<field name="isPublic" title="${uiLabelMap.PartyIsPublic}" map-name="dataResource">
<drop-down no-current-selected-key="N">
- <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="createButton" use-when="content==null"><submit button-type="button"/></field>
diff --git a/applications/party/widget/partymgr/PartyScreens.xml b/applications/party/widget/partymgr/PartyScreens.xml
index e489196..58e0576 100644
--- a/applications/party/widget/partymgr/PartyScreens.xml
+++ b/applications/party/widget/partymgr/PartyScreens.xml
@@ -42,7 +42,7 @@
<widgets>
<screenlet id="FindPartyPanel" title="${uiLabelMap.PartyFindParty}" navigation-menu-name="CreateNewParty"
navigation-form-name="LookupParty" save-collapsed="false" collapsible="true" initially-collapsed="${initialyCollapsed}">
- <include-menu name="CreateNewParty" location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="CreateNewParty"/>
<include-form name="LookupParty" location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.CommonSearchResults}" navigation-form-name="ListParty">
diff --git a/applications/product/minilang/product/category/CategoryContentServices.xml b/applications/product/minilang/product/category/CategoryContentServices.xml
index 39a36b6..496ff62 100644
--- a/applications/product/minilang/product/category/CategoryContentServices.xml
+++ b/applications/product/minilang/product/category/CategoryContentServices.xml
@@ -22,7 +22,7 @@
xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
<!-- ProductCategoryContent -->
<simple-method method-name="createCategoryContent" short-description="Create Content For Product Category">
- <make-value entity-name="ProductCategoryContent" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductCategoryContent"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -41,7 +41,7 @@
<field-to-result field="newEntity.prodCatContentTypeId" result-name="prodCatContentTypeId"/>
</simple-method>
<simple-method method-name="updateCategoryContent" short-description="Update Content For Category">
- <make-value entity-name="ProductCategoryContent" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductCategoryContent"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductCategoryContent" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
diff --git a/applications/product/minilang/product/category/CategoryServices.xml b/applications/product/minilang/product/category/CategoryServices.xml
index ec025a9..9338444 100644
--- a/applications/product/minilang/product/category/CategoryServices.xml
+++ b/applications/product/minilang/product/category/CategoryServices.xml
@@ -33,7 +33,7 @@
<check-errors/>
<now-timestamp field="nowTimestamp"/>
- <make-value entity-name="ProductCategory" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductCategory"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="parameters.productCategoryId">
@@ -67,7 +67,7 @@
</entity-and>
<iterate list="productCategoryRoles" entry="productCategoryRole">
<!-- add this new product to the category -->
- <make-value entity-name="ProductCategoryRollup" value-field="newLimitRollup"/>
+ <make-value value-field="newLimitRollup" entity-name="ProductCategoryRollup"/>
<set field="newLimitRollup.productCategoryId" from-field="newEntity.productCategoryId"/>
<set field="newLimitRollup.parentProductCategoryId" from-field="productCategoryRole.productCategoryId"/>
<set field="newLimitRollup.fromDate" from-field="nowTimestamp"/>
@@ -145,7 +145,7 @@
<store-value value-field="product"/>
</if-compare-field>
- <make-value entity-name="ProductCategoryMember" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductCategoryMember"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductCategoryMember" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
@@ -161,7 +161,7 @@
<call-simple-method method-name="checkCategoryRelatedPermission"/>
<check-errors/>
- <make-value entity-name="ProductCategoryRole" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductCategoryRole"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -177,7 +177,7 @@
<call-simple-method method-name="checkCategoryRelatedPermission"/>
<check-errors/>
- <make-value entity-name="ProductCategoryRole" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductCategoryRole"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductCategoryRole" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -189,7 +189,7 @@
<call-simple-method method-name="checkCategoryRelatedPermission"/>
<check-errors/>
- <make-value entity-name="ProductCategoryRole" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductCategoryRole"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductCategoryRole" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
@@ -207,7 +207,7 @@
<call-simple-method method-name="checkCategoryRelatedPermission"/>
<check-errors/>
- <make-value entity-name="ProductCategoryRollup" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -227,7 +227,7 @@
<call-simple-method method-name="checkCategoryRelatedPermission"/>
<check-errors/>
- <make-value entity-name="ProductCategoryRollup" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/>
<set field="newEntity.parentProductCategoryId" from-field="category"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -246,7 +246,7 @@
<call-simple-method method-name="checkCategoryRelatedPermission"/>
<check-errors/>
- <make-value entity-name="ProductCategoryRollup" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/>
<set field="newEntity.parentProductCategoryId" from-field="parameters.categories"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -267,7 +267,7 @@
<call-simple-method method-name="checkCategoryRelatedPermission"/>
<check-errors/>
- <make-value entity-name="ProductCategoryRollup" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductCategoryRollup"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductCategoryRollup" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -282,7 +282,7 @@
<call-simple-method method-name="checkCategoryRelatedPermission"/>
<check-errors/>
- <make-value entity-name="ProductCategoryRollup" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductCategoryRollup"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductCategoryRollup" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
@@ -577,7 +577,7 @@
</check-permission>
<check-errors/>
- <make-value entity-name="ProductCategoryAttribute" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductCategoryAttribute"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
@@ -590,7 +590,7 @@
</check-permission>
<check-errors/>
- <make-value entity-name="ProductCategoryAttribute" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductCategoryAttribute"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductCategoryAttribute" map="lookupPKMap" value-field="ProductCategoryAttributeInstance"/>
<set-nonpk-fields map="parameters" value-field="ProductCategoryAttributeInstance"/>
@@ -603,7 +603,7 @@
</check-permission>
<check-errors/>
- <make-value entity-name="ProductCategoryAttribute" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductCategoryAttribute"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductCategoryAttribute" map="lookupPKMap" value-field="ProductCategoryAttributeInstance"/>
<remove-value value-field="ProductCategoryAttributeInstance"/>
diff --git a/applications/product/minilang/product/config/ConfigServices.xml b/applications/product/minilang/product/config/ConfigServices.xml
index 6be9f22..ced4e32 100644
--- a/applications/product/minilang/product/config/ConfigServices.xml
+++ b/applications/product/minilang/product/config/ConfigServices.xml
@@ -23,7 +23,7 @@
<!-- ProductConfig methods -->
<!-- Methods for Config Options -->
<simple-method method-name="createProductConfigOption" short-description="Create a Config Option">
- <check-permission permission="CATALOG" action ="_CREATE">
+ <check-permission action="_CREATE" permission="CATALOG">
<fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
</check-permission>
<check-errors/>
diff --git a/applications/product/minilang/product/config/ProductConfigItemContentServices.xml b/applications/product/minilang/product/config/ProductConfigItemContentServices.xml
index 1a81f92..4894961 100644
--- a/applications/product/minilang/product/config/ProductConfigItemContentServices.xml
+++ b/applications/product/minilang/product/config/ProductConfigItemContentServices.xml
@@ -22,7 +22,7 @@
xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
<!-- ProductConfigItemContent -->
<simple-method method-name="createProductConfigItemContent" short-description="Create Content For ProductConfigItem">
- <make-value entity-name="ProdConfItemContent" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProdConfItemContent"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -41,7 +41,7 @@
<field-to-result field="newEntity.confItemContentTypeId" result-name="confItemContentTypeId"/>
</simple-method>
<simple-method method-name="updateProductConfigItemContent" short-description="Update Content For ProductConfigItem">
- <make-value entity-name="ProdConfItemContent" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ProdConfItemContent"/>
<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"/>
diff --git a/applications/product/minilang/product/cost/CostServices.xml b/applications/product/minilang/product/cost/CostServices.xml
index df09a77..7b233ec 100644
--- a/applications/product/minilang/product/cost/CostServices.xml
+++ b/applications/product/minilang/product/cost/CostServices.xml
@@ -45,7 +45,7 @@
<store-value value-field="existingCost"/>
</iterate>
<!-- The new cost is created -->
- <make-value entity-name="CostComponent" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="CostComponent"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id sequence-name="CostComponent" field="newEntity.costComponentId"/>
<if-empty field="newEntity.fromDate">
diff --git a/applications/product/minilang/product/feature/ProductFeatureServices.xml b/applications/product/minilang/product/feature/ProductFeatureServices.xml
index 835d6bc..8f58a72 100644
--- a/applications/product/minilang/product/feature/ProductFeatureServices.xml
+++ b/applications/product/minilang/product/feature/ProductFeatureServices.xml
@@ -75,7 +75,7 @@
</if>
<check-errors/>
- <make-value entity-name="ProductFeatureType" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductFeatureType"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
@@ -88,7 +88,7 @@
<fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
</check-permission>
<check-errors/>
- <make-value entity-name="ProductFeatureApplAttr" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductFeatureApplAttr"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
diff --git a/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml b/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml
index 5cf0d23..154c302 100644
--- a/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml
+++ b/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml
@@ -147,7 +147,7 @@
</iterate>
</if-not-empty>
- <make-value entity-name="ProductContent" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductContent"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
diff --git a/applications/product/minilang/product/inventory/InventoryServices.xml b/applications/product/minilang/product/inventory/InventoryServices.xml
index ab2ae3c..1fe5401 100644
--- a/applications/product/minilang/product/inventory/InventoryServices.xml
+++ b/applications/product/minilang/product/inventory/InventoryServices.xml
@@ -158,14 +158,14 @@
<field-map field-name="lotId" from-field="parameters.lotId" />
</entity-and>
<if-empty field="lotList">
- <make-value entity-name="Lot" value-field="lot"/>
+ <make-value value-field="lot" entity-name="Lot"/>
<set field="lot.lotId" from-field="parameters.lotId"/>
<create-value value-field="lot"/>
</if-empty>
</if-not-empty>
</if-compare>
- <make-value entity-name="InventoryItem" value-field="inventoryItem"/>
+ <make-value value-field="inventoryItem" entity-name="InventoryItem"/>
<!-- TODO: make sure availableToPromiseTotal and quantityOnHandTotal are not changed -->
<set-nonpk-fields map="parameters" value-field="inventoryItem"/>
@@ -308,7 +308,7 @@
<field-map field-name="lotId" from-field="parameters.lotId" />
</entity-and>
<if-empty field="lotList">
- <make-value entity-name="Lot" value-field="lot"/>
+ <make-value value-field="lot" entity-name="Lot"/>
<set field="lot.lotId" from-field="parameters.lotId"/>
<create-value value-field="lot"/>
</if-empty>
@@ -339,7 +339,7 @@
<store-value value-field="oldInventoryItemStatus"/>
</if-not-empty>
- <make-value entity-name="InventoryItemStatus" value-field="inventoryItemStatus"/>
+ <make-value value-field="inventoryItemStatus" entity-name="InventoryItemStatus"/>
<set-nonpk-fields map="parameters" value-field="inventoryItemStatus"/>
<set-pk-fields map="parameters" value-field="inventoryItemStatus"/>
<set field="inventoryItemStatus.statusDatetime" from-field="nowTimestamp"/>
@@ -355,7 +355,7 @@
</simple-method>
<simple-method method-name="createInventoryItemDetail" short-description="Create an InventoryItemDetail">
- <make-value entity-name="InventoryItemDetail" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="InventoryItemDetail"/>
<set from-field="parameters.inventoryItemId" field="newEntity.inventoryItemId"/>
<!-- NOTE DEJ20070927: not using make-next-seq-id because a single InventoryItem may see traffic from lots of threads at the same time, and make-next-seq-id doesn't do well with that <make-next-seq-id seq-field-name="inventoryItemDetailSeqId" value-field="newEntity" increment-by="1" numeric-padding="4"/> -->
@@ -548,7 +548,7 @@
<simple-method method-name="createInventoryItemVariance" short-description="Create an InventoryItemVariance">
<!-- add changes to availableToPromise and quantityOnHand -->
- <make-value entity-name="InventoryItem" value-field="inventoryItemLookup"/>
+ <make-value value-field="inventoryItemLookup" entity-name="InventoryItem"/>
<set-pk-fields map="parameters" value-field="inventoryItemLookup"/>
<find-by-primary-key map="inventoryItemLookup" value-field="inventoryItem"/>
@@ -566,7 +566,7 @@
<set from-field="parameters.comments" field="createDetailMap.description"/>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
- <make-value entity-name="InventoryItemVariance" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="InventoryItemVariance"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
@@ -899,7 +899,7 @@
<!-- Inventory Transfer Services -->
<simple-method method-name="createInventoryTransfer" short-description="Create an Inventory Transfer">
- <make-value entity-name="InventoryTransfer" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="InventoryTransfer"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id sequence-name="InventoryTransfer" field="newEntity.inventoryTransferId"/>
<field-to-result field="newEntity.inventoryTransferId" result-name="inventoryTransferId"/>
diff --git a/applications/product/minilang/product/price/PriceServices.xml b/applications/product/minilang/product/price/PriceServices.xml
index b9ecfa7..bdd91fe 100644
--- a/applications/product/minilang/product/price/PriceServices.xml
+++ b/applications/product/minilang/product/price/PriceServices.xml
@@ -32,7 +32,7 @@
<call-simple-method method-name="inlineHandlePriceWithTaxIncluded"/>
- <make-value entity-name="ProductPrice" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductPrice"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
@@ -167,7 +167,7 @@
<!-- TODO NMA convert to entity auto when changed fileds are managed -->
<simple-method method-name="saveProductPriceChange" short-description="Save History of ProductPrice Change">
<!-- Note that this is kept pretty simple: if a price is specific but no oldPrice, then it is generally a create, if both are specified it is generally an update, if only the oldPrice is specified it is generally a delete -->
- <make-value entity-name="ProductPriceChange" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductPriceChange"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id sequence-name="ProductPriceChange" field="productPriceChangeId"/>
@@ -192,7 +192,7 @@
<if-not-empty field="parameters.condValueInput">
<set field="parameters.condValue" from-field="parameters.condValueInput"/>
</if-not-empty>
- <make-value entity-name="ProductPriceCond" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductPriceCond"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<make-next-seq-id value-field="newEntity" seq-field-name="productPriceCondSeqId" numeric-padding="2"/>
diff --git a/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml b/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml
index bb0c547..1536701 100644
--- a/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml
+++ b/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml
@@ -23,7 +23,7 @@
<simple-method method-name="createCustomerDigitalDownloadProduct" short-description="createCustomerDigitalDownloadProduct">
<now-timestamp field="nowTimestamp"/>
- <make-value entity-name="Product" value-field="createProductMap"/>
+ <make-value value-field="createProductMap" entity-name="Product"/>
<sequenced-id sequence-name="Product" field="createProductMap.productId"/>
<set field="productId" from-field="createProductMap.productId"/>
@@ -33,7 +33,7 @@
<set field="createProductMap.productTypeId" value="DIGITAL_GOOD"/>
<create-value value-field="createProductMap"/>
- <make-value entity-name="ProductPrice" value-field="createProductPriceMap"/>
+ <make-value value-field="createProductPriceMap" entity-name="ProductPrice"/>
<set field="createProductPriceMap.productId" from-field="productId"/>
<set field="createProductPriceMap.productPriceTypeId" value="DEFAULT_PRICE"/>
<set field="createProductPriceMap.productPricePurposeId" value="PURCHASE"/>
@@ -43,7 +43,7 @@
<set field="createProductPriceMap.price" from-field="parameters.price"/>
<create-value value-field="createProductPriceMap"/>
- <make-value entity-name="SupplierProduct" value-field="createProductSupplierMap"/>
+ <make-value value-field="createProductSupplierMap" entity-name="SupplierProduct"/>
<set field="createProductSupplierMap.productId" from-field="productId"/>
<set field="createProductSupplierMap.partyId" from-field="userLogin.partyId"/>
<set field="createProductSupplierMap.currencyUomId" from-field="parameters.currencyUomId" default-value="USD"/>
@@ -59,7 +59,7 @@
<!-- create association with ProductStore.digProdUploadCategoryId -->
<entity-one entity-name="ProductStore" value-field="productStore"/>
<if-not-empty field="productStore.digProdUploadCategoryId">
- <make-value entity-name="ProductCategoryMember" value-field="addProductToCategoryMap"/>
+ <make-value value-field="addProductToCategoryMap" entity-name="ProductCategoryMember"/>
<set field="addProductToCategoryMap.productId" from-field="productId"/>
<set field="addProductToCategoryMap.productCategoryId" from-field="productStore.digProdUploadCategoryId"/>
<create-value value-field="addProductToCategoryMap"/>
@@ -168,7 +168,7 @@
<check-errors/>
- <make-value entity-name="ProductContent" value-field="productContent"/>
+ <make-value value-field="productContent" entity-name="ProductContent"/>
<set field="productContent.productId" from-field="parameters.productId"/>
<set field="productContent.contentId" from-field="parameters.contentId"/>
<set field="productContent.productContentTypeId" value="DIGITAL_DOWNLOAD"/>
diff --git a/applications/product/minilang/product/product/ProductContentServices.xml b/applications/product/minilang/product/product/ProductContentServices.xml
index 141d6c6..39b938d 100644
--- a/applications/product/minilang/product/product/ProductContentServices.xml
+++ b/applications/product/minilang/product/product/ProductContentServices.xml
@@ -22,7 +22,7 @@
xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
<!-- ProductContent -->
<simple-method method-name="createProductContent" short-description="Create Content For Product">
- <make-value entity-name="ProductContent" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductContent"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -41,7 +41,7 @@
<field-to-result field="newEntity.productContentTypeId" result-name="productContentTypeId"/>
</simple-method>
<simple-method method-name="updateProductContent" short-description="Update Content For Product">
- <make-value entity-name="ProductContent" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductContent"/>
<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"/>
@@ -51,7 +51,7 @@
<call-service service-name="updateContent" in-map-name="updateContent"/>
</simple-method>
<simple-method method-name="removeProductContent" short-description="Remove Content From Product">
- <make-value entity-name="ProductContent" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductContent"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
diff --git a/applications/product/minilang/product/product/ProductServices.xml b/applications/product/minilang/product/product/ProductServices.xml
index e1bddaf..93c21e3 100644
--- a/applications/product/minilang/product/product/ProductServices.xml
+++ b/applications/product/minilang/product/product/ProductServices.xml
@@ -27,7 +27,7 @@
</check-permission>
<check-errors/>
- <make-value entity-name="Product" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="Product"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set from-field="parameters.productId" field="newEntity.productId"/>
@@ -83,7 +83,7 @@
<iterate list="productCategoryRoles" entry="productCategoryRole">
<!-- add this new product to the category -->
- <make-value entity-name="ProductCategoryMember" value-field="newLimitMember"/>
+ <make-value value-field="newLimitMember" entity-name="ProductCategoryMember"/>
<set from-field="newEntity.productId" field="newLimitMember.productId"/>
<set from-field="productCategoryRole.productCategoryId" field="newLimitMember.productCategoryId"/>
<set from-field="nowTimestamp" field="newLimitMember.fromDate"/>
@@ -420,7 +420,7 @@
<entity-one entity-name="ProductCalculatedInfo" value-field="productCalculatedInfo"/>
<if-empty field="productCalculatedInfo">
<!-- go ahead and create it -->
- <make-value entity-name="ProductCalculatedInfo" value-field="productCalculatedInfo"/>
+ <make-value value-field="productCalculatedInfo" entity-name="ProductCalculatedInfo"/>
<set from-field="parameters.productId" field="productCalculatedInfo.productId"/>
<set from-field="parameters.weight" field="productCalculatedInfo.totalTimesViewed"/>
<create-value value-field="productCalculatedInfo"/>
@@ -447,7 +447,7 @@
</simple-method>
<simple-method method-name="createProductReview" short-description="Create a ProductReview" login-required="false">
- <make-value entity-name="ProductReview" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductReview"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set from-field="userLogin.userLoginId" field="newEntity.userLoginId"/>
<set value="PRR_PENDING" field="newEntity.statusId"/>
@@ -486,7 +486,7 @@
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <make-value entity-name="ProductReview" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductReview"/>
<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"/>
@@ -509,7 +509,7 @@
<entity-one entity-name="ProductCalculatedInfo" value-field="productCalculatedInfo"/>
<if-empty field="productCalculatedInfo">
<!-- go ahead and create it -->
- <make-value entity-name="ProductCalculatedInfo" value-field="productCalculatedInfo"/>
+ <make-value value-field="productCalculatedInfo" entity-name="ProductCalculatedInfo"/>
<set from-field="productId" field="productCalculatedInfo.productId"/>
<set from-field="averageCustomerRating" field="productCalculatedInfo.averageCustomerRating"/>
<create-value value-field="productCalculatedInfo"/>
@@ -745,7 +745,7 @@
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <make-value entity-name="ProductRole" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductRole"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -761,7 +761,7 @@
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <make-value entity-name="ProductRole" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductRole"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductRole" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -773,7 +773,7 @@
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <make-value entity-name="ProductRole" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ProductRole"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ProductRole" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
@@ -786,7 +786,7 @@
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <make-value entity-name="ProductCategoryGlAccount" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductCategoryGlAccount"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
diff --git a/applications/product/minilang/product/promo/PromoServices.xml b/applications/product/minilang/product/promo/PromoServices.xml
index 358c16f..8ddeb6a 100644
--- a/applications/product/minilang/product/promo/PromoServices.xml
+++ b/applications/product/minilang/product/promo/PromoServices.xml
@@ -23,7 +23,7 @@
<!-- ProductPromoCond methods -->
<simple-method method-name="createProductPromoCond" short-description="Create an ProductPromoCond">
- <make-value entity-name="ProductPromoCond" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductPromoCond"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-not-empty field="parameters.carrierShipmentMethod">
<set field="newEntity.otherValue" from-field="parameters.carrierShipmentMethod"/>
diff --git a/applications/product/minilang/product/storage/FacilityContactMechServices.xml b/applications/product/minilang/product/storage/FacilityContactMechServices.xml
index 213c04f..ac27d2a 100644
--- a/applications/product/minilang/product/storage/FacilityContactMechServices.xml
+++ b/applications/product/minilang/product/storage/FacilityContactMechServices.xml
@@ -48,7 +48,7 @@
<!-- now create the FacilityContactMechPurpose record -->
<if-not-empty field="parameters.contactMechPurposeTypeId">
- <make-value entity-name="FacilityContactMechPurpose" value-field="facilityContactMechPurpose"/>
+ <make-value value-field="facilityContactMechPurpose" entity-name="FacilityContactMechPurpose"/>
<set-pk-fields map="newValue" value-field="facilityContactMechPurpose"/>
<set field="facilityContactMechPurpose.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/>
<create-value value-field="facilityContactMechPurpose"/>
@@ -72,9 +72,9 @@
</if-empty>
<check-errors/>
- <log level="info" message="parameters: ${parameters}"/>
+ <log message="parameters: ${parameters}" level="info"/>
<clone-value value-field="facilityContactMech" new-value-field="newFacilityContactMech"/>
- <log level="info" message="parameters: ${parameters}"/>
+ <log message="parameters: ${parameters}" level="info"/>
<!-- If we already have a new contactMechId don't update ContactMech -->
<if-empty field="parameters.newContactMechId">
<set-service-fields service-name="updateContactMech" map="parameters" to-map="updateContactMechMap"/>
@@ -144,7 +144,7 @@
<simple-method method-name="createFacilityPostalAddress" short-description="Create a PostalAddress for facility">
<set-service-fields service-name="createPostalAddress" map="parameters" to-map="createPostalAddressMap"/>
- <call-service service-name="createPostalAddress" in-map-name="createPostalAddressMap">
+ <call-service in-map-name="createPostalAddressMap" service-name="createPostalAddress">
<default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/>
<result-to-field result-name="contactMechId" field="newFacilityContactMech.contactMechId"/>
</call-service>
@@ -164,7 +164,7 @@
<simple-method method-name="updateFacilityPostalAddress" short-description="Update a PostalAddress for facility">
<make-value entity-name="FacilityContactMech" value-field="newFacilityContactMech"/>
<set-service-fields service-name="updatePostalAddress" map="parameters" to-map="updatePostalAddressMap"/>
- <call-service service-name="updatePostalAddress" in-map-name="updatePostalAddressMap">
+ <call-service in-map-name="updatePostalAddressMap" service-name="updatePostalAddress">
<default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyUpdated"/>
<result-to-field result-name="contactMechId" field="newFacilityContactMech.contactMechId"/>
</call-service>
@@ -184,7 +184,7 @@
<simple-method method-name="createFacilityTelecomNumber" short-description="Create a TelecomNumber for facility">
<log level="info" message="Creating telecom number"/>
<set-service-fields service-name="createTelecomNumber" map="parameters" to-map="createTelecomNumberMap"/>
- <call-service service-name="createTelecomNumber" in-map-name="createTelecomNumberMap">
+ <call-service in-map-name="createTelecomNumberMap" service-name="createTelecomNumber">
<default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/>
<result-to-field result-name="contactMechId" field="newFacilityContactMech.contactMechId"/>
</call-service>
@@ -214,7 +214,7 @@
<set field="updateFacilityContactMechMap.contactMechTypeId" value="TELECOM_NUMBER"/>
<log level="info" message="Copied id to updateFacilityContactMechMap: ${updateFacilityContactMechMap.newContactMechId}"/>
- <call-service service-name="updateFacilityContactMech" in-map-name="updateFacilityContactMechMap">
+ <call-service in-map-name="updateFacilityContactMechMap" service-name="updateFacilityContactMech">
<default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyUpdated"/>
</call-service>
<log level="info" message="Setting result id: ${newFacilityContactMech.contactMechId}"/>
@@ -278,7 +278,7 @@
</if-not-empty>
<now-timestamp field="nowTimestamp"/>
- <make-value entity-name="FacilityContactMechPurpose" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="FacilityContactMechPurpose"/>
<set field="newEntity.facilityId" from-field="parameters.facilityId"/>
<set field="newEntity.contactMechId" from-field="parameters.contactMechId"/>
<set field="newEntity.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/>
diff --git a/applications/product/minilang/product/storage/StorageServices.xml b/applications/product/minilang/product/storage/StorageServices.xml
index a531546..a4cd7e2 100644
--- a/applications/product/minilang/product/storage/StorageServices.xml
+++ b/applications/product/minilang/product/storage/StorageServices.xml
@@ -23,7 +23,7 @@
<!-- Facility Location Services -->
<simple-method method-name="createFacilityLocation" short-description="Create a Facility Location">
- <make-value entity-name="FacilityLocation" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="FacilityLocation"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set field="newEntity.facilityId" from-field="parameters.facilityId"/>
@@ -63,14 +63,14 @@
</simple-method>
<simple-method method-name="removePartyFromFacilityGroup" short-description="Remove Party From FacilityGroup">
- <make-value entity-name="FacilityGroupRole" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="FacilityGroupRole"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="FacilityGroupRole" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteFacilityContent" short-description="Delete Content From Facility">
- <make-value entity-name="FacilityContent" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="FacilityContent"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="FacilityContent" map="lookupPKMap" value-field="lookedUpValue"/>
<now-timestamp field="lookedUpValue.thruDate"/>
diff --git a/applications/product/minilang/product/store/ProductStoreServices.xml b/applications/product/minilang/product/store/ProductStoreServices.xml
index b763b24..fc5e27a 100644
--- a/applications/product/minilang/product/store/ProductStoreServices.xml
+++ b/applications/product/minilang/product/store/ProductStoreServices.xml
@@ -49,7 +49,7 @@
<check-errors/>
</if-compare>
- <make-value entity-name="ProductStore" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ProductStore"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id sequence-name="ProductStore" field="productStoreId"/>
@@ -62,7 +62,7 @@
<now-timestamp field="nowTimestamp"/>
<if-not-empty field="newEntity.inventoryFacilityId">
- <make-value entity-name="ProductStoreFacility" value-field="storeFacility"/>
+ <make-value value-field="storeFacility" entity-name="ProductStoreFacility"/>
<set from-field="newEntity.inventoryFacilityId" field="storeFacility.facilityId"/>
<set from-field="newEntity.productStoreId" field="storeFacility.productStoreId"/>
<set from-field="nowTimestamp" field="storeFacility.fromDate"/>
@@ -119,7 +119,7 @@
</iterate>
</if-compare>
<!-- create the new entry -->
- <make-value entity-name="ProductStoreFacility" value-field="storeFacility"/>
+ <make-value value-field="storeFacility" entity-name="ProductStoreFacility"/>
<set from-field="store.inventoryFacilityId" field="storeFacility.facilityId"/>
<set from-field="store.productStoreId" field="storeFacility.productStoreId"/>
<set from-field="nowTimestamp" field="storeFacility.fromDate"/>
diff --git a/applications/product/minilang/shipment/issuance/IssuanceServices.xml b/applications/product/minilang/shipment/issuance/IssuanceServices.xml
index 24e2cca..d140caf 100644
--- a/applications/product/minilang/shipment/issuance/IssuanceServices.xml
+++ b/applications/product/minilang/shipment/issuance/IssuanceServices.xml
@@ -26,7 +26,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="component://product/minilang/shipment/shipment/ShipmentServices.xml"/>
<check-errors/>
- <make-value entity-name="ItemIssuance" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ItemIssuance"/>
<sequenced-id sequence-name="ItemIssuance" field="newEntity.itemIssuanceId"/>
<field-to-result field="newEntity.itemIssuanceId" result-name="itemIssuanceId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -87,7 +87,7 @@
<set value="Create ItemIssuanceRole" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="component://product/minilang/shipment/shipment/ShipmentServices.xml"/>
<check-errors/>
- <make-value entity-name="ItemIssuanceRole" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ItemIssuanceRole"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
diff --git a/applications/product/minilang/shipment/picklist/PicklistServices.xml b/applications/product/minilang/shipment/picklist/PicklistServices.xml
index b377f54..7da46ae 100644
--- a/applications/product/minilang/shipment/picklist/PicklistServices.xml
+++ b/applications/product/minilang/shipment/picklist/PicklistServices.xml
@@ -900,7 +900,7 @@
-->
<simple-method method-name="editPicklistItem" short-description="Edit a Picklist Item">
- <make-value entity-name="PicklistItem" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="PicklistItem"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="picklistItem"/>
@@ -1192,7 +1192,7 @@
A Map with a List of PicklistItemInfo records keyed by the productId
-->
<if-not-empty field="picklistItemInfo.inventoryItemAndLocation.locationSeqId">
- <make-value entity-name="FacilityLocation" value-field="facilityLocation" map="picklistItemInfo.inventoryItemAndLocation"/>
+ <make-value value-field="facilityLocation" entity-name="FacilityLocation" map="picklistItemInfo.inventoryItemAndLocation"/>
<set from-field="facilityLocation" field="facilityLocationByLocationSeqIdMap[facilityLocation.locationSeqId]"/>
<clear-field field="picklistItemInfoTempList"/>
@@ -1550,12 +1550,12 @@
<!-- special method to check update the picklist status from the item status -->
<simple-method method-name="checkPicklistBinItemStatuses" short-description="Checks the item status and updates the pick list status">
<!-- find the picklist bin -->
- <make-value entity-name="PicklistBin" value-field="binLookup"/>
+ <make-value value-field="binLookup" entity-name="PicklistBin"/>
<set-pk-fields map="parameters" value-field="binLookup"/>
<find-by-primary-key map="binLookup" value-field="picklistBin"/>
<!-- find the pick list -->
- <make-value entity-name="Picklist" value-field="plLookup"/>
+ <make-value value-field="plLookup" entity-name="Picklist"/>
<set-pk-fields map="picklistBin" value-field="plLookup"/>
<find-by-primary-key map="plLookup" value-field="picklist"/>
diff --git a/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml b/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml
index 2e77612..46eb92c 100644
--- a/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml
+++ b/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml
@@ -21,7 +21,7 @@
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="createShipmentReceipt" short-description="Create a ShipmentReceipt">
- <make-value entity-name="ShipmentReceipt" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ShipmentReceipt"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id sequence-name="ShipmentReceipt" field="receiptId"/>
@@ -64,7 +64,7 @@
</simple-method>
<simple-method method-name="createShipmentReceiptRole" short-description="Create a ShipmentReceipt Role">
- <make-value entity-name="ShipmentReceiptRole" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ShipmentReceiptRole"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -72,7 +72,7 @@
</simple-method>
<simple-method method-name="removeShipmentReceiptRole" short-description="Remove a ShipmentReceipt Role">
- <make-value entity-name="ShipmentReceiptRole" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ShipmentReceiptRole"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentReceiptRole" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
diff --git a/applications/product/minilang/shipment/shipment/ShipmentServices.xml b/applications/product/minilang/shipment/shipment/ShipmentServices.xml
index 78bc658..059c121 100644
--- a/applications/product/minilang/shipment/shipment/ShipmentServices.xml
+++ b/applications/product/minilang/shipment/shipment/ShipmentServices.xml
@@ -22,7 +22,7 @@
xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
<!-- Shipment services -->
<simple-method method-name="createShipment" short-description="Create Shipment">
- <make-value entity-name="Shipment" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="Shipment"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-not-empty field="parameters.shipmentId">
@@ -115,7 +115,7 @@
<set value="Update Shipment" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusDelivered"/>
- <make-value entity-name="Shipment" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="Shipment"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
@@ -821,7 +821,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value entity-name="ShipmentItem" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ShipmentItem"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<!-- if no shipmentItemSeqId, generate one based on existing items, ie one greater than the current higher number -->
@@ -834,7 +834,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value entity-name="ShipmentItem" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ShipmentItem"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentItem" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -856,7 +856,7 @@
</add-error>
<check-errors/>
<else>
- <make-value entity-name="ShipmentItem" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ShipmentItem"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentItem" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
@@ -949,7 +949,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value entity-name="ShipmentPackage" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ShipmentPackage"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -974,7 +974,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusShipped"/>
<check-errors/>
- <make-value entity-name="ShipmentPackage" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ShipmentPackage"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackage" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -1033,7 +1033,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value entity-name="ShipmentPackageContent" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ShipmentPackageContent"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -1045,7 +1045,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value entity-name="ShipmentPackageContent" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ShipmentPackageContent"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackageContent" map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -1056,7 +1056,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value entity-name="ShipmentPackageContent" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ShipmentPackageContent"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackageContent" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
@@ -1065,7 +1065,7 @@
<set value="Create ShipmentPackageContent" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value entity-name="ShipmentPackageContent" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ShipmentPackageContent"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<find-by-primary-key value-field="shipmentPackageContent" map="newEntity"/>
<log level="verbose" message="In addShipmentContentToPackage trying values: ${newEntity}"/>
@@ -1090,7 +1090,7 @@
<!-- ShipmentPackageRouteSeg services -->
<simple-method method-name="createShipmentPackageRouteSeg" short-description="Create ShipmentPackageRouteSeg">
- <make-value entity-name="ShipmentPackageRouteSeg" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ShipmentPackageRouteSeg"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -1101,7 +1101,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value entity-name="ShipmentPackageRouteSeg" value-field="lookupPKMap"/>
+ <make-value value-field="lookupPKMap" entity-name="ShipmentPackageRouteSeg"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="ShipmentPackageRouteSeg" map="lookupPKMap" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
@@ -1113,7 +1113,7 @@
<call-simple-method method-name="checkCanChangeShipmentStatusPacked"/>
<check-errors/>
- <make-value entity-name="ShipmentRouteSegment" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="ShipmentRouteSegment"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -1231,7 +1231,7 @@
<!-- shipment method type services -->
<simple-method method-name="createCarrierShipmentMethod" short-description="Creates a CarrierShipmentMethod">
- <make-value entity-name="CarrierShipmentMethod" value-field="carrierShipmentMethod"/>
+ <make-value value-field="carrierShipmentMethod" entity-name="CarrierShipmentMethod"/>
<set-pk-fields map="parameters" value-field="carrierShipmentMethod"/>
<set-nonpk-fields map="parameters" value-field="carrierShipmentMethod"/>
<create-value value-field="carrierShipmentMethod"/>
@@ -1242,7 +1242,7 @@
</simple-method>
<simple-method method-name="createShipmentMethodType" short-description="Creates a ShipmentMethodType">
- <make-value entity-name="ShipmentMethodType" value-field="shipmentMethodType"/>
+ <make-value value-field="shipmentMethodType" entity-name="ShipmentMethodType"/>
<set-pk-fields map="parameters" value-field="shipmentMethodType"/>
<set-nonpk-fields map="parameters" value-field="shipmentMethodType"/>
<create-value value-field="shipmentMethodType"/>
@@ -2015,7 +2015,7 @@
<!-- QuantityBreak services -->
<!-- create a new QuantityBreak -->
<simple-method method-name="createQuantityBreak" short-description="Create a QuoteAttribute">
- <make-value entity-name="QuantityBreak" value-field="quantityBreak"/>
+ <make-value value-field="quantityBreak" entity-name="QuantityBreak"/>
<set-nonpk-fields map="parameters" value-field="quantityBreak"/>
<sequenced-id sequence-name="QuantityBreak" field="quantityBreak.quantityBreakId"/>
<create-value value-field="quantityBreak"/>
diff --git a/applications/product/webapp/catalog/WEB-INF/controller.xml b/applications/product/webapp/catalog/WEB-INF/controller.xml
index 9fa30ff..4909965 100644
--- a/applications/product/webapp/catalog/WEB-INF/controller.xml
+++ b/applications/product/webapp/catalog/WEB-INF/controller.xml
@@ -2527,19 +2527,19 @@
</request-map>
<request-map uri="createProductConfigItem">
<security auth="true" https="true"/>
- <event type="service" invoke="createProductConfigItem" path=""/>
+ <event invoke="createProductConfigItem" path="" type="service"/>
<response name="success" type="view" value="EditProductConfigItem"/>
<response name="error" type="view" value="EditProductConfigItem"/>
</request-map>
<request-map uri="updateProductConfigItem">
<security auth="true" https="true"/>
- <event type="service" invoke="updateProductConfigItem" path=""/>
+ <event invoke="updateProductConfigItem" path="" type="service"/>
<response name="success" type="view" value="EditProductConfigItem"/>
<response name="error" type="view" value="EditProductConfigItem"/>
</request-map>
<request-map uri="deleteProductConfigItem">
<security auth="true" https="true"/>
- <event type="service" invoke="deleteProductConfigItem" path=""/>
+ <event invoke="deleteProductConfigItem" path="" type="service"/>
<response name="success" type="view" value="EditProductConfigItem"/>
<response name="error" type="view" value="EditProductConfigItem"/>
</request-map>
@@ -2551,19 +2551,19 @@
</request-map>
<request-map uri="createProductConfigOption">
<security auth="true" https="true"/>
- <event type="service" invoke="createProductConfigOption"/>
+ <event invoke="createProductConfigOption" type="service"/>
<response name="success" type="view" value="EditProductConfigOptions"/>
<response name="error" type="view" value="EditProductConfigOptions"/>
</request-map>
<request-map uri="updateProductConfigOption">
<security auth="true" https="true"/>
- <event type="service" invoke="updateProductConfigOption"/>
+ <event invoke="updateProductConfigOption" type="service"/>
<response name="success" type="view" value="EditProductConfigOptions"/>
<response name="error" type="view" value="EditProductConfigOptions"/>
</request-map>
<request-map uri="deleteProductConfigOption">
<security auth="true" https="true"/>
- <event type="service" invoke="deleteProductConfigOption"/>
+ <event invoke="deleteProductConfigOption" type="service"/>
<response name="success" type="view" value="EditProductConfigOptions"/>
<response name="error" type="view" value="EditProductConfigOptions"/>
</request-map>
@@ -2571,19 +2571,19 @@
<!-- Product Config Product Requests -->
<request-map uri="createProductConfigProduct">
<security auth="true" https="true"/>
- <event type="service" invoke="createProductConfigProduct"/>
+ <event invoke="createProductConfigProduct" type="service"/>
<response name="success" type="view" value="EditProductConfigOptions"/>
<response name="error" type="view" value="EditProductConfigOptions"/>
</request-map>
<request-map uri="updateProductConfigProduct">
<security auth="true" https="true"/>
- <event type="service" invoke="updateProductConfigProduct"/>
+ <event invoke="updateProductConfigProduct" type="service"/>
<response name="success" type="view" value="EditProductConfigOptions"/>
<response name="error" type="view" value="EditProductConfigOptions"/>
</request-map>
<request-map uri="deleteProductConfigProduct">
<security auth="true" https="true"/>
- <event type="service" invoke="deleteProductConfigProduct"/>
+ <event invoke="deleteProductConfigProduct" type="service"/>
<response name="success" type="view" value="EditProductConfigOptions"/>
<response name="error" type="view" value="EditProductConfigOptions"/>
</request-map>
diff --git a/applications/product/webapp/facility/WEB-INF/controller.xml b/applications/product/webapp/facility/WEB-INF/controller.xml
index 2737051..2618f72 100644
--- a/applications/product/webapp/facility/WEB-INF/controller.xml
+++ b/applications/product/webapp/facility/WEB-INF/controller.xml
@@ -827,7 +827,7 @@
</request-map>
<request-map uri="deleteFacilityContent">
<security auth="true" https="true"/>
- <event type="service" invoke="deleteFacilityContent"/>
+ <event invoke="deleteFacilityContent" type="service"/>
<response name="success" type="request-redirect" value="EditFacilityContent">
<redirect-parameter name="facilityId"/>
</response>
diff --git a/applications/product/widget/catalog/ConfigForms.xml b/applications/product/widget/catalog/ConfigForms.xml
index ec21442..ca56408 100644
--- a/applications/product/widget/catalog/ConfigForms.xml
+++ b/applications/product/widget/catalog/ConfigForms.xml
@@ -70,8 +70,8 @@
<field use-when="configItem==null&&configItemId==null" name="configItemId" title="${uiLabelMap.ProductConfigItem}"><ignored/></field>
<field name="configItemTypeId" title="${uiLabelMap.ProductConfigItem} ${uiLabelMap.CommonType}">
<drop-down allow-empty="false">
- <option key="${uiLabelMap.ProductSingleChoice}" description="SINGLE"/>
- <option key="${uiLabelMap.ProductMultiChoice}" description="MULTIPLE"/>
+ <option key="SINGLE" description="${uiLabelMap.ProductSingleChoice}"/>
+ <option key="MULTIPLE" description="${uiLabelMap.ProductMultiChoice}"/>
</drop-down>
</field>
diff --git a/applications/product/widget/catalog/FieldLookupForms.xml b/applications/product/widget/catalog/FieldLookupForms.xml
index ba43f21..3f8e093 100644
--- a/applications/product/widget/catalog/FieldLookupForms.xml
+++ b/applications/product/widget/catalog/FieldLookupForms.xml
@@ -223,8 +223,8 @@
</field>
<field name="showInSelect">
<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="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
diff --git a/applications/product/widget/catalog/ImageManagementForms.xml b/applications/product/widget/catalog/ImageManagementForms.xml
index 6504bed..3891973 100644
--- a/applications/product/widget/catalog/ImageManagementForms.xml
+++ b/applications/product/widget/catalog/ImageManagementForms.xml
@@ -100,18 +100,18 @@
</field>
<field name="statusProductId" title="${uiLabelMap.ProductStatus}" position="1" use-when="${groovy:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}">
<radio no-current-selected-key="${checkRadio}">
- <option key="${uiLabelMap.FormFieldTitle_approve}" description="IM_APPROVED__${productId}"/>
- <option key="${uiLabelMap.FormFieldTitle_rejectButton}" description="IM_REJECTED__${productId}"/>
- <option key="${uiLabelMap.FormFieldTitle_pending}" description="IM_PENDING__${productId}"/>
+ <option key="IM_APPROVED__${productId}" description="${uiLabelMap.FormFieldTitle_approve}"/>
+ <option key="IM_REJECTED__${productId}" description="${uiLabelMap.FormFieldTitle_rejectButton}"/>
+ <option key="IM_PENDING__${productId}" description="${uiLabelMap.FormFieldTitle_pending}"/>
</radio>
</field>
<field name="_rowSubmit" position="2" title=" " widget-style="hidden"><check all-checked="true"/></field>
<field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field>
<field name="checkStatusId" position="2" title="${uiLabelMap.CommonStatus}">
<radio no-current-selected-key="${checkRadio}">
- <option key="${uiLabelMap.FormFieldTitle_approve}" description="IM_APPROVED/${productId}"/>
- <option key="${uiLabelMap.FormFieldTitle_rejectButton}" description="IM_REJECTED/${productId}"/>
- <option key="${uiLabelMap.FormFieldTitle_pending}" description="IM_PENDING/${productId}"/>
+ <option key="IM_APPROVED/${productId}" description="${uiLabelMap.FormFieldTitle_approve}"/>
+ <option key="IM_REJECTED/${productId}" description="${uiLabelMap.FormFieldTitle_rejectButton}"/>
+ <option key="IM_PENDING/${productId}" description="${uiLabelMap.FormFieldTitle_pending}"/>
</radio>
</field>
<field name="drDataResourceName" position="2" title="${uiLabelMap.ImageManagementImageName}"><display/></field>
@@ -310,9 +310,9 @@
document.ListImageManage.action='checkAction?productId=${productId}&contentId=${contentId}&dataResourceId=${dataResourceId}';
document.ListImageManage.submit();">
<drop-down allow-empty="true">
- <option key="${uiLabelMap.ImageManagementFrame}" description="frame"/>
- <option key="${uiLabelMap.ImageManagementCrop}" description="crop"/>
- <option key="${uiLabelMap.ImageManagementRotate}" description="rotate"/>
+ <option key="frame" description="${uiLabelMap.ImageManagementFrame}"/>
+ <option key="crop" description="${uiLabelMap.ImageManagementCrop}"/>
+ <option key="rotate" description="${uiLabelMap.ImageManagementRotate}"/>
</drop-down>
</field>
<field name="description" use-when="${groovy: return context.statusId == 'IM_APPROVED';}" title="${uiLabelMap.ImageManagementCaption}"><text/></field>
@@ -765,8 +765,8 @@
<form name="ImageResize" type="single" title="" header-row-style="header-row" default-table-style="basic-table" target="resizeImages">
<field name="resizeOption">
<drop-down >
- <option key="Resize All Images" description="resizeAllImages"/>
- <option key="Create New Thumbnail Size" description="createNewThumbnail"/>
+ <option key="resizeAllImages" description="Resize All Images"/>
+ <option key="createNewThumbnail" description="Create New Thumbnail Size"/>
</drop-down>
</field>
<field name="productId" title="${uiLabelMap.ImageManagementChooseProductID}"><lookup target-form-name="LookupProduct"/></field>
diff --git a/applications/product/widget/catalog/PriceForms.xml b/applications/product/widget/catalog/PriceForms.xml
index 3eb69c5..4e5e807 100644
--- a/applications/product/widget/catalog/PriceForms.xml
+++ b/applications/product/widget/catalog/PriceForms.xml
@@ -60,8 +60,8 @@
<field name="description" title="${uiLabelMap.CommonDescription}"><text size="60"/></field>
<field name="isSale" title="${uiLabelMap.ProductSaleRule}">
<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="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time type="timestamp"/></field>
diff --git a/applications/product/widget/catalog/ProdCatalogForms.xml b/applications/product/widget/catalog/ProdCatalogForms.xml
index 3535447..dfa2b32 100644
--- a/applications/product/widget/catalog/ProdCatalogForms.xml
+++ b/applications/product/widget/catalog/ProdCatalogForms.xml
@@ -70,7 +70,7 @@
<field name="catalogName"><text size="30" maxlength="60"/></field>
<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="styleSheet" title="${uiLabelMap.ProductStyleSheet}"><text size="60" maxlength="250"/></field>
@@ -79,10 +79,10 @@
<field name="templatePathPrefix" title="${uiLabelMap.ProductTemplatePathPrefix}" tooltip="${uiLabelMap.ProductPrependedTemplatePaths}"><text size="60" maxlength="250"/></field>
<field name="viewAllowPermReqd" title="${uiLabelMap.ProductCategoryViewAllowPermReqd}">
- <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="purchaseAllowPermReqd" title="${uiLabelMap.ProductCategoryPurchaseAllowPermReqd}">
- <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.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
diff --git a/applications/product/widget/catalog/ProductForms.xml b/applications/product/widget/catalog/ProductForms.xml
index a86a03c..a5e1345 100644
--- a/applications/product/widget/catalog/ProductForms.xml
+++ b/applications/product/widget/catalog/ProductForms.xml
@@ -78,10 +78,10 @@
</drop-down>
</field>
<field position="1" name="isVirtual" title="${uiLabelMap.ProductVirtualProduct}">
- <drop-down><option key="${uiLabelMap.CommonN}" description="N"/><option key="${uiLabelMap.CommonY}" description="Y"/></drop-down>
+ <drop-down><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></drop-down>
</field>
<field position="2" name="isVariant" title="${uiLabelMap.ProductVariantProduct}">
- <drop-down><option key="${uiLabelMap.CommonN}" description="N"/><option key="${uiLabelMap.CommonY}" description="Y"/></drop-down>
+ <drop-down><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></drop-down>
</field>
<field position="3" name="virtualVariantMethodEnum" title="${uiLabelMap.ProductVirtualVariantMethod}">
<drop-down allow-empty="true">
@@ -112,7 +112,7 @@
<field position="4" name="supportDiscontinuationDate" title="${uiLabelMap.ProductSupportThruDate}" red-when="before-now"><date-time/></field>
<field name="salesDiscWhenNotAvail" title="${uiLabelMap.ProductSalesDiscontinuationNotAvailable}">
- <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 position="1" name="requirementMethodEnumId" title="${uiLabelMap.ProductRequirementMethodEnumId}">
<drop-down allow-empty="true">
@@ -124,7 +124,7 @@
</field>
<field name="requireInventory" title="${uiLabelMap.ProductRequireInventory}" tooltip="${uiLabelMap.ProductInventoryRequiredProduct}">
- <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="inventoryMessage" title="${uiLabelMap.ProductInventoryMessage}"><text size="20" maxlength="255"/></field>
<field name="inventoryItemTypeId" title="${uiLabelMap.ProductInventoryItemTypeId}" use-when="product==null">
@@ -140,9 +140,9 @@
<field name="lotIdFilledIn" title="${uiLabelMap.ProductLotId}">
<drop-down allow-empty="false">
- <option key="${uiLabelMap.lotIdFilledInAllowed}" description="Allowed"/>
- <option key="${uiLabelMap.lotIdFilledInMandatory}" description="Mandatory"/>
- <option key="${uiLabelMap.lotIdFilledInForbidden}" description="Forbidden"/>
+ <option key="Allowed" description="${uiLabelMap.lotIdFilledInAllowed}"/>
+ <option key="Mandatory" description="${uiLabelMap.lotIdFilledInMandatory}"/>
+ <option key="Forbidden" description="${uiLabelMap.lotIdFilledInForbidden}"/>
</drop-down>
</field>
@@ -157,7 +157,7 @@
<field position="2" title="${uiLabelMap.ProductRating}" name="productRating"><text size="10" maxlength="20"/></field>
<field position="1" name="requireAmount" title="${uiLabelMap.ProductRequireAmount}" tooltip="${uiLabelMap.ProductRequireCustomerAmount}">
- <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 position="2" name="amountUomTypeId" title="${uiLabelMap.ProductAmountUomTypeId}">
<drop-down allow-empty="true">
@@ -231,7 +231,7 @@
</field>
<field position="1" name="piecesIncluded" title="${uiLabelMap.ProductPiecesIncluded}"><text size="10" maxlength="20"/></field>
<field position="2" name="inShippingBox" title="${uiLabelMap.ProductShippingBox}">
- <drop-down><option key="${uiLabelMap.CommonN}" description="N"/><option key="${uiLabelMap.CommonY}" description="Y"/></drop-down>
+ <drop-down><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></drop-down>
</field>
<field position="3" name="defaultShipmentBoxTypeId" title="${uiLabelMap.ProductDefaultShipmentBoxTypeId}">
<drop-down allow-empty="true">
@@ -241,21 +241,21 @@
</drop-down>
</field>
<field position="4" name="chargeShipping" title="${uiLabelMap.ProductChargeShipping}">
- <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 position="1" name="returnable" title="${uiLabelMap.ProductReturnable}">
- <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 position="2" name="includeInPromotions" title="${uiLabelMap.ProductIncludePromotions}">
- <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 position="3" name="taxable" title="${uiLabelMap.ProductTaxable}">
- <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 position="4" name="autoCreateKeywords" title="${uiLabelMap.ProductAutoCreateKeywords}">
- <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="contentInfoText" title="${uiLabelMap.ProductContentInfoText}" widget-style="tooltip">
@@ -281,7 +281,7 @@
<display description="[${product.createdByUserLogin}] ${uiLabelMap.CommonOn} ${product.createdDate}" also-hidden="false"/>
</field>
<field name="orderDecimalQuantity" >
- <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>
<sort-order>
<field-group>
@@ -942,8 +942,8 @@
</field>
<field name="canDropShip" title="${uiLabelMap.ProductSupplierCanDropShip}">
<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 use-when="supplierProduct == null" name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
@@ -1005,8 +1005,8 @@
<field name="productId"><hidden value="${productId}"/></field>
<field name="configTypeId">
<drop-down allow-empty="false">
- <option key="${uiLabelMap.ProductStandard}" description="STANDARD"/>
- <option key="${uiLabelMap.ProductQuestion}" description="QUESTION"/>
+ <option key="STANDARD" description="${uiLabelMap.ProductStandard}"/>
+ <option key="QUESTION" description="${uiLabelMap.ProductQuestion}"/>
</drop-down>
</field>
<field name="configItemId" title="${uiLabelMap.ProductConfigItem}">
@@ -1033,8 +1033,8 @@
</field>
<field name="configTypeId">
<drop-down allow-empty="false">
- <option key="${uiLabelMap.ProductStandard}" description="STANDARD"/>
- <option key="${uiLabelMap.ProductQuestion}" description="QUESTION"/>
+ <option key="STANDARD" description="${uiLabelMap.ProductStandard}"/>
+ <option key="QUESTION" description="${uiLabelMap.ProductQuestion}"/>
</drop-down>
</field>
<field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"><display/></field>
@@ -1308,7 +1308,7 @@
<field name="productId"><hidden value="${productId}"/></field>
<field name="costComponentTypePrefix">
<drop-down allow-empty="false">
- <option key="${uiLabelMap.ProductEstimatedCosts}" description="EST_STD"/>
+ <option key="EST_STD" description="${uiLabelMap.ProductEstimatedCosts}"/>
</drop-down>
</field>
<field name="costUomId" title="${uiLabelMap.CommonCurrency}">
@@ -1436,7 +1436,7 @@
<field name="productId"><hidden value="${productId}"/></field>
<field name="costComponentTypePrefix">
<drop-down allow-empty="false">
- <option key="${uiLabelMap.ProductEstimatedCosts}" description="EST_STD"/>
+ <option key="EST_STD" description="${uiLabelMap.ProductEstimatedCosts}"/>
</drop-down>
</field>
<field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
diff --git a/applications/product/widget/catalog/PromoForms.xml b/applications/product/widget/catalog/PromoForms.xml
index 92ed8dc..9308d91 100644
--- a/applications/product/widget/catalog/PromoForms.xml
+++ b/applications/product/widget/catalog/PromoForms.xml
@@ -49,13 +49,13 @@
<field name="promoText" title="${uiLabelMap.ProductPromoText}"><textarea cols="70" rows="5"/></field>
<field name="userEntered" title="${uiLabelMap.ProductPromoUserEntered}">
- <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="showToCustomer" title="${uiLabelMap.ProductPromoShowToCustomer}">
- <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="requireCode" title="${uiLabelMap.ProductPromotionReqCode}">
- <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonN}" description="N"/><option key="${uiLabelMap.CommonY}" description="Y"/></drop-down>
+ <drop-down allow-empty="false" no-current-selected-key="N"><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></drop-down>
</field>
<field name="overrideOrgPartyId"><lookup target-form-name="LookupPartyName"/></field>
@@ -86,10 +86,10 @@
<field use-when="productPromoCode==null&&productPromoCodeId==null" name="productPromoCodeId" tooltip="${uiLabelMap.ProductPromoCodeBlank}"><text/></field>
<field name="userEntered">
- <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="requireEmailOrParty">
- <drop-down allow-empty="false" no-current-selected-key="N"><option key="${uiLabelMap.CommonN}" description="N"/><option key="${uiLabelMap.CommonY}" description="Y"/></drop-down>
+ <drop-down allow-empty="false" no-current-selected-key="N"><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
diff --git a/applications/product/widget/catalog/StoreForms.xml b/applications/product/widget/catalog/StoreForms.xml
index 51987e5..241cc98 100644
--- a/applications/product/widget/catalog/StoreForms.xml
+++ b/applications/product/widget/catalog/StoreForms.xml
@@ -74,44 +74,44 @@
</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 @@
</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 @@
<!--
<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 @@
</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 @@
<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 @@
<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 @@
<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 @@
<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 @@
<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 @@
<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"/>
diff --git a/applications/product/widget/catalog/SubscriptionForms.xml b/applications/product/widget/catalog/SubscriptionForms.xml
index 394f6ba..081def2 100644
--- a/applications/product/widget/catalog/SubscriptionForms.xml
+++ b/applications/product/widget/catalog/SubscriptionForms.xml
@@ -64,8 +64,8 @@
<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 @@
</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 @@
</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 @@
</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">
diff --git a/applications/product/widget/facility/FacilityForms.xml b/applications/product/widget/facility/FacilityForms.xml
index c8ab158..ac76611 100644
--- a/applications/product/widget/facility/FacilityForms.xml
+++ b/applications/product/widget/facility/FacilityForms.xml
@@ -208,9 +208,9 @@
<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 @@
<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>
diff --git a/applications/product/widget/facility/InventoryItemLabelForms.xml b/applications/product/widget/facility/InventoryItemLabelForms.xml
index 71aea56..1397e91 100644
--- a/applications/product/widget/facility/InventoryItemLabelForms.xml
+++ b/applications/product/widget/facility/InventoryItemLabelForms.xml
@@ -31,7 +31,7 @@
</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>
diff --git a/applications/product/widget/facility/ShipmentGatewayConfigForms.xml b/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
index 8146a40..8e97b98 100644
--- a/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
+++ b/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
@@ -82,7 +82,7 @@
</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 @@
</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 @@
</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 @@
</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 @@
</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 @@
</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 @@
</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 @@
</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 @@
</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">
diff --git a/applications/workeffort/minilang/timesheet/TimesheetServices.xml b/applications/workeffort/minilang/timesheet/TimesheetServices.xml
index a57f32d..faa7f4b 100644
--- a/applications/workeffort/minilang/timesheet/TimesheetServices.xml
+++ b/applications/workeffort/minilang/timesheet/TimesheetServices.xml
@@ -23,7 +23,7 @@
<!-- 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 @@
<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"/>
diff --git a/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml b/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
index 9070f6f..df6045b 100644
--- a/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
+++ b/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
@@ -27,7 +27,7 @@
<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 @@
</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 @@
<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 @@
<!-- 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 @@
<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 @@
</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 @@
<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 @@
</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 @@
<!-- 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 @@
<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 @@
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 @@
<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 @@
<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 @@
<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 @@
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 @@
<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 @@
<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 @@
<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 @@
<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 @@
</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 @@
<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 @@
<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 @@
</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 @@
</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 @@
<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 @@
<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"/>
diff --git a/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml b/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
index a9d4c73..f407dee 100644
--- a/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
+++ b/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
@@ -482,21 +482,21 @@
<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 @@
<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>
diff --git a/applications/workeffort/widget/CalendarForms.xml b/applications/workeffort/widget/CalendarForms.xml
index 769d6d7..f018617 100644
--- a/applications/workeffort/widget/CalendarForms.xml
+++ b/applications/workeffort/widget/CalendarForms.xml
@@ -62,9 +62,9 @@
<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>
diff --git a/applications/workeffort/widget/WorkEffortForms.xml b/applications/workeffort/widget/WorkEffortForms.xml
index 9b01c41..55fa690 100644
--- a/applications/workeffort/widget/WorkEffortForms.xml
+++ b/applications/workeffort/widget/WorkEffortForms.xml
@@ -93,15 +93,15 @@
<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 @@
<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>
diff --git a/framework/common/minilang/CommonServices.xml b/framework/common/minilang/CommonServices.xml
index 3f4083a..39f60e3 100644
--- a/framework/common/minilang/CommonServices.xml
+++ b/framework/common/minilang/CommonServices.xml
@@ -30,7 +30,7 @@
<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 @@
<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 @@
<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 @@
</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"/>
diff --git a/framework/common/minilang/PortalPageServices.xml b/framework/common/minilang/PortalPageServices.xml
index 519519c..71ef5d9 100644
--- a/framework/common/minilang/PortalPageServices.xml
+++ b/framework/common/minilang/PortalPageServices.xml
@@ -27,7 +27,7 @@
<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 @@
<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"/>
diff --git a/framework/common/minilang/period/PeriodServices.xml b/framework/common/minilang/period/PeriodServices.xml
index 5974c70..465e472 100644
--- a/framework/common/minilang/period/PeriodServices.xml
+++ b/framework/common/minilang/period/PeriodServices.xml
@@ -27,7 +27,7 @@
</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 @@
</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 @@
</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"/>
diff --git a/framework/common/widget/SecurityForms.xml b/framework/common/widget/SecurityForms.xml
index dd6a026..6f62be7 100644
--- a/framework/common/widget/SecurityForms.xml
+++ b/framework/common/widget/SecurityForms.xml
@@ -71,8 +71,8 @@
<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">
diff --git a/framework/webtools/widget/CacheForms.xml b/framework/webtools/widget/CacheForms.xml
index 686e3a6..c10083d 100644
--- a/framework/webtools/widget/CacheForms.xml
+++ b/framework/webtools/widget/CacheForms.xml
@@ -68,8 +68,8 @@
<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>
diff --git a/framework/webtools/widget/LogScreens.xml b/framework/webtools/widget/LogScreens.xml
index 5c0ff5f..752be27 100644
--- a/framework/webtools/widget/LogScreens.xml
+++ b/framework/webtools/widget/LogScreens.xml
@@ -33,7 +33,7 @@
<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>
diff --git a/framework/webtools/widget/MiscForms.xml b/framework/webtools/widget/MiscForms.xml
index 63bf42b..2924710 100644
--- a/framework/webtools/widget/MiscForms.xml
+++ b/framework/webtools/widget/MiscForms.xml
@@ -34,8 +34,8 @@
<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 @@
</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 @@
<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 @@
</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">
diff --git a/framework/webtools/widget/ServiceForms.xml b/framework/webtools/widget/ServiceForms.xml
index e5355e5..f9bf6ca 100644
--- a/framework/webtools/widget/ServiceForms.xml
+++ b/framework/webtools/widget/ServiceForms.xml
@@ -31,13 +31,13 @@
<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>
diff --git a/specialpurpose/bi/minilang/DimensionServices.xml b/specialpurpose/bi/minilang/DimensionServices.xml
index 5820803..5ebf279 100644
--- a/specialpurpose/bi/minilang/DimensionServices.xml
+++ b/specialpurpose/bi/minilang/DimensionServices.xml
@@ -91,7 +91,7 @@
<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 @@
</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"/>
diff --git a/specialpurpose/bi/minilang/FactServices.xml b/specialpurpose/bi/minilang/FactServices.xml
index 3993573..a3589cf 100644
--- a/specialpurpose/bi/minilang/FactServices.xml
+++ b/specialpurpose/bi/minilang/FactServices.xml
@@ -683,7 +683,7 @@
<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">
diff --git a/specialpurpose/birt/widget/accounting/AccountingForms.xml b/specialpurpose/birt/widget/accounting/AccountingForms.xml
index 0d62daa..920df3b 100644
--- a/specialpurpose/birt/widget/accounting/AccountingForms.xml
+++ b/specialpurpose/birt/widget/accounting/AccountingForms.xml
@@ -24,8 +24,8 @@
<form name="PaymentReport" type="single" target="paymentReportHtml" extends="FindPayments" extends-resource="component://accounting/widget/PaymentForms.xml" target-window="_BLANK">
<field name="contentType" action="document.PaymentReport.action=this.value" event="onchange">
<drop-down>
- <option key="text/html" description="paymentReportHtml"></option>
- <option key="application/pdf" description="paymentReportPdf"></option>
+ <option key="paymentReportHtml" description="text/html"></option>
+ <option key="paymentReportPdf" description="application/pdf"></option>
<!--option key="application/vnd.ms-excel">application/vnd.ms-excel</option>
<option key="application/vnd.ms-word">application/vnd.ms-word</option>
<option key="application/vnd.ms-powerpoint">application/vnd.ms-powerpoint</option-->
diff --git a/specialpurpose/birt/widget/facility/FacilityForms.xml b/specialpurpose/birt/widget/facility/FacilityForms.xml
index 8a8792b..303e902 100644
--- a/specialpurpose/birt/widget/facility/FacilityForms.xml
+++ b/specialpurpose/birt/widget/facility/FacilityForms.xml
@@ -90,11 +90,11 @@
<field name="lastIntMonth" title="${uiLabelMap.BirtFacilityReportLastIntMonth}"><text size="15" default-value="0"></text></field>
<field name="contentType" action="document.ViewFacilityInventoryHistoryReportForm.action=this.value" event="onchange">
<drop-down allow-empty="false" >
- <option key="HTML" description="RenderInventoryReportHtml"/>
- <option key="PDF" description="RenderInventoryReportPDF"/>
+ <option key="RenderInventoryReportHtml" description="HTML"/>
+ <option key="RenderInventoryReportPDF" description="PDF"/>
<!--option key="RenderInventoryReportExcel" description="MS-Excel"/>
- <option key="MS-Word" description="RenderInventoryReportMSWord"/>
- <option key="MS-Powerpoint" description="RenderInventoryReportPPT"/-->
+ <option key="RenderInventoryReportMSWord" description="MS-Word"/>
+ <option key="RenderInventoryReportPPT" description="MS-Powerpoint"/-->
</drop-down>
</field>
<field name="submitButton"><hidden/></field>
diff --git a/specialpurpose/birt/widget/order/OrderForms.xml b/specialpurpose/birt/widget/order/OrderForms.xml
index 1150f0a..3802dc8 100644
--- a/specialpurpose/birt/widget/order/OrderForms.xml
+++ b/specialpurpose/birt/widget/order/OrderForms.xml
@@ -28,16 +28,16 @@
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time type="date"/></field>
<field name="reportBy" title="${uiLabelMap.BirtOrderReportReportBy}">
<drop-down>
- <option key="${uiLabelMap.CommonDays}" description="day"></option>
- <option key="${uiLabelMap.CommonWeeks}" description="week"></option>
- <option key="${uiLabelMap.CommonMonths}" description="month"></option>
+ <option key="day" description="${uiLabelMap.CommonDays}"></option>
+ <option key="week" description="${uiLabelMap.CommonWeeks}"></option>
+ <option key="month" description="${uiLabelMap.CommonMonths}"></option>
</drop-down>
</field>
<field name="exportType" title="${uiLabelMap.BirtOrderReportFormatType}">
<drop-down>
- <option key="PDF" description="pdf"></option>
- <option key="Excel" description="excel"></option>
- <option key="HTML" description="html"></option>
+ <option key="pdf" description="PDF"></option>
+ <option key="excel" description="Excel"></option>
+ <option key="html" description="HTML"></option>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field>
diff --git a/specialpurpose/ebaystore/minilang/EbayServices.xml b/specialpurpose/ebaystore/minilang/EbayServices.xml
index 6b7f8f7..245718e 100644
--- a/specialpurpose/ebaystore/minilang/EbayServices.xml
+++ b/specialpurpose/ebaystore/minilang/EbayServices.xml
@@ -155,7 +155,7 @@
</entity-one>
<if-empty field="ebayProductStoreInventory">
<!-- add new reserved product -->
- <make-value entity-name="EbayProductStoreInventory" value-field="newEbayProductStoreInven"/>
+ <make-value value-field="newEbayProductStoreInven" entity-name="EbayProductStoreInventory"/>
<set field="newEbayProductStoreInven.productStoreId" from-field="parameters.productStoreId"/>
<set field="newEbayProductStoreInven.facilityId" from-field="parameters.facilityId"/>
<set field="newEbayProductStoreInven.productId" from-field="parameters.productId"/>
diff --git a/specialpurpose/ebaystore/servicedef/secas.xml b/specialpurpose/ebaystore/servicedef/secas.xml
index 1c67ac1..8e10af7 100644
--- a/specialpurpose/ebaystore/servicedef/secas.xml
+++ b/specialpurpose/ebaystore/servicedef/secas.xml
@@ -21,22 +21,22 @@
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
<eca service="createEbayProductStorePref" event="commit">
- <condition field-name="enabled" operator="equals" value="Y"/>
- <condition field-name="serviceName" operator="is-not-empty"/>
+ <condition operator="equals" field-name="enabled" value="Y"/>
+ <condition operator="is-not-empty" field-name="serviceName"/>
<action service="startEbayAutoPreference" mode="sync"/>
</eca>
<eca service="updateEbayProductStorePref" event="commit">
- <condition field-name="enabled" operator="equals" value="Y"/>
- <condition field-name="serviceName" operator="is-not-empty"/>
+ <condition operator="equals" field-name="enabled" value="Y"/>
+ <condition operator="is-not-empty" field-name="serviceName"/>
<action service="startEbayAutoPreference" mode="sync"/>
</eca>
<eca service="createEbayProductStorePref" event="commit">
- <condition field-name="enabled" operator="equals" value="N"/>
- <condition field-name="serviceName" operator="is-not-empty"/>
+ <condition operator="equals" field-name="enabled" value="N"/>
+ <condition operator="is-not-empty" field-name="serviceName"/>
<action service="stopEbayAutoPreference" mode="sync"/>
</eca>
<eca service="updateEbayProductStorePref" event="commit">
- <condition field-name="enabled" operator="equals" value="N"/>
+ <condition operator="equals" field-name="enabled" value="N"/>
<action service="stopEbayAutoPreference" mode="sync"/>
</eca>
</service-eca>
diff --git a/specialpurpose/ebaystore/widget/CommonScreens.xml b/specialpurpose/ebaystore/widget/CommonScreens.xml
index 2b10150..99e155a 100644
--- a/specialpurpose/ebaystore/widget/CommonScreens.xml
+++ b/specialpurpose/ebaystore/widget/CommonScreens.xml
@@ -130,7 +130,7 @@
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="EbaySellingManagerTabBar" location="component://ebaystore/widget/EbayStoreMenus.xml"/>
+ <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbaySellingManagerTabBar"/>
<decorator-section-include name="body"/>
</widgets>
</section>
@@ -149,7 +149,7 @@
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="EbayAccountTabBar" location="component://ebaystore/widget/EbayStoreMenus.xml"/>
+ <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayAccountTabBar"/>
<decorator-section-include name="body"/>
</widgets>
</section>
diff --git a/specialpurpose/ebaystore/widget/EbayAccountForms.xml b/specialpurpose/ebaystore/widget/EbayAccountForms.xml
index cbc92cf..e354378 100644
--- a/specialpurpose/ebaystore/widget/EbayAccountForms.xml
+++ b/specialpurpose/ebaystore/widget/EbayAccountForms.xml
@@ -25,8 +25,8 @@
<field name="statusId"><hidden value="PARTY_ENABLED"/></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="currentPassword"><password/></field>
diff --git a/specialpurpose/ebaystore/widget/EbayAccountScreens.xml b/specialpurpose/ebaystore/widget/EbayAccountScreens.xml
index 0078b59..b7a4b35 100644
--- a/specialpurpose/ebaystore/widget/EbayAccountScreens.xml
+++ b/specialpurpose/ebaystore/widget/EbayAccountScreens.xml
@@ -56,7 +56,7 @@
</condition>
<widgets>
<screenlet title="${uiLabelMap.EbayFeedback}">
- <include-menu name="EbayFeedbackTabBar" location="component://ebaystore/widget/EbayStoreMenus.xml"/>
+ <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayFeedbackTabBar"/>
<decorator-section-include name="body"/>
</screenlet>
</widgets>
@@ -116,7 +116,7 @@
<decorator-section name="body">
<screenlet>
<screenlet title="${uiLabelMap.EbayLeaveFeedback}">
- <include-menu name="EbayFeedbackSubTabBar" location="component://ebaystore/widget/EbayStoreMenus.xml"/>
+ <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayFeedbackSubTabBar"/>
<platform-specific>
<html><html-template location="component://ebaystore/template/feedback/LeaveFeedback.ftl"/></html>
</platform-specific>
@@ -144,7 +144,7 @@
</condition>
<widgets>
<screenlet title="${uiLabelMap.EbayFeedback}">
- <include-menu name="EbayFeedbackTabBar" location="component://ebaystore/widget/EbayStoreMenus.xml"/>
+ <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayFeedbackTabBar"/>
<decorator-section-include name="body"/>
</screenlet>
</widgets>
@@ -204,7 +204,7 @@
<decorator-section name="body">
<screenlet>
<screenlet title="${uiLabelMap.EbayLeaveFeedback}">
- <include-menu name="EbayFeedbackSubTabBar" location="component://ebaystore/widget/EbayStoreMenus.xml"/>
+ <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayFeedbackSubTabBar"/>
<platform-specific>
<html><html-template location="component://ebaystore/template/feedback/LeaveFeedback.ftl"/></html>
</platform-specific>
diff --git a/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml b/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
index 308a6d1..e8d3df3 100644
--- a/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
+++ b/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
@@ -107,21 +107,21 @@
<field name="transaction"><text disabled="true" default-value="${parameters.transactionId}"/></field>
<field name="disputeReasonCodeType">
<radio no-current-selected-key="TransactionMutuallyCanceled">
- <option key="The buyer has not paid for the item" description="BUYER_HAS_NOT_PAID"/>
- <option key="We have both agreed not to complete the transaction" description="TRANSACTION_MUTUALLY_CANCELED"/>
+ <option key="BUYER_HAS_NOT_PAID" description="The buyer has not paid for the item"/>
+ <option key="TRANSACTION_MUTUALLY_CANCELED" description="We have both agreed not to complete the transaction"/>
</radio>
</field>
<field name="disputeExplanationCodeType">
<drop-down>
<option key="" description="- - Select One - -"/>
- <option key="Buyer purchased item by mistake or changed mind" description="BUYER_PURCHASING_MISTAKE"/>
- <option key="Buyer is returning item for a refund" description="BUYER_RETURNED_ITEM_FOR_REFUND"/>
- <option key="Buyer and I disagreed over terms" description="UNABLE_TO_RESOLVE_TERMS"/>
- <option key="Buyer is unresponsive" description="BUYER_HAS_NOT_RESPONDED"/>
- <option key="Buyer's payment hasn't been received or hasn't cleared" description="PAYMENT_METHOD_NOT_SUPPORTED"/>
- <option key="Buyer requested shipment to an unconfirmed address" description="SHIPPING_ADDRESS_NOT_CONFIRMED"/>
- <option key="Seller doesn't ship to the country requested by buyer" description="SHIP_COUNTRY_NOT_SUPPORTED"/>
- <option key="Other reason" description="OTHER_EXPLANATION"/>
+ <option key="BUYER_PURCHASING_MISTAKE" description="Buyer purchased item by mistake or changed mind"/>
+ <option key="BUYER_RETURNED_ITEM_FOR_REFUND" description="Buyer is returning item for a refund"/>
+ <option key="UNABLE_TO_RESOLVE_TERMS" description="Buyer and I disagreed over terms"/>
+ <option key="BUYER_HAS_NOT_RESPONDED" description="Buyer is unresponsive"/>
+ <option key="PAYMENT_METHOD_NOT_SUPPORTED" description="Buyer's payment hasn't been received or hasn't cleared"/>
+ <option key="SHIPPING_ADDRESS_NOT_CONFIRMED" description="Buyer requested shipment to an unconfirmed address"/>
+ <option key="SHIP_COUNTRY_NOT_SUPPORTED" description="Seller doesn't ship to the country requested by buyer"/>
+ <option key="OTHER_EXPLANATION" description="Other reason"/>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" position="1"><submit/></field>
@@ -135,10 +135,10 @@
<auto-fields-service service-name="addEbaySecondChanceOffer"/>
<field name="duration">
<drop-down>
- <option key="a day" description="DAYS_1"/>
- <option key="3 days" description="DAYS_3"/>
- <option key="5 days" description="DAYS_5"/>
- <option key="7 days" description="DAYS_7"/>
+ <option key="DAYS_1" description="a day"/>
+ <option key="DAYS_3" description="3 days"/>
+ <option key="DAYS_5" description="5 days"/>
+ <option key="DAYS_7" description="7 days"/>
</drop-down>
</field>
<field name="recipientBidderUserId">
@@ -206,8 +206,8 @@
<field name="quantity" required-field="true"><text default-value="${ebayProductStoreInventory.quantityReserved}"></text></field>
<field name="actionType">
<drop-down allow-empty="false">
- <option key="Add" description="ADD"/>
- <option key="Remove" description="REMOVE"/>
+ <option key="ADD" description="Add"/>
+ <option key="REMOVE" description="Remove"/>
</drop-down>
</field>
<field name="submitButton"><submit button-type="button"/></field>
@@ -273,8 +273,8 @@
<field name="isAutoPositiveFeedback" position="1" title="${uiLabelMap.EbayIsAutoPositiveFeedback}"><check></check></field>
<field name="feedbackEventCode" position="2" title="${uiLabelMap.EbaySituations}">
<radio>
- <option key="${uiLabelMap.EbayTxtPaymentReceive}" description="PAYMENT_RECEIVED"/>
- <option key="${uiLabelMap.EbayTxtPaymentReceiveAndPositive}" description="POSITIVE_FEEDBACK_RECEIVED"/>
+ <option key="PAYMENT_RECEIVED" description="${uiLabelMap.EbayTxtPaymentReceive}"/>
+ <option key="POSITIVE_FEEDBACK_RECEIVED" description="${uiLabelMap.EbayTxtPaymentReceiveAndPositive}"/>
</radio>
</field>
<field name="headerLabel" title=" " encode-output="false"><display type="text" description="<br/><b>Your stored positive feedback comments.</b>"></display></field>
@@ -396,55 +396,55 @@
<field name="emailDetail" title=" " widget-area-style="h2"><display description="${uiLabelMap.EbayEmailDetail}"/></field>
<field name="autoText" action="doSelect(this.id)" event="onchange" >
<drop-down allow-empty="true">
- <option key="Buyer User ID" description="$\{buyerUserId}"/>
- <option key="Buyer name" description="$\{buyerName}"/>
- <option key="Buyer First name" description="$\{buyerFirstName}"/>
- <option key="Buyer Last name" description="$\{buyerLastName}"/>
- <option key="Buyer street 1" description="$\{buyerStreet1}"/>
- <option key="Buyer street 2" description="$\{buyerStreet2}"/>
- <option key="Buyer City" description="$\{buyerCity}"/>
- <option key="Buyer State" description="$\{buyerState}"/>
- <option key="Buyer zip code" description="$\{buyerZipCode}"/>
- <option key="Buyer Country" description="$\{buyerCountry}"/>
- <option key="Item Number" description="$\{itemId}"/>
- <option key="Item Title" description="$\{itemTitle}"/>
- <option key="Link to listing" description="$\{linkToListing}"/>
- <option key="Quantity" description="$\{Quantity}"/>
- <option key="Favorites list" description="$\{favoriteslist}"/>
- <option key="Feedback link" description="$\{feedbackLink}"/>
- <option key="Closing Date/Time" description="$\{closingDateTime}"/>
- <option key="Total price" description="$\{totalPrice}"/>
- <option key="Closing price" description="$\{closingPrice}"/>
- <option key="S&H fee" description="$\{SHFee}"/>
- <option key="Insurance cost" description="$\{insuranceCost}"/>
- <option key="Insurance option" description="$\{insuranceOption}"/>
- <option key="Tax" description="$\{tax}"/>
- <option key="Tax State" description="$\{taxState}"/>
- <option key="Payment accepted" description="$\{paymentAcceped}"/>
- <option key="Payment instructions" description="$\{paymentInstructions}"/>
- <option key="Seller User ID" description="$\{sellerUserId}"/>
- <option key="Seller name" description="$\{sellerName}"/>
- <option key="Seller First name" description="$\{sellerFirstName}"/>
- <option key="Seller Last name" description="$\{sellerLastName}"/>
- <option key="Seller street 1" description="$\{sellerStreet1}"/>
- <option key="Seller street 2" description="$\{sellerStreet2}"/>
- <option key="Seller city" description="$\{sellerCity}"/>
- <option key="Seller state" description="$\{sellerState}"/>
- <option key="Seller zip code" description="$\{sellerZipCode}"/>
- <option key="Seller country" description="$\{sellerCountry}"/>
- <option key="Seller email" description="$\{sellerEmail}"/>
- <option key="Seller phone" description="$\{sellerPhone}"/>
- <option key="Sales record number" description="$\{salesRecordNumber}"/>
- <option key="Shipped date" description="$\{shippedDate}"/>
- <option key="Transaction table" description="$\{transactionTable}"/>
- <option key="Checkout link" description="$\{checkoutLink}"/>
- <option key="Shipping Calculator" description="$\{shippingCalculator}"/>
- <option key="Track shipment link" description="$\{trackShipmentLink}"/>
- <option key="Shipping Options" description="$\{shippingOptions}"/>
- <option key="Notes to buyer" description="$\{notesToBuyer}"/>
- <option key="Discounts or Charges" description="$\{DiscountsOrCharges}"/>
- <option key="Refund Amount" description="$\{refundAmount}"/>
- <option key="Variation details" description="$\{variationDetails}"/>
+ <option key="$\{buyerUserId}" description="Buyer User ID"/>
+ <option key="$\{buyerName}" description="Buyer name"/>
+ <option key="$\{buyerFirstName}" description="Buyer First name"/>
+ <option key="$\{buyerLastName}" description="Buyer Last name"/>
+ <option key="$\{buyerStreet1}" description="Buyer street 1"/>
+ <option key="$\{buyerStreet2}" description="Buyer street 2"/>
+ <option key="$\{buyerCity}" description="Buyer City"/>
+ <option key="$\{buyerState}" description="Buyer State"/>
+ <option key="$\{buyerZipCode}" description="Buyer zip code"/>
+ <option key="$\{buyerCountry}" description="Buyer Country"/>
+ <option key="$\{itemId}" description="Item Number"/>
+ <option key="$\{itemTitle}" description="Item Title"/>
+ <option key="$\{linkToListing}" description="Link to listing"/>
+ <option key="$\{Quantity}" description="Quantity"/>
+ <option key="$\{favoriteslist}" description="Favorites list"/>
+ <option key="$\{feedbackLink}" description="Feedback link"/>
+ <option key="$\{closingDateTime}" description="Closing Date/Time"/>
+ <option key="$\{totalPrice}" description="Total price"/>
+ <option key="$\{closingPrice}" description="Closing price"/>
+ <option key="$\{SHFee}" description="S&H fee"/>
+ <option key="$\{insuranceCost}" description="Insurance cost"/>
+ <option key="$\{insuranceOption}" description="Insurance option"/>
+ <option key="$\{tax}" description="Tax"/>
+ <option key="$\{taxState}" description="Tax State"/>
+ <option key="$\{paymentAcceped}" description="Payment accepted"/>
+ <option key="$\{paymentInstructions}" description="Payment instructions"/>
+ <option key="$\{sellerUserId}" description="Seller User ID"/>
+ <option key="$\{sellerName}" description="Seller name"/>
+ <option key="$\{sellerFirstName}" description="Seller First name"/>
+ <option key="$\{sellerLastName}" description="Seller Last name"/>
+ <option key="$\{sellerStreet1}" description="Seller street 1"/>
+ <option key="$\{sellerStreet2}" description="Seller street 2"/>
+ <option key="$\{sellerCity}" description="Seller city"/>
+ <option key="$\{sellerState}" description="Seller state"/>
+ <option key="$\{sellerZipCode}" description="Seller zip code"/>
+ <option key="$\{sellerCountry}" description="Seller country"/>
+ <option key="$\{sellerEmail}" description="Seller email"/>
+ <option key="$\{sellerPhone}" description="Seller phone"/>
+ <option key="$\{salesRecordNumber}" description="Sales record number"/>
+ <option key="$\{shippedDate}" description="Shipped date"/>
+ <option key="$\{transactionTable}" description="Transaction table"/>
+ <option key="$\{checkoutLink}" description="Checkout link"/>
+ <option key="$\{shippingCalculator}" description="Shipping Calculator"/>
+ <option key="$\{trackShipmentLink}" description="Track shipment link"/>
+ <option key="$\{shippingOptions}" description="Shipping Options"/>
+ <option key="$\{notesToBuyer}" description="Notes to buyer"/>
+ <option key="$\{DiscountsOrCharges}" description="Discounts or Charges"/>
+ <option key="$\{refundAmount}" description="Refund Amount"/>
+ <option key="$\{variationDetails}" description="Variation details"/>
</drop-down>
</field>
<field name="subject"><text/></field>
@@ -507,9 +507,9 @@
<field name="listingType" action="document.ItemOption.submit()" event="onchange">
<drop-down>
<option key="" description="All"/>
- <option key="Auction Only" description="AUCTION"/>
- <option key="Fixed Price Item Only" description="FIXED_PRICE_ITEM"/>
- <option key="Stores Inventory Only" description="STORES_FIXED_PRICE"/>
+ <option key="AUCTION" description="Auction Only"/>
+ <option key="FIXED_PRICE_ITEM" description="Fixed Price Item Only"/>
+ <option key="STORES_FIXED_PRICE" description="Stores Inventory Only"/>
</drop-down>
</field>
<field name="submitButton"><submit/></field>
@@ -545,8 +545,8 @@
<field name="orderTypeId" title="Order Type">
<drop-down>
<option key="" description="Any Order Type"/>
- <option key="Purchase Order" description="PURCHASE_ORDER"/>
- <option key="Sales Order" description="SALES_ORDER"/>
+ <option key="PURCHASE_ORDER" description="Purchase Order"/>
+ <option key="SALES_ORDER" description="Sales Order"/>
</drop-down>
</field>
<field name="statusId" title="Status">
@@ -690,11 +690,11 @@
<field name="contactStatus"><hidden value="${contactStatus}"/></field>
<field name="contactSetting" title="Contact Status Setting">
<drop-down >
- <option key="_Select_" description="_NA_"/>
- <option key="Not Contact" description="NOT_CONTACT"/>
- <option key="Contacting" description="CONTACTING"/>
- <option key="Accept Offer" description="ACCEPT"/>
- <option key="Decline Offer" description="DECLINE"/>
+ <option key="_NA_" description="_Select_"/>
+ <option key="NOT_CONTACT" description="Not Contact"/>
+ <option key="CONTACTING" description="Contacting"/>
+ <option key="ACCEPT" description="Accept Offer"/>
+ <option key="DECLINE" description="Decline Offer"/>
</drop-down>
</field>
<field name="updateContactStatus"><submit button-type="button"/></field>
diff --git a/specialpurpose/ebaystore/widget/EbayStoreForms.xml b/specialpurpose/ebaystore/widget/EbayStoreForms.xml
index 6b85dcd..fa1845a 100644
--- a/specialpurpose/ebaystore/widget/EbayStoreForms.xml
+++ b/specialpurpose/ebaystore/widget/EbayStoreForms.xml
@@ -111,8 +111,8 @@
<field name="statusId"><hidden value="PARTY_ENABLED"/></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="currentPassword"><password/></field>
diff --git a/specialpurpose/ecommerce/widget/ForumForms.xml b/specialpurpose/ecommerce/widget/ForumForms.xml
index 9ecadf5..b06bf94 100644
--- a/specialpurpose/ecommerce/widget/ForumForms.xml
+++ b/specialpurpose/ecommerce/widget/ForumForms.xml
@@ -45,9 +45,9 @@
</field>
<field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" >
<drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY">
- <option key="${uiLabelMap.EcommerceTextOnly}" description="TEMPLATE_TEXT_ONLY"/>
- <option key="${uiLabelMap.EcommerceImageCenteredAbove}" description="TEMPLATE_IMAGE_CENTERED"/>
- <option key="${uiLabelMap.EcommerceImageLeft}" description="TEMPLATE_IMAGE_LEFT"/>
+ <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}"/>
+ <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}"/>
+ <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.EcommerceImageLeft}"/>
</drop-down>
</field>
<field name="ftlContentId" position="1">
@@ -74,9 +74,9 @@
<field name="textData" title="${uiLabelMap.ProductText}" id-name="textData"><textarea rows="20" cols="60"/></field>
<field name="privilegeEnumId" >
<drop-down allow-empty="false" no-current-selected-key="SUBSCRIBE_BRONZE">
- <option key="${uiLabelMap.EcommerceBronze}" description="SUBSCRIBE_BRONZE"/>
- <option key="${uiLabelMap.EcommerceSilver}" description="SUBSCRIBE_SILVER"/>
- <option key="${uiLabelMap.EcommerceGold}" description="SUBSCRIBE_GOLD"/>
+ <option key="SUBSCRIBE_BRONZE" description="${uiLabelMap.EcommerceBronze}"/>
+ <option key="SUBSCRIBE_SILVER" description="${uiLabelMap.EcommerceSilver}"/>
+ <option key="SUBSCRIBE_GOLD" description="${uiLabelMap.EcommerceGold}"/>
</drop-down>
</field>
<field name="section" >
@@ -227,9 +227,9 @@
</field>
<field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" >
<drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY">
- <option key="${uiLabelMap.EcommerceTextOnly}" description="TEMPLATE_TEXT_ONLY"/>
- <option key="${uiLabelMap.EcommerceImageCenteredAbove}" description="TEMPLATE_IMAGE_CENTERED"/>
- <option key="${uiLabelMap.EcommerceImageLeft}" description="TEMPLATE_IMAGE_LEFT"/>
+ <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}"/>
+ <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}"/>
+ <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.EcommerceImageLeft}"/>
</drop-down>
</field>
<field name="ftlContentId" position="1">
@@ -339,11 +339,11 @@
</field>
<field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}">
<drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY">
- <option key="${uiLabelMap.EcommerceTextOnly}" description="TEMPLATE_TEXT_ONLY"/>
- <option key="${uiLabelMap.EcommerceImageCenteredAbove}" description="TEMPLATE_IMAGE_CENTERED"/>
- <option key="${uiLabelMap.EcommerceImageCenteredAboveFile}" description="TEMPLATE_IMAGE_CENTERED_FILE"/>
- <option key="${uiLabelMap.EcommerceImageLeft}" description="TEMPLATE_IMAGE_LEFT"/>
- <option key="${uiLabelMap.EcommerceNestedContent}" description="TEMPLATE_COMPOSITE"/>
+ <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}"/>
+ <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}"/>
+ <option key="TEMPLATE_IMAGE_CENTERED_FILE" description="${uiLabelMap.EcommerceImageCenteredAboveFile}"/>
+ <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.EcommerceImageLeft}"/>
+ <option key="TEMPLATE_COMPOSITE" description="${uiLabelMap.EcommerceNestedContent}"/>
</drop-down>
</field>
<field name="ownerContentId"><lookup target-form-name="LookupContent"/></field>
@@ -459,9 +459,9 @@
</field>
<field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" >
<drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY">
- <option key="${uiLabelMap.EcommerceTextOnly}" description="TEMPLATE_TEXT_ONLY"/>
- <option key="${uiLabelMap.EcommerceImageCenteredAbove}" description="TEMPLATE_IMAGE_CENTERED"/>
- <option key="${uiLabelMap.EcommerceImageLeft}" description="TEMPLATE_IMAGE_LEFT"/>
+ <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}"/>
+ <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}"/>
+ <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.EcommerceImageLeft}"/>
</drop-down>
</field>
<field name="contentId" position="1">
diff --git a/specialpurpose/ecommerce/widget/blog/BlogForms.xml b/specialpurpose/ecommerce/widget/blog/BlogForms.xml
index 302c02b..4ea0a59 100644
--- a/specialpurpose/ecommerce/widget/blog/BlogForms.xml
+++ b/specialpurpose/ecommerce/widget/blog/BlogForms.xml
@@ -23,8 +23,8 @@
default-title-style="tableheadtext" default-widget-style="inputBox">
<field name="caContentIdTo" title="${uiLabelMap.ContentPublishToContent}">
<drop-down>
- <option key="${uiLabelMap.ContentBlogs}" description="OFBIZBLOGROOT"/>
- <option key="${uiLabelMap.ContentForums}" description="OFBIZFORUMROOT"/>
+ <option key="OFBIZBLOGROOT" description="${uiLabelMap.ContentBlogs}"/>
+ <option key="OFBIZFORUMROOT" description="${uiLabelMap.ContentForums}"/>
</drop-down>
</field>
<field name="caMapKey">
@@ -100,8 +100,8 @@
</field>
<field name="statusId">
<radio no-current-selected-key="CTNT_INITIAL_DRAFT">
- <option key="${uiLabelMap.ContentBlogPost}" description="CTNT_PUBLISHED"/>
- <option key="${uiLabelMap.ContentBlogPreview}" description="CTNT_INITIAL_DRAFT"/>
+ <option key="CTNT_PUBLISHED" description="${uiLabelMap.ContentBlogPost}"/>
+ <option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.ContentBlogPreview}"/>
</radio>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit">
@@ -167,8 +167,8 @@
</field>
<field name="statusId">
<radio no-current-selected-key="CTNT_INITIAL_DRAFT">
- <option key="${uiLabelMap.ContentBlogPost}" description="CTNT_PUBLISHED"/>
- <option key="${uiLabelMap.ContentBlogPreview}" description="CTNT_INITIAL_DRAFT"/>
+ <option key="CTNT_PUBLISHED" description="${uiLabelMap.ContentBlogPost}"/>
+ <option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.ContentBlogPreview}"/>
</radio>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit">
diff --git a/specialpurpose/example/widget/example/ExampleForms.xml b/specialpurpose/example/widget/example/ExampleForms.xml
index 76b7af0..d911820 100644
--- a/specialpurpose/example/widget/example/ExampleForms.xml
+++ b/specialpurpose/example/widget/example/ExampleForms.xml
@@ -206,7 +206,7 @@
<field name="longDescription" title="${uiLabelMap.ExampleLongDescription}"/>
<field name="anotherText">
<drop-down allow-empty="true">
- <option key="${uiLabelMap.ExampleExplicitOption}" description="Explicit Option"/>
+ <option key="Explicit Option" description="${uiLabelMap.ExampleExplicitOption}"/>
<entity-options entity-name="ExampleType" key-field-name="exampleTypeId">
<entity-order-by field-name="description"/>
</entity-options>
@@ -333,56 +333,56 @@
<field name="userPassword" title="${uiLabelMap.PDFUserPassword}"><text size="15" maxlength="250"/></field>
<field name="allowPrint" title="${uiLabelMap.PDFAllowPrint}">
<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="allowCopyContent" title="${uiLabelMap.PDFAllowCopyContent}">
<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="allowEditContent" title="${uiLabelMap.PDFAllowEditContent}">
<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="allowEditAnnotations" title="${uiLabelMap.PDFAllowEditAnnotations}">
<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="allowFillInForms" title="${uiLabelMap.PDFAllowFillInForms}">
<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="allowAccessContent" title="${uiLabelMap.PDFAllowAccessContent}">
<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="allowAssembleDocument" title="${uiLabelMap.PDFAllowAssembleDocument}">
<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="allowPrintHq" title="${uiLabelMap.PDFAllowPrintHq}">
<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="encrypt-metadata" title="${uiLabelMap.PDFEncryptMetadata}">
<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="encryption-length" title="${uiLabelMap.PDFEncryptionLength}"><text size="15"/></field>
diff --git a/specialpurpose/example/widget/example/FormWidgetExampleForms.xml b/specialpurpose/example/widget/example/FormWidgetExampleForms.xml
index 673aca1..fb45953 100644
--- a/specialpurpose/example/widget/example/FormWidgetExampleForms.xml
+++ b/specialpurpose/example/widget/example/FormWidgetExampleForms.xml
@@ -137,8 +137,8 @@
title="${uiLabelMap.ExampleDropDownField1Title}"
tooltip="${uiLabelMap.ExampleDropDownField1Tooltip}" tooltip-style="button-text">
<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>
<!-- ***************** -->
@@ -148,8 +148,8 @@
title="${uiLabelMap.ExampleDropDownField2Title}"
tooltip="${uiLabelMap.ExampleDropDownField2Tooltip}" tooltip-style="button-text">
<drop-down allow-empty="false"> <!-- allow-empty="false" is also the default value, so you can also not specify this attribute here -->
- <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>
<!-- ***************** -->
@@ -159,8 +159,8 @@
title="${uiLabelMap.ExampleDropDownField5Title}"
tooltip="${uiLabelMap.ExampleDropDownField5Tooltip}" tooltip-style="button-text">
<drop-down 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>
<!-- ***************** -->
@@ -172,8 +172,8 @@
action="return showErrorAlert('${uiLabelMap.CommonErrorMessage2}','${uiLabelMap.YouChangedTheSelectBoxValue}');"
tooltip="${uiLabelMap.ExampleDropDownField8Tooltip}" tooltip-style="button-text">
<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>
@@ -253,10 +253,10 @@
<field name="otherValue" title="${uiLabelMap.ExampleSpecifyOtherDropdown}"
tooltip="${uiLabelMap.ExampleSpecifyOtherTooltip}" tooltip-style="button-text" >
<drop-down other-field-size="15">
- <option key="Option A" description="A" />
- <option key="Option B" description="B" />
- <option key="Option C" description="C" />
- <option key="specify other" description="_OTHER_" />
+ <option key="A" description="Option A" />
+ <option key="B" description="Option B" />
+ <option key="C" description="Option C" />
+ <option key="_OTHER_" description="specify other" />
</drop-down>
</field>
<!-- ****************************** -->
diff --git a/specialpurpose/lucene/webapp/content/WEB-INF/controller.xml b/specialpurpose/lucene/webapp/content/WEB-INF/controller.xml
index d2354ba..74a5890 100644
--- a/specialpurpose/lucene/webapp/content/WEB-INF/controller.xml
+++ b/specialpurpose/lucene/webapp/content/WEB-INF/controller.xml
@@ -33,7 +33,7 @@
<request-map uri="AdminIndex"><security https="true" auth="true"/><response name="success" type="view" value="AdminIndex"/></request-map>
<request-map uri="indexContentTree">
<security https="true" auth="true"/>
- <event type="java" invoke="indexContentTree" path="org.apache.ofbiz.content.search.SearchEvents"/>
+ <event invoke="indexContentTree" path="org.apache.ofbiz.content.search.SearchEvents" type="java"/>
<response name="success" type="view" value="AdminIndex"/>
<response name="error" type="view" value="AdminIndex"/>
</request-map>
diff --git a/specialpurpose/projectmgr/minilang/ProjectServices.xml b/specialpurpose/projectmgr/minilang/ProjectServices.xml
index 6fbb204..83ed05a 100644
--- a/specialpurpose/projectmgr/minilang/ProjectServices.xml
+++ b/specialpurpose/projectmgr/minilang/ProjectServices.xml
@@ -148,7 +148,7 @@
</or>
</condition>
<then>
- <make-value entity-name="WorkEffortPartyAssignment" value-field="workEffortPartyAssignment"/>
+ <make-value value-field="workEffortPartyAssignment" entity-name="WorkEffortPartyAssignment"/>
<set field="workEffortPartyAssignment.workEffortId" from-field="parameters.workEffortId"/>
<set field="workEffortPartyAssignment.partyId" from-field="updProjectRole.newPartyId"/>
<set field="workEffortPartyAssignment.roleTypeId" from-field="updProjectRole.roleTypeId"/>
@@ -236,7 +236,7 @@
<now-timestamp field="workEffortPartyAssignment.thruDate"/>
<store-value value-field="workEffortPartyAssignment"/>
<!-- create a new one -->
- <make-value entity-name="WorkEffortPartyAssignment" value-field="newAssign"/>
+ <make-value value-field="newAssign" entity-name="WorkEffortPartyAssignment"/>
<set field="newAssign.workEffortId" from-field="parameters.workEffortId"/>
<set field="newAssign.partyId" from-field="parameters.newPartyId"/>
<set field="newAssign.roleTypeId" from-field="parameters.newRoleTypeId"/>
diff --git a/specialpurpose/projectmgr/widget/CommonScreens.xml b/specialpurpose/projectmgr/widget/CommonScreens.xml
index 1a6b180..283138b 100644
--- a/specialpurpose/projectmgr/widget/CommonScreens.xml
+++ b/specialpurpose/projectmgr/widget/CommonScreens.xml
@@ -352,7 +352,7 @@
<section>
<condition><not><if-empty field="partyId"/></not></condition>
<widgets>
- <include-menu name="ResourceTabBar" location="component://projectmgr/widget/ProjectMenus.xml"/>
+ <include-menu location="component://projectmgr/widget/ProjectMenus.xml" name="ResourceTabBar"/>
<container>
<section>
<widgets>
diff --git a/specialpurpose/projectmgr/widget/forms/ProjectForms.xml b/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
index 874ca87..fe15ded 100644
--- a/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
+++ b/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
@@ -65,15 +65,15 @@
</field>
<field name="priority" title="${uiLabelMap.CommonPriority}">
<drop-down allow-empty="true" no-current-selected-key="${priority}">
- <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" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}">
@@ -285,15 +285,15 @@
<field name="description" title="${uiLabelMap.CommonDescription}"><text size="15"/></field>
<field name="priority" title="${uiLabelMap.CommonPriority}" 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="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><date-time/></field>
@@ -338,15 +338,15 @@
<field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
<field name="priority" title="${uiLabelMap.CommonPriority}">
<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" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><date-time type="date"/></field>
@@ -381,15 +381,15 @@
<field name="description" title="${uiLabelMap.CommonDescription}"><text size="15"/></field>
<field name="priority" title="${uiLabelMap.CommonPriority}" 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="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
@@ -842,8 +842,8 @@
<field name="invoiceId"><hidden/></field>
<field name="reCreate" position="1" title="${uiLabelMap.ProjectMgrRecreateInvoice}: ${invoiceId}" use-when="context.get("invoiceId")!=null">
<drop-down no-current-selected-key="N">
- <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.PageTitleAddProjectTimeToNewInvoice}" widget-style="smallSubmit"><submit button-type="button"/></field>
diff --git a/specialpurpose/projectmgr/widget/forms/TaskForms.xml b/specialpurpose/projectmgr/widget/forms/TaskForms.xml
index 42f24a0..9d947c7 100644
--- a/specialpurpose/projectmgr/widget/forms/TaskForms.xml
+++ b/specialpurpose/projectmgr/widget/forms/TaskForms.xml
@@ -85,21 +85,21 @@
<field name="currentStatusId" use-when="task==null||task==void"><hidden value="PTS_CREATED"/></field>
<field name="priority" title="${uiLabelMap.CommonPriority}">
<drop-down allow-empty="true" current="selected">
- <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="workEffortTypeId" title="${uiLabelMap.CommonType}">
<drop-down allow-empty="false" current="selected">
- <option key="${uiLabelMap.FormFieldTitle_task}" description="TASK"/>
- <option key="${uiLabelMap.FormFieldTitle_milestone}" description="MILESTONE"/>
+ <option key="TASK" description="${uiLabelMap.FormFieldTitle_task}"/>
+ <option key="MILESTONE" description="${uiLabelMap.FormFieldTitle_milestone}"/>
</drop-down>
</field>
<field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonMax250Chars}"><textarea/></field>
@@ -717,15 +717,15 @@
</field>
<field name="taskPriority" parameter-name="priority" title="${uiLabelMap.CommonPriority}">
<drop-down allow-empty="true" current="selected">
- <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="taskScopeEnumId" parameter-name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}">
diff --git a/specialpurpose/scrum/minilang/ScrumEvents.xml b/specialpurpose/scrum/minilang/ScrumEvents.xml
index 6b915ca..950fba3 100644
--- a/specialpurpose/scrum/minilang/ScrumEvents.xml
+++ b/specialpurpose/scrum/minilang/ScrumEvents.xml
@@ -460,7 +460,7 @@
<field-to-request field="workEffortId" request-name="projectId"/>
<log level="info" message="Creating new project, projectId=${workEffortId}"/>
<!-- Create workeffort associate with product -->
- <make-value entity-name="WorkEffortGoodStandard" value-field="goodStandardMap"/>
+ <make-value value-field="goodStandardMap" entity-name="WorkEffortGoodStandard"/>
<set field="goodStandardMap.workEffortId" from-field="workEffortId"/>
<set field="goodStandardMap.productId" from-field="parameters.productId"/>
<set field="goodStandardMap.workEffortGoodStdTypeId" value="SCRUM_PRO_WORKEFF"/>
@@ -469,7 +469,7 @@
<create-value value-field="goodStandardMap"/>
<!-- Create project billed options -->
<if-not-empty field="parameters.billed">
- <make-value entity-name="WorkEffortAttribute" value-field="workEffortAttMap"/>
+ <make-value value-field="workEffortAttMap" entity-name="WorkEffortAttribute"/>
<set field="workEffortAttMap.workEffortId" from-field="workEffortId"/>
<set field="workEffortAttMap.attrName" value="PROJECT_BILLED"/>
<set field="workEffortAttMap.attrValue" from-field="parameters.billed"/>
@@ -530,7 +530,7 @@
<remove-list list="workEffGSDList"/>
</if-not-empty>
<!-- create old workeffort associate with product -->
- <make-value entity-name="WorkEffortGoodStandard" value-field="goodStandardMap"/>
+ <make-value value-field="goodStandardMap" entity-name="WorkEffortGoodStandard"/>
<set field="goodStandardMap.workEffortId" from-field="parameters.workEffortId"/>
<set field="goodStandardMap.productId" from-field="parameters.productId"/>
<set field="goodStandardMap.workEffortGoodStdTypeId" value="SCRUM_PRO_WORKEFF"/>
@@ -546,7 +546,7 @@
<set field="workEffortAttMap.attrValue" from-field="parameters.billed"/>
<store-value value-field="workEffortAttMap"/>
<else>
- <make-value entity-name="WorkEffortAttribute" value-field="workEffortAttMap"/>
+ <make-value value-field="workEffortAttMap" entity-name="WorkEffortAttribute"/>
<set field="workEffortAttMap.workEffortId" from-field="parameters.workEffortId"/>
<set field="workEffortAttMap.attrName" value="PROJECT_BILLED"/>
<set field="workEffortAttMap.attrValue" from-field="parameters.billed"/>
@@ -596,7 +596,7 @@
<remove-by-and entity-name="CustRequestItemNote" map="custRequestItemCtx"/>
<remove-by-and entity-name="CustRequestItemWorkEffort" map="custRequestItemCtx"/>
- <make-value entity-name="CustRequestItem" value-field="deleteCustRequestItem"/>
+ <make-value value-field="deleteCustRequestItem" entity-name="CustRequestItem"/>
<set-pk-fields value-field="deleteCustRequestItem" map="parameters"/>
<set-nonpk-fields map="parameters" value-field="deleteCustRequestItem"/>
<remove-value value-field="deleteCustRequestItem"/>
@@ -1015,7 +1015,7 @@
<call-service service-name="createNote" in-map-name="newNoteMap">
<result-to-field result-name="noteId" field="noteId"/>
</call-service>
- <make-value entity-name="CustRequestNote" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="CustRequestNote"/>
<set from-field="custRequestId" field="newEntity.custRequestId"/>
<set from-field="noteId" field="newEntity.noteId"/>
<create-value value-field="newEntity"/>
@@ -1671,7 +1671,7 @@
<if-empty field="custRequestNoteViews">
<!-- create CustRequestNote -->
<if-not-empty field="parameters.noteInfo">
- <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 field="newNoteMap.note" from-field="parameters.noteInfo"/>
<set field="newNoteMap.noteName" value="How to test"/>
@@ -1749,12 +1749,12 @@
<field-map field-name="roleTypeId" value="PRODUCT_OWNER"/>
</entity-one>
<if-empty field="partyRoles">
- <make-value entity-name="PartyRole" value-field="partyRole"/>
+ <make-value value-field="partyRole" entity-name="PartyRole"/>
<set field="partyRole.partyId" value="${parameters.partyId}"/>
<set field="partyRole.roleTypeId" value="PRODUCT_OWNER"/>
<create-value value-field="partyRole"/>
</if-empty>
- <make-value entity-name="ProductRole" value-field="productRole" />
+ <make-value value-field="productRole" entity-name="ProductRole" />
<set field="productRole.productId" from-field="parameters.productId" />
<set field="productRole.partyId" value="${parameters.partyId}"/>
<set field="productRole.roleTypeId" value="PRODUCT_OWNER"/>
@@ -1766,12 +1766,12 @@
<field-map field-name="roleTypeId" value="PRODUCT_OWNER_COMP"/>
</entity-one>
<if-empty field="partyRoles">
- <make-value entity-name="PartyRole" value-field="partyRole"/>
+ <make-value value-field="partyRole" entity-name="PartyRole"/>
<set field="partyRole.partyId" value="${companyId}"/>
<set field="partyRole.roleTypeId" value="PRODUCT_OWNER_COMP"/>
<create-value value-field="partyRole"/>
</if-empty>
- <make-value entity-name="ProductRole" value-field="productRole" />
+ <make-value value-field="productRole" entity-name="ProductRole" />
<set field="productRole.productId" from-field="parameters.productId" />
<set field="productRole.partyId" value="${companyId}"/>
<set field="productRole.roleTypeId" value="PRODUCT_OWNER_COMP"/>
@@ -1828,7 +1828,7 @@
<field-map field-name="roleTypeId" value="PRODUCT_OWNER_COMP"/>
</entity-and>
<if-empty field="partyRoleList">
- <make-value entity-name="PartyRole" value-field="partyRole"/>
+ <make-value value-field="partyRole" entity-name="PartyRole"/>
<set field="partyRole.partyId" value="${companyId}"/>
<set field="partyRole.roleTypeId" value="PRODUCT_OWNER_COMP"/>
<create-value value-field="partyRole"/>
@@ -1836,7 +1836,7 @@
<call-class-method class-name="org.apache.ofbiz.base.util.UtilDateTime" method-name="getDayStart" ret-field="formDate">
<field field="nowTimestamp" type="java.sql.Timestamp"/>
</call-class-method>
- <make-value entity-name="ProductRole" value-field="productRole" />
+ <make-value value-field="productRole" entity-name="ProductRole" />
<set field="productRole.productId" from-field="parameters.productId" />
<set field="productRole.partyId" value="${companyId}"/>
<set field="productRole.roleTypeId" value="PRODUCT_OWNER_COMP"/>
@@ -1879,7 +1879,7 @@
<field-map field-name="roleTypeId" value="PRODUCT_OWNER_COMP"/>
</entity-and>
<if-empty field="productCompList">
- <make-value entity-name="ProductRole" value-field="productComp" />
+ <make-value value-field="productComp" entity-name="ProductRole" />
<set field="productComp.productId" from-field="parameters.productId" />
<set field="productComp.partyId" value="${companyId}"/>
<set field="productComp.roleTypeId" value="PRODUCT_OWNER_COMP"/>
@@ -1954,7 +1954,7 @@
</call-class-method>
<if-not-empty field="parameters.noteInfo1">
- <make-value entity-name="NoteData" value-field="noteData"/>
+ <make-value value-field="noteData" entity-name="NoteData"/>
<sequenced-id sequence-name="NoteData" field="noteId"/>
<set field="noteData.noteId" from-field="noteId"/>
<set field="noteData.noteName" from-field="parameters.noteName1"/>
@@ -1963,16 +1963,16 @@
<set field="noteData.noteDateTime" from-field="noteDateTime" type="Timestamp"/>
<create-value value-field="noteData"/>
- <make-value entity-name="WorkEffortNote" value-field="newWorkEffortNote"/>
+ <make-value value-field="newWorkEffortNote" entity-name="WorkEffortNote"/>
<set from-field="noteId" field="newWorkEffortNote.noteId"/>
<set from-field="parameters.workEffortId" field="newWorkEffortNote.workEffortId"/>
<create-value value-field="newWorkEffortNote"/>
- <make-value entity-name="NoteData" value-field="noteData"/>
+ <make-value value-field="noteData" entity-name="NoteData"/>
</if-not-empty>
<if-not-empty field="parameters.noteInfo2">
- <make-value entity-name="NoteData" value-field="noteData"/>
+ <make-value value-field="noteData" entity-name="NoteData"/>
<sequenced-id sequence-name="NoteData" field="noteId"/>
<set field="noteData.noteId" from-field="noteId"/>
<set field="noteData.noteName" from-field="parameters.noteName2"/>
@@ -1981,16 +1981,16 @@
<set field="noteData.noteDateTime" from-field="noteDateTime" type="Timestamp"/>
<create-value value-field="noteData"/>
- <make-value entity-name="WorkEffortNote" value-field="newWorkEffortNote"/>
+ <make-value value-field="newWorkEffortNote" entity-name="WorkEffortNote"/>
<set from-field="noteId" field="newWorkEffortNote.noteId"/>
<set from-field="parameters.workEffortId" field="newWorkEffortNote.workEffortId"/>
<create-value value-field="newWorkEffortNote"/>
- <make-value entity-name="NoteData" value-field="noteData"/>
+ <make-value value-field="noteData" entity-name="NoteData"/>
</if-not-empty>
<if-not-empty field="parameters.noteInfo3">
- <make-value entity-name="NoteData" value-field="noteData"/>
+ <make-value value-field="noteData" entity-name="NoteData"/>
<sequenced-id sequence-name="NoteData" field="noteId"/>
<set field="noteData.noteId" from-field="noteId"/>
<set field="noteData.noteName" from-field="parameters.noteName3"/>
@@ -1999,12 +1999,12 @@
<set field="noteData.noteDateTime" from-field="noteDateTime" type="Timestamp"/>
<create-value value-field="noteData"/>
- <make-value entity-name="WorkEffortNote" value-field="newWorkEffortNote"/>
+ <make-value value-field="newWorkEffortNote" entity-name="WorkEffortNote"/>
<set from-field="noteId" field="newWorkEffortNote.noteId"/>
<set from-field="parameters.workEffortId" field="newWorkEffortNote.workEffortId"/>
<create-value value-field="newWorkEffortNote"/>
- <make-value entity-name="NoteData" value-field="noteData"/>
+ <make-value value-field="noteData" entity-name="NoteData"/>
</if-not-empty>
<field-to-request field="parameters.workEffortId" request-name="projectId"/>
</then>
@@ -2176,7 +2176,7 @@
<call-service service-name="createNote" in-map-name="newNoteMap">
<result-to-field result-name="noteId" field="noteId"/>
</call-service>
- <make-value entity-name="WorkEffortNote" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="WorkEffortNote"/>
<set field="newEntity.workEffortId" from-field="parameters.workEffortId" />
<set field="newEntity.noteId" from-field="noteId" />
<set field="newEntity.internalNote" value="Y"/>
@@ -2392,7 +2392,7 @@
</if-compare>
</iterate>
</if-not-empty>
- <make-value entity-name="CustRequest" value-field="custRequestMap"/>
+ <make-value value-field="custRequestMap" entity-name="CustRequest"/>
<set field="custRequestMap.custRequestId" from-field="formInput.formInput.custRequestId"/>
<set field="custRequestMap.custRequestTypeId" value="RF_UNPLAN_BACKLOG"/>
<store-value value-field="custRequestMap"/>
@@ -2653,7 +2653,7 @@
<result-to-field result-name="workEffortId"/>
</call-service>
<if-compare field="parameters.workEffortPurposeTypeId" operator="not-equals" value="SYSTEM_DEFAULT_TASK" >
- <make-value entity-name="WorkEffortGoodStandard" value-field="goodStandardMap"/>
+ <make-value value-field="goodStandardMap" entity-name="WorkEffortGoodStandard"/>
<set field="goodStandardMap.workEffortId" from-field="workEffortId"/>
<set field="goodStandardMap.productId" from-field="parameters.productId"/>
<set field="goodStandardMap.workEffortGoodStdTypeId" value="SCRUM_PRO_WORKEFF"/>
@@ -2971,7 +2971,7 @@
<call-service service-name="createNote" in-map-name="newNoteMap">
<result-to-field result-name="noteId" field="noteId"/>
</call-service>
- <make-value entity-name="CustRequestNote" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="CustRequestNote"/>
<set field="newEntity.custRequestId" from-field="parameters.custRequestId" />
<set field="newEntity.noteId" from-field="noteId" />
<create-value value-field="newEntity"/>
@@ -3603,7 +3603,7 @@
<call-service service-name="createNote" in-map-name="newNoteMap">
<result-to-field result-name="noteId" field="noteId"/>
</call-service>
- <make-value entity-name="CustRequestNote" value-field="newEntity"/>
+ <make-value value-field="newEntity" entity-name="CustRequestNote"/>
<set from-field="custRequestId" field="newEntity.custRequestId"/>
<set from-field="noteId" field="newEntity.noteId"/>
<log level="always" message=">>>>>>>>>>>>>>>>>> newEntity : ${newEntity}"></log>
@@ -4321,13 +4321,13 @@
<field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/>
</entity-and>
<if-empty field="partyRoleList">
- <make-value entity-name="PartyRole" value-field="partyRole"/>
+ <make-value value-field="partyRole" entity-name="PartyRole"/>
<set field="partyRole.partyId" from-field="parameters.partyId"/>
<set field="partyRole.roleTypeId" from-field="parameters.roleTypeId"/>
<create-value value-field="partyRole"/>
</if-empty>
<now-timestamp field="nowTimestamp"/>
- <make-value entity-name="ProductRole" value-field="productRoleMap" />
+ <make-value value-field="productRoleMap" entity-name="ProductRole" />
<set field="productRoleMap.productId" from-field="parameters.productId" />
<set field="productRoleMap.partyId" from-field="parameters.partyId"/>
<set field="productRoleMap.roleTypeId" from-field="parameters.roleTypeId"/>
diff --git a/specialpurpose/scrum/minilang/ScrumServices.xml b/specialpurpose/scrum/minilang/ScrumServices.xml
index 7e084ea..733dbb4 100644
--- a/specialpurpose/scrum/minilang/ScrumServices.xml
+++ b/specialpurpose/scrum/minilang/ScrumServices.xml
@@ -1141,7 +1141,7 @@
<now-timestamp field="workEffortPartyAssignment.thruDate" />
<store-value value-field="workEffortPartyAssignment" />
<!-- create a new one -->
- <make-value entity-name="WorkEffortPartyAssignment" value-field="newAssign" />
+ <make-value value-field="newAssign" entity-name="WorkEffortPartyAssignment" />
<set field="newAssign.workEffortId" from-field="parameters.workEffortId" />
<set field="newAssign.partyId" from-field="parameters.newPartyId" />
<set field="newAssign.roleTypeId" from-field="parameters.newRoleTypeId" />
diff --git a/specialpurpose/scrum/servicedef/secas.xml b/specialpurpose/scrum/servicedef/secas.xml
index 9b1b135..9089a8a 100644
--- a/specialpurpose/scrum/servicedef/secas.xml
+++ b/specialpurpose/scrum/servicedef/secas.xml
@@ -21,51 +21,51 @@
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
<eca service="updateWorkEffort" event="commit">
- <condition field-name="currentStatusId" operator="equals" value="STS_COMPLETED"/>
+ <condition operator="equals" field-name="currentStatusId" value="STS_COMPLETED"/>
<set field-name="webSiteId" env-name="webSiteId"/>
<action service="autoCompleteBacklog" mode="sync"/>
</eca>
<eca service="createWorkEffort" event="commit">
- <condition field-name="currentStatusId" operator="equals" value="SPRINT_ACTIVE"/>
+ <condition operator="equals" field-name="currentStatusId" value="SPRINT_ACTIVE"/>
<set field-name="sprintId" env-name="workEffortId"/>
<set field-name="sprintStatusId" env-name="currentStatusId"/>
<set field-name="webSiteId" env-name="webSiteId"/>
<action service="autoScrumNotification" mode="sync"/>
</eca>
<eca service="updateWorkEffort" event="commit">
- <condition field-name="currentStatusId" operator="equals" value="SPRINT_CLOSED"/>
+ <condition operator="equals" field-name="currentStatusId" value="SPRINT_CLOSED"/>
<set field-name="sprintId" env-name="workEffortId"/>
<set field-name="sprintStatusId" env-name="currentStatusId"/>
<set field-name="webSiteId" env-name="webSiteId"/>
<action service="autoScrumNotification" mode="sync"/>
</eca>
<eca service="createCustRequest" event="commit">
- <condition field-name="statusId" operator="equals" value="CRQ_ACCEPTED"/>
+ <condition operator="equals" field-name="statusId" value="CRQ_ACCEPTED"/>
<set field-name="custRequestStatusId" value="CRQ_ACCEPTED"/>
<set field-name="webSiteId" env-name="webSiteId"/>
<action service="autoScrumNotification" mode="sync"/>
</eca>
<eca service="setCustRequestStatus" event="commit">
<condition field-name="oldStatusId" operator="equals" value="CRQ_REVIEWED"/>
- <condition field-name="statusId" operator="equals" value="CRQ_ACCEPTED"/>
+ <condition operator="equals" field-name="statusId" value="CRQ_ACCEPTED"/>
<set field-name="custRequestStatusId" value="CRQ_ACCEPTED"/>
<set field-name="webSiteId" env-name="webSiteId"/>
<action service="autoScrumNotification" mode="sync"/>
</eca>
<eca service="setCustRequestStatus" event="commit">
- <condition field-name="statusId" operator="equals" value="CRQ_REVIEWED"/>
+ <condition operator="equals" field-name="statusId" value="CRQ_REVIEWED"/>
<set field-name="custRequestStatusId" value="CRQ_REVIEWED"/>
<set field-name="webSiteId" env-name="webSiteId"/>
<action service="autoScrumNotification" mode="sync"/>
</eca>
<eca service="setCustRequestStatus" event="commit">
- <condition field-name="statusId" operator="equals" value="CRQ_COMPLETED"/>
+ <condition operator="equals" field-name="statusId" value="CRQ_COMPLETED"/>
<set field-name="custRequestStatusId" value="CRQ_COMPLETED"/>
<set field-name="webSiteId" env-name="webSiteId"/>
<action service="autoScrumNotification" mode="sync"/>
</eca>
<eca service="setCustRequestStatus" event="commit">
- <condition field-name="statusId" operator="equals" value="CRQ_CANCELLED"/>
+ <condition operator="equals" field-name="statusId" value="CRQ_CANCELLED"/>
<set field-name="custRequestStatusId" value="CRQ_CANCELLED"/>
<set field-name="webSiteId" env-name="webSiteId"/>
<action service="autoScrumNotification" mode="sync"/>
diff --git a/specialpurpose/scrum/widget/CommonScreens.xml b/specialpurpose/scrum/widget/CommonScreens.xml
index 62e4611..1ac7613 100644
--- a/specialpurpose/scrum/widget/CommonScreens.xml
+++ b/specialpurpose/scrum/widget/CommonScreens.xml
@@ -383,7 +383,7 @@
<section>
<condition><not><if-empty field="partyId"/></not></condition>
<widgets>
- <include-menu name="ResourceTabBar" location="component://scrum/widget/scrumMenus.xml"/>
+ <include-menu location="component://scrum/widget/scrumMenus.xml" name="ResourceTabBar"/>
<container>
<section>
<widgets>
diff --git a/specialpurpose/scrum/widget/ResourceForms.xml b/specialpurpose/scrum/widget/ResourceForms.xml
index e174a16..6fc1264 100644
--- a/specialpurpose/scrum/widget/ResourceForms.xml
+++ b/specialpurpose/scrum/widget/ResourceForms.xml
@@ -179,8 +179,8 @@
<field name="userLoginId"><hidden/></field>
<field name="userPrefValue" title="Enable">
<drop-down allow-empty="false" no-current-selected-key="Y">
- <option key="No" description="N"/>
- <option key="Yes" description="Y"/>
+ <option key="N" description="No"/>
+ <option key="Y" description="Yes"/>
</drop-down>
</field>
<field name="submit" title="${uiLabelMap.CommonSubmit}"><submit/></field>
@@ -296,7 +296,7 @@
<alt-target use-when="product!=null" target="UpdateCompanyAndOwner"/>
<field name="partyId" title="${uiLabelMap.ScrumCompanyAndPerson}" tooltip="${uiLabelMap.ScrumCompanyNameShow} - ${uiLabelMap.ScrumProductName}" event="onchange" action="javascript:document.UpdateCompanyAndOwner.partyCompany.value=this.options[this.selectedIndex].text;" parameter-name="partyId" use-when="companyCurrent!=null">
<drop-down allow-empty="false" current-description="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}" >
- <option key="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}" description="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}(${companyCurrentList[0].partyId})"/>
+ <option key="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}(${companyCurrentList[0].partyId})" description="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}"/>
<option key="" description=""/>
<list-options list-name="scrumRolesPersonAndCompanyList" description="${groupName}[${partyIdFrom}] - ${lastName} ${firstName} ${middleName}" key-name="partyId"/>
</drop-down>
diff --git a/specialpurpose/scrum/widget/TaskForms.xml b/specialpurpose/scrum/widget/TaskForms.xml
index 743bc70..56ed103 100644
--- a/specialpurpose/scrum/widget/TaskForms.xml
+++ b/specialpurpose/scrum/widget/TaskForms.xml
@@ -779,8 +779,8 @@
</field>
<field name="unplannedFlag" position="2" title="${uiLabelMap.ScrumUnplanBacklog}">
<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="statusId" title="${uiLabelMap.CommonStatus}">
diff --git a/specialpurpose/scrum/widget/scrumForms.xml b/specialpurpose/scrum/widget/scrumForms.xml
index 759833a..492c998 100644
--- a/specialpurpose/scrum/widget/scrumForms.xml
+++ b/specialpurpose/scrum/widget/scrumForms.xml
@@ -501,8 +501,8 @@
<field name="workEffortName" title="${uiLabelMap.ScrumProjectName}"><text/></field>
<field name="billed" title="${uiLabelMap.ScrumBilled}" map-name="workEffAttMap">
<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="currentStatusId" use-when="workEffortId==null"><hidden value="SPJ_ACTIVE"/></field>
@@ -697,14 +697,14 @@
<field name="custSequenceNum" title="${uiLabelMap.CommonSequenceNum}" use-when="custRequest!=null&&isTeamMember==true"><display/></field>
<field name="billed" title="${uiLabelMap.ScrumBilled}" use-when="custRequest==null">
<drop-down allow-empty="false" no-current-selected-key="Y">
- <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="billed" title="${uiLabelMap.ScrumBilled}" use-when="custRequest!=null&&isTeamMember==false&&projectBilled==null">
<drop-down allow-empty="false" no-current-selected-key="Y">
- <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="billed" title="${uiLabelMap.ScrumBilled}" use-when="custRequest!=null&&isTeamMember==false&&projectBilled!=null" tooltip="${uiLabelMap.ScrumSetOnProjectLevel}">
@@ -713,8 +713,8 @@
<field name="billed" title="${uiLabelMap.ScrumBilled}" use-when="custRequest!=null&&isTeamMember==true"><display/></field>
<field name="custRequestTypeId" title="${uiLabelMap.ScrumUnplanBacklog}" use-when="isTeamMember==false">
<drop-down allow-empty="false" no-current-selected-key="N">
- <option key="${uiLabelMap.CommonY}" description="RF_UNPLAN_BACKLOG"/>
- <option key="${uiLabelMap.CommonN}" description="RF_PROD_BACKLOG"/>
+ <option key="RF_UNPLAN_BACKLOG" description="${uiLabelMap.CommonY}"/>
+ <option key="RF_PROD_BACKLOG" description="${uiLabelMap.CommonN}"/>
</drop-down>
</field>
<field name="custRequestTypeId" title="${uiLabelMap.ScrumUnplanBacklog}" use-when="custRequest!=null&&isTeamMember==true">
@@ -722,8 +722,8 @@
</field>
<field name="unplannedFlag" title="${uiLabelMap.ScrumUnplanBacklog}" use-when="custRequest==null">
<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="statusId" title="${uiLabelMap.CommonStatus}" use-when="custRequest!=null">
@@ -806,14 +806,14 @@
</field>
<field name="billed" title="${uiLabelMap.ScrumBilled}" position="2">
<drop-down allow-empty="true" current-description="" >
- <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="custRequestTypeId" title="${uiLabelMap.ScrumPlanned}">
<drop-down allow-empty="true">
- <option key="${uiLabelMap.CommonY}" description="RF_PROD_BACKLOG"/>
- <option key="${uiLabelMap.CommonN}" description="RF_UNPLAN_BACKLOG"/>
+ <option key="RF_PROD_BACKLOG" description="${uiLabelMap.CommonY}"/>
+ <option key="RF_UNPLAN_BACKLOG" description="${uiLabelMap.CommonN}"/>
</drop-down>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
@@ -863,14 +863,14 @@
</field>
<field name="custRequestTypeId" title="${uiLabelMap.ScrumPlanned}">
<drop-down allow-empty="true">
- <option key="${uiLabelMap.CommonY}" description="RF_PROD_BACKLOG"/>
- <option key="${uiLabelMap.CommonN}" description="RF_UNPLAN_BACKLOG"/>
+ <option key="RF_PROD_BACKLOG" description="${uiLabelMap.CommonY}"/>
+ <option key="RF_UNPLAN_BACKLOG" description="${uiLabelMap.CommonN}"/>
</drop-down>
</field>
<field name="billed" title="${uiLabelMap.ScrumBilled}" position="2">
<drop-down allow-empty="true" current-description="" >
- <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="statusId" title="${uiLabelMap.CommonStatus}">
@@ -1471,7 +1471,7 @@
</field>
<field name="partyId" title="${uiLabelMap.ScrumCompanyAndProductOwner}" tooltip="${uiLabelMap.ScrumCompanyNameShow} - ${uiLabelMap.ScrumProductName}" event="onchange" action="javascript:document.EditProduct.partyCompany.value=this.options[this.selectedIndex].text;" parameter-name="partyId" use-when="companyCurrent!=null">
<drop-down allow-empty="false" current-description="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}" >
- <option key="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}" description="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}(${companyCurrentList[0].partyId})"/>
+ <option key="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}(${companyCurrentList[0].partyId})" description="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}"/>
<option key="" description=""/>
<list-options list-name="scrumRolesPersonAndCompanyList" description="${groupName}[${partyIdFrom}] - ${lastName} ${firstName} ${middleName}" key-name="partyId"/>
</drop-down>
@@ -1686,7 +1686,7 @@
<field name="internalName" title="${uiLabelMap.ScrumProductName}"><text/></field>
<field name="statusId" parameter-name="statusId">
<drop-down allow-empty="false">
- <option key="${uiLabelMap.CommonAny}" description="Any"/>
+ <option key="Any" description="${uiLabelMap.CommonAny}"/>
<entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="PRODUCT_STATUS"/>
</entity-options>
@@ -1812,8 +1812,8 @@
<field name="backlogId" parameter-name="custRequestId" use-when="${groovy:showPosition1==false}"><hidden value="${custRequestId}"/></field>
<field name="billed" position="1" use-when="${groovy:showPosition1==true}" title="${uiLabelMap.ScrumBilled}">
<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="dummy1" title=" " position="1" use-when="${groovy:showPosition1==true}"><display description=" "/></field>
@@ -1853,8 +1853,8 @@
</field>
<field name="reCreate" position="1" title="${uiLabelMap.ScrumRecreateInvoice}: ${invoiceId}" use-when="context.get("invoiceId")!=null">
<drop-down no-current-selected-key="N">
- <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="invoiceDate" title="${uiLabelMap.ScrumInvoiceDate}" use-when="context.get("invoiceId")!=null"><date-time type="date"></date-time></field>
@@ -2826,15 +2826,15 @@
<field name="description" title="${uiLabelMap.ScrumProductBacklogItem}" required-field="true"><text size="50" maxlength="255"/></field>
<field name="billed" title="${uiLabelMap.ScrumBilled}">
<drop-down allow-empty="false" no-current-selected-key="Y">
- <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="unplanned" title="${uiLabelMap.ScrumUnplanBacklog}" event="onchange" action="javascript:document.QuickAddBacklog.action='QuickAddBacklog';document.QuickAddBacklog.submit();" required-field="true">
<drop-down allow-empty="false">
<option key="" description="- ${uiLabelMap.CommonSelectOne} -"/>
- <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="productId" title="${uiLabelMap.ScrumProductName}" use-when="${groovy: unplanned.equals("Y")}" event="onchange" action="javascript:document.QuickAddBacklog.action='QuickAddBacklog';document.QuickAddBacklog.submit();"
diff --git a/specialpurpose/solr/entitydef/eecas.xml b/specialpurpose/solr/entitydef/eecas.xml
index 1e2a5ba..f0ff723 100644
--- a/specialpurpose/solr/entitydef/eecas.xml
+++ b/specialpurpose/solr/entitydef/eecas.xml
@@ -37,15 +37,15 @@
<action service="addToSolr" mode="sync" value-attr="instance"/>
</eca>
<eca entity="ProductPrice" operation="create-store-remove" event="return">
- <condition field-name="productPriceTypeId" operator="equals" value="LIST_PRICE"/>
+ <condition operator="equals" field-name="productPriceTypeId" value="LIST_PRICE"/>
<action service="addToSolr" mode="sync" value-attr="instance"/>
</eca>
<eca entity="ProductPrice" operation="create-store-remove" event="return">
- <condition field-name="productPriceTypeId" operator="equals" value="DEFAULT_PRICE"/>
+ <condition operator="equals" field-name="productPriceTypeId" value="DEFAULT_PRICE"/>
<action service="addToSolr" mode="sync" value-attr="instance"/>
</eca>
<eca entity="ProductPrice" operation="create-store-remove" event="return">
- <condition field-name="productPriceTypeId" operator="equals" value="DEFAULT_PRICE"/>
+ <condition operator="equals" field-name="productPriceTypeId" value="DEFAULT_PRICE"/>
<action service="addToSolr" mode="sync" value-attr="instance"/>
</eca>
-->
diff --git a/specialpurpose/webpos/minilang/ManagerEvents.xml b/specialpurpose/webpos/minilang/ManagerEvents.xml
index ad71c42..39aa765 100644
--- a/specialpurpose/webpos/minilang/ManagerEvents.xml
+++ b/specialpurpose/webpos/minilang/ManagerEvents.xml
@@ -45,7 +45,7 @@
<add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerOpenTerminalDrawingAmountNotValid"/></add-error>
<check-errors/>
<else>
- <make-value entity-name="PosTerminalState" value-field="terminalState"/>
+ <make-value value-field="terminalState" entity-name="PosTerminalState"/>
<call-object-method obj-field="webPosSession" method-name="getId" ret-field="terminalState.posTerminalId"/>
<call-class-method class-name="org.apache.ofbiz.base.util.UtilDateTime" method-name="nowTimestamp" ret-field="terminalState.openedDate"/>
<call-object-method obj-field="webPosSession" method-name="getUserLoginId" ret-field="terminalState.openedByUserLoginId"/>
@@ -310,7 +310,7 @@
</simple-map-processor>
</call-map-processor>
<if-not-empty field="context.amountInOut">
- <make-value entity-name="PosTerminalInternTx" value-field="internTx"/>
+ <make-value value-field="internTx" entity-name="PosTerminalInternTx"/>
<call-object-method obj-field="webPosTransaction" method-name="getTerminalLogId" ret-field="internTx.posTerminalLogId"/>
<set field="internTx.paidAmount" from-field="context.amountInOut" type="BigDecimal"/>
<set field="internTx.reasonComment" from-field="parameters.reasonCommentInOut"/>
