Improvement: Miniland code readability and consistency improvements
(OFBIZ-8744) (OFBIZ-8745) (OFBIZ-8746) (OFBIZ-8748) (OFBIZ-8829) (OFBIZ-8830) (OFBIZ-8907) (OFBIZ-8908) (OFBIZ-8924) (OFBIZ-8925)
Thanks: Ankush Upadhyay , Sega patidar , Abhijeet Ashapure for your patches.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768219 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/applications/accounting/minilang/UpgradeServices.xml b/applications/accounting/minilang/UpgradeServices.xml
index c6a6072..28247fc 100644
--- a/applications/accounting/minilang/UpgradeServices.xml
+++ b/applications/accounting/minilang/UpgradeServices.xml
@@ -51,7 +51,7 @@
</simple-method>
<simple-method method-name="migrateFixedAssetMaintMeter" short-description="Copy FixedAssetMaintMeter To FixedAssetMeter">
- <entity-condition list="maintMeterList" entity-name="FixedAssetMaintMeter"/>
+ <entity-condition entity-name="FixedAssetMaintMeter" list="maintMeterList"/>
<iterate list="maintMeterList" entry="maintMeter">
<make-value value-field="newEntity" entity-name="FixedAssetMeter"/>
<set-pk-fields map="maintMeter" value-field="newEntity"/>
@@ -70,7 +70,7 @@
</simple-method>
<simple-method method-name="migrateAgreementWorkEffortAppl" short-description="Copy AgreementWorkEffortAppl To AgreementWorkEffortApplic">
- <entity-condition list="agreementWorkEffortApplList" entity-name="OldAgreementWorkEffortAppl"/>
+ <entity-condition entity-name="OldAgreementWorkEffortAppl" list="agreementWorkEffortApplList"/>
<iterate list="agreementWorkEffortApplList" entry="agreementWorkEffortAppl">
<make-value value-field="newEntity" entity-name="AgreementWorkEffortApplic"/>
<set-pk-fields map="agreementWorkEffortAppl" value-field="newEntity"/>
diff --git a/applications/accounting/minilang/admin/AcctgAdminServices.xml b/applications/accounting/minilang/admin/AcctgAdminServices.xml
index c545fb7..9f68470 100644
--- a/applications/accounting/minilang/admin/AcctgAdminServices.xml
+++ b/applications/accounting/minilang/admin/AcctgAdminServices.xml
@@ -146,7 +146,7 @@
<store-list list="uomConversions"/>
<!-- now create a new conversion relationship -->
- <set-service-fields to-map="createParams" service-name="createUomConversionDated" map="parameters"/>
+ <set-service-fields service-name="createUomConversionDated" map="parameters" to-map="createParams"/>
<if-empty field="parameters.fromDate">
<set field="createParams.fromDate" from-field="nowTimestamp"/>
</if-empty>
diff --git a/applications/accounting/minilang/agreement/AgreementServices.xml b/applications/accounting/minilang/agreement/AgreementServices.xml
index 1faee6e..3855681 100644
--- a/applications/accounting/minilang/agreement/AgreementServices.xml
+++ b/applications/accounting/minilang/agreement/AgreementServices.xml
@@ -39,7 +39,7 @@
<simple-method method-name="copyAgreement" short-description="Copy an existing Agreement">
<entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
<check-errors/>
- <set-service-fields service-name="createAgreement" to-map="createAgreementInMap" map="agreement"/>
+ <set-service-fields service-name="createAgreement" map="agreement" to-map="createAgreementInMap"/>/>
<call-service service-name="createAgreement" in-map-name="createAgreementInMap">
<result-to-field result-name="agreementId" field="agreementIdTo"/>
</call-service>
@@ -47,7 +47,7 @@
<get-related value-field="agreement" relation-name="AgreementItem" list="agreementItems"/>
<iterate list="agreementItems" entry="agreementItem">
<clear-field field="createAgreementItemInMap"/>
- <set-service-fields service-name="createAgreementItem" to-map="createAgreementItemInMap" map="agreementItem"/>
+ <set-service-fields service-name="createAgreementItem" map="agreementItem" to-map="createAgreementItemInMap"/>/>
<set from-field="agreementIdTo" field="createAgreementItemInMap.agreementId"/>
<call-service service-name="createAgreementItem" in-map-name="createAgreementItemInMap"/>
</iterate>
@@ -55,7 +55,7 @@
<get-related value-field="agreement" relation-name="AgreementTerm" list="agreementTerms"/>
<iterate list="agreementTerms" entry="agreementTerm">
<clear-field field="createAgreementTermInMap"/>
- <set-service-fields service-name="createAgreementTerm" to-map="createAgreementTermInMap" map="agreementTerm"/>
+ <set-service-fields service-name="createAgreementTerm" map="agreementTerm" to-map="createAgreementTermInMap"/>/>
<set from-field="agreementIdTo" field="createAgreementTermInMap.agreementId"/>
<call-service service-name="createAgreementTerm" in-map-name="createAgreementTermInMap"/>
</iterate>
@@ -64,7 +64,7 @@
<get-related value-field="agreement" relation-name="AgreementProductAppl" list="agreementProductAppls"/>
<iterate list="agreementProductAppls" entry="agreementProductAppl">
<clear-field field="createAgreementProductApplInMap"/>
- <set-service-fields service-name="createAgreementProductAppl" to-map="createAgreementProductApplInMap" map="agreementProductAppl"/>
+ <set-service-fields service-name="createAgreementProductAppl" map="agreementProductAppl" to-map="createAgreementProductApplInMap"/>/>
<set from-field="agreementIdTo" field="createAgreementProductApplInMap.agreementId"/>
<call-service service-name="createAgreementProductAppl" in-map-name="createAgreementProductApplInMap"/>
</iterate>
@@ -73,7 +73,7 @@
<get-related value-field="agreement" relation-name="AgreementFacilityAppl" list="agreementFacilityAppls"/>
<iterate list="agreementFacilityAppls" entry="agreementFacilityAppl">
<clear-field field="createAgreementFacilityApplInMap"/>
- <set-service-fields service-name="createAgreementFacilityAppl" to-map="createAgreementFacilityApplInMap" map="agreementFacilityAppl"/>
+ <set-service-fields service-name="createAgreementFacilityAppl" map="agreementFacilityAppl" to-map="createAgreementFacilityApplInMap"/>/>
<set from-field="agreementIdTo" field="createAgreementFacilityApplInMap.agreementId"/>
<call-service service-name="createAgreementFacilityAppl" in-map-name="createAgreementFacilityApplInMap"/>
</iterate>
@@ -82,7 +82,7 @@
<get-related value-field="agreement" relation-name="AgreementPartyApplic" list="agreementPartyApplic"/>
<iterate list="agreementPartyApplics" entry="agreementPartyApplic">
<clear-field field="createAgreementPartyApplicInMap"/>
- <set-service-fields service-name="createAgreementPartyApplic" to-map="createAgreementPartyApplicInMap" map="agreementPartyApplic"/>
+ <set-service-fields service-name="createAgreementPartyApplic" map="agreementPartyApplic" to-map="createAgreementPartyApplicInMap"/>/>
<set from-field="agreementIdTo" field="createAgreementPartyApplicInMap.agreementId"/>
<call-service service-name="createAgreementPartyApplic" in-map-name="createAgreementPartyApplicInMap"/>
</iterate>
diff --git a/applications/accounting/minilang/budget/BudgetServices.xml b/applications/accounting/minilang/budget/BudgetServices.xml
index ed710d1..f721f0a 100644
--- a/applications/accounting/minilang/budget/BudgetServices.xml
+++ b/applications/accounting/minilang/budget/BudgetServices.xml
@@ -46,16 +46,16 @@
</entity-and>
<if-not-empty field="budgetStatuses">
<first-from-list entry="budgetStatus" list="budgetStatuses"/>
- <entity-one value-field="statusValidChange" entity-name="StatusValidChange">
+ <entity-one entity-name="StatusValidChange" value-field="statusValidChange">
<field-map field-name="statusId" from-field="budgetStatus.statusId"/>
<field-map field-name="statusIdTo" from-field="parameters.statusId"/>
</entity-one>
<if-not-empty field="statusValidChange">
- <set-service-fields service-name="createBudgetStatus" to-map="createBudgetStatusMap" map="parameters" mode="IN"/>
+ <set-service-fields service-name="createBudgetStatus" map="parameters" to-map="createBudgetStatusMap"/> mode="IN"/>
<call-service service-name="createBudgetStatus" in-map-name="createBudgetStatusMap"/>
</if-not-empty>
<else>
- <set-service-fields service-name="createBudgetStatus" to-map="createBudgetStatusMap" map="parameters" mode="IN"/>
+ <set-service-fields service-name="createBudgetStatus" map="parameters" to-map="createBudgetStatusMap"/> mode="IN"/>
<call-service service-name="createBudgetStatus" in-map-name="createBudgetStatusMap"/>
</else>
</if-not-empty>
diff --git a/applications/accounting/minilang/finaccount/FinAccountServices.xml b/applications/accounting/minilang/finaccount/FinAccountServices.xml
index cc1dad2..12ad4d2 100644
--- a/applications/accounting/minilang/finaccount/FinAccountServices.xml
+++ b/applications/accounting/minilang/finaccount/FinAccountServices.xml
@@ -148,7 +148,7 @@
<field-to-result field="lookedUpValue.finAccountId" result-name="finAccountId"/>
</simple-method>
<simple-method method-name="deleteFinAccount" short-description="Delete a Financial Account">
- <entity-one value-field="finAccount" entity-name="FinAccount"/>
+ <entity-one entity-name="FinAccount" value-field="finAccount"/>
<remove-value value-field="finAccount"/>
</simple-method>
@@ -494,7 +494,7 @@
<field-map field-name="paymentId" from-field="payment.paymentId"/>
</entity-and>
<if-not-empty field="paymentGroupMembers">
- <first-from-list entry="paymentGroupMember" list="paymentGroupMembers"/>
+ <first-from-list list="paymentGroupMembers" entry="paymentGroupMember"/>
<set-service-fields service-name="expirePaymentGroupMember" map="paymentGroupMember" to-map="expirePaymentGroupMemberMap"/>
<call-service service-name="expirePaymentGroupMember" in-map-name="expirePaymentGroupMemberMap"/>
<clear-field field="expirePaymentGroupMemberMap"/>
diff --git a/applications/accounting/minilang/fixedasset/FixedAssetServices.xml b/applications/accounting/minilang/fixedasset/FixedAssetServices.xml
index 4d42d5b..2f2ce10 100644
--- a/applications/accounting/minilang/fixedasset/FixedAssetServices.xml
+++ b/applications/accounting/minilang/fixedasset/FixedAssetServices.xml
@@ -64,7 +64,7 @@
<else>
<!-- Create the WorkEffort -->
<!-- Maintenance WorkEffort entity -->
- <entity-one value-field="fixedAsset" entity-name="FixedAsset"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
<property-to-field field="workEffortName" resource="AccountingUiLabels" property="AccountingFixedAssetMaintWorkEffortName"/>
<set from-field="workEffortName" field="maintWorkEffortMap.workEffortName"/>
<set value="TASK" field="maintWorkEffortMap.workEffortTypeId"/>
@@ -111,7 +111,7 @@
</condition>
<then>
<set field="workEffortId" from-field="lookedUpValue.scheduleWorkEffortId"/>
- <entity-one value-field="workEffort" entity-name="WorkEffort"/>
+ <entity-one entity-name="WorkEffort" value-field="workEffort"/>
<if>
<condition>
<and>
@@ -130,7 +130,7 @@
<set field="updateWorkEffortCtx.actualCompletionDate" from-field="nowTimestamp"/>
<call-service service-name="updateWorkEffort" in-map-name="updateWorkEffortCtx"/>
<check-errors/>
- <entity-condition list="wepas" entity-name="WorkEffortPartyAssignment" filter-by-date="true">
+ <entity-condition entity-name="WorkEffortPartyAssignment" list="wepas" filter-by-date="true">
<condition-expr field-name="workEffortId" from-field="workEffortId" operator="equals"/>
</entity-condition>
<iterate list="wepas" entry="wepa">
@@ -176,7 +176,7 @@
</entity-and>
<iterate list="productMaintList" entry="productMaintValue">
<set field="repeatCount" from-field="productMaintValue.repeatCount" default-value="0" type="Long"/>
- <entity-condition list="maintList" entity-name="FixedAssetMaint">
+ <entity-condition entity-name="FixedAssetMaint" list="maintList">
<condition-list combine="and">
<condition-expr field-name="fixedAssetId" operator="equals" from-field="fixedAssetValue.fixedAssetId"/>
<condition-expr field-name="productMaintTypeId" operator="equals" from-field="productMaintValue.productMaintTypeId"/>
@@ -209,7 +209,7 @@
</else>
</if-compare>
<if-compare field="maintDue" operator="equals" value="true">
- <set-service-fields service-name="createFixedAssetMaint" to-map="createMaintCxt" map="productMaintValue"/>
+ <set-service-fields service-name="createFixedAssetMaint" map="productMaintValue" to-map="createMaintCxt"/>/>
<set field="createMaintCxt.fixedAssetId" from-field="fixedAssetValue.fixedAssetId"/>
<set field="createMaintCxt.intervalQuantity" from-field="meterValue.meterValue"/>
<set field="createMaintCxt.statusId" value="FAM_CREATED"/>
@@ -222,14 +222,14 @@
</simple-method>
<simple-method method-name="createMaintsFromTimeInterval" short-description="Create Fixed Asset Maintenances From A Product Maint Time Interval">
<now-timestamp field="nowTimestamp"/>
- <entity-condition list="fixedAssets" entity-name="FixedAsset">
+ <entity-condition entity-name="FixedAsset" list="fixedAssets">
<condition-list combine="and">
<condition-expr field-name="instanceOfProductId" operator="not-equals" from-field="null"/>
<condition-expr field-name="actualEndOfLife" operator="equals" from-field="null"/>
</condition-list>
</entity-condition>
<iterate list="fixedAssets" entry="fixedAsset">
- <entity-condition list="productMaints" entity-name="ProductMaint">
+ <entity-condition entity-name="ProductMaint" list="productMaints">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="fixedAsset.instanceOfProductId"/>
<condition-expr field-name="intervalUomId" operator="like" value="TF_%"/>
@@ -237,7 +237,7 @@
</entity-condition>
<iterate list="productMaints" entry="productMaint">
<set field="repeatCount" from-field="productMaint.repeatCount" default-value="0" type="Long"/>
- <entity-condition list="maintList" entity-name="FixedAssetMaintWorkEffort">
+ <entity-condition entity-name="FixedAssetMaintWorkEffort" list="maintList">
<condition-list combine="and">
<condition-expr field-name="fixedAssetId" operator="equals" from-field="fixedAsset.fixedAssetId"/>
<condition-expr field-name="productMaintTypeId" operator="equals" from-field="productMaint.productMaintTypeId"/>
@@ -282,7 +282,7 @@
</else>
</if-compare>
<if-compare field="maintDue" operator="equals" value="true">
- <set-service-fields service-name="createFixedAssetMaint" to-map="createMaintCxt" map="productMaint"/>
+ <set-service-fields service-name="createFixedAssetMaint" map="productMaint" to-map="createMaintCxt"/>/>
<set field="createMaintCxt.fixedAssetId" from-field="fixedAsset.fixedAssetId"/>
<set field="createMaintCxt.statusId" value="FAM_CREATED"/>
<call-service service-name="createFixedAssetMaint" in-map-name="createMaintCxt"/>
diff --git a/applications/accounting/minilang/invoice/InvoiceServices.xml b/applications/accounting/minilang/invoice/InvoiceServices.xml
index 4a71a31..f6b471f 100644
--- a/applications/accounting/minilang/invoice/InvoiceServices.xml
+++ b/applications/accounting/minilang/invoice/InvoiceServices.xml
@@ -150,7 +150,7 @@
<!-- call getNextInvoiceId service with the parameters.partyIdFrom when invoice Id is not suplied
else use it from the input -->
<if-empty field="parameters.invoiceId">
- <set-service-fields service-name="getNextInvoiceId" to-map="getNextInvoiceIdMap" map="parameters"/>
+ <set-service-fields service-name="getNextInvoiceId" map="parameters" to-map="getNextInvoiceIdMap"/>/>
<set field="getNextInvoiceIdMap.partyId" from-field="parameters.partyIdFrom"/>
<call-service service-name="getNextInvoiceId" in-map-name="getNextInvoiceIdMap">
<result-to-field result-name="invoiceId" field="parameters.invoiceId"/>
@@ -755,7 +755,7 @@
<fail-property resource="AccountingUiLabels" property="AccountingTaxCannotCalculate"/>
</add-error>
</if-empty>
- <first-from-list entry="contactMech" list="contacts"/>
+ <first-from-list list="contacts" entry="contactMech"/>
<entity-one entity-name="PostalAddress" value-field="postalAddress">
<field-map field-name="contactMechId" from-field="contactMech.contactMechId"/>
</entity-one>
@@ -770,7 +770,7 @@
<entity-and entity-name="Product" list="product">
<field-map field-name="productId" from-field="invoiceItem.productId"/>
</entity-and>
- <first-from-list entry="itemProduct" list="product"/>
+ <first-from-list list="product" entry="itemProduct"/>
<if-not-empty field="invoiceItem.productId">
<entity-and entity-name="InvoiceItem" list="findinvoiceItems">
<field-map field-name="invoiceId" from-field="invoice.invoiceId"/>
@@ -899,7 +899,7 @@
</simple-method>
<simple-method method-name="createInvoiceFromOrder" short-description="Create an invoice from existing order when invoicePerShipment is N">
- <entity-one value-field="orderHeader" entity-name="OrderHeader">
+ <entity-one entity-name="OrderHeader" value-field="orderHeader">
<field-map field-name="orderId" from-field="parameters.orderId"/>
</entity-one>
<set field="invoicePerShipment" from-field="orderHeader.invoicePerShipment"/>
@@ -987,7 +987,7 @@
</simple-method>
<simple-method method-name="isInvoiceInForeignCurrency" short-description="check if a invoice is in a foreign currency related to the accounting company.">
- <entity-one value-field="invoice" entity-name="InvoiceAndType">
+ <entity-one entity-name="InvoiceAndType" value-field="invoice">
<field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
</entity-one>
<if-empty field="invoice">
diff --git a/applications/accounting/minilang/ledger/GeneralLedgerServices.xml b/applications/accounting/minilang/ledger/GeneralLedgerServices.xml
index fea357b..a2033bc 100644
--- a/applications/accounting/minilang/ledger/GeneralLedgerServices.xml
+++ b/applications/accounting/minilang/ledger/GeneralLedgerServices.xml
@@ -26,7 +26,7 @@
<!-- TODO: Do we need to create a GlJournal record here? -->
<!-- first, create the AcctgTrans -->
- <set-service-fields service-name="createAcctgTrans" to-map="createAcctgTransParams" map="parameters"/>
+ <set-service-fields service-name="createAcctgTrans" map="parameters" to-map="createAcctgTransParams"/>/>
<if-empty field="createAcctgTransParams.transactionDate">
<now-timestamp field="createAcctgTransParams.transactionDate"/>
</if-empty>
@@ -337,10 +337,10 @@
<if-compare field="acctgTransEntry.origAmount" operator="less" value="0">
<log level="verbose" message="${acctgTransEntry} is going to get inverted"/>
<calculate field="acctgTransEntry.origAmount">
- <calcop field="acctgTransEntry.origAmount" operator="negative"/>
+ <calcop operator="negative" field="acctgTransEntry.origAmount"/>
</calculate>
<calculate field="acctgTransEntry.amount">
- <calcop field="acctgTransEntry.amount" operator="negative"/>
+ <calcop operator="negative" field="acctgTransEntry.amount"/>
</calculate>
<if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
<set value="C" field="acctgTransEntry.debitCreditFlag"/>
@@ -684,18 +684,18 @@
</condition>
<then>
<calculate field="totalDebitAmount">
- <calcop field="totalDebitAmount" operator="add"><calcop field="amount" operator="get"/></calcop>
+ <calcop operator="add" field="totalDebitAmount"><calcop operator="get" field="amount"/></calcop>
</calculate>
</then>
<else>
<calculate field="totalCreditAmount">
- <calcop field="totalCreditAmount" operator="add"><calcop field="amount" operator="get"/></calcop>
+ <calcop operator="add" field="totalCreditAmount"><calcop operator="get" field="amount"/></calcop>
</calculate>
</else>
</if>
</iterate>
<calculate field="totalAmount">
- <calcop field="totalCreditAmount" operator="subtract"><calcop field="totalDebitAmount" operator="get"/></calcop>
+ <calcop operator="subtract" field="totalCreditAmount"><calcop operator="get" field="totalDebitAmount"/></calcop>
</calculate>
<set field="partyAccountingPreferencesCallMap.organizationPartyId" from-field="customTimePeriod.organizationPartyId"/>
<call-service service-name="getPartyAccountingPreferences" in-map-name="partyAccountingPreferencesCallMap">
@@ -963,31 +963,31 @@
</condition>
<then>
<calculate field="amount">
- <calcop field="amount" operator="negative"/>
+ <calcop operator="negative" field="amount"/>
</calculate>
</then>
</if>
<if-compare field="isExpenseAccount" operator="equals" value="true" type="Boolean">
<calculate field="amount">
- <calcop field="amount" operator="negative"/>
+ <calcop operator="negative" field="amount"/>
</calculate>
</if-compare>
<calculate field="totalNetIncome">
- <calcop field="totalNetIncome" operator="add"><calcop field="amount" operator="get"/></calcop>
+ <calcop operator="add" field="totalNetIncome"><calcop operator="get" field="amount"/></calcop>
</calculate>
<if-compare field="isExpenseAccount" operator="equals" value="true" type="Boolean">
<if-empty field="glAccountTotalsExpenseMap[glAccount.glAccountId]">
<set field="glAccountTotalsExpenseMap[glAccount.glAccountId]" value="0.0" type="BigDecimal"/>
</if-empty>
<calculate field="glAccountTotalsExpenseMap[glAccount.glAccountId]">
- <calcop field="glAccountTotalsExpenseMap[glAccount.glAccountId]" operator="add"><calcop field="amount" operator="get"/></calcop>
+ <calcop operator="add" field="glAccountTotalsExpenseMap[glAccount.glAccountId]"><calcop operator="get" field="amount"/></calcop>
</calculate>
<else>
<if-empty field="glAccountTotalsProfitMap[glAccount.glAccountId]">
<set field="glAccountTotalsProfitMap[glAccount.glAccountId]" value="0.0" type="BigDecimal"/>
</if-empty>
<calculate field="glAccountTotalsProfitMap[glAccount.glAccountId]">
- <calcop field="glAccountTotalsProfitMap[glAccount.glAccountId]" operator="add"><calcop field="amount" operator="get"/></calcop>
+ <calcop operator="add" field="glAccountTotalsProfitMap[glAccount.glAccountId]"><calcop operator="get" field="amount"/></calcop>
</calculate>
</else>
</if-compare>
@@ -1976,7 +1976,7 @@
<iterate list="orderItemBillings" entry="orderItemBilling">
<get-related-one value-field="orderItemBilling" relation-name="OrderItem" to-value-field="orderItem"/>
<calculate field="amountFromOrder" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}">
- <calcop field="amountFromOrder" operator="add">
+ <calcop operator="add" field="amountFromOrder">
<calcop operator="multiply">
<calcop operator="get" field="orderItemBilling.quantity"/>
<calcop operator="get" field="orderItem.unitPrice"/>
@@ -2399,7 +2399,7 @@
<!--Cloning AcctgTrans-->
<clone-value value-field="acctgTrans" new-value-field="newAcctgTrans"/>
<clear-field field="newAcctgTrans.acctgTransId"/>
- <set-service-fields to-map="createAcctgTransInMap" service-name="createAcctgTrans" map="newAcctgTrans"/>
+ <set-service-fields service-name="createAcctgTrans" map="newAcctgTrans" to-map="createAcctgTransInMap"/>
<now-timestamp field="nowTimestamp"/>
<set field="createAcctgTransInMap.transactionDate" from-field="nowTimestamp"/>
<set field="createAcctgTransInMap.isPosted" value="N"/>
@@ -2415,7 +2415,7 @@
<!--Cloning AcctgTransEntry-->
<clone-value value-field="acctgTransEntry" new-value-field="newAcctgTransEntry"/>
<clear-field field="newAcctgTransEntry.acctgTransId"/>
- <set-service-fields to-map="createAcctgTransAndEntryInMap" service-name="createAcctgTransEntry" map="newAcctgTransEntry"/>
+ <set-service-fields service-name="createAcctgTransEntry" map="newAcctgTransEntry" to-map="createAcctgTransAndEntryInMap"/>
<set field="createAcctgTransAndEntryInMap.acctgTransId" from-field="newAcctgTrans.acctgTransId"/>
<if-compare field="parameters.revert" operator="equals" value="Y">
<if-compare field="newAcctgTransEntry.debitCreditFlag" operator="equals" value="D">
@@ -2690,7 +2690,7 @@
<call-service service-name="createGlAccountCategoryMember" in-map-name="createGlAccountCategoryMemberMap"/>
<log level="info" message="GlAccountCategoryMember created for [${glAccountCategoryId}] and [${glAccountId}]"/>
<else>
- <set-service-fields service-name="updateGlAccountCategoryMember" to-map="updateGlAccountCategoryMemberMap" map="glAccountCategoryMember"/>
+ <set-service-fields service-name="updateGlAccountCategoryMember" map="glAccountCategoryMember" to-map="updateGlAccountCategoryMemberMap"/>/>
<set field="updateGlAccountCategoryMemberMap.amountPercentage" from-field="amountPercentage" type="BigDecimal"/>
<call-service service-name="updateGlAccountCategoryMember" in-map-name="updateGlAccountCategoryMemberMap"/>
</else>
diff --git a/applications/accounting/minilang/payment/PaymentServices.xml b/applications/accounting/minilang/payment/PaymentServices.xml
index 4eabbbf..196bd86 100644
--- a/applications/accounting/minilang/payment/PaymentServices.xml
+++ b/applications/accounting/minilang/payment/PaymentServices.xml
@@ -61,7 +61,7 @@
</if-compare-field>
</if-not-empty>
<if-not-empty field="parameters.paymentPreferenceId">
- <entity-one value-field="orderPaymentPreference" entity-name="OrderPaymentPreference">
+ <entity-one entity-name="OrderPaymentPreference" value-field="orderPaymentPreference">
<field-map field-name="orderPaymentPreferenceId" from-field="parameters.paymentPreferenceId"/>
</entity-one>
<if-empty field="parameters.paymentMethodId">
@@ -236,13 +236,13 @@
<entity-one entity-name="Payment" value-field="toPayment">
<field-map field-name="paymentId" from-field="parameters.toPaymentId"/>
</entity-one>
- <entity-one value-field="toPaymentType" entity-name="PaymentType">
+ <entity-one entity-name="PaymentType" value-field="toPaymentType">
<field-map field-name="paymentTypeId" from-field="toPayment.paymentTypeId"/>
</entity-one>
<entity-one entity-name="Payment" value-field="payment">
<field-map field-name="paymentId" from-field="parameters.paymentId"/>
</entity-one>
- <entity-one value-field="paymentType" entity-name="PaymentType">
+ <entity-one entity-name="PaymentType" value-field="paymentType">
<field-map field-name="paymentTypeId" from-field="payment.paymentTypeId"/>
</entity-one>
@@ -280,7 +280,7 @@
<field-to-result field="paymentAppl.paymentApplicationId" result-name="paymentApplicationId"/>
<create-value value-field="paymentAppl"/>
- <entity-one value-field="payment" entity-name="Payment"/>
+ <entity-one entity-name="Payment" value-field="payment"/>
<field-to-result field="payment.paymentTypeId" result-name="paymentTypeId"/>
</simple-method>
@@ -369,14 +369,14 @@
<simple-method method-name="createPaymentAndApplication" short-description="Create a payment and a payment application for the full amount">
<set-service-fields service-name="createPayment" map="parameters" to-map="createPaymentInMap"/>
<call-service service-name="createPayment" in-map-name="createPaymentInMap">
- <result-to-field field="paymentId" result-name="paymentId"/>
+ <result-to-field result-name="paymentId" field="paymentId"/>
</call-service>
<check-errors/>
<set-service-fields service-name="createPaymentApplication" map="parameters" to-map="createPaymentAppInMap"/>
<set field="createPaymentAppInMap.paymentId" from-field="paymentId"/>
<set field="createPaymentAppInMap.amountApplied" from-field="parameters.amount"/>
<call-service service-name="createPaymentApplication" in-map-name="createPaymentAppInMap">
- <result-to-field field="paymentApplicationId" result-name="paymentApplicationId"/>
+ <result-to-field result-name="paymentApplicationId" field="paymentApplicationId"/>
</call-service>
<check-errors/>
<field-to-result field="paymentId" result-name="paymentId"/>
@@ -411,26 +411,26 @@
<field field="invoiceTerm.termDays" type="Long"/>
</call-class-method>
<calculate field="invoiceTermAmount" type="BigDecimal">
- <calcop field="invoiceTotalAmount" operator="multiply">
- <calcop field="invoiceTerm.termValue" operator="get"/>
+ <calcop operator="multiply" field="invoiceTotalAmount">
+ <calcop operator="get" field="invoiceTerm.termValue"/>
</calcop>
</calculate>
<calculate field="invoiceTermAmount" type="BigDecimal">
- <calcop field="invoiceTermAmount" operator="divide">
+ <calcop operator="divide" field="invoiceTermAmount">
<number value="100"/>
</calcop>
</calculate>
<set field="invoicePaymentInfo.amount" from-field="invoiceTermAmount"/>
<calculate field="computedTotalAmount" type="BigDecimal">
- <calcop field="computedTotalAmount" operator="add">
- <calcop field="invoicePaymentInfo.amount" operator="get"/>
+ <calcop operator="add" field="computedTotalAmount">
+ <calcop operator="get" field="invoicePaymentInfo.amount"/>
</calcop>
</calculate>
<if-compare-field field="remainingAppliedAmount" to-field="invoiceTermAmount" operator="greater-equals" type="BigDecimal">
<set field="invoicePaymentInfo.paidAmount" from-field="invoiceTermAmount" type="BigDecimal"/>
<calculate field="remainingAppliedAmount" type="BigDecimal">
- <calcop field="remainingAppliedAmount" operator="subtract">
- <calcop field="invoiceTermAmount" operator="get"/>
+ <calcop operator="subtract" field="remainingAppliedAmount">
+ <calcop operator="get" field="invoiceTermAmount"/>
</calcop>
</calculate>
<else>
@@ -439,8 +439,8 @@
</else>
</if-compare-field>
<calculate field="invoicePaymentInfo.outstandingAmount" type="BigDecimal">
- <calcop field="invoicePaymentInfo.amount" operator="subtract">
- <calcop field="invoicePaymentInfo.paidAmount" operator="get"/>
+ <calcop operator="subtract" field="invoicePaymentInfo.amount">
+ <calcop operator="get" field="invoicePaymentInfo.paidAmount"/>
</calcop>
</calculate>
<set field="invoicePaymentInfoList[]" from-field="invoicePaymentInfo"/>
@@ -473,14 +473,14 @@
</if-not-empty>
<set field="invoicePaymentInfo.invoiceId" from-field="invoice.invoiceId"/>
<calculate field="invoicePaymentInfo.amount" type="BigDecimal">
- <calcop field="invoiceTotalAmount" operator="subtract">
- <calcop field="computedTotalAmount" operator="get"/>
+ <calcop operator="subtract" field="invoiceTotalAmount">
+ <calcop operator="get" field="computedTotalAmount"/>
</calcop>
</calculate>
<set field="invoicePaymentInfo.paidAmount" from-field="remainingAppliedAmount" type="BigDecimal"/>
<calculate field="invoicePaymentInfo.outstandingAmount" type="BigDecimal">
- <calcop field="invoicePaymentInfo.amount" operator="subtract">
- <calcop field="invoicePaymentInfo.paidAmount" operator="get"/>
+ <calcop operator="subtract" field="invoicePaymentInfo.amount">
+ <calcop operator="get" field="invoicePaymentInfo.paidAmount"/>
</calcop>
</calculate>
<set field="invoicePaymentInfoList[]" from-field="invoicePaymentInfo"/>
@@ -509,7 +509,7 @@
<clear-field field="getInvoicePaymentInfoListInMap"/>
<set field="getInvoicePaymentInfoListInMap.invoice" from-field="invoice"/>
<call-service service-name="getInvoicePaymentInfoList" in-map-name="getInvoicePaymentInfoListInMap">
- <result-to-field field="invoicePaymentInfoList" result-name="invoicePaymentInfoList"/>
+ <result-to-field result-name="invoicePaymentInfoList" field="invoicePaymentInfoList"/>
</call-service>
<iterate list="invoicePaymentInfoList" entry="invoicePaymentInfo">
<if>
@@ -566,7 +566,7 @@
<set field="copyAcctgTransCtx.fromAcctgTransId" from-field="acctgTransPayment.acctgTransId"/>
<set field="copyAcctgTransCtx.revert" value="Y"/>
<call-service service-name="copyAcctgTransAndEntries" in-map-name="copyAcctgTransCtx">
- <result-to-field field="postAcctgTransMap.acctgTransId" result-name="acctgTransId"/>
+ <result-to-field result-name="acctgTransId" field="postAcctgTransMap.acctgTransId"/>
</call-service>
<if-compare field="acctgTransPayment.isPosted" operator="equals" value="Y">
<call-service service-name="postAcctgTrans" in-map-name="postAcctgTransMap"/>
@@ -880,7 +880,7 @@
</simple-method>
<simple-method method-name="createPaymentFromOrder" short-description="Service auto create Payment from Order when payment does exist yet and not disabled by accounting config">
- <entity-one value-field="orderHeader" entity-name="OrderHeader"/>
+ <entity-one entity-name="OrderHeader" value-field="orderHeader"/>
<if-compare operator="equals" value="PURCHASE_ORDER" field="orderHeader.orderTypeId">
<property-to-field resource="accounting" property="accounting.payment.purchaseorder.autocreate" field="purchaseAutoCreate" default="Y"/>
@@ -1006,18 +1006,18 @@
<set field="parameters.partyIdTo" from-field="orderRoleTo.partyId"/>
<set field="parameters.paymentMethodTypeId" value="COMPANY_ACCOUNT"/>
<set field="parameters.statusId" value="PMNT_NOT_PAID"/>
- <set-service-fields service-name="createPayment" to-map="createPayment" map="parameters"/>
+ <set-service-fields service-name="createPayment" map="parameters" to-map="createPayment"/>/>
<call-service service-name="createPayment" in-map-name="createPayment">
<result-to-field result-name="paymentId" field="parameters.paymentId"/>
</call-service>
<set field="parameters.orderId" from-field="orderHeader.orderId"/>
<set field="parameters.maxAmount" from-field="orderHeader.grandTotal"/>
- <set-service-fields service-name="createOrderPaymentPreference" to-map="newOrderPaymentPreference" map="parameters"/>
+ <set-service-fields service-name="createOrderPaymentPreference" map="parameters" to-map="newOrderPaymentPreference"/>/>
<call-service service-name="createOrderPaymentPreference" in-map-name="newOrderPaymentPreference">
<result-to-field result-name="orderPaymentPreferenceId" field="parameters.paymentPreferenceId"/>
</call-service>
- <set-service-fields service-name="updatePayment" to-map="updatePayment" map="parameters"/>
+ <set-service-fields service-name="updatePayment" map="parameters" to-map="updatePayment"/>/>
<call-service service-name="updatePayment" in-map-name="updatePayment"/>
<field-to-result field="parameters.paymentId" result-name="paymentId"/>
<log level="info" message="payment ${parameters.paymentId} with the not-paid status automatically created from order: ${parameters.orderId} (can be disabled in accounting.properties)"/>
@@ -1031,7 +1031,7 @@
</if-compare>
<if-not-empty field="parameters.invoiceId">
- <entity-one value-field="invoice" entity-name="Invoice"/>
+ <entity-one entity-name="Invoice" value-field="invoice"/>
<if-not-empty field="invoice">
<call-class-method method-name="getInvoiceTotal" class-name="org.apache.ofbiz.accounting.invoice.InvoiceWorker" ret-field="invoiceTotal">
<field field="invoice" type="GenericValue"/>
@@ -1042,7 +1042,7 @@
<result-to-field result-name="isForeign"/>
</call-service>
<if-compare operator="equals" value="true" field="isForeign">
- <entity-condition list="payments" entity-name="Payment">
+ <entity-condition entity-name="Payment" list="payments">
<condition-list combine="and">
<condition-expr field-name="statusId" value="PMNT_CONFIRMED" operator="not-equals"/>
<condition-expr field-name="partyIdFrom" from-field="invoice.partyId" operator="equals"/>
@@ -1053,7 +1053,7 @@
<order-by field-name="effectiveDate"/>
</entity-condition>
<else>
- <entity-condition list="payments" entity-name="Payment">
+ <entity-condition entity-name="Payment" list="payments">
<condition-list combine="and">
<condition-expr field-name="statusId" value="PMNT_CONFIRMED" operator="not-equals"/>
<condition-expr field-name="partyIdFrom" from-field="invoice.partyId" operator="equals"/>
@@ -1086,10 +1086,10 @@
</if-not-empty>
<if-not-empty field="parameters.paymentId">
- <entity-one value-field="payment" entity-name="Payment"/>
+ <entity-one entity-name="Payment" value-field="payment"/>
<if-not-empty field="payment">
- <entity-condition list="invoices" entity-name="Invoice">
+ <entity-condition entity-name="Invoice" list="invoices">
<condition-list combine="and">
<condition-expr field-name="statusId" value="INVOICE_READY" operator="not-equals"/>
<condition-expr field-name="statusId" value="INVOICE_PAID" operator="not-equals"/>
diff --git a/applications/accounting/minilang/rate/RateServices.xml b/applications/accounting/minilang/rate/RateServices.xml
index 3edb407..9063feb 100644
--- a/applications/accounting/minilang/rate/RateServices.xml
+++ b/applications/accounting/minilang/rate/RateServices.xml
@@ -51,7 +51,7 @@
<!-- end existing value -->
<if-not-empty field="rateAmounts">
- <first-from-list entry="rateAmount" list="rateAmounts"/>
+ <first-from-list list="rateAmounts" entry="rateAmount"/>
<if-compare-field field="rateAmount.rateAmount" operator="not-equals" to-field="parameters.rateAmount">
<set-service-fields service-name="deleteRateAmount" map="rateAmount" to-map="delRateAmount"/>
<call-service service-name="deleteRateAmount" in-map-name="delRateAmount"/>
@@ -195,7 +195,7 @@
<!-- We narrowed as much as we could the result, now returning the first record of the list -->
<if-not-empty field="parameters.ratesList">
- <first-from-list entry="amount" list="parameters.ratesList"/>
+ <first-from-list list="parameters.ratesList" entry="amount"/>
<if-empty field="amount.rateAmount">
<set field="amount.rateAmount" value="0" type="BigDecimal"/>
</if-empty>
@@ -341,7 +341,7 @@
<field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/>
</entity-and>
<if-not-empty field="partyRates">
- <first-from-list entry="partyRate" list="partyRates"/>
+ <first-from-list list="partyRates" entry="partyRate"/>
<now-timestamp field="partyRate.thruDate"/>
<store-value value-field="partyRate"/>
</if-not-empty>
@@ -371,7 +371,7 @@
<field-map field-name="defaultRate" value="Y"/>
</entity-and>
<if-not-empty field="rates">
- <first-from-list entry="rate" list="rates"/>
+ <first-from-list list="rates" entry="rate"/>
<set field="rate.defaultRate" value="N"/>
<store-value value-field="rate"/>
</if-not-empty>
diff --git a/applications/accounting/minilang/tax/TaxAuthorityServices.xml b/applications/accounting/minilang/tax/TaxAuthorityServices.xml
index e217934..432820a 100644
--- a/applications/accounting/minilang/tax/TaxAuthorityServices.xml
+++ b/applications/accounting/minilang/tax/TaxAuthorityServices.xml
@@ -43,7 +43,7 @@
<simple-method method-name="createPartyTaxAuthInfo" short-description="create a PartyTaxAuthInfo">
<call-simple-method method-name="validatePartyTaxIdInline"/>
- <entity-one value-field="taxAuth" entity-name="TaxAuthority"/>
+ <entity-one entity-name="TaxAuthority" value-field="taxAuth"/>
<if-empty field="taxAuth">
<add-error>
<fail-property resource="PartyUiLabels" property="PartyTaxAuthPartyAndGeoNotAvailable"/>
diff --git a/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml b/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml
index c0305f8..7174d54 100644
--- a/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml
+++ b/applications/accounting/minilang/test/AutoAcctgTransTestsPurchase.xml
@@ -57,7 +57,7 @@
<field-map field-name="shipmentId"/>
</entity-and>
<assert><not><if-empty field="acctgTransList"/></not></assert>
- <first-from-list entry="acctgTrans" list="acctgTransList"/>
+ <first-from-list list="acctgTransList" entry="acctgTrans"/>
<assert><if-compare field="acctgTrans.glJournalId" operator="not-equals" value="ERROR_JOURNAL"/></assert>
@@ -113,7 +113,7 @@
<entity-and entity-name="OrderItemBilling" list="orderItemBillings">
<field-map field-name="orderId"/>
</entity-and>
- <first-from-list entry="orderItemBilling" list="orderItemBillings"/>
+ <first-from-list list="orderItemBillings" entry="orderItemBilling"/>
<entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
diff --git a/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml b/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml
index e965474..e1095bd 100644
--- a/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml
+++ b/applications/accounting/minilang/test/AutoAcctgTransTestsSales.xml
@@ -56,12 +56,12 @@
<set field="serviceCtx.quantity" from-field="quantity"/>
<call-service service-name="issueOrderItemShipGrpInvResToShipment" in-map-name="serviceCtx"/>
- <entity-condition list="acctgTransList" entity-name="AcctgTrans">
+ <entity-condition entity-name="AcctgTrans" list="acctgTransList">
<condition-expr field-name="shipmentId" from-field="shipmentId"/>
<order-by field-name="-postedDate"/>
</entity-condition>
<assert><not><if-empty field="acctgTransList"/></not></assert>
- <first-from-list entry="acctgTrans" list="acctgTransList"/>
+ <first-from-list list="acctgTransList" entry="acctgTrans"/>
<assert><if-compare field="acctgTrans.glJournalId" operator="not-equals" value="ERROR_JOURNAL"/></assert>
@@ -119,12 +119,12 @@
<set field="serviceCtx.statusId" value="SHIPMENT_PACKED"/>
<call-service service-name="updateShipment" in-map-name="serviceCtx"/>
- <entity-condition list="shipmentItemBillings" entity-name="ShipmentItemBilling">
+ <entity-condition entity-name="ShipmentItemBilling" list="shipmentItemBillings">
<condition-expr field-name="shipmentId" value="9998"/>
<order-by field-name="-createdStamp"/>
</entity-condition>
<assert><not><if-empty field="shipmentItemBillings"/></not></assert>
- <first-from-list entry="shipmentItemBilling" list="shipmentItemBillings"/>
+ <first-from-list list="shipmentItemBillings" entry="shipmentItemBilling"/>
<set field="invoiceId" from-field="shipmentItemBilling.invoiceId"/>
<entity-one entity-name="Invoice" value-field="invoice">
@@ -136,7 +136,7 @@
<!-- Check the invoice transaction -->
<set field="acctgTransFilter.acctgTransTypeId" value="SALES_INVOICE"/>
<filter-list-by-and to-list="salesAcctgTransList" list="acctgTransList" map="acctgTransFilter"/>
- <first-from-list entry="salesAcctgTrans" list="salesAcctgTransList"/>
+ <first-from-list list="salesAcctgTransList" entry="salesAcctgTrans"/>
<assert><if-compare field="salesAcctgTrans.glJournalId" operator="not-equals" value="ERROR_JOURNAL"/></assert>
@@ -160,7 +160,7 @@
<clear-field field="acctgTransEntryFilter"/>
<set field="acctgTransFilter.acctgTransTypeId" value="PAYMENT_APPL"/>
<filter-list-by-and to-list="paymentAcctgTransList" list="acctgTransList" map="acctgTransFilter"/>
- <first-from-list entry="paymentAcctgTrans" list="paymentAcctgTransList"/>
+ <first-from-list list="paymentAcctgTransList" entry="paymentAcctgTrans"/>
<assert><if-compare field="paymentAcctgTrans.glJournalId" operator="not-equals" value="ERROR_JOURNAL"/></assert>
@@ -202,7 +202,7 @@
<entity-and entity-name="PartyRole" list="customerRoles">
<field-map field-name="roleTypeId" value="CUSTOMER"/>
</entity-and>
- <first-from-list entry="customerRole" list="customerRoles"/>
+ <first-from-list list="customerRoles" entry="customerRole"/>
<set field="serviceCtx.partyIdFrom" from-field="customerRole.partyId"/>
<set field="serviceCtx.amount" value="100.00" type="BigDecimal"/>
<set field="serviceCtx.partyIdTo" value="Company"/>
diff --git a/applications/accounting/minilang/test/AutoInvoiceTests.xml b/applications/accounting/minilang/test/AutoInvoiceTests.xml
index 58bc91e..77ea06f 100644
--- a/applications/accounting/minilang/test/AutoInvoiceTests.xml
+++ b/applications/accounting/minilang/test/AutoInvoiceTests.xml
@@ -99,7 +99,7 @@
</simple-method>
<simple-method method-name="assertInvoiceTotal" login-required="false"
short-description="Inline method to assist testInvoiceWorkerGetInvoiceTotal">
- <entity-one value-field="invoice" entity-name="Invoice">
+ <entity-one entity-name="Invoice" value-field="invoice">
<field-map field-name="invoiceId"/>
</entity-one>
<call-class-method method-name="getInvoiceTotal" class-name="org.apache.ofbiz.accounting.invoice.InvoiceWorker" ret-field="invoiceTotal">
diff --git a/applications/accounting/minilang/test/InvoicePerShipmentTests.xml b/applications/accounting/minilang/test/InvoicePerShipmentTests.xml
index 82104e7..6779114 100644
--- a/applications/accounting/minilang/test/InvoicePerShipmentTests.xml
+++ b/applications/accounting/minilang/test/InvoicePerShipmentTests.xml
@@ -43,7 +43,7 @@
<field field="response" type="javax.servlet.http.HttpServletResponse"/>
</call-class-method>
<log level="info" message="===== >>> Event : routeOrderEntry, Response : ${result}"/>
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<script>groovy:
@@ -103,11 +103,11 @@
</call-class-method>
<log level="info" message="===== >>> Event : destroyCart, Response = ${result}"/>
<!-- Step 3 -->
- <entity-condition list="orderHeaders" entity-name="OrderHeader">
+ <entity-condition entity-name="OrderHeader" list="orderHeaders">
<condition-expr field-name="orderTypeId" value="SALES_ORDER"/>
<order-by field-name="-entryDate"/>
</entity-condition>
- <first-from-list entry="orderHeader" list="orderHeaders"/>
+ <first-from-list list="orderHeaders" entry="orderHeader"/>
<log level="info" message="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx : ${orderHeader}"/>
<script>groovy:
import org.apache.ofbiz.shipment.packing.PackingSession;
@@ -133,7 +133,7 @@
<result-to-field result-name="responseMessage"/>
</call-service>
<log level="info" message="===== >>> Service: packBulkItems, Response = ${responseMessage}"/>
- <set-service-fields service-name="completePack" to-map="completePackInput" map="packInput"/>
+ <set-service-fields service-name="completePack" map="packInput" to-map="completePackInput"/>/>
<call-service service-name="completePack" in-map-name="completePackInput">
<result-to-field result-name="shipmentId"/>
</call-service>
@@ -170,7 +170,7 @@
<field field="response" type="javax.servlet.http.HttpServletResponse"/>
</call-class-method>
<log level="info" message="===== >>> Event : routeOrderEntry, Response = ${result}"/>
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<script>groovy:
@@ -230,11 +230,11 @@
</call-class-method>
<log level="info" message="===== >>> Event : destroyCart, Response = ${result}"/>
<!-- Step 3 -->
- <entity-condition list="orderHeaders" entity-name="OrderHeader">
+ <entity-condition entity-name="OrderHeader" list="orderHeaders">
<condition-expr field-name="orderTypeId" value="SALES_ORDER"/>
<order-by field-name="-entryDate"/>
</entity-condition>
- <first-from-list entry="orderHeader" list="orderHeaders"/>
+ <first-from-list list="orderHeaders" entry="orderHeader"/>
<script>groovy:
import org.apache.ofbiz.shipment.packing.PackingSession;
packingSession = new PackingSession(dispatcher, userLogin);
@@ -259,7 +259,7 @@
<result-to-field result-name="responseMessage"/>
</call-service>
<log level="info" message="===== >>> Service: packBulkItems, Response = ${responseMessage}"/>
- <set-service-fields service-name="completePack" to-map="completePackInput" map="packInput"/>
+ <set-service-fields service-name="completePack" map="packInput" to-map="completePackInput"/>/>
<call-service service-name="completePack" in-map-name="completePackInput">
<result-to-field result-name="shipmentId"/>
</call-service>
@@ -288,7 +288,7 @@
<field field="response" type="javax.servlet.http.HttpServletResponse"/>
</call-class-method>
<log level="info" message="===== >>> Event : routeOrderEntry, Response = ${result}"/>
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<script>groovy:
@@ -347,11 +347,11 @@
<field field="response" type="javax.servlet.http.HttpServletResponse"/>
</call-class-method>
<log level="info" message="===== >>> Event : destroyCart, Response = ${result}"/>
- <entity-condition list="orderHeaders" entity-name="OrderHeader">
+ <entity-condition entity-name="OrderHeader" list="orderHeaders">
<condition-expr field-name="orderTypeId" value="SALES_ORDER"/>
<order-by field-name="-entryDate"/>
</entity-condition>
- <first-from-list entry="orderHeader" list="orderHeaders"/>
+ <first-from-list list="orderHeaders" entry="orderHeader"/>
<set field="orderInput.orderId" from-field="orderHeader.orderId"/>
<set field="orderInput.invoicePerShipment" value="N"/>
<set field="orderInput.userLogin" from-field="userLogin"/>
@@ -384,7 +384,7 @@
<result-to-field result-name="responseMessage"/>
</call-service>
<log level="info" message="===== >>> Service: packBulkItems, Response = ${responseMessage}"/>
- <set-service-fields service-name="completePack" to-map="completePackInput" map="packInput"/>
+ <set-service-fields service-name="completePack" map="packInput" to-map="completePackInput"/>/>
<call-service service-name="completePack" in-map-name="completePackInput">
<result-to-field result-name="shipmentId"/>
</call-service>
@@ -413,7 +413,7 @@
<field field="response" type="javax.servlet.http.HttpServletResponse"/>
</call-class-method>
<log level="info" message="===== >>> Event : routeOrderEntry, Response = ${result}"/>
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<script>groovy:
@@ -472,11 +472,11 @@
<field field="response" type="javax.servlet.http.HttpServletResponse"/>
</call-class-method>
<log level="info" message="===== >>> Event : destroyCart, Response = ${result}"/>
- <entity-condition list="orderHeaders" entity-name="OrderHeader">
+ <entity-condition entity-name="OrderHeader" list="orderHeaders">
<condition-expr field-name="orderTypeId" value="SALES_ORDER"/>
<order-by field-name="-entryDate"/>
</entity-condition>
- <first-from-list entry="orderHeader" list="orderHeaders"/>
+ <first-from-list list="orderHeaders" entry="orderHeader"/>
<set field="orderInput.orderId" from-field="orderHeader.orderId"/>
<set field="orderInput.invoicePerShipment" value="Y"/>
<set field="orderInput.userLogin" from-field="userLogin"/>
@@ -509,7 +509,7 @@
<result-to-field result-name="responseMessage"/>
</call-service>
<log level="info" message="===== >>> Service: packBulkItems, Response = ${responseMessage}"/>
- <set-service-fields service-name="completePack" to-map="completePackInput" map="packInput"/>
+ <set-service-fields service-name="completePack" map="packInput" to-map="completePackInput"/>/>
<call-service service-name="completePack" in-map-name="completePackInput">
<result-to-field result-name="shipmentId"/>
</call-service>
diff --git a/applications/accounting/minilang/test/PaymentApplicationTests.xml b/applications/accounting/minilang/test/PaymentApplicationTests.xml
index 0983978..833c33b 100644
--- a/applications/accounting/minilang/test/PaymentApplicationTests.xml
+++ b/applications/accounting/minilang/test/PaymentApplicationTests.xml
@@ -41,7 +41,7 @@
<entity-one entity-name="PaymentApplication" value-field="paymentApplication">
<field-map field-name="paymentApplicationId" from-field="paymentApplicationId"/>
</entity-one>
- <entity-one value-field="payment" entity-name="Payment">
+ <entity-one entity-name="Payment" value-field="payment">
<field-map field-name="paymentId" from-field="serviceInMap.paymentId"/>
</entity-one>
<assert>
@@ -91,7 +91,7 @@
<field field="delegator" type="org.apache.ofbiz.entity.Delegator"/>
<field field="serviceInMap.paymentId"/>
</call-class-method>
- <entity-one value-field="payment" entity-name="Payment">
+ <entity-one entity-name="Payment" value-field="payment">
<field-map field-name="paymentId" from-field="serviceInMap.paymentId"/>
</entity-one>
<assert>
@@ -142,7 +142,7 @@
<field field="delegator" type="org.apache.ofbiz.entity.Delegator"/>
<field field="serviceInMap.paymentId"/>
</call-class-method>
- <entity-one value-field="payment" entity-name="Payment">
+ <entity-one entity-name="Payment" value-field="payment">
<field-map field-name="paymentId" from-field="serviceInMap.paymentId"/>
</entity-one>
<assert>
@@ -186,7 +186,7 @@
<entity-one entity-name="PaymentApplication" value-field="paymentApplication">
<field-map field-name="paymentApplicationId" from-field="paymentApplicationId"/>
</entity-one>
- <entity-one value-field="payment" entity-name="Payment">
+ <entity-one entity-name="Payment" value-field="payment">
<field-map field-name="paymentId" from-field="serviceInMap.paymentId"/>
</entity-one>
<assert>
diff --git a/applications/accounting/widget/AgreementForms.xml b/applications/accounting/widget/AgreementForms.xml
index 42d68ae..b7cccc0 100644
--- a/applications/accounting/widget/AgreementForms.xml
+++ b/applications/accounting/widget/AgreementForms.xml
@@ -66,18 +66,18 @@
</row-actions>
<auto-fields-entity entity-name="Agreement" default-field-type="display"/>
<field name="agreementId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext" sort-field="true">
- <hyperlink also-hidden="false" description="${agreementId}" target="EditAgreement">
+ <hyperlink description="${agreementId}" target="EditAgreement" also-hidden="false">
<parameter param-name="agreementId"/>
</hyperlink>
</field>
<field name="productId" sort-field="true"></field>
<field name="partyIdFrom" sort-field="true">
- <hyperlink target="/partymgr/control/viewprofile" description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target-type="inter-app">
+ <hyperlink description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="partyIdFrom"/>
</hyperlink>
</field>
<field name="partyIdTo" sort-field="true">
- <hyperlink target="/partymgr/control/viewprofile" description="${partyNameResultTo.fullName} [${partyIdTo}]" target-type="inter-app">
+ <hyperlink description="${partyNameResultTo.fullName} [${partyIdTo}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="partyIdTo"/>
</hyperlink>
</field>
@@ -94,7 +94,7 @@
<field name="textData" title="${uiLabelMap.AccountingTextData}"><hidden/></field>
<field name="description" sort-field="true"></field>
<field name="cancelLink" title=" " widget-style="buttontext">
- <hyperlink target="cancelAgreement" description="${uiLabelMap.CommonCancel}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonCancel}" target="cancelAgreement" also-hidden="false">
<parameter param-name="agreementId"/>
</hyperlink>
</field>
@@ -142,7 +142,7 @@
<auto-fields-entity entity-name="AgreementItem" default-field-type="display"/>
<field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
<field name="agreementItemSeqId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${agreementItemSeqId}" target="EditAgreementItem">
+ <hyperlink description="${agreementItemSeqId}" target="EditAgreementItem" also-hidden="false">
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
</hyperlink>
@@ -151,7 +151,7 @@
<display-entity entity-name="AgreementItemType"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeAgreementItem" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeAgreementItem" also-hidden="false">
<parameter param-name="agreementItemSeqId"/>
<parameter param-name="agreementId"/>
</hyperlink>
@@ -189,7 +189,7 @@
<field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
<field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
<field name="agreementTermId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${agreementTermId}" target="EditAgreementItemTerm">
+ <hyperlink description="${agreementTermId}" target="EditAgreementItemTerm" also-hidden="false">
<parameter param-name="agreementTermId"/>
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
@@ -202,7 +202,7 @@
<display-entity entity-name="InvoiceItemType"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeAgreementItemTerm" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeAgreementItemTerm" also-hidden="false">
<parameter param-name="agreementTermId"/>
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
@@ -233,7 +233,7 @@
</drop-down>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteAgreementTerm" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteAgreementTerm" also-hidden="false">
<parameter param-name="agreementTermId"/>
<parameter param-name="agreementId"/>
</hyperlink>
@@ -348,7 +348,7 @@
<field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
<field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
<field name="productId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${productId}" target="EditAgreementItemProduct">
+ <hyperlink description="${productId}" target="EditAgreementItemProduct" also-hidden="false">
<parameter param-name="productId"/>
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
@@ -359,7 +359,7 @@
</field>
<field name="price"><display type="currency" currency="${agreementItem.currencyUomId}"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeAgreementItemProduct" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeAgreementItemProduct" also-hidden="false">
<parameter param-name="productId"/>
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
@@ -372,7 +372,7 @@
<field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
<field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
<field name="facilityId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${facilityId}" target="EditAgreementItemFacility">
+ <hyperlink description="${facilityId}" target="EditAgreementItemFacility" also-hidden="false">
<parameter param-name="facilityId"/>
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
@@ -382,7 +382,7 @@
<display-entity entity-name="Facility" key-field-name="facilityId" description="${internalName}"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeAgreementItemFacility" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeAgreementItemFacility" also-hidden="false">
<parameter param-name="facilityId"/>
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
@@ -397,7 +397,7 @@
<field name="partyId"><hidden/></field>
<field name="currencyUomId"><hidden/></field>
<field name="productId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${productId}" target="EditAgreementItemSupplierProduct">
+ <hyperlink description="${productId}" target="EditAgreementItemSupplierProduct" also-hidden="false">
<parameter param-name="minimumOrderQuantity"/>
<parameter param-name="currencyUomId"/>
<parameter param-name="availableFromDate"/>
@@ -412,7 +412,7 @@
</field>
<field name="lastPrice"><display type="currency" currency="${agreementItem.currencyUomId}"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeAgreementItemSupplierProduct" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeAgreementItemSupplierProduct" also-hidden="false">
<parameter param-name="minimumOrderQuantity"/>
<parameter param-name="currencyUomId"/>
<parameter param-name="availableFromDate"/>
@@ -544,7 +544,7 @@
<field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
<field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
<field name="productPromoId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${productPromoId}" target="EditAgreementPromoAppl">
+ <hyperlink description="${productPromoId}" target="EditAgreementPromoAppl" also-hidden="false">
<parameter param-name="productPromoId"/>
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
@@ -555,7 +555,7 @@
<display-entity entity-name="ProductPromo" key-field-name="productPromoId" description="${promoName}"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeAgreementPromoAppl" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeAgreementPromoAppl" also-hidden="false">
<parameter param-name="productPromoId"/>
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
@@ -590,7 +590,7 @@
<field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
<field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
<field name="partyId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${partyId}" target="EditAgreementItemParty">
+ <hyperlink description="${partyId}" target="EditAgreementItemParty" also-hidden="false">
<parameter param-name="partyId"/>
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
@@ -600,7 +600,7 @@
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${lastName}"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeAgreementItemParty" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeAgreementItemParty" also-hidden="false">
<parameter param-name="partyId"/>
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
@@ -630,7 +630,7 @@
<display-entity entity-name="Geo" key-field-name="geoId" description="${geoName} [${geoId}]"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeAgreementGeographicalApplic" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeAgreementGeographicalApplic" also-hidden="false">
<parameter param-name="geoId"/>
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
@@ -683,7 +683,7 @@
<field name="agreementItemSeqId"><display/></field>
<field name="workEffortId"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteAgreementWorkEffortApplic">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteAgreementWorkEffortApplic" also-hidden="false">
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
<parameter param-name="workEffortId"/>
@@ -702,7 +702,7 @@
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><display/></field>
<field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteAgreementRole" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteAgreementRole" also-hidden="false">
<parameter param-name="agreementId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
diff --git a/applications/accounting/widget/BillingAccountForms.xml b/applications/accounting/widget/BillingAccountForms.xml
index 8c5df81..c1bd643 100644
--- a/applications/accounting/widget/BillingAccountForms.xml
+++ b/applications/accounting/widget/BillingAccountForms.xml
@@ -106,7 +106,7 @@
<field name="total" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field>
<field name="amountToApply" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field>
<field name="capture" use-when="${groovy:!paidInvoice}" widget-style="buttontext">
- <hyperlink target="capturePaymentsByInvoice" description="${uiLabelMap.AccountingCapture}">
+ <hyperlink description="${uiLabelMap.AccountingCapture}" target="capturePaymentsByInvoice">
<parameter param-name="invoiceId"/>
<parameter param-name="billingAccountId"/>
</hyperlink>
@@ -137,7 +137,7 @@
</field>
<field name="contactMechId" tooltip="${uiLabelMap.AccountingBillingContactMechIdMessage}" use-when="billingAccount != null">
<drop-down>
- <entity-options entity-name="BillingAccountRoleAndAddress" description="[${partyId}][${contactMechId}] ${toName}, ${attnName}, ${address1}, ${stateProvinceGeoId} ${postalCode}" key-field-name="contactMechId" filter-by-date="true">
+ <entity-options entity-name="BillingAccountRoleAndAddress" key-field-name="contactMechId" description="[${partyId}][${contactMechId}] ${toName}, ${attnName}, ${address1}, ${stateProvinceGeoId} ${postalCode}" filter-by-date="true">
<entity-constraint name="billingAccountId" env-name="billingAccountId"/>
<entity-order-by field-name="partyId"/>
<entity-order-by field-name="contactMechId"/>
@@ -184,7 +184,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteBillingAccountRole" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteBillingAccountRole" also-hidden="false">
<parameter param-name="billingAccountId"/>
<parameter param-name="roleTypeId"/>
<parameter param-name="partyId"/>
@@ -324,7 +324,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="billingAccountId"><hidden/></field>
<field name="orderId" widget-style="buttontext">
- <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" also-hidden="false">
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" also-hidden="false">
<parameter param-name="orderId"/>
</hyperlink>
</field>
diff --git a/applications/accounting/widget/BudgetForms.xml b/applications/accounting/widget/BudgetForms.xml
index 4a6b0a6..3f74d37 100644
--- a/applications/accounting/widget/BudgetForms.xml
+++ b/applications/accounting/widget/BudgetForms.xml
@@ -33,7 +33,7 @@
</service>
</actions>
<field name="budgetId" widget-style="linktext" sort-field="true">
- <hyperlink also-hidden="false" description="${budgetId}" target="EditBudget">
+ <hyperlink description="${budgetId}" target="EditBudget" also-hidden="false">
<parameter param-name="budgetId"/>
</hyperlink>
</field>
diff --git a/applications/accounting/widget/CommonScreens.xml b/applications/accounting/widget/CommonScreens.xml
index c7a8540..68babbc 100644
--- a/applications/accounting/widget/CommonScreens.xml
+++ b/applications/accounting/widget/CommonScreens.xml
@@ -51,7 +51,7 @@
<section>
<actions>
<set field="headerItem" value="FindFinAccount"/>
- <entity-one value-field="finAccount" entity-name="FinAccount"/>
+ <entity-one entity-name="FinAccount" value-field="finAccount"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
diff --git a/applications/accounting/widget/CostForms.xml b/applications/accounting/widget/CostForms.xml
index 5049514..17123f1 100644
--- a/applications/accounting/widget/CostForms.xml
+++ b/applications/accounting/widget/CostForms.xml
@@ -37,7 +37,7 @@
<field name="updateCostComponentCalc" title="${uiLabelMap.CommonUpdate}"><submit/></field>
<field name="costCustomMethodId"><display-entity entity-name="CustomMethod" key-field-name="customMethodId"/></field>
<field name="deleteCostComponentCalc" title=" " widget-style="buttontext">
- <hyperlink target="deleteCostComponentCalc" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteCostComponentCalc" also-hidden="false">
<parameter param-name="costComponentCalcId"/>
</hyperlink>
</field>
diff --git a/applications/accounting/widget/FieldLookupForms.xml b/applications/accounting/widget/FieldLookupForms.xml
index 594f72e..8e629f1 100644
--- a/applications/accounting/widget/FieldLookupForms.xml
+++ b/applications/accounting/widget/FieldLookupForms.xml
@@ -47,7 +47,7 @@
</service>
</actions>
<field name="fixedAssetId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')"/>
+ <hyperlink description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="fixedAssetName" title="${uiLabelMap.CommonName}"><display/></field>
<field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity entity-name="FixedAssetType"/></field>
@@ -79,7 +79,7 @@
</service>
</actions>
<field name="fixedAssetId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')"/>
+ <hyperlink description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="fixedAssetName" title="${uiLabelMap.CommonName}"><display/></field>
<field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity entity-name="FixedAssetType"/></field>
@@ -106,7 +106,7 @@
</service>
</actions>
<field name="billingAccountId" title="${uiLabelMap.AccountingBillingAccountId}" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${billingAccountId}" target="javascript:set_value('${billingAccountId}')"/>
+ <hyperlink description="${billingAccountId}" target="javascript:set_value('${billingAccountId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="description"><display/></field>
<field name="externalAccountId" title="${uiLabelMap.AccountingExternalAccountId}"><display/></field>
@@ -145,7 +145,7 @@
</service>
</actions>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${glAccountId}" target="javascript:set_value('${glAccountId}')"/>
+ <hyperlink description="${glAccountId}" target="javascript:set_value('${glAccountId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="accountName" title="${uiLabelMap.CommonName}"><display/></field>
<field name="glAccountTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="GlAccountType"/></field>
@@ -173,7 +173,7 @@
</service>
</actions>
<field name="paymentId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${paymentId}" target="javascript:set_value('${paymentId}')"/>
+ <hyperlink description="${paymentId}" target="javascript:set_value('${paymentId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="partyIdFrom"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
<field name="partyIdTo"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
@@ -217,7 +217,7 @@
</service>
</actions>
<field name="invoiceId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${invoiceId}" target="javascript:set_value('${invoiceId}')"/>
+ <hyperlink description="${invoiceId}" target="javascript:set_value('${invoiceId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="invoiceTypeId"><display-entity entity-name="InvoiceType"/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
@@ -247,7 +247,7 @@
</service>
</actions>
<field name="agreementId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${agreementId}" target="javascript:set_value('${agreementId}')"/>
+ <hyperlink description="${agreementId}" target="javascript:set_value('${agreementId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="productId"><display/></field>
<field name="partyIdFrom"><display/></field>
@@ -281,7 +281,7 @@
</actions>
<field name="agreementId"><display/></field>
<field name="agreementItemSeqId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${agreementItemSeqId}" target="javascript:set_value('${agreementItemSeqId}')"/>
+ <hyperlink description="${agreementItemSeqId}" target="javascript:set_value('${agreementItemSeqId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="agreementItemTypeId"><display/></field>
<field name="currencyUomId"><display/></field>
@@ -307,7 +307,7 @@
</service>
</actions>
<field name="paymentGroupId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${paymentGroupId}" target="javascript:set_value('${paymentGroupId}')"/>
+ <hyperlink description="${paymentGroupId}" target="javascript:set_value('${paymentGroupId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="paymentId"><display/></field>
<field name="sequenceNum"><display/></field>
@@ -334,7 +334,7 @@
</service>
</actions>
<field name="glReconciliationId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${glReconciliationId}" target="javascript:set_value('${glReconciliationId}')"/>
+ <hyperlink description="${glReconciliationId}" target="javascript:set_value('${glReconciliationId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="glReconciliationName"><display/></field>
<field name="organizationPartyId"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${firstName} ${lastName}[${partyId}]"/></field>
@@ -377,7 +377,7 @@
</service>
</actions>
<field name="customTimePeriodId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${customTimePeriodId}" target="javascript:set_value('${customTimePeriodId}')"/>
+ <hyperlink description="${customTimePeriodId}" target="javascript:set_value('${customTimePeriodId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="parentPeriodId"><display/></field>
<field name="periodTypeId"><display-entity entity-name="PeriodType"/></field>
diff --git a/applications/accounting/widget/FinAccountForms.xml b/applications/accounting/widget/FinAccountForms.xml
index 5a524bb..2a6f88d 100644
--- a/applications/accounting/widget/FinAccountForms.xml
+++ b/applications/accounting/widget/FinAccountForms.xml
@@ -64,17 +64,17 @@
</hyperlink>
</field>
<field name="organizationPartyId">
- <hyperlink target="/partymgr/control/viewprofile" description="${organizationPartyId}" target-type="inter-app">
+ <hyperlink description="${organizationPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="organizationPartyId"/>
</hyperlink>
</field>
<field name="ownerPartyId">
- <hyperlink target="/partymgr/control/viewprofile" description="${ownerPartyId}" target-type="inter-app">
+ <hyperlink description="${ownerPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="ownerPartyId"/>
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteFinAccount" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteFinAccount" also-hidden="false">
<parameter param-name="finAccountId"/>
</hyperlink>
</field>
@@ -155,7 +155,7 @@
<field name="thruDate"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteFinAccountRole" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteFinAccountRole" also-hidden="false">
<parameter param-name="finAccountId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
@@ -209,7 +209,7 @@
</field>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccount}">
<drop-down>
- <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountCode} - ${accountName} [${glAccountId}]" key-field-name="glAccountId">
+ <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]">
<entity-constraint name="organizationPartyId" operator="equals" env-name="defaultOrganizationPartyId"/>
<entity-order-by field-name="glAccountId"/>
</entity-options>
@@ -230,7 +230,7 @@
<field name="finAccountAuthId"><display/></field>
<field name="finAccountId"><hidden/></field>
<field name="expireLink" title=" " widget-style="buttontext">
- <hyperlink target="expireFinAccountAuth" description="${uiLabelMap.CommonExpire}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonExpire}" target="expireFinAccountAuth" also-hidden="false">
<parameter param-name="finAccountId"/>
<parameter param-name="finAccountAuthId"/>
</hyperlink>
@@ -265,7 +265,7 @@
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'} @and ${paymentGroupMemberAndTransList[0].finAccountTransStatusId != 'FINACT_TRNS_APPROVED'} @and ${groovy:org.apache.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
- <hyperlink target="deleteDepositSlip" description="${uiLabelMap.CommonCancel}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonCancel}" target="deleteDepositSlip" also-hidden="false">
<parameter param-name="paymentGroupId"/>
<parameter param-name="finAccountId"/>
<parameter param-name="glReconciliationId"/>
@@ -287,7 +287,7 @@
</entity-and>
</actions>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="expireDepositSlipMember" description="${uiLabelMap.CommonCancel}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonCancel}" target="expireDepositSlipMember" also-hidden="false">
<parameter param-name="paymentGroupId"/>
<parameter param-name="paymentId"/>
<parameter param-name="fromDate"/>
@@ -424,19 +424,19 @@
</row-actions>
<auto-fields-service service-name="updateGlReconciliation" default-field-type="display" map-name="glReconciliation"/>
<field name="glReconciliationId">
- <hyperlink target="ViewGlReconciliationWithTransaction" description="${glReconciliation.glReconciliationId}">
+ <hyperlink description="${glReconciliation.glReconciliationId}" target="ViewGlReconciliationWithTransaction">
<parameter param-name="glReconciliationId" from-field="glReconciliation.glReconciliationId"/>
<parameter param-name="finAccountId"/>
</hyperlink>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
<field name="organizationPartyId" title="${uiLabelMap.PartyParty}">
- <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyName.firstName} ${partyName.lastName}${partyName.groupName} [${partyName.partyId}]">
+ <hyperlink description="${partyName.firstName} ${partyName.lastName}${partyName.groupName} [${partyName.partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="partyName.partyId"/>
</hyperlink>
</field>
<field name="cancelButton" title="${uiLabelMap.AccountingCancelBankReconciliation}" use-when="${glReconciliation.statusId == 'GLREC_CREATED'}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonCancel}" target="cancelReconciliation">
+ <hyperlink description="${uiLabelMap.CommonCancel}" target="cancelReconciliation" also-hidden="false">
<parameter param-name="glReconciliationId" from-field="glReconciliation.glReconciliationId"/>
<parameter param-name="finAccountId"/>
</hyperlink>
diff --git a/applications/accounting/widget/FinAccountScreens.xml b/applications/accounting/widget/FinAccountScreens.xml
index f3a9e57..b99f994 100644
--- a/applications/accounting/widget/FinAccountScreens.xml
+++ b/applications/accounting/widget/FinAccountScreens.xml
@@ -27,7 +27,7 @@
<section>
<actions>
<set field="headerItem" value="FindFinAccount"/>
- <entity-one value-field="finAccount" entity-name="FinAccount"/>
+ <entity-one entity-name="FinAccount" value-field="finAccount"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
diff --git a/applications/accounting/widget/FixedAssetForms.xml b/applications/accounting/widget/FixedAssetForms.xml
index 4e0630b..7d61f6e 100644
--- a/applications/accounting/widget/FixedAssetForms.xml
+++ b/applications/accounting/widget/FixedAssetForms.xml
@@ -44,7 +44,7 @@
</service>
</row-actions>
<field name="fixedAssetId" widget-style="linktext" sort-field="true">
- <hyperlink also-hidden="false" description="${fixedAssetId}" target="EditFixedAsset">
+ <hyperlink description="${fixedAssetId}" target="EditFixedAsset" also-hidden="false">
<parameter param-name="fixedAssetId"/>
</hyperlink>
</field>
@@ -135,7 +135,7 @@
<field name="fixedAssetId"><hidden/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeFixedAssetProduct" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeFixedAssetProduct" also-hidden="false">
<parameter param-name="fixedAssetId"/>
<parameter param-name="productId"/>
<parameter param-name="fixedAssetProductTypeId"/>
@@ -212,7 +212,7 @@
</drop-down>
</field>
<field name="cancel" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonCancel}" target="cancelFixedAssetStdCost">
+ <hyperlink description="${uiLabelMap.CommonCancel}" target="cancelFixedAssetStdCost" also-hidden="false">
<parameter param-name="fixedAssetId"/>
<parameter param-name="fixedAssetStdCostTypeId"/>
<parameter param-name="fromDate"/>
@@ -257,7 +257,7 @@
</field>
<field name="idValue" title="${uiLabelMap.AccountingFixedAssetIdentIdValue}"/>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeFixedAssetIdent" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeFixedAssetIdent" also-hidden="false">
<parameter param-name="fixedAssetId"/>
<parameter param-name="fixedAssetIdentTypeId"/>
</hyperlink>
@@ -297,7 +297,7 @@
<field name="licenseNumber" title="${uiLabelMap.AccountingFixedAssetLicenseNumber}"><text size="20"/></field>
<field name="govAgencyPartyId" title="${uiLabelMap.AccountingFixedAssetGovAgencyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteFixedAssetRegistration" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteFixedAssetRegistration" also-hidden="false">
<parameter param-name="fixedAssetId"/>
<parameter param-name="fromDate"/>
</hyperlink>
@@ -329,7 +329,7 @@
</service>
</actions>
<field name="maintHistSeqId">
- <hyperlink also-hidden="false" description="${maintHistSeqId}" target="EditFixedAssetMaint">
+ <hyperlink description="${maintHistSeqId}" target="EditFixedAssetMaint" also-hidden="false">
<parameter param-name="fixedAssetId"/>
<parameter param-name="maintHistSeqId"/>
</hyperlink>
@@ -410,7 +410,7 @@
</drop-down>
</field>
<field name="scheduleWorkEffortId" widget-style="buttontext">
- <hyperlink target="/workeffort/control/WorkEffortSummary" also-hidden="false" description="${fixedAssetMaint.scheduleWorkEffortId}" target-type="inter-app">
+ <hyperlink description="${fixedAssetMaint.scheduleWorkEffortId}" target="/workeffort/control/WorkEffortSummary" also-hidden="false" target-type="inter-app">
<parameter param-name="workEffortId" from-field="fixedAssetMaint.scheduleWorkEffortId"/>
</hyperlink>
</field>
@@ -439,14 +439,14 @@
<field name="readingDate"><display/></field>
<field name="meterValue" title="${uiLabelMap.AccountingFixedAssetMeterValue}"><text/></field>
<field name="maintHistSeqId" title="${uiLabelMap.AccountingFixedAssetMaint}">
- <hyperlink target="EditFixedAssetMaint" description="${maintHistSeqId}" also-hidden="false">
+ <hyperlink description="${maintHistSeqId}" target="EditFixedAssetMaint" also-hidden="false">
<parameter param-name="fixedAssetId"/>
<parameter param-name="maintHistSeqId"/>
</hyperlink>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonRemove}" widget-style="buttontext">
- <hyperlink target="deleteFixedAssetMeter" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteFixedAssetMeter" also-hidden="false">
<parameter param-name="fixedAssetId"/>
<parameter param-name="productMeterTypeId"/>
<parameter param-name="readingDate"/>
@@ -486,13 +486,13 @@
<field name="fixedAssetId"><hidden/></field>
<field name="maintHistSeqId"><hidden/></field>
<field name="orderId" widget-style="buttontext">
- <hyperlink target="/ordermgr/control/orderview" also-hidden="false" description="${orderId}" target-type="inter-app">
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview" also-hidden="false" target-type="inter-app">
<parameter param-name="orderId"/>
</hyperlink>
</field>
<field name="orderItemSeqId"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteFixedAssetMaintOrder" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteFixedAssetMaintOrder" also-hidden="false">
<parameter param-name="fixedAssetId"/>
<parameter param-name="maintHistSeqId"/>
<parameter param-name="orderId"/>
@@ -546,7 +546,7 @@
<submit button-type="button"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deletePartyFixedAssetAssignment" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyFixedAssetAssignment" also-hidden="false">
<parameter param-name="fixedAssetId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
@@ -606,7 +606,7 @@
<display-entity entity-name="CustomMethod" key-field-name="customMethodId"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteFixedAssetDepMethod" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteFixedAssetDepMethod" also-hidden="false">
<parameter param-name="fixedAssetId"/>
<parameter param-name="depreciationCustomMethodId"/>
<parameter param-name="fromDate"/>
@@ -631,7 +631,7 @@
</entity-condition>
</actions>
<field name="acctgTransId" widget-style="buttontext">
- <hyperlink target="EditAcctgTrans" description="${acctgTransId}" also-hidden="false">
+ <hyperlink description="${acctgTransId}" target="EditAcctgTrans" also-hidden="false">
<parameter param-name="acctgTransId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -740,7 +740,7 @@
<field name="profitGlAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"/></field>
<field name="lossGlAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteFixedAssetTypeGlAccountForFixedAsset" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteFixedAssetTypeGlAccountForFixedAsset" also-hidden="false">
<parameter param-name="fixedAssetTypeId"/>
<parameter param-name="fixedAssetId"/>
<parameter param-name="organizationPartyId"/>
diff --git a/applications/accounting/widget/FixedAssetScreens.xml b/applications/accounting/widget/FixedAssetScreens.xml
index 4dfc417..38fd23e 100644
--- a/applications/accounting/widget/FixedAssetScreens.xml
+++ b/applications/accounting/widget/FixedAssetScreens.xml
@@ -616,7 +616,7 @@
<set field="titleProperty" value="PageTitleFixedAssetGeoLocation"/>
<set field="tabButtonItem" value="FixedAssetGeoLocation"/>
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
- <entity-one value-field="fixedAsset" entity-name="FixedAsset"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
<script location="component://accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy"/>
</actions>
<widgets>
diff --git a/applications/accounting/widget/GlForms.xml b/applications/accounting/widget/GlForms.xml
index ed15e98..b4d36b9 100644
--- a/applications/accounting/widget/GlForms.xml
+++ b/applications/accounting/widget/GlForms.xml
@@ -101,7 +101,7 @@
</actions>
<field name="acctgTransId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${acctgTransId}" target="EditAcctgTrans">
+ <hyperlink description="${acctgTransId}" target="EditAcctgTrans" also-hidden="false">
<parameter param-name="acctgTransId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -111,25 +111,25 @@
<field name="description"><display/></field>
<field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}"><display-entity entity-name="GlFiscalType"/></field>
<field name="invoiceId" use-when="invoiceId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice">
+ <hyperlink description="${invoiceId}" target="editInvoice" also-hidden="false">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
<field name="invoiceId" use-when="invoiceId==null"><display/></field>
<field name="paymentId" use-when="paymentId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${paymentId}" target="editPayment">
+ <hyperlink description="${paymentId}" target="editPayment" also-hidden="false">
<parameter param-name="paymentId"/>
</hyperlink>
</field>
<field name="paymentId" use-when="paymentId==null"><display/></field>
<field name="workEffortId" use-when="workEffortId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${workEffortId}" target="/workeffort/control/EditWorkEffort" target-type="inter-app">
+ <hyperlink description="${workEffortId}" target="/workeffort/control/EditWorkEffort" also-hidden="false" target-type="inter-app">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
<field name="workEffortId" use-when="workEffortId==null"><display/></field>
<field name="shipmentId" use-when="shipmentId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${shipmentId}" target="/facility/control/EditShipment" target-type="inter-app">
+ <hyperlink description="${shipmentId}" target="/facility/control/EditShipment" also-hidden="false" target-type="inter-app">
<parameter param-name="shipmentId"/>
</hyperlink>
</field>
@@ -137,12 +137,12 @@
<field name="isPosted"><display/></field>
<field name="postedDate"><display/></field>
<field name="postAcctgTrans" title=" " use-when="'N'.equals(isPosted)" widget-style="buttontext">
- <hyperlink target="postAcctgTrans" description="${uiLabelMap.AccountingPostTransaction}">
+ <hyperlink description="${uiLabelMap.AccountingPostTransaction}" target="postAcctgTrans">
<parameter param-name="acctgTransId"/>
</hyperlink>
</field>
<field name="createTransactionDetailReportPDF" title=" " use-when="${isPosted=='Y'}" widget-style="buttontext">
- <hyperlink target="acctgTransDetailReportPdf.pdf" target-window="_BLANK" description="${uiLabelMap.AccountingInvoicePDF}">
+ <hyperlink description="${uiLabelMap.AccountingInvoicePDF}" target="acctgTransDetailReportPdf.pdf" target-window="_BLANK">
<parameter param-name="acctgTransId"/>
</hyperlink>
</field>
@@ -152,7 +152,7 @@
<form name="ListUnpostedAcctgTrans" type="list" title="Unposted Accounting Transactions" list-name="transactions"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="acctgTransId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${acctgTransId}" target="EditAcctgTrans">
+ <hyperlink description="${acctgTransId}" target="EditAcctgTrans" also-hidden="false">
<parameter param-name="acctgTransId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -161,13 +161,13 @@
<field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}"><display-entity entity-name="AcctgTransType"/></field>
<field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}"><display-entity entity-name="GlFiscalType"/></field>
<field name="invoiceId" use-when="invoiceId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice">
+ <hyperlink description="${invoiceId}" target="editInvoice" also-hidden="false">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
<field name="invoiceId" use-when="invoiceId==null"><display/></field>
<field name="paymentId" use-when="paymentId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${paymentId}" target="editPayment">
+ <hyperlink description="${paymentId}" target="editPayment" also-hidden="false">
<parameter param-name="paymentId"/>
</hyperlink>
</field>
@@ -288,7 +288,7 @@
</field>
<field name="acctgTransId" widget-style="buttontext" position="2">
- <hyperlink also-hidden="false" description="${acctgTransId}" target="EditAcctgTrans">
+ <hyperlink description="${acctgTransId}" target="EditAcctgTrans" also-hidden="false">
<parameter param-name="acctgTransId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -298,37 +298,37 @@
<field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}" position="2"><display-entity entity-name="AcctgTransType"/></field>
<field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}" position="2"><display-entity entity-name="GlFiscalType"/></field>
<field name="invoiceId" position="2" use-when="invoiceId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice">
+ <hyperlink description="${invoiceId}" target="editInvoice" also-hidden="false">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
<field name="invoiceId" position="2" use-when="invoiceId==null"><display/></field>
<field name="paymentId" position="2" use-when="paymentId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${paymentId}" target="editPayment">
+ <hyperlink description="${paymentId}" target="editPayment" also-hidden="false">
<parameter param-name="paymentId"/>
</hyperlink>
</field>
<field name="paymentId" position="2" use-when="paymentId==null"><display/></field>
<field name="workEffortId" position="2" use-when="workEffortId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${workEffortId}" target="/workeffort/control/EditWorkEffort" target-type="inter-app">
+ <hyperlink description="${workEffortId}" target="/workeffort/control/EditWorkEffort" also-hidden="false" target-type="inter-app">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
<field name="workEffortId" position="2" use-when="workEffortId==null"><display/></field>
<field name="shipmentId" position="2" use-when="shipmentId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${shipmentId}" target="/facility/control/EditShipment" target-type="inter-app">
+ <hyperlink description="${shipmentId}" target="/facility/control/EditShipment" also-hidden="false" target-type="inter-app">
<parameter param-name="shipmentId"/>
</hyperlink>
</field>
<field name="shipmentId" position="2" use-when="shipmentId==null"><display/></field>
<field name="partyId" position="2" use-when="partyId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
+ <hyperlink description="${partyId}" target="/partymgr/control/viewprofile" also-hidden="false" target-type="inter-app">
<parameter param-name="partyId"/>
</hyperlink>
</field>
<field name="partyId" position="2" use-when="partyId==null"><display/></field>
<field name="productId" position="2" use-when="productId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
+ <hyperlink description="${productId}" target="/catalog/control/EditProduct" also-hidden="false" target-type="inter-app">
<parameter param-name="productId"/>
</hyperlink>
</field>
@@ -365,7 +365,7 @@
<field name="transactionDate"><display/></field>
<field name="acctgTransId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${acctgTransId}" target="EditAcctgTrans">
+ <hyperlink description="${acctgTransId}" target="EditAcctgTrans" also-hidden="false">
<parameter param-name="acctgTransId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -381,37 +381,37 @@
<display-entity entity-name="GlAccountClass"/>
</field>
<field name="invoiceId" use-when="invoiceId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice">
+ <hyperlink description="${invoiceId}" target="editInvoice" also-hidden="false">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
<field name="invoiceId" use-when="invoiceId==null"><display/></field>
<field name="paymentId" use-when="paymentId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${paymentId}" target="editPayment">
+ <hyperlink description="${paymentId}" target="editPayment" also-hidden="false">
<parameter param-name="paymentId"/>
</hyperlink>
</field>
<field name="paymentId" use-when="paymentId==null"><display/></field>
<field name="workEffortId" use-when="workEffortId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${workEffortId}" target="/workeffort/control/EditWorkEffort" target-type="inter-app">
+ <hyperlink description="${workEffortId}" target="/workeffort/control/EditWorkEffort" also-hidden="false" target-type="inter-app">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
<field name="workEffortId" use-when="workEffortId==null"><display/></field>
<field name="shipmentId" use-when="shipmentId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${shipmentId}" target="/facility/control/EditShipment" target-type="inter-app">
+ <hyperlink description="${shipmentId}" target="/facility/control/EditShipment" also-hidden="false" target-type="inter-app">
<parameter param-name="shipmentId"/>
</hyperlink>
</field>
<field name="shipmentId" use-when="shipmentId==null"><display/></field>
<field name="partyId" use-when="partyId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
+ <hyperlink description="${partyId}" target="/partymgr/control/viewprofile" also-hidden="false" target-type="inter-app">
<parameter param-name="partyId"/>
</hyperlink>
</field>
<field name="partyId" use-when="partyId==null"><display/></field>
<field name="productId" use-when="productId!=null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
+ <hyperlink description="${productId}" target="/catalog/control/EditProduct" also-hidden="false" target-type="inter-app">
<parameter param-name="productId"/>
</hyperlink>
</field>
@@ -796,7 +796,7 @@
<field name="organizationPartyId"><hidden/></field>
<field name="glAccountId">
<drop-down allow-empty="false">
- <entity-options entity-name="GlAccount" description="${accountCode} - ${accountName} [${glAccountId}]" key-field-name="glAccountId">
+ <entity-options entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]">
<entity-order-by field-name="accountCode"/>
</entity-options>
</drop-down>
@@ -825,18 +825,18 @@
</field>
<field name="acctgTransEntrySeqId"><display/></field>
<field name="glAccountId">
- <hyperlink target="GlAccountNavigate" description="${glAccountId}">
+ <hyperlink description="${glAccountId}" target="GlAccountNavigate">
<parameter param-name="glAccountId"/>
</hyperlink>
</field>
<field name="partyId">
- <hyperlink target="/partymgr/control/viewprofile" description="${partyIdTo}" target-type="inter-app">
+ <hyperlink description="${partyIdTo}" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId"/>
</hyperlink>
</field>
<field name="productId"><display/></field>
<field name="organizationPartyId">
- <hyperlink target="/partymgr/control/viewprofile" description="${organizationPartyId}" target-type="inter-app">
+ <hyperlink description="${organizationPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="organizationPartyId"/>
</hyperlink>
</field>
@@ -885,7 +885,7 @@
<field name="organizationPartyId"><hidden/></field>
<field name="glAccountId">
<drop-down allow-empty="false">
- <entity-options entity-name="GlAccount" description="${accountCode} - ${accountName} [${glAccountId}]" key-field-name="glAccountId">
+ <entity-options entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]">
<entity-order-by field-name="accountCode"/>
</entity-options>
</drop-down>
@@ -907,7 +907,7 @@
</entity-condition>
</actions>
<field name="glReconciliationId">
- <hyperlink also-hidden="false" description="${glReconciliationId}" target="EditGlReconciliations">
+ <hyperlink description="${glReconciliationId}" target="EditGlReconciliations" also-hidden="false">
<parameter param-name="glReconciliationId"/>
<parameter param-name="tabButtonItem" from-field="AccountReconciliations"/>
<parameter param-name="organizationPartyId"/>
@@ -918,12 +918,12 @@
<field name="createdByUserLogin"><display/></field>
<field name="lastModifiedByUserLogin"><display/></field>
<field name="glAccountId">
- <hyperlink target="GlAccountNavigate" description="${glAccountId}">
+ <hyperlink description="${glAccountId}" target="GlAccountNavigate">
<parameter param-name="glAccountId"/>
</hyperlink>
</field>
<field name="organizationPartyId">
- <hyperlink target="/partymgr/control/viewprofile" description="${organizationPartyId}" target-type="inter-app">
+ <hyperlink description="${organizationPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="organizationPartyId"/>
</hyperlink>
</field>
@@ -956,8 +956,8 @@
<field name="postedDate" position="2"/>
<field name="inventoryItemId" position="1"/>
<field name="physicalInventoryId" position="2"/>
- <field name="invoiceId" position="1"><hyperlink target="invoiceOverview?invoiceId=${acctgTrans.invoiceId}" description="${acctgTrans.invoiceId}"/></field>
- <field name="paymentId" position="2"><hyperlink target="paymentOverview?paymentId=${acctgTrans.paymentId}" description="${acctgTrans.paymentId}"/></field>
+ <field name="invoiceId" position="1"><hyperlink description="${acctgTrans.invoiceId}" target="invoiceOverview?invoiceId=${acctgTrans.invoiceId}"/></field>
+ <field name="paymentId" position="2"><hyperlink description="${acctgTrans.paymentId}" target="paymentOverview?paymentId=${acctgTrans.paymentId}"/></field>
<field name="receiptId" position="1"/>
<field name="workEffortId" position="2"/>
<field name="shipmentId" position="1"/>
diff --git a/applications/accounting/widget/GlSetupForms.xml b/applications/accounting/widget/GlSetupForms.xml
index 5c424c3..2c60364 100644
--- a/applications/accounting/widget/GlSetupForms.xml
+++ b/applications/accounting/widget/GlSetupForms.xml
@@ -25,17 +25,17 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="partyId" title="${uiLabelMap.AccountingCompanies}"><display-entity entity-name="PartyGroup" description="${groupName}"/></field>
<field name="setup" title=" " use-when="hasPrefPermission" widget-style="buttontext">
- <hyperlink target="AdminMain" description="${uiLabelMap.AccountingSetup}">
+ <hyperlink description="${uiLabelMap.AccountingSetup}" target="AdminMain">
<parameter param-name="organizationPartyId" from-field="partyId"/>
</hyperlink>
</field>
<field name="accounting" title=" " use-when="hasBasicPermission" widget-style="buttontext">
- <hyperlink target="PartyAccountsSummary" description="${uiLabelMap.AccountingAccounting}">
+ <hyperlink description="${uiLabelMap.AccountingAccounting}" target="PartyAccountsSummary">
<parameter param-name="organizationPartyId" from-field="partyId"/>
</hyperlink>
</field>
<field name="importexport" title=" " use-when="hasBasicPermission" widget-style="buttontext">
- <hyperlink target="ImportExport" description="${uiLabelMap.CommonImportExport}">
+ <hyperlink description="${uiLabelMap.CommonImportExport}" target="ImportExport">
<parameter param-name="organizationPartyId" from-field="partyId"/>
</hyperlink>
</field>
@@ -50,7 +50,7 @@
</entity-condition>
</actions>
<field name="accountCode" title="${uiLabelMap.CommonCode}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${accountCode}" target="GlAccountNavigate">
+ <hyperlink description="${accountCode}" target="GlAccountNavigate" also-hidden="false">
<parameter param-name="glAccountId"/>
</hyperlink>
</field>
@@ -483,14 +483,14 @@
<field name="invoiceItemTypeId"><hidden/></field>
<field name="description"><display/></field>
<field name="defaultGlAccountId">
- <hyperlink target="GlAccountNavigate" description="${defaultGlAccountId}">
+ <hyperlink description="${defaultGlAccountId}" target="GlAccountNavigate">
<parameter param-name="glAccountId" from-field="defaultGlAccountId"/>
</hyperlink>
</field>
<field name="overrideGlAccountId"><display/></field>
<field name="activeGlDescription"><display/></field>
<field name="remove" title=" " widget-style="buttontext" use-when="defaultAccount==false">
- <hyperlink target="removeSalInvoiceItemTypeGlAssignment" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeSalInvoiceItemTypeGlAssignment">
<parameter param-name="organizationPartyId"/><parameter param-name="invoiceItemTypeId"/>
</hyperlink>
</field>
@@ -537,14 +537,14 @@
<field name="invoiceItemTypeId"><hidden/></field>
<field name="description"><display/></field>
<field name="defaultGlAccountId">
- <hyperlink target="GlAccountNavigate" description="${defaultGlAccountId}">
+ <hyperlink description="${defaultGlAccountId}" target="GlAccountNavigate">
<parameter param-name="glAccountId" from-field="defaultGlAccountId"/>
</hyperlink>
</field>
<field name="overrideGlAccountId" title="${uiLabelMap.AccountingInvoiceOverrideExpenseGlAccountId}"><display/></field>
<field name="activeGlDescription"><display/></field>
<field name="remove" title=" " widget-style="buttontext" use-when="defaultAccount==false">
- <hyperlink target="removePurInvoiceItemTypeGlAssignment" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removePurInvoiceItemTypeGlAssignment">
<parameter param-name="organizationPartyId"/><parameter param-name="invoiceItemTypeId"/>
</hyperlink>
</field>
@@ -593,7 +593,7 @@
<field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}"><display-entity entity-name="GlAccountType"/></field>
<field name="organizationPartyId"><hidden/></field>
<field name="remove" title=" " widget-style="buttontext">
- <hyperlink target="removePaymentTypeGlAssignment" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removePaymentTypeGlAssignment">
<parameter param-name="organizationPartyId"/><parameter param-name="paymentTypeId"/>
</hyperlink>
</field>
@@ -646,12 +646,12 @@
</field>
<field name="organizationPartyId"><hidden/></field>
<field name="defaultGlAccountId">
- <hyperlink target="GlAccountNavigate" description="${defaultGlAccountId} : ${description}">
+ <hyperlink description="${defaultGlAccountId} : ${description}" target="GlAccountNavigate">
<parameter param-name="glAccountId" from-field="defaultGlAccountId"/>
</hyperlink>
</field>
<field name="remove" title=" " widget-style="buttontext">
- <hyperlink target="removePaymentMethodTypeGlAssignment" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removePaymentMethodTypeGlAssignment">
<parameter param-name="organizationPartyId"/><parameter param-name="paymentMethodTypeId"/>
</hyperlink>
</field>
@@ -705,7 +705,7 @@
<display-entity entity-name="CustomTimePeriod" key-field-name="customTimePeriodId" description="[${customTimePeriodId}] ${periodName}: ${fromDate} - ${thruDate}"/>
</field>
<field name="close" title=" " widget-style="buttontext">
- <hyperlink target="closeFinancialTimePeriod" description="${uiLabelMap.CommonClose}">
+ <hyperlink description="${uiLabelMap.CommonClose}" target="closeFinancialTimePeriod">
<parameter param-name="organizationPartyId"/><parameter param-name="customTimePeriodId"/>
</hyperlink>
</field>
@@ -755,12 +755,12 @@
<auto-fields-entity entity-name="GlJournal" default-field-type="display"/>
<field name="organizationPartyId"><hidden/></field>
<field name="glJournalId" widget-style="buttontext">
- <hyperlink target="SetupGlJournals" description="${glJournalId}">
+ <hyperlink description="${glJournalId}" target="SetupGlJournals">
<parameter param-name="organizationPartyId"/><parameter param-name="glJournalId"/>
</hyperlink>
</field>
<field name="remove" title=" " widget-style="buttontext">
- <hyperlink target="deleteGlJournal" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteGlJournal">
<parameter param-name="organizationPartyId"/><parameter param-name="glJournalId"/>
</hyperlink>
</field>
@@ -780,7 +780,7 @@
</drop-down>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductGlAccount" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteProductGlAccount">
<parameter param-name="organizationPartyId"/><parameter param-name="productId"/><parameter param-name="glAccountTypeId"/>
</hyperlink>
</field>
@@ -825,7 +825,7 @@
</drop-down>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteFinAccountTypeGlAccount" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteFinAccountTypeGlAccount">
<parameter param-name="organizationPartyId"/><parameter param-name="finAccountTypeId"/>
</hyperlink>
</field>
@@ -865,7 +865,7 @@
</drop-down>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductCategoryGlAccount" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteProductCategoryGlAccount">
<parameter param-name="organizationPartyId"/><parameter param-name="productCategoryId"/><parameter param-name="glAccountTypeId"/>
</hyperlink>
</field>
@@ -910,7 +910,7 @@
</drop-down>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteVarianceReasonGlAccount" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteVarianceReasonGlAccount">
<parameter param-name="organizationPartyId"/><parameter param-name="varianceReasonId"/>
</hyperlink>
</field>
@@ -951,7 +951,7 @@
</drop-down>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteCreditCardTypeGlAccount" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteCreditCardTypeGlAccount">
<parameter param-name="organizationPartyId"/><parameter param-name="cardType"/>
</hyperlink>
</field>
@@ -963,7 +963,7 @@
<field name="organizationPartyId"><hidden/></field>
<field name="cardType">
<drop-down allow-empty="false">
- <entity-options entity-name="Enumeration" description="${enumCode}" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId" description="${enumCode}">
<entity-constraint name="enumTypeId" operator="equals" value="CREDIT_CARD_TYPE"/>
<entity-order-by field-name="enumId"/>
</entity-options>
@@ -1003,7 +1003,7 @@
</drop-down>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteOrganizationTaxAuthorityGlAccount" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteOrganizationTaxAuthorityGlAccount">
<parameter param-name="organizationPartyId"/><parameter param-name="taxAuthGeoId"/><parameter param-name="taxAuthPartyId"/>
</hyperlink>
</field>
@@ -1039,7 +1039,7 @@
<auto-fields-service service-name="updatePartyGlAccount" default-field-type="display"/>
<field name="organizationPartyId"><hidden/></field>
<field name="partyId">
- <hyperlink target="/partymgr/control/viewprofile" description="${partyId}" target-type="inter-app">
+ <hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -1052,7 +1052,7 @@
</drop-down>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deletePartyGlAccount" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyGlAccount">
<parameter param-name="organizationPartyId"/><parameter param-name="partyId"/><parameter param-name="glAccountId"/><parameter param-name="roleTypeId"/><parameter param-name="glAccountTypeId"/>
</hyperlink>
</field>
@@ -1131,7 +1131,7 @@
</service>
</actions>
<field name="glAccountCategoryId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${glAccountCategoryId}" target="EditGlAccountCategory">
+ <hyperlink description="${glAccountCategoryId}" target="EditGlAccountCategory" also-hidden="false">
<parameter param-name="glAccountCategoryId"/>
<parameter param-name="glAccountCategoryTypeId"/>
</hyperlink>
@@ -1166,7 +1166,7 @@
<field name="fromDate"><display/></field>
<field name="thruDate"><date-time/></field>
<field name="deleteLink" title="" widget-style="buttontext">
- <hyperlink target="deleteGlAccountCategoryMember" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteGlAccountCategoryMember" also-hidden="false">
<parameter param-name="glAccountId" from-field="glAccountId"/>
<parameter param-name="glAccountCategoryId" from-field="glAccountCategoryId"/>
<parameter param-name="fromDate" from-field="fromDate"/>
@@ -1281,7 +1281,7 @@
<field name="profitGlAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"/></field>
<field name="lossGlAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteFixedAssetTypeGlAccount" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteFixedAssetTypeGlAccount" also-hidden="false">
<parameter param-name="fixedAssetTypeId"/>
<parameter param-name="fixedAssetId"/>
<parameter param-name="organizationPartyId"/>
diff --git a/applications/accounting/widget/GlobalGlAccountsForms.xml b/applications/accounting/widget/GlobalGlAccountsForms.xml
index a7ada78..0d568a5 100644
--- a/applications/accounting/widget/GlobalGlAccountsForms.xml
+++ b/applications/accounting/widget/GlobalGlAccountsForms.xml
@@ -35,7 +35,7 @@
</actions>
<auto-fields-entity entity-name="GlAccountOrganization" default-field-type="display"/>
<field name="glAccountId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${glAccountId}" target="GlAccountNavigate">
+ <hyperlink description="${glAccountId}" target="GlAccountNavigate" also-hidden="false">
<parameter param-name="glAccountId"/>
</hyperlink>
</field>
@@ -79,7 +79,7 @@
<property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
</actions>
<field name="accountCode" title="${uiLabelMap.CommonCode}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${accountCode}" target="GlAccountNavigate">
+ <hyperlink description="${accountCode}" target="GlAccountNavigate" also-hidden="false">
<parameter param-name="glAccountId"/>
</hyperlink>
</field>
@@ -160,7 +160,7 @@
<form name="ListAcctgTransEntries" type="list" list-name="entries" default-entity-name="AcctgTransEntry"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="acctgTransId">
- <hyperlink also-hidden="false" description="${acctgTransId}" target="ListAcctgTransEntries">
+ <hyperlink description="${acctgTransId}" target="ListAcctgTransEntries" also-hidden="false">
<parameter param-name="acctgTransId"/>
</hyperlink>
</field>
@@ -187,7 +187,7 @@
<form name="GlAccountsNavForm" type="single" target="" title="GL Accounts" default-map-name="journal"
header-row-style="header-row" default-table-style="basic-table">
<field name="backToAdmin" title=" ">
- <hyperlink also-hidden="false" description="${uiLabelMap.AccountingBackToAdmin}" target="AdminMain">
+ <hyperlink description="${uiLabelMap.AccountingBackToAdmin}" target="AdminMain" also-hidden="false">
<parameter param-name="organizationPartyId"/>
</hyperlink>
</field>
@@ -196,7 +196,7 @@
<form name="ListGlReconciliations" type="list" list-name="glReconciliations" default-entity-name="GlReconciliation"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="glReconciliationId">
- <hyperlink also-hidden="false" description="${glReconciliationId}" target="EditGlReconciliation">
+ <hyperlink description="${glReconciliationId}" target="EditGlReconciliation" also-hidden="false">
<parameter param-name="glReconciliationId"/>
<parameter param-name="organizationPartyId"/>
<parameter param-name="glAccountId"/>
@@ -221,7 +221,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="glReconciliationId"><display/></field>
<field name="acctgTransId">
- <hyperlink also-hidden="false" description="${acctgTransId}" target="ListAcctgTransEntries">
+ <hyperlink description="${acctgTransId}" target="ListAcctgTransEntries" also-hidden="false">
<parameter param-name="acctgTransId"/>
</hyperlink>
</field>
@@ -244,7 +244,7 @@
<field name="rateDescription"><display/></field>
<field name="periodTypeId"><display description="${periodDescription}"/></field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}" sort-field="true">
- <hyperlink target="/partymgr/control/viewprofile" description="${groupName}${lastName} ${firstName} ${middleName}" target-type="inter-app">
+ <hyperlink description="${groupName}${lastName} ${firstName} ${middleName}" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId"/>
</hyperlink>
</field>
diff --git a/applications/accounting/widget/InvoiceForms.xml b/applications/accounting/widget/InvoiceForms.xml
index 7c6f3d9..fd145b9 100644
--- a/applications/accounting/widget/InvoiceForms.xml
+++ b/applications/accounting/widget/InvoiceForms.xml
@@ -85,12 +85,12 @@
<field name="statusId" title="${uiLabelMap.CommonStatus}" sort-field="true"><display-entity entity-name="StatusItem"/></field>
<field name="description" sort-field="true"><display/></field>
<field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}" sort-field="true">
- <hyperlink target="/partymgr/control/PartyFinancialHistory" target-type="inter-app" description="${partyNameResultFrom.fullName} [${partyIdFrom}]">
+ <hyperlink description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target="/partymgr/control/PartyFinancialHistory" target-type="inter-app">
<parameter param-name="partyId" from-field="partyIdFrom"/>
</hyperlink>
</field>
<field name="partyIdTo" title="${uiLabelMap.AccountingToParty}" parameter-name="partyId">
- <hyperlink target="/partymgr/control/PartyFinancialHistory" target-type="inter-app" description="${partyNameResultTo.fullName} [${partyId}]">
+ <hyperlink description="${partyNameResultTo.fullName} [${partyId}]" target="/partymgr/control/PartyFinancialHistory" target-type="inter-app">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -119,12 +119,12 @@
<field position="1" name="description"><display/></field>
<field position="2" name="invoiceMessage"><display/></field>
<field position="1" name="partyIdFrom">
- <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultFrom.fullName} [${invoice.partyIdFrom}]">
+ <hyperlink description="${partyNameResultFrom.fullName} [${invoice.partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="invoice.partyIdFrom"/>
</hyperlink>
</field>
<field position="2" name="partyIdTo" entry-name="partyId">
- <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultTo.fullName} [${invoice.partyId}]">
+ <hyperlink description="${partyNameResultTo.fullName} [${invoice.partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="invoice.partyId"/>
</hyperlink>
</field>
@@ -149,7 +149,7 @@
<field name="invoiceItemSeqId"><display/></field>
<field name="invoiceItemTypeId"><display-entity entity-name="InvoiceItemType"/></field>
<field name="orderId" widget-style="linktext">
- <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}">
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app">
<parameter param-name="orderId"/>
</hyperlink>
</field>
@@ -159,12 +159,12 @@
<field name="amount" title="${uiLabelMap.AccountingUnitPrice}" widget-area-style="align-text"><display type="currency" currency="${invoice.currencyUomId}"/></field>
<field name="total"><display type="currency" currency="${invoice.currencyUomId}"/></field>
<field name="productId" widget-style="linktext">
- <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}">
+ <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
<parameter param-name="productId"/>
</hyperlink>
</field>
<field name="overrideGlAccountId" widget-area-style="align-text">
- <hyperlink target="GlAccountNavigate" description="${overrideGlAccountId}">
+ <hyperlink description="${overrideGlAccountId}" target="GlAccountNavigate">
<parameter param-name="glAccountId" from-field="overrideGlAccountId"/>
</hyperlink>
</field>
@@ -198,7 +198,7 @@
<field name="total" widget-area-style="align-text"><display type="currency" currency="${invoice.currencyUomId}"/></field>
<field name="invoiceId"><hidden/></field>
<field name="paymentId" widget-style="linktext">
- <hyperlink target="paymentOverview" description="${paymentId}">
+ <hyperlink description="${paymentId}" target="paymentOverview">
<parameter param-name="paymentId"/>
</hyperlink>
</field>
@@ -210,7 +210,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="AcctgTransAndEntries" default-field-type="display"/>
<field name="invoiceId"><hidden/></field>
- <field name="paymentId"><hyperlink target="paymentOverview?paymentId=${paymentId}" description="${paymentId}"/></field>
+ <field name="paymentId"><hyperlink description="${paymentId}" target="paymentOverview?paymentId=${paymentId}"/></field>
<field name="amount"><display type="currency" currency="${currencyUomId}"/></field>
<field name="origAmount"><display type="currency" currency="${origCurrencyUomId}"/></field>
<field name="acctgTransId"><hyperlink description="${acctgTransId}" target="EditAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}"/></field>
@@ -527,7 +527,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="invoiceId"><hidden/></field>
<field name="paymentId" widget-style="buttontext">
- <hyperlink target="paymentOverview" description="[${paymentId}]">
+ <hyperlink description="[${paymentId}]" target="paymentOverview">
<parameter param-name="paymentId"/>
</hyperlink>
</field>
@@ -613,7 +613,7 @@
<field name="invoiceId"><hidden/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="unlinkInvoiceFromTimeEntry" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="unlinkInvoiceFromTimeEntry" also-hidden="false">
<parameter param-name="timeEntryId"/>
<parameter param-name="invoiceId"/>
<parameter param-name="viewIndex"/>
@@ -632,7 +632,7 @@
<field name="invoiceItemSeqId"><display/></field>
<field name="timeEntryId"><display/></field>
<field name="timesheetId" entry-name="timesheet.timesheetId">
- <hyperlink target="/workeffort/control/EditTimesheet" target-type="inter-app" description="${timesheetId}">
+ <hyperlink description="${timesheetId}" target="/workeffort/control/EditTimesheet" target-type="inter-app">
<parameter param-name="timesheetId"/>
</hyperlink>
</field>
diff --git a/applications/accounting/widget/InvoiceScreens.xml b/applications/accounting/widget/InvoiceScreens.xml
index 0a3c8cc..da695d0 100644
--- a/applications/accounting/widget/InvoiceScreens.xml
+++ b/applications/accounting/widget/InvoiceScreens.xml
@@ -602,7 +602,7 @@
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<script location="component://party/groovyScripts/party/GetMyCompany.groovy"/>
- <entity-condition list="invoices" entity-name="Invoice">
+ <entity-condition entity-name="Invoice" list="invoices">
<condition-list combine="and">
<condition-expr field-name="partyId" operator="equals" from-field="myCompanyId"/>
<condition-list combine="or">
@@ -627,7 +627,7 @@
<section>
<actions>
<set field="myCompanyId" from-field="userLogin.partyId"/>
- <entity-condition list="invoiceslistexternal" entity-name="Invoice">
+ <entity-condition entity-name="Invoice" list="invoiceslistexternal">
<condition-list combine="and">
<condition-expr field-name="partyIdFrom" operator="equals" from-field="myCompanyId"/>
<condition-expr field-name="invoiceTypeId" operator="equals" value="PURCHASE_INVOICE"/>
diff --git a/applications/accounting/widget/PaymentForms.xml b/applications/accounting/widget/PaymentForms.xml
index 14437fc..c555ede 100644
--- a/applications/accounting/widget/PaymentForms.xml
+++ b/applications/accounting/widget/PaymentForms.xml
@@ -308,7 +308,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="paymentId"><hidden/></field>
<field name="invoiceId" widget-style="buttontext">
- <hyperlink target="invoiceOverview" description="${invoiceId}">
+ <hyperlink description="${invoiceId}" target="invoiceOverview">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
@@ -330,7 +330,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="paymentId"><hidden/></field>
<field name="toPaymentId" widget-style="buttontext">
- <hyperlink target="paymentOverview" description="[${toPaymentId}]">
+ <hyperlink description="[${toPaymentId}]" target="paymentOverview">
<parameter param-name="paymentId" from-field="toPaymentId"/>
</hyperlink>
</field>
@@ -379,12 +379,12 @@
<field name="statusId" title="${uiLabelMap.CommonStatus}" position="1"><display-entity entity-name="StatusItem"/></field>
<field name="paymentMethodId" position="2"><display-entity entity-name="PaymentMethod" description="${description} [${paymentMethodId}]"/></field>
<field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}" position="1">
- <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultFrom.fullName} [${payment.partyIdFrom}]">
+ <hyperlink description="${partyNameResultFrom.fullName} [${payment.partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="payment.partyIdFrom"/>
</hyperlink>
</field>
<field name="partyIdTo" title="${uiLabelMap.AccountingToParty}" position="2">
- <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultTo.fullName} [${payment.partyIdTo}]">
+ <hyperlink description="${partyNameResultTo.fullName} [${payment.partyIdTo}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="payment.partyIdTo"/>
</hyperlink>
</field>
@@ -421,23 +421,23 @@
<field name="paymentApplicationId"><hidden/></field>
<field name="paymentId"><hidden/></field>
<field name="invoiceId" widget-style="buttontext">
- <hyperlink target="invoiceOverview" description="${invoiceId}">
+ <hyperlink description="${invoiceId}" target="invoiceOverview">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
<field name="invoiceItemSeqId" widget-style="buttontext">
- <hyperlink target="listInvoiceItems" description="${invoiceItemSeqId}">
+ <hyperlink description="${invoiceItemSeqId}" target="listInvoiceItems">
<parameter param-name="invoiceId"/>
<parameter param-name="invoiceItemSeqId"/>
</hyperlink>
</field>
<field name="toPaymentId" widget-style="buttontext">
- <hyperlink target="paymentOverview" description="${toPaymentId}">
+ <hyperlink description="${toPaymentId}" target="paymentOverview">
<parameter param-name="paymentId" from-field="toPaymentId"/>
</hyperlink>
</field>
<field name="billingAccountId" widget-style="buttontext">
- <hyperlink target="EditBillingAccount" description="${billingAccountId}">
+ <hyperlink description="${billingAccountId}" target="EditBillingAccount">
<parameter param-name="billingAccountId"/>
</hyperlink>
</field>
@@ -447,13 +447,13 @@
<form name="AcctgTransAndEntries" type="list" list-name="AcctgTransAndEntries" extends="AcctgTransAndEntries" extends-resource="component://accounting/widget/InvoiceForms.xml">
<field name="paymentId"><hidden/></field>
- <field name="invoiceId"><hyperlink target="invoiceOverview?invoiceId=${invoiceId}" description="${invoiceId}"/></field>
+ <field name="invoiceId"><hyperlink description="${invoiceId}" target="invoiceOverview?invoiceId=${invoiceId}"/></field>
</form>
<form name="ListChecksToPrint" type="multi" list-name="payments" target="printChecks" separate-columns="true"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" target-window="_blank">
<field name="paymentId">
- <hyperlink target="paymentOverview" description="${paymentId}">
+ <hyperlink description="${paymentId}" target="paymentOverview">
<parameter param-name="paymentId"/>
</hyperlink>
</field>
@@ -471,7 +471,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="paymentId"><hidden/></field>
<field name="paymentId">
- <hyperlink target="paymentOverview" description="${paymentId}">
+ <hyperlink description="${paymentId}" target="paymentOverview">
<parameter param-name="paymentId"/>
</hyperlink>
</field>
@@ -522,7 +522,7 @@
<form name="ListInvoicesByDueDate" type="list" list-name="invoicePaymentInfoList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="invoiceId" widget-style="buttontext">
- <hyperlink target="invoiceOverview" description="${invoiceId}">
+ <hyperlink description="${invoiceId}" target="invoiceOverview">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
@@ -539,7 +539,7 @@
<field name="finAccountTransTypeId" title="${uiLabelMap.FormFieldTitle_finAccountTransType}" position="2"><display-entity entity-name="FinAccountTransType"/></field>
<field name="amount" position="1"><display type="currency" currency="${payment.currencyUomId}"/></field>
<field name="glReconciliationId" position="2">
- <hyperlink target="ViewGlReconciliationWithTransaction" description="${finAccountTrans.glReconciliationId}">
+ <hyperlink description="${finAccountTrans.glReconciliationId}" target="ViewGlReconciliationWithTransaction">
<parameter param-name="glReconciliationId" from-field="finAccountTrans.glReconciliationId"/>
<parameter param-name="finAccountId" from-field="finAccountTrans.finAccountId"/>
</hyperlink>
diff --git a/applications/accounting/widget/PaymentGroupForms.xml b/applications/accounting/widget/PaymentGroupForms.xml
index 6670c1f..2027066 100644
--- a/applications/accounting/widget/PaymentGroupForms.xml
+++ b/applications/accounting/widget/PaymentGroupForms.xml
@@ -47,22 +47,22 @@
<field name="paymentGroupTypeId" title="${uiLabelMap.FormFieldTitle_paymentGroupType}"><display-entity entity-name="PaymentGroupType"/></field>
<field name="paymentGroupName"><display description="${paymentGroupName}"/></field>
<field name="depositSlip" title=" " widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'} @and ${groovy:org.apache.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
- <hyperlink target="DepositSlip.pdf" target-window="_BLANK" description="${uiLabelMap.AccountingInvoicePDF}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.AccountingInvoicePDF}" target="DepositSlip.pdf" target-window="_BLANK" also-hidden="false">
<parameter param-name="paymentGroupId"/>
</hyperlink>
</field>
<field name="printCheck" title=" " widget-style="buttontext" use-when="${paymentGroupTypeId == 'CHECK_RUN'} @and ${groovy:org.apache.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
- <hyperlink target="printChecks.pdf" target-window="_BLANK" description="${uiLabelMap.AccountingInvoicePDF}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.AccountingInvoicePDF}" target="printChecks.pdf" target-window="_BLANK" also-hidden="false">
<parameter param-name="paymentGroupId"/>
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'} @and ${paymentGroupMemberAndTransList[0].finAccountTransStatusId != 'FINACT_TRNS_APPROVED'} @and ${groovy:org.apache.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
- <hyperlink target="cancelPaymentGroup" description="${uiLabelMap.CommonCancel}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonCancel}" target="cancelPaymentGroup" also-hidden="false">
<parameter param-name="paymentGroupId"/>
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext" use-when="${paymentGroupTypeId == 'CHECK_RUN'} @and ${paymentGroupMemberAndTransList[0].finAccountTransStatusId != 'FINACT_TRNS_APPROVED'} @and ${groovy:org.apache.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
- <hyperlink target="cancelCheckRunPayments" description="${uiLabelMap.CommonCancel}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonCancel}" target="cancelCheckRunPayments" also-hidden="false">
<parameter param-name="paymentGroupId"/>
</hyperlink>
</field>
@@ -119,7 +119,7 @@
</row-actions>
<field name="paymentGroupId"><hidden/></field>
<field name="paymentId">
- <hyperlink target="paymentOverview" description="${paymentId}">
+ <hyperlink description="${paymentId}" target="paymentOverview">
<parameter param-name="paymentId"/>
</hyperlink>
</field>
@@ -149,7 +149,7 @@
<field name="fromDate"><display/></field>
<field name="thruDate"><date-time/></field>
<field name="deleteLink" title="" widget-style="buttontext">
- <hyperlink target="expirePaymentGroupMember" description="${uiLabelMap.CommonCancel}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonCancel}" target="expirePaymentGroupMember" also-hidden="false">
<parameter param-name="paymentGroupId"/>
<parameter param-name="paymentId"/>
<parameter param-name="fromDate"/>
@@ -176,7 +176,7 @@
<set field="partyIdTo" from-field="payment.partyIdTo"/>
</row-actions>
<field name="paymentId">
- <hyperlink target="paymentOverview" description="${paymentId}">
+ <hyperlink description="${paymentId}" target="paymentOverview">
<parameter param-name="paymentId"/>
</hyperlink>
</field>
diff --git a/applications/accounting/widget/ReportFinancialSummaryForms.xml b/applications/accounting/widget/ReportFinancialSummaryForms.xml
index b544ca0..a0ee7e8 100644
--- a/applications/accounting/widget/ReportFinancialSummaryForms.xml
+++ b/applications/accounting/widget/ReportFinancialSummaryForms.xml
@@ -41,7 +41,7 @@
<field name="year" title="${uiLabelMap.CommonYear}" required-field="true"><text size="4"/></field>
<field name="organizationPartyId" required-field="false">
<drop-down allow-empty="true" no-current-selected-key="Company">
- <entity-options entity-name="PartyRoleNameDetail" description="${groupName} [${partyId}]" key-field-name="partyId">
+ <entity-options entity-name="PartyRoleNameDetail" key-field-name="partyId" description="${groupName} [${partyId}]">
<entity-constraint name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
<entity-order-by field-name="groupName"/>
</entity-options>
@@ -100,7 +100,7 @@
<form name="IncomeStatementRevenues" type="list" list-name="revenueAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -111,7 +111,7 @@
<form name="IncomeStatementExpenses" type="list" list-name="expenseAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -122,7 +122,7 @@
<form name="IncomeStatementIncome" type="list" list-name="incomeAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -178,7 +178,7 @@
<form name="ComparativeIncomeStatementRevenues" type="list" list-name="revenueAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -193,7 +193,7 @@
<form name="ComparativeIncomeStatementExpenses" type="list" list-name="expenseAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -208,7 +208,7 @@
<form name="ComparativeIncomeStatementIncome" type="list" list-name="incomeAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -237,7 +237,7 @@
<form name="BalanceSheetAssets" type="list" list-name="assetAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -248,7 +248,7 @@
<form name="BalanceSheetLiabilities" type="list" list-name="liabilityAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -259,7 +259,7 @@
<form name="BalanceSheetEquities" type="list" list-name="equityAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -321,7 +321,7 @@
<form name="ComparativeBalanceSheetAssets" type="list" list-name="assetAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -336,7 +336,7 @@
<form name="ComparativeBalanceSheetLiabilities" type="list" list-name="liabilityAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -351,7 +351,7 @@
<form name="ComparativeBalanceSheetEquities" type="list" list-name="equityAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -407,7 +407,7 @@
<set field="closingC" value="${openingC + C}" type="BigDecimal"/>
</row-actions>
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -574,7 +574,7 @@
<form name="TrialBalanceReport" type="list" list-name="accountBalances"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -608,7 +608,7 @@
<form name="CashFlowStatementOpeningCashBalance" type="list" list-name="openingCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -622,7 +622,7 @@
<form name="CashFlowStatementPeriodCashBalance" type="list" list-name="periodCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -638,7 +638,7 @@
<form name="CashFlowStatementClosingCashBalance" type="list" list-name="closingCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -696,7 +696,7 @@
<form name="ComparativeCashFlowStatementOpeningCashBalance" type="list" list-name="openingCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -711,7 +711,7 @@
<form name="ComparativeCashFlowStatementPeriodCashBalance" type="list" list-name="periodCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
@@ -730,7 +730,7 @@
<form name="ComparativeCashFlowStatementClosingCashBalance" type="list" list-name="closingCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
- <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
+ <hyperlink description="${accountCode}" target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
diff --git a/applications/accounting/widget/TaxAuthorityForms.xml b/applications/accounting/widget/TaxAuthorityForms.xml
index dbc628b..82c052c 100644
--- a/applications/accounting/widget/TaxAuthorityForms.xml
+++ b/applications/accounting/widget/TaxAuthorityForms.xml
@@ -94,7 +94,7 @@
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteTaxAuthorityCategory" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTaxAuthorityCategory" also-hidden="false">
<parameter param-name="taxAuthPartyId"/>
<parameter param-name="taxAuthGeoId"/>
<parameter param-name="productCategoryId"/>
@@ -146,7 +146,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteTaxAuthorityAssoc" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTaxAuthorityAssoc" also-hidden="false">
<parameter param-name="taxAuthPartyId"/>
<parameter param-name="taxAuthGeoId"/>
<parameter param-name="toTaxAuthPartyId"/>
@@ -204,7 +204,7 @@
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteTaxAuthorityGlAccount" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTaxAuthorityGlAccount" also-hidden="false">
<parameter param-name="taxAuthPartyId"/>
<parameter param-name="taxAuthGeoId"/>
<parameter param-name="glAccountId"/>
@@ -267,7 +267,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteTaxAuthorityRateProduct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTaxAuthorityRateProduct" also-hidden="false">
<parameter param-name="taxAuthPartyId"/>
<parameter param-name="taxAuthGeoId"/>
<parameter param-name="taxAuthorityRateSeqId"/>
@@ -362,7 +362,7 @@
<field name="isNexus"><display/></field>
<field name="editLink" title=" " widget-style="buttontext">
- <hyperlink target="EditTaxAuthorityPartyInfo" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditTaxAuthorityPartyInfo" also-hidden="false">
<parameter param-name="taxAuthPartyId"/>
<parameter param-name="taxAuthGeoId"/>
<parameter param-name="partyId"/>
@@ -370,7 +370,7 @@
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteTaxAuthorityPartyInfo" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTaxAuthorityPartyInfo" also-hidden="false">
<parameter param-name="taxAuthPartyId"/>
<parameter param-name="taxAuthGeoId"/>
<parameter param-name="partyId"/>
diff --git a/applications/accounting/widget/TransactionForms.xml b/applications/accounting/widget/TransactionForms.xml
index ab2c8da..5758232 100644
--- a/applications/accounting/widget/TransactionForms.xml
+++ b/applications/accounting/widget/TransactionForms.xml
@@ -97,7 +97,7 @@
<form name="ViewGatewayResponseRelations" type="single" target="" title=""
header-row-style="header-row" default-table-style="basic-table">
<field name="orderId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="inter-app" description="${orderId}" target="/ordermgr/control/orderview">
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview" also-hidden="false" target-type="inter-app">
<parameter param-name="orderId"/>
</hyperlink>
</field>
diff --git a/applications/accounting/widget/ap/forms/InvoiceForms.xml b/applications/accounting/widget/ap/forms/InvoiceForms.xml
index 63f2e8f..e553127 100644
--- a/applications/accounting/widget/ap/forms/InvoiceForms.xml
+++ b/applications/accounting/widget/ap/forms/InvoiceForms.xml
@@ -50,12 +50,12 @@
<field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
<field name="description"><display/></field>
<field name="partyIdFrom">
- <hyperlink target="/partymgr/control/viewprofile" description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target-type="inter-app">
+ <hyperlink description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="partyIdFrom"/>
</hyperlink>
</field>
<field name="partyIdTo" parameter-name="partyId">
- <hyperlink target="/partymgr/control/viewprofile" description="${partyNameResultTo.fullName} [${partyId}]" target-type="inter-app">
+ <hyperlink description="${partyNameResultTo.fullName} [${partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="partyId"/>
</hyperlink>
</field>
diff --git a/applications/accounting/widget/ap/forms/VendorForms.xml b/applications/accounting/widget/ap/forms/VendorForms.xml
index 2fd784b..65855c2 100644
--- a/applications/accounting/widget/ap/forms/VendorForms.xml
+++ b/applications/accounting/widget/ap/forms/VendorForms.xml
@@ -31,7 +31,7 @@
</service>
</actions>
<field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${partyId}" target="editVendor">
+ <hyperlink description="${partyId}" target="editVendor" also-hidden="false">
<parameter param-name="partyId"/>
</hyperlink>
</field>
diff --git a/applications/accounting/widget/ar/forms/ArPaymentForms.xml b/applications/accounting/widget/ar/forms/ArPaymentForms.xml
index 418d08a..7fbea91 100644
--- a/applications/accounting/widget/ar/forms/ArPaymentForms.xml
+++ b/applications/accounting/widget/ar/forms/ArPaymentForms.xml
@@ -37,7 +37,7 @@
<field name="noConditionFind"><hidden/></field>
<field name="cardType" tooltip="Select Credit Card from above list of Payment Method Types.">
<drop-down allow-empty="true">
- <entity-options entity-name="Enumeration" description="${enumCode}" key-field-name="enumCode">
+ <entity-options entity-name="Enumeration" key-field-name="enumCode" description="${enumCode}">
<entity-constraint name="enumTypeId" operator="equals" value="CREDIT_CARD_TYPE"/>
<entity-order-by field-name="enumId"/>
</entity-options>
diff --git a/applications/accounting/widget/ar/forms/InvoiceForms.xml b/applications/accounting/widget/ar/forms/InvoiceForms.xml
index 666af0f..ab6f255 100644
--- a/applications/accounting/widget/ar/forms/InvoiceForms.xml
+++ b/applications/accounting/widget/ar/forms/InvoiceForms.xml
@@ -51,12 +51,12 @@
<field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
<field name="description"><display/></field>
<field name="partyIdFrom">
- <hyperlink target="/partymgr/control/viewprofile" description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target-type="inter-app">
+ <hyperlink description="${partyNameResultFrom.fullName} [${partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="partyIdFrom"/>
</hyperlink>
</field>
<field name="partyIdTo">
- <hyperlink target="/partymgr/control/viewprofile" description="${partyNameResultTo.fullName} [${partyId}]" target-type="inter-app">
+ <hyperlink description="${partyNameResultTo.fullName} [${partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId"/>
</hyperlink>
</field>
diff --git a/applications/commonext/minilang/SystemInfoServices.xml b/applications/commonext/minilang/SystemInfoServices.xml
index 82ba679..ba95f62 100644
--- a/applications/commonext/minilang/SystemInfoServices.xml
+++ b/applications/commonext/minilang/SystemInfoServices.xml
@@ -38,7 +38,7 @@
</entity-and>
<if-not-empty field="ulList">
<set field="haveUserLogin" value="true"/>
- <first-from-list entry="userLogin" list="ulList"/>
+ <first-from-list list="ulList" entry="userLogin"/>
<set field="paMap.ownerUserLoginId" from-field="userLogin.userLoginId"/>
<set field="paMap.portalPortletId" value="SystemInfoNotes"/>
<call-service service-name="getPortletAttributes" in-map-name="paMap">
@@ -48,7 +48,7 @@
</simple-method>
<simple-method method-name="deleteSystemInfoNote" short-description="Delete SystemInfo Note">
- <entity-one value-field="noteData" entity-name="NoteData"/>
+ <entity-one entity-name="NoteData" value-field="noteData"/>
<remove-related relation-name="CustRequestItemNote" value-field="noteData"/>
<remove-related relation-name="CustRequestNote" value-field="noteData"/>
<remove-related relation-name="MarketingCampaignNote" value-field="noteData"/>
@@ -82,7 +82,7 @@
</entity-condition>
<if-compare field="comCount" value="0" operator="greater">
<set field="status.noteInfo" value="Open communication events: ${comCount}"/>
- <first-from-list entry="comm" list="comms"/>
+ <first-from-list list="comms" entry="comm"/>
<set field="status.noteDateTime" from-field="comm.entryDate"/>
<field-to-list field="status" list="systemInfoStatus"/>
<clear-field field="status"/>
@@ -103,7 +103,7 @@
</entity-count>
<if-compare field="assignCount" value="0" operator="greater">
<set field="status.noteInfo" value="Assigned and not completed tasks: ${assignCount}"/>
- <first-from-list entry="assign" list="assigns"/>
+ <first-from-list list="assigns" entry="assign"/>
<set field="status.noteDateTime" from-field="assign.fromDate"/>
<field-to-list field="status" list="systemInfoStatus"/>
</if-compare>
diff --git a/applications/commonext/minilang/setup/SetupEvents.xml b/applications/commonext/minilang/setup/SetupEvents.xml
index 97dd33d..faab9a6 100644
--- a/applications/commonext/minilang/setup/SetupEvents.xml
+++ b/applications/commonext/minilang/setup/SetupEvents.xml
@@ -368,7 +368,7 @@
<entity-and entity-name="PartyAndPostalAddress" list="listPartyPostalAddress" filter-by-date="true">
<field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-and>
- <first-from-list entry="partyPostalAddress" list="listPartyPostalAddress"/>
+ <first-from-list list="listPartyPostalAddress" entry="partyPostalAddress"/>
<sequenced-id sequence-name="ContactMech" field="partyPostalAddress.contactMechId"/>
<set-service-fields service-name="createPostalAddress" map="partyPostalAddress" to-map="addressContext"/>
<call-service service-name="createPostalAddress" in-map-name="addressContext">
@@ -604,7 +604,7 @@
<call-service service-name="createProductPrice" in-map-name="createDefaultPriceMap"/>
<else>
- <first-from-list entry="defaultPrice" list="defaultPriceValues"/>
+ <first-from-list list="defaultPriceValues" entry="defaultPrice"/>
<set field="updateDefaultPriceMap.productId" from-field="productId"/>
<set field="updateDefaultPriceMap.price" from-field="parameters.defaultPrice" type="BigDecimal"/>
<set field="updateDefaultPriceMap.productPricePurposeId" from-field="defaultPrice.productPricePurposeId"/>
@@ -636,7 +636,7 @@
<call-service service-name="createProductPrice" in-map-name="createAverageCostMap"/>
<else>
- <first-from-list entry="averageCost" list="averageCostValues"/>
+ <first-from-list list="averageCostValues" entry="averageCost"/>
<set field="updateAverageCostMap.productId" from-field="productId"/>
<set field="updateAverageCostMap.productPricePurposeId" from-field="averageCost.productPricePurposeId"/>
<set field="updateAverageCostMap.productPriceTypeId" from-field="averageCost.productPriceTypeId"/>
diff --git a/applications/commonext/widget/CommonScreens.xml b/applications/commonext/widget/CommonScreens.xml
index fbf5b46..fdde819 100644
--- a/applications/commonext/widget/CommonScreens.xml
+++ b/applications/commonext/widget/CommonScreens.xml
@@ -64,7 +64,7 @@
<field-map field-name="partyId" from-field="defaultOrganizationPartyId"/>
<field-map field-name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
</entity-one>
- <entity-one value-field="orgPartyLogoMap" entity-name="PartyGroup">
+ <entity-one entity-name="PartyGroup" value-field="orgPartyLogoMap">
<field-map field-name="partyId" from-field="defaultOrganizationPartyId"/>
</entity-one>
<entity-and entity-name="PartyContent" list="orgPartyContentMap" filter-by-date="true">
diff --git a/applications/commonext/widget/SystemInfoForms.xml b/applications/commonext/widget/SystemInfoForms.xml
index 3d70e2e..35ff138 100644
--- a/applications/commonext/widget/SystemInfoForms.xml
+++ b/applications/commonext/widget/SystemInfoForms.xml
@@ -24,9 +24,9 @@
<form name="SystemInfoNotes" type="list" list-name="systemInfoNotes"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="noteDateTime" title="${uiLabelMap.CommonExtDateInfoCreated}"><display type="date-time"/></field>
- <field name="noteInfo" title="${uiLabelMap.CommonExtSystemInfoNote}"><hyperlink target="${moreInfoUrl}${groovy: if (moreInfoItemName &&moreInfoItemId)"?" + moreInfoItemName + "=" + moreInfoItemId + "&id=" + moreInfoItemId;}" target-type="inter-app" description="${noteInfo}"></hyperlink></field>
+ <field name="noteInfo" title="${uiLabelMap.CommonExtSystemInfoNote}"><hyperlink description="${noteInfo}" target="${moreInfoUrl}${groovy: if (moreInfoItemName &&moreInfoItemId)"?" + moreInfoItemName + "=" + moreInfoItemId + "&id=" + moreInfoItemId;}" target-type="inter-app"></hyperlink></field>
<field name="deleteLink" title=" " widget-style="buttontext" >
- <hyperlink target="deleteSystemInfoNote" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSystemInfoNote">
<parameter param-name="noteId"/>
<parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
</hyperlink>
@@ -46,7 +46,7 @@
<form name="SystemInfoStatus" type="list" list-name="systemInfoStatus"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="noteDateTime" title="${uiLabelMap.CommonExtDateLastChanged}"><display type="date-time"/></field>
- <field name="noteInfo" title="${uiLabelMap.CommonExtSystemInfoStatus}"><hyperlink target="${moreInfoUrl}" target-type="inter-app" description="${noteInfo}"></hyperlink></field>
+ <field name="noteInfo" title="${uiLabelMap.CommonExtSystemInfoStatus}"><hyperlink description="${noteInfo}" target="${moreInfoUrl}" target-type="inter-app"></hyperlink></field>
</form>
<form name="CreateSystemInfoNote" type="single" target="createSystemInfoNote">
diff --git a/applications/commonext/widget/ofbizsetup/SetupForms.xml b/applications/commonext/widget/ofbizsetup/SetupForms.xml
index e348a1b..3a20bd6 100644
--- a/applications/commonext/widget/ofbizsetup/SetupForms.xml
+++ b/applications/commonext/widget/ofbizsetup/SetupForms.xml
@@ -270,17 +270,17 @@
<entity-one entity-name="PartyGroup" value-field="partyGroup"/>
</row-actions>
<field name="partyId" title="${uiLabelMap.AccountingCompanies}" use-when="partyAcctgPreference==null" widget-style="buttontext">
- <hyperlink target="viewprofile" description="${partyGroup.groupName} [${partyId}]">
+ <hyperlink description="${partyGroup.groupName} [${partyId}]" target="viewprofile">
<parameter param-name="partyId"/>
</hyperlink>
</field>
<field name="partyId" title="${uiLabelMap.AccountingCompanies}" use-when="partyAcctgPreference!=null" widget-style="buttontext">
- <hyperlink target="showMessage" description="${partyGroup.groupName} [${partyId}]">
+ <hyperlink description="${partyGroup.groupName} [${partyId}]" target="showMessage">
<parameter param-name="partyId"/>
</hyperlink>
</field>
<field name="setToComplete" title=" " use-when="partyAcctgPreference==null" widget-style="buttontext">
- <hyperlink target="OrganizationToComplete" description="${uiLabelMap.SetupSetToComplete}">
+ <hyperlink description="${uiLabelMap.SetupSetToComplete}" target="OrganizationToComplete">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -288,7 +288,7 @@
<form name="EditCustomer" extends="EditPerson" extends-resource="component://party/widget/partymgr/PartyForms.xml">
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false">
<parameter param-name="partyId" from-field="parameters.partyId"/>
</hyperlink>
</field>
diff --git a/applications/content/minilang/blog/BlogServices.xml b/applications/content/minilang/blog/BlogServices.xml
index c1e4dc8..79ff86e 100644
--- a/applications/content/minilang/blog/BlogServices.xml
+++ b/applications/content/minilang/blog/BlogServices.xml
@@ -215,7 +215,7 @@
<field-map field-name="contentIdTo" from-field="imageContent.contentId"/>
<field-map field-name="mapKey" value="IMAGE"/>
</entity-and>
- <first-from-list entry="oldAssoc" list="oldAssocs"/>
+ <first-from-list list="oldAssocs" entry="oldAssoc"/>
<now-timestamp field="oldAssoc.thruDate"/>
<store-value value-field="oldAssoc"/>
</if-not-empty>
diff --git a/applications/content/minilang/compdoc/CompDocServices.xml b/applications/content/minilang/compdoc/CompDocServices.xml
index ae8a81c..a35451d 100644
--- a/applications/content/minilang/compdoc/CompDocServices.xml
+++ b/applications/content/minilang/compdoc/CompDocServices.xml
@@ -555,8 +555,8 @@
<set from-field="thisContentId" field="map.contentId"/>
<set from-field="thisContentRevisionSeqId" field="map.contentRevisionSeqId"/>
<call-service service-name="getFinalApprovalStatus" in-map-name="map">
- <result-to-field field="finalApprovalStatusId" result-name="approvalStatusId"/>
- <result-to-field field="contentApprovalList" result-name="contentApprovalList"/>
+ <result-to-field result-name="approvalStatusId" field="finalApprovalStatusId"/>
+ <result-to-field result-name="contentApprovalList" field="contentApprovalList"/>
</call-service>
<!-- determine status of previous approvals --><!-- finalApprovalStatusId is the applicable status from previous approvals -->
<log level="info" message="cloneContentApprovals(2)- finalApprovalStatusId : ${finalApprovalStatusId} "/>
diff --git a/applications/content/minilang/content/ContentEvents.xml b/applications/content/minilang/content/ContentEvents.xml
index 3b6e902..265beac 100644
--- a/applications/content/minilang/content/ContentEvents.xml
+++ b/applications/content/minilang/content/ContentEvents.xml
@@ -52,7 +52,7 @@
<session-to-field field="context.userLogin" session-name="userLogin"/>
<call-service in-map-name="context" service-name="createContent">
- <result-to-field field="contentId" result-name="contentId"/>
+ <result-to-field result-name="contentId" field="contentId"/>
<result-to-request request-name="contentId" result-name="contentId"/>
</call-service>
<if-empty field="contentId">
@@ -113,7 +113,7 @@
<set field="context.targetOperationList" from-field="targetOperationList"/>
<session-to-field field="context.userLogin" session-name="userLogin"/>
<call-service in-map-name="context" service-name="updateContent">
- <result-to-field field="contentId" result-name="contentId"/>
+ <result-to-field result-name="contentId" field="contentId"/>
</call-service>
<check-errors/>
</simple-method>
diff --git a/applications/content/minilang/content/ContentPermissionEvents.xml b/applications/content/minilang/content/ContentPermissionEvents.xml
index 6ca676f..69cb36b 100644
--- a/applications/content/minilang/content/ContentPermissionEvents.xml
+++ b/applications/content/minilang/content/ContentPermissionEvents.xml
@@ -40,7 +40,7 @@
<session-to-field field="context.userLogin" session-name="userLogin"/>
<call-service in-map-name="context" service-name="checkContentPermission">
- <result-to-field field="permissionStatus" result-name="permissionStatus"/>
+ <result-to-field result-name="permissionStatus" field="permissionStatus"/>
</call-service>
<log level="always" message="permissionStatus:${permissionStatus}"/>
diff --git a/applications/content/minilang/content/ContentServices.xml b/applications/content/minilang/content/ContentServices.xml
index 238c19d..f659ae7 100644
--- a/applications/content/minilang/content/ContentServices.xml
+++ b/applications/content/minilang/content/ContentServices.xml
@@ -37,7 +37,7 @@
<field-map field-name="statusTypeId" value="CONTENT_STATUS"/>
<order-by field-name="sequenceId"/>
</entity-and>
- <first-from-list entry="statusItem" list="contentStatus"/>
+ <first-from-list list="contentStatus" entry="statusItem"/>
<set field="content.statusId" from-field="statusItem.statusId"/>
</if-empty>
@@ -206,8 +206,8 @@
<log level="always" message="assocContent, parameters:${parameters}"/>
<log level="always" message="assocContent, context:${context}"/>
<call-service in-map-name="parameters" service-name="checkAssocPermission">
- <result-to-field field="permissionStatus" result-name="permissionStatus"/>
- <result-to-field field="rolesOut" result-name="rolesOut"/>
+ <result-to-field result-name="permissionStatus" field="permissionStatus"/>
+ <result-to-field result-name="rolesOut" field="rolesOut"/>
</call-service>
<log level="always" message="permissionStatus:${permissionStatus}"/>
@@ -481,7 +481,7 @@
-->
<now-timestamp field="nowTimestamp"/>
- <set-service-fields to-map="persistIn" service-name="persistContentAndAssoc" map="parameters"/>
+ <set-service-fields service-name="persistContentAndAssoc" map="parameters" to-map="persistIn"/>
<!-- let's take a guess at what the dataResourceTypeId should be if it is empty -->
<if-empty field="persistIn.dataResourceTypeId">
<log level="info" message="persistIn.drMimeTypeId: ${persistIn.drMimeTypeId}"/>
@@ -530,7 +530,7 @@
</check-permission>
<check-errors/>
-->
- <set-service-fields to-map="persistIn" service-name="persistContentAndAssoc" map="parameters"/>
+ <set-service-fields service-name="persistContentAndAssoc" map="parameters" to-map="persistIn"/>
<call-service service-name="persistContentAndAssoc" in-map-name="persistIn">
<results-to-map map-name="persistOut"/>
</call-service>
@@ -867,7 +867,7 @@
<set field="filterByDate" from-field="parameters.filterByDate" default-value="true" type="Boolean"/>
<set field="useCache" from-field="parameters.useCache" default-value="true" type="Boolean"/>
- <entity-condition list="viewList" entity-name="ContentAssocViewTo" filter-by-date="${filterByDate}" use-cache="${useCache}">
+ <entity-condition entity-name="ContentAssocViewTo" list="viewList" filter-by-date="${filterByDate}" use-cache="${useCache}">
<condition-list combine="and">
<condition-expr field-name="contentIdStart" from-field="parameters.contentId"/>
<condition-expr field-name="caContentAssocTypeId" from-field="parameters.contentAssocTypeId" ignore-if-empty="true"/>
@@ -923,7 +923,7 @@
</condition-list>
</entity-condition>
<clear-field field="view2"/>
- <first-from-list entry="view2" list="viewList"/>
+ <first-from-list list="viewList" entry="view2"/>
<clear-field field="map"/>
<set field="map.contentIdFrom" from-field="view.contentId"/>
<set field="map.dataResourceIdFrom" from-field="view.dataResourceId"/>
@@ -979,7 +979,7 @@
</or>
</condition>
<then>
- <entity-condition list="contents" entity-name="Content">
+ <entity-condition entity-name="Content" list="contents">
<condition-list combine="and">
<condition-expr field-name="contentName" operator="not-equals" from-field="nullField"/>
<condition-list combine="or">
@@ -993,7 +993,7 @@
</entity-condition>
</then>
<else>
- <entity-condition list="contents" entity-name="Content">
+ <entity-condition entity-name="Content" list="contents">
<condition-list combine="and">
<condition-expr field-name="contentName" operator="not-equals" from-field="nullField"/>
<condition-expr field-name="contentId" operator="equals" from-field="parameters.contentId"/>
@@ -1010,7 +1010,7 @@
</if>
<iterate list="contents" entry="content">
<set field="localeString" from-field="content.localeString" default-value="${defaultLocaleString}"/>
- <entity-condition list="contentAssocDataResources" entity-name="ContentAssocDataResourceViewTo">
+ <entity-condition entity-name="ContentAssocDataResourceViewTo" list="contentAssocDataResources">
<condition-list combine="and">
<condition-expr field-name="caContentAssocTypeId" operator="equals" value="ALTERNATIVE_URL"/>
<condition-expr field-name="contentIdStart" operator="equals" from-field="content.contentId"/>
@@ -1102,7 +1102,7 @@
<iterate list="parameters.productCategories" entry="productCategoryList">
<!-- Create Content Alternative URLs for Product Category Content -->
- <entity-condition list="productCategoryContentAndInfoList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true">
+ <entity-condition entity-name="ProductCategoryContentAndInfo" list="productCategoryContentAndInfoList" filter-by-date="true" use-cache="true">
<condition-list combine="and">
<condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
<condition-expr field-name="prodCatContentTypeId" operator="not-equals" value="ALTERNATIVE_URL"/>
@@ -1131,7 +1131,7 @@
</iterate>
<!-- Create Content Alternative URLs for Product Content -->
- <entity-condition list="productCategoryMemberList" entity-name="ProductCategoryMember" filter-by-date="true" use-cache="true">
+ <entity-condition entity-name="ProductCategoryMember" list="productCategoryMemberList" filter-by-date="true" use-cache="true">
<condition-list combine="and">
<condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
</condition-list>
@@ -1139,7 +1139,7 @@
</entity-condition>
<iterate list="productCategoryMemberList" entry="productCategoryMember">
<set field="product.productId" from-field="productCategoryMember.productId"/>
- <entity-condition list="productContentAndInfoList" entity-name="ProductContentAndInfo" filter-by-date="true" use-cache="true">
+ <entity-condition entity-name="ProductContentAndInfo" list="productContentAndInfoList" filter-by-date="true" use-cache="true">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="product.productId"/>
<condition-expr field-name="productContentTypeId" operator="not-equals" value="ALTERNATIVE_URL"/>
@@ -1232,7 +1232,7 @@
</entity-and>
<iterate list="productCategoryRollups" entry="productCategoryRollup">
<!-- append product category to list -->
- <entity-one value-field="productCategory" entity-name="ProductCategory">
+ <entity-one entity-name="ProductCategory" value-field="productCategory">
<field-map field-name="productCategoryId" from-field="productCategoryRollup.productCategoryId"/>
</entity-one>
<field-to-list list="parameters.productCategories" field="productCategory"/>
diff --git a/applications/content/minilang/data/DataServices.xml b/applications/content/minilang/data/DataServices.xml
index f519516..8911d3c 100644
--- a/applications/content/minilang/data/DataServices.xml
+++ b/applications/content/minilang/data/DataServices.xml
@@ -46,7 +46,7 @@
<field-map field-name="statusTypeId" value="CONTENT_STATUS"/>
<order-by field-name="sequenceId"/>
</entity-and>
- <first-from-list entry="statusItem" list="contentStatus"/>
+ <first-from-list list="contentStatus" entry="statusItem"/>
<set field="newEntity.statusId" from-field="statusItem.statusId"/>
</if-empty>
@@ -64,7 +64,7 @@
</simple-method>
<simple-method method-name="createDataResourceAndAssocToContent" short-description="Create a Data Resource and return the data resource type">
- <entity-one value-field="content" entity-name="Content"/>
+ <entity-one entity-name="Content" value-field="content"/>
<if-empty field="content">
<add-error>
<fail-property resource="ContentErrorUiLabels" property="layoutEvents.content_empty"/>
@@ -72,7 +72,7 @@
<check-errors/>
</if-empty>
- <set-service-fields service-name="createDataResource" to-map="dataResourceCtx" map="parameters"/>
+ <set-service-fields service-name="createDataResource" map="parameters" to-map="dataResourceCtx"/>/>
<call-service service-name="createDataResource" in-map-name="dataResourceCtx">
<result-to-field result-name="dataResource"/>
</call-service>
@@ -344,7 +344,7 @@
<set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
<find-by-and entity-name="FileExtension" map="extenLookup" list="extensions"/>
- <first-from-list entry="extension" list="extensions"/>
+ <first-from-list list="extensions" entry="extension"/>
<set from-field="parameters._uploadedFile_fileName" field="dataResource.dataResourceName"/>
<set value="${uploadPath}/${dataResource.dataResourceId}" field="dataResource.objectInfo"/>
@@ -414,7 +414,7 @@
<set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
<find-by-and entity-name="FileExtension" map="extenLookup" list="extensions"/>
- <first-from-list entry="extension" list="extensions"/>
+ <first-from-list list="extensions" entry="extension"/>
<set from-field="parameters._uploadedFile_fileName" field="dataResource.dataResourceName"/>
<set from-field="parameters._uploadedFile_contentType" field="dataResource.mimeTypeId"/>
@@ -728,7 +728,7 @@
<set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
<find-by-and entity-name="FileExtension" map="extenLookup" list="extensions"/>
- <first-from-list entry="extension" list="extensions"/>
+ <first-from-list list="extensions" entry="extension"/>
<set from-field="parameters._uploadedFile_fileName" field="dataResource.dataResourceName"/>
<set from-field="parameters._uploadedFile_contentType" field="dataResource.mimeTypeId"/>
diff --git a/applications/content/minilang/layout/LayoutEvents.xml b/applications/content/minilang/layout/LayoutEvents.xml
index 8f0eb06..b076cda 100644
--- a/applications/content/minilang/layout/LayoutEvents.xml
+++ b/applications/content/minilang/layout/LayoutEvents.xml
@@ -37,8 +37,8 @@
<set field="context.objectInfo" from-field="parameters.drObjectInfo"/>
<set field="context.dataResourceTypeId" value="LOCAL_FILE"/>
<call-service in-map-name="context" service-name="persistContentAndAssoc">
- <result-to-field field="contentId" result-name="contentId"/>
- <result-to-field field="dataResourceId" result-name="dataResourceId"/>
+ <result-to-field result-name="contentId" field="contentId"/>
+ <result-to-field result-name="dataResourceId" field="dataResourceId"/>
</call-service>
<if-empty field="contentId">
<add-error>
@@ -64,7 +64,7 @@
<set field="context.targetOperationList" from-field="targetOperationList"/>
<session-to-field field="context.userLogin" session-name="userLogin"/>
<call-service in-map-name="context" service-name="checkContentPermission">
- <result-to-field field="permissionStatus" result-name="permissionStatus"/>
+ <result-to-field result-name="permissionStatus" field="permissionStatus"/>
</call-service>
<if-compare field="permissionStatus" operator="not-equals" value="granted" type="String">
<add-error>
@@ -113,10 +113,10 @@
<set field="context.contentTypeId" value="DOCUMENT"/>
<call-service in-map-name="context" service-name="persistContentAndAssoc">
- <result-to-field field="context2.activeContentId" result-name="contentId"/>
- <result-to-field field="dataResourceId" result-name="dataResourceId"/>
- <result-to-field field="context2.contentAssocTypeId" result-name="contentAssocTypeId"/>
- <result-to-field field="context2.fromDate" result-name="fromDate"/>
+ <result-to-field result-name="contentId" field="context2.activeContentId"/>
+ <result-to-field result-name="dataResourceId" field="dataResourceId"/>
+ <result-to-field result-name="contentAssocTypeId" field="context2.contentAssocTypeId"/>
+ <result-to-field result-name="fromDate" field="context2.fromDate"/>
</call-service>
<check-errors/>
@@ -129,7 +129,7 @@
<set field="context2.mapKey" from-field="parameters.mapKey"/>
<if-not-empty field="context2.activeContentId">
<call-service in-map-name="context2" service-name="deactivateAssocs">
- <result-to-field field="deactivateList" result-name="deactivateList"/>
+ <result-to-field result-name="deactivateList" field="deactivateList"/>
</call-service>
</if-not-empty>
@@ -209,10 +209,10 @@
<set field="context.contentTypeId" value="DOCUMENT"/>
<call-service in-map-name="context" service-name="persistContentAndAssoc">
- <result-to-field field="context2.activeContentId" result-name="contentId"/>
- <result-to-field field="dataResourceId" result-name="dataResourceId"/>
- <result-to-field field="context2.contentAssocTypeId" result-name="contentAssocTypeId"/>
- <result-to-field field="context2.fromDate" result-name="fromDate"/>
+ <result-to-field result-name="contentId" field="context2.activeContentId"/>
+ <result-to-field result-name="dataResourceId" field="dataResourceId"/>
+ <result-to-field result-name="contentAssocTypeId" field="context2.contentAssocTypeId"/>
+ <result-to-field result-name="fromDate" field="context2.fromDate"/>
</call-service>
<check-errors/>
@@ -225,7 +225,7 @@
<set field="context2.mapKey" from-field="formInput.mapKey"/>
<if-not-empty field="context2.activeContentId">
<call-service in-map-name="context2" service-name="deactivateAssocs">
- <result-to-field field="deactivateList" result-name="deactivateList"/>
+ <result-to-field result-name="deactivateList" field="deactivateList"/>
</call-service>
</if-not-empty>
@@ -267,10 +267,10 @@
<set field="context.contentTypeId" value="DOCUMENT"/>
<call-service in-map-name="context" service-name="persistContentAndAssoc">
- <result-to-field field="context2.activeContentId" result-name="contentId"/>
- <result-to-field field="dataResourceId" result-name="dataResourceId"/>
- <result-to-field field="context2.contentAssocTypeId" result-name="contentAssocTypeId"/>
- <result-to-field field="context2.fromDate" result-name="fromDate"/>
+ <result-to-field result-name="contentId" field="context2.activeContentId"/>
+ <result-to-field result-name="dataResourceId" field="dataResourceId"/>
+ <result-to-field result-name="contentAssocTypeId" field="context2.contentAssocTypeId"/>
+ <result-to-field result-name="fromDate" field="context2.fromDate"/>
</call-service>
<check-errors/>
@@ -283,7 +283,7 @@
<set field="context2.mapKey" from-field="parameters.mapKey"/>
<if-not-empty field="context2.activeContentId">
<call-service in-map-name="context2" service-name="deactivateAssocs">
- <result-to-field field="deactivateList" result-name="deactivateList"/>
+ <result-to-field result-name="deactivateList" field="deactivateList"/>
</call-service>
</if-not-empty>
diff --git a/applications/content/widget/LookupForms.xml b/applications/content/widget/LookupForms.xml
index 01c3d48..0d97e5a 100644
--- a/applications/content/widget/LookupForms.xml
+++ b/applications/content/widget/LookupForms.xml
@@ -29,7 +29,7 @@
</entity-condition>
</actions>
<field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${contentId}" target-type="plain" target="javascript:execRemoteCall('cloneLayout', '${drDataResourceId}', '${contentId}', 'TEMPLATE_MASTER', '')"/>
+ <hyperlink description="${contentId}" target-type="plain" target="javascript:execRemoteCall('cloneLayout', '${drDataResourceId}', '${contentId}', 'TEMPLATE_MASTER', '')" also-hidden="false"/>
</field>
<field name="contentName"><display/></field>
<field name="description"><display/></field>
diff --git a/applications/content/widget/WebSiteScreens.xml b/applications/content/widget/WebSiteScreens.xml
index a81641d..33702cb 100644
--- a/applications/content/widget/WebSiteScreens.xml
+++ b/applications/content/widget/WebSiteScreens.xml
@@ -211,7 +211,7 @@
<field-map field-name="dataResourceId" from-field="content.dataResourceId"/>
</entity-one>
<set field="parameters.fromDate" type="Timestamp" from-field="parameters.fromDate"/>
- <entity-condition list="assocs" entity-name="ContentAssoc">
+ <entity-condition entity-name="ContentAssoc" list="assocs">
<condition-list>
<condition-expr field-name="contentId" from-field="parameters.contentIdFrom" ignore-if-empty="true"/>
<condition-expr field-name="contentIdTo" from-field="parameters.contentId"/>
diff --git a/applications/content/widget/cms/CMSForms.xml b/applications/content/widget/cms/CMSForms.xml
index c6661f8..e206184 100644
--- a/applications/content/widget/cms/CMSForms.xml
+++ b/applications/content/widget/cms/CMSForms.xml
@@ -45,7 +45,7 @@
</actions>
<field name="caContentIdTo" title=" ">
- <hyperlink also-hidden="false" description="${caContentIdTo}" target="EditAddContent">
+ <hyperlink description="${caContentIdTo}" target="EditAddContent" also-hidden="false">
<parameter param-name="MASTER_contentId" from-field="contentId"/>
<parameter param-name="MASTER_drDataResourceId" from-field="drDataResourceId"/>
<parameter param-name="MASTER_caContentIdTo" from-field="caContentIdTo"/>
@@ -54,7 +54,7 @@
<parameter param-name="MASTER_caMapKey" from-field="caMapKey"/>
</hyperlink>
<!--
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContent">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditContent" also-hidden="false">
<parameter param-name="caContentIdTo"/>
<parameter param-name="caFromDate"/>
<parameter param-name="contentId"/>
@@ -185,7 +185,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-service service-name="updateContentPurposeOperation" default-field-type="display"/>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation" also-hidden="false">
<parameter param-name="contentPurposeTypeId"/>
<parameter param-name="contentOperationId"/>
<parameter param-name="roleTypeId"/>
@@ -293,7 +293,7 @@
</field>
<!--
<field name="submitContentEdit" title=" ">
- <hyperlink also-hidden="false" description="Submit" target="javascript:document.EditAddContent.action='${persistAction}'; document.EditAddContent.submit()" target-type="plain"/>
+ <hyperlink description="Submit" target="javascript:document.EditAddContent.action='${persistAction}'; document.EditAddContent.submit()" also-hidden="false" target-type="plain"/>
</field>
-->
<field name="deactivateExisting" >
diff --git a/applications/content/widget/compdoc/CompDocForms.xml b/applications/content/widget/compdoc/CompDocForms.xml
index 50c36b7..b5f0c77 100644
--- a/applications/content/widget/compdoc/CompDocForms.xml
+++ b/applications/content/widget/compdoc/CompDocForms.xml
@@ -52,7 +52,7 @@
<field name="contentTypeId"><display/></field>
<field name="contentName"><display/></field>
<field name="edit" use-when=""COMPDOC_TEMPLATE".equals(contentTypeId)" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="rootContentId" from-field="caContentIdTo"/>
<parameter param-name="caContentAssocTypeId"/>
@@ -60,7 +60,7 @@
</hyperlink>
</field>
<field name="edit" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="rootContentId" from-field="caContentIdTo"/>
<parameter param-name="caContentAssocTypeId"/>
@@ -68,7 +68,7 @@
</hyperlink>
</field>
<field name="edit" use-when=""TEMPLATE".equals(contentTypeId)" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditChildCompDoc">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditChildCompDoc" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="rootContentId" from-field="caContentIdTo"/>
<parameter param-name="caContentAssocTypeId"/>
@@ -76,7 +76,7 @@
</hyperlink>
</field>
<field name="edit" use-when=""DOCUMENT".equals(contentTypeId)" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditChildCompDoc">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditChildCompDoc" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="rootContentId" from-field="caContentIdTo"/>
<parameter param-name="caContentAssocTypeId"/>
@@ -84,12 +84,12 @@
</hyperlink>
</field>
<field name="tree" use-when=""COMPDOC_TEMPLATE".equals(contentTypeId)" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.ContentTree}" target="ViewCompDocTemplateTree">
+ <hyperlink description="${uiLabelMap.ContentTree}" target="ViewCompDocTemplateTree" also-hidden="false">
<parameter param-name="rootContentId" from-field="contentId"/>
</hyperlink>
</field>
<field name="tree" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.ContentTree}" target="ViewCompDocInstanceTree">
+ <hyperlink description="${uiLabelMap.ContentTree}" target="ViewCompDocInstanceTree" also-hidden="false">
<parameter param-name="rootContentId" from-field="contentId"/>
</hyperlink>
</field>
@@ -104,12 +104,12 @@
<field name="caFromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
<field name="caThruDate"><hidden/></field>
<field name="editTemplate" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc" also-hidden="false">
<parameter param-name="rootContentId" from-field="contentId"/>
</hyperlink>
</field>
<field name="templateTree" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.ContentTree}" target="ViewCompDocInstanceTree">
+ <hyperlink description="${uiLabelMap.ContentTree}" target="ViewCompDocInstanceTree" also-hidden="false">
<parameter param-name="rootContentId" from-field="contentId"/>
</hyperlink>
</field>
@@ -143,7 +143,7 @@
<field name="committedByPartyId"><display/></field>
<field name="comments"><display/></field>
<field name="editLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContentRevision">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditContentRevision" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="contentRevisionSeqId"/>
<parameter param-name="rootContentId"/>
@@ -151,7 +151,7 @@
</hyperlink>
</field>
<field name="itemLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonItems}" target="ListContentRevisionItem">
+ <hyperlink description="${uiLabelMap.CommonItems}" target="ListContentRevisionItem" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="contentRevisionSeqId"/>
<parameter param-name="rootContentId"/>
@@ -159,7 +159,7 @@
</hyperlink>
</field>
<field name="create" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonCreate}" target="EditContentRevision">
+ <hyperlink description="${uiLabelMap.CommonCreate}" target="EditContentRevision" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="contentRevisionSeqId"/>
<parameter param-name="rootContentId"/>
@@ -167,13 +167,13 @@
</hyperlink>
</field>
<field name="tree" title=" " widget-style="buttontext" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)">
- <hyperlink also-hidden="false" description="${uiLabelMap.ContentTree}" target="ViewCompDocInstanceTree">
+ <hyperlink description="${uiLabelMap.ContentTree}" target="ViewCompDocInstanceTree" also-hidden="false">
<parameter param-name="rootContentId" from-field="contentId"/>
<parameter param-name="rootContentRevisionSeqId" from-field="contentRevisionSeqId"/>
</hyperlink>
</field>
<field name="tree" title=" " widget-style="buttontext" use-when=""COMPDOC_TEMPLATE".equals(contentTypeId)">
- <hyperlink also-hidden="false" description="${uiLabelMap.ContentTree}" target="ViewCompDocTemplateTree">
+ <hyperlink description="${uiLabelMap.ContentTree}" target="ViewCompDocTemplateTree" also-hidden="false">
<parameter param-name="rootContentId" from-field="contentId"/>
<parameter param-name="rootContentRevisionSeqId" from-field="contentRevisionSeqId"/>
</hyperlink>
@@ -204,7 +204,7 @@
<field name="oldDataResourceId"><display/></field>
<field name="newDataResourceId"><display/></field>
<field name="editLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContentRevisionItem">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditContentRevisionItem" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="contentRevisionSeqId"/>
<parameter param-name="itemContentId"/>
@@ -213,7 +213,7 @@
</hyperlink>
</field>
<field name="create" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonCreate}" target="EditContentRevisionItem">
+ <hyperlink description="${uiLabelMap.CommonCreate}" target="EditContentRevisionItem" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="contentRevisionSeqId"/>
<parameter param-name="rootContentId"/>
@@ -298,7 +298,7 @@
<field name="comments" widget-style="inputBox"><textarea cols="30" rows="3"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field>
<field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit">
- <hyperlink target="removeContentApproval" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentApproval">
<parameter param-name="contentApprovalId"/>
<parameter param-name="rootContentId"/>
<parameter param-name="rootContentRevisionSeqId"/>
@@ -470,7 +470,7 @@
</field>
<field name="addSurveyResponse" map-name="dummy" widget-style="buttontext"
use-when=""DOCUMENT".equals(contentTypeId) && dataResource!=null && dataResource.get("relatedDetailId")==null && templateDataResource!=null && templateDataResource.get("relatedDetailId")!=null">
- <hyperlink description="${uiLabelMap.CommonCreate} ${uiLabelMap.ContentSurveyResponse} (${uiLabelMap.CommonFor} ${uiLabelMap.ContentSurvey} ${templateDataResource.relatedDetailId})" target="EditSurveyResponse" also-hidden="false" target-window="_blank">
+ <hyperlink description="${uiLabelMap.CommonCreate} ${uiLabelMap.ContentSurveyResponse} (${uiLabelMap.CommonFor} ${uiLabelMap.ContentSurvey} ${templateDataResource.relatedDetailId})" target="EditSurveyResponse" target-window="_blank" also-hidden="false">
<parameter param-name="surveyId" from-field="templateDataResource.relatedDetailId"/>
<parameter param-name="dataResourceId" from-field="dataResource.dataResourceId"/>
<parameter param-name="rootContentId"/>
@@ -478,7 +478,7 @@
</field>
<field name="updateSurveyResponse" map-name="dummy" widget-style="buttontext"
use-when=""DOCUMENT".equals(contentTypeId) && dataResource!=null && dataResource.get("relatedDetailId")!=null && templateDataResource!=null && templateDataResource.get("relatedDetailId")!=null">
- <hyperlink description="${uiLabelMap.CommonUpdate} ${uiLabelMap.ContentSurveyResponse} (${uiLabelMap.CommonFor} ${uiLabelMap.ContentSurvey} ${templateDataResource.relatedDetailId}, Response ${dataResource.relatedDetailId})" target="EditSurveyResponse" also-hidden="false" target-window="_blank">
+ <hyperlink description="${uiLabelMap.CommonUpdate} ${uiLabelMap.ContentSurveyResponse} (${uiLabelMap.CommonFor} ${uiLabelMap.ContentSurvey} ${templateDataResource.relatedDetailId}, Response ${dataResource.relatedDetailId})" target="EditSurveyResponse" target-window="_blank" also-hidden="false">
<parameter param-name="surveyId" from-field="templateDataResource.relatedDetailId"/>
<parameter param-name="surveyResponseId" from-field="dataResource.relatedDetailId"/>
<parameter param-name="dataResourceId" from-field="dataResource.dataResourceId"/>
diff --git a/applications/content/widget/content/ContentForms.xml b/applications/content/widget/content/ContentForms.xml
index 92408b1..d5c9605 100644
--- a/applications/content/widget/content/ContentForms.xml
+++ b/applications/content/widget/content/ContentForms.xml
@@ -62,7 +62,7 @@
</field>
<!--<field name="localeString">
<drop-down allow-empty="true">
- <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode">
+ <entity-options entity-name="CountryCode" key-field-name="countryCode" description="${countryName} [${countryCode}]">
<entity-order-by field-name="countryName"/>
</entity-options>
</drop-down>
@@ -123,7 +123,7 @@
<call-parent-actions/>
</actions>
<field name="contentId">
- <hyperlink also-hidden="false" target-type="plain" description="${contentId}" target="javascript:set_value('${contentId}')"/>
+ <hyperlink description="${contentId}" target="javascript:set_value('${contentId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="contentName"><display/></field>
<field name="mimeTypeId"><display/></field>
@@ -223,7 +223,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="contentId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${contentId}" target="javascript:set_value('${contentId}')"/>
+ <hyperlink description="${contentId}" target="javascript:set_value('${contentId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="contentName" widget-style="buttontext"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}" widget-style="buttontext"><display/></field>
@@ -294,7 +294,7 @@
<field name="mapKey"><display/></field>
<field name="fromDate"><display description="${groovy:fromDate.toString().substring(0,10)}"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssoc">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentAssoc" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="contentIdTo"/>
<parameter param-name="contentAssocTypeId"/>
@@ -325,7 +325,7 @@
<field name="mapKey"><display/></field>
<field name="fromDate"><display description="${groovy:fromDate.toString().substring(0,10)}"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssoc">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentAssoc" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="contentIdTo"/>
<parameter param-name="contentAssocTypeId"/>
@@ -377,7 +377,7 @@
<submit button-type="button"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="remove${contentRoleTarget}ContentRole">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="remove${contentRoleTarget}ContentRole" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="roleTypeId"/>
<parameter param-name="partyId"/>
@@ -411,7 +411,7 @@
<field name="sequenceNum"><text /></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurpose">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentPurpose" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="contentPurposeTypeId"/>
</hyperlink>
@@ -438,7 +438,7 @@
<field name="attrValue" widget-style="buttontext"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAttribute">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentAttribute" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="attrName"/>
</hyperlink>
@@ -484,7 +484,7 @@
<field name="metaDataPredicateId" widget-style="buttontext"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentMetaData">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentMetaData" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="metaDataPredicateId"/>
</hyperlink>
@@ -495,7 +495,7 @@
<form name="MruLookupPerson" list-name="mruList" target="" title="" type="list"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="partyId" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
+ <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="firstName" title=" " widget-style="buttontext"><display/></field>
<field name="lastName" title=" " widget-style="buttontext"><display/></field>
@@ -503,7 +503,7 @@
<form name="MruLookupPartyAndUserLoginAndPerson" list-name="mruList" target="" title="" type="list"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="partyId" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}', '${userLoginId}')"/>
+ <hyperlink description="${partyId}" target="javascript:set_value('${partyId}', '${userLoginId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="firstName" title=" " widget-style="buttontext"><display/></field>
<field name="lastName" title=" " widget-style="buttontext"><display/></field>
@@ -547,7 +547,7 @@
<field name="fromDate"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContent">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContent" also-hidden="false">
<parameter param-name="workEffortContentTypeId"/>
<parameter param-name="fromDate"/>
<parameter param-name="workEffortId"/>
@@ -558,10 +558,10 @@
<!--form name="ListDocument" target="" type="list" list-name="contentAssoc" paginate-target="navigateContent"
odd-row-style="alternate-row" header-row-style="header-row" default-table-style="basic-table hover-bar">
<field name="contentId" use-when=""application/pdf".equals(mimeTypeId)">
- <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="showContentPdf?contentId=${contentId}" target-window="_blank"/>
+ <hyperlink description="${contentName} [${contentId}]" target="showContentPdf?contentId=${contentId}" target-window="_blank" also-hidden="false"/>
</field>
<field name="contentId" use-when=""text/html".equals(mimeTypeId)">
- <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="showContent?contentId=${contentId}" target-window="_blank"/>
+ <hyperlink description="${contentName} [${contentId}]" target="showContent?contentId=${contentId}" target-window="_blank" also-hidden="false"/>
</field>
<field name="contentTypeId">
<display-entity entity-name="ContentType" key-field-name="contentTypeId"/>
@@ -574,7 +574,7 @@
</field>
<field name="caCreatedDate"><display/></field>
<field name="delete" title="${uiLabelMap.CommonDelete}">
- <hyperlink target="removeDocumentFromTree" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeDocumentFromTree">
<parameter param-name="contentId"/>
<parameter param-name="contentIdTo"/>
<parameter param-name="contentAssocTypeId"/>
@@ -616,7 +616,7 @@
</form>
<form name="ViewContentDetail" type="single" default-map-name="lookupContentDetail">
<field name="contentId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${contentId}" target="javascript:set_value('${contentId}')"/>
+ <hyperlink description="${contentId}" target="javascript:set_value('${contentId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="contentName"><display/></field>
<field name="contentTypeId"><display/></field>
diff --git a/applications/content/widget/content/DataResourceForms.xml b/applications/content/widget/content/DataResourceForms.xml
index 412f176..aa35c42 100644
--- a/applications/content/widget/content/DataResourceForms.xml
+++ b/applications/content/widget/content/DataResourceForms.xml
@@ -53,7 +53,7 @@
</field>
<!--<field name="localeString" position="2">
<drop-down allow-empty="true">
- <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode">
+ <entity-options entity-name="CountryCode" key-field-name="countryCode" description="${countryName} [${countryCode}]">
<entity-order-by field-name="countryName"/>
</entity-options>
</drop-down>
@@ -141,14 +141,14 @@
</service>
</actions>
<field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}">
- <hyperlink also-hidden="false" target-type="plain" description="${dataResourceId}" target="javascript:set_value('${dataResourceId}')"/>
+ <hyperlink description="${dataResourceId}" target="javascript:set_value('${dataResourceId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="dataResourceName"><display/></field>
</form>
<form name="MruLookupDataResource" default-entity-name="DataResource" list-name="mruList" target="" title="" type="list" default-widget-style="display"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="contentId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${dataResourceId}" target="javascript:set_value('${dataResourceId}')"/>
+ <hyperlink description="${dataResourceId}" target="javascript:set_value('${dataResourceId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="dataResourceName" widget-style="buttontext"><display/></field>
<field name="dataCategoryId" widget-style="buttontext"><display/></field>
@@ -227,7 +227,7 @@
</entity-and>
</actions>
<field name="contentId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${contentId}" target="/EditContent">
+ <hyperlink description="${contentId}" target="/EditContent" also-hidden="false">
<parameter param-name="contentId"/>
</hyperlink>
</field>
@@ -375,7 +375,7 @@
<field name="attrValue"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceAttribute">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeDataResourceAttribute" also-hidden="false">
<parameter param-name="dataResourceId"/>
<parameter param-name="attrName"/>
</hyperlink>
@@ -410,7 +410,7 @@
<field name="thruDate" widget-style="buttontext"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceRole">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeDataResourceRole" also-hidden="false">
<parameter param-name="dataResourceId"/>
<parameter param-name="roleTypeId"/>
<parameter param-name="partyId"/>
@@ -439,7 +439,7 @@
</actions>
<auto-fields-entity entity-name="ProductFeatureDataResource" default-field-type="display"/>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceProductFeature">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeDataResourceProductFeature" also-hidden="false">
<parameter param-name="dataResourceId"/>
<parameter param-name="productFeatureId"/>
</hyperlink>
@@ -468,13 +468,13 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="ProductFeature" default-field-type="display"/>
<field name="productFeatureId" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')"/>
+ <hyperlink description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')" also-hidden="false" target-type="plain"/>
</field>
</form>
<form name="MruLookupProductFeature" default-entity-name="ProductFeature" list-name="mruList" target="" title="" type="list"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="contentId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')"/>
+ <hyperlink description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="description" title="${uiLabelMap.FormFieldTitle_contentName}" widget-style="buttontext"><display/></field>
<field name="productFeatureTypeId" title="${uiLabelMap.CommonType}" widget-style="buttontext"><display/></field>
diff --git a/applications/content/widget/contentsetup/ContentSetupForms.xml b/applications/content/widget/contentsetup/ContentSetupForms.xml
index b061d8f..b3b4db7 100644
--- a/applications/content/widget/contentsetup/ContentSetupForms.xml
+++ b/applications/content/widget/contentsetup/ContentSetupForms.xml
@@ -41,7 +41,7 @@
<submit button-type="button"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentType">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentType" also-hidden="false">
<parameter param-name="contentTypeId"/>
</hyperlink>
</field>
@@ -73,7 +73,7 @@
<display/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentTypeAttr">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentTypeAttr" also-hidden="false">
<parameter param-name="contentTypeId"/>
<parameter param-name="attrName"/>
</hyperlink>
@@ -101,7 +101,7 @@
<submit button-type="button"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssocType">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentAssocType" also-hidden="false">
<parameter param-name="contentAssocTypeId"/>
</hyperlink>
</field>
@@ -128,7 +128,7 @@
<submit button-type="button"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurposeType">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentPurposeType" also-hidden="false">
<parameter param-name="contentPurposeTypeId"/>
</hyperlink>
</field>
@@ -155,7 +155,7 @@
<submit button-type="button"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssocPredicate">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentAssocPredicate" also-hidden="false">
<parameter param-name="contentAssocPredicateId"/>
</hyperlink>
</field>
@@ -182,7 +182,7 @@
<submit button-type="button"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentOperation">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentOperation" also-hidden="false">
<parameter param-name="contentOperationId"/>
</hyperlink>
</field>
@@ -218,7 +218,7 @@
</actions>
<auto-fields-service service-name="updateContentPurposeOperation" default-field-type="display"/>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation" also-hidden="false">
<parameter param-name="contentPurposeTypeId"/>
<parameter param-name="contentOperationId"/>
<parameter param-name="roleTypeId"/>
diff --git a/applications/content/widget/datasetup/DataSetupForms.xml b/applications/content/widget/datasetup/DataSetupForms.xml
index e206f5b..c258bd4 100644
--- a/applications/content/widget/datasetup/DataSetupForms.xml
+++ b/applications/content/widget/datasetup/DataSetupForms.xml
@@ -41,7 +41,7 @@
<submit button-type="button"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceType">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeDataResourceType" also-hidden="false">
<parameter param-name="dataResourceTypeId"/>
</hyperlink>
</field>
@@ -73,7 +73,7 @@
<display/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceTypeAttr">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeDataResourceTypeAttr" also-hidden="false">
<parameter param-name="dataResourceTypeId"/>
<parameter param-name="attrName"/>
</hyperlink>
@@ -101,7 +101,7 @@
<submit button-type="button"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeCharacterSet">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeCharacterSet" also-hidden="false">
<parameter param-name="characterSetId"/>
</hyperlink>
</field>
@@ -113,7 +113,7 @@
<auto-fields-service service-name="createDataCategory"/>
<field name="parentCategoryId">
<drop-down allow-empty="true">
- <entity-options entity-name="DataCategory" description="${categoryName}" key-field-name="dataCategoryId"></entity-options>
+ <entity-options entity-name="DataCategory" key-field-name="dataCategoryId" description="${categoryName}"></entity-options>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
@@ -140,7 +140,7 @@
<submit button-type="button"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataCategory">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeDataCategory" also-hidden="false">
<parameter param-name="dataCategoryId"/>
</hyperlink>
</field>
@@ -178,7 +178,7 @@
<submit button-type="button"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeFileExtension">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeFileExtension" also-hidden="false">
<parameter param-name="fileExtensionId"/>
</hyperlink>
</field>
@@ -206,7 +206,7 @@
<submit button-type="button"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeMetaDataPredicate">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeMetaDataPredicate" also-hidden="false">
<parameter param-name="metaDataPredicateId"/>
</hyperlink>
</field>
@@ -233,7 +233,7 @@
<submit button-type="button"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeMimeType">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeMimeType" also-hidden="false">
<parameter param-name="mimeTypeId"/>
</hyperlink>
</field>
@@ -268,7 +268,7 @@
<submit button-type="button"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeMimeTypeHtmlTemplate">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeMimeTypeHtmlTemplate" also-hidden="false">
<parameter param-name="mimeTypeId"/>
<parameter param-name="dataResourceId"/>
<parameter param-name="fromDate"/>
diff --git a/applications/content/widget/forum/BlogForms.xml b/applications/content/widget/forum/BlogForms.xml
index 07ea3ef..596199c 100644
--- a/applications/content/widget/forum/BlogForms.xml
+++ b/applications/content/widget/forum/BlogForms.xml
@@ -24,7 +24,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="contentId"><hidden/></field>
<field name="contentName">
- <hyperlink target="editBlog" description="${contentName} [${contentId}]">
+ <hyperlink description="${contentName} [${contentId}]" target="editBlog">
<parameter param-name="blogContentId" from-field="contentId"/>
</hyperlink>
</field>
@@ -40,7 +40,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="contentId"><hidden/></field>
<field name="contentName">
- <hyperlink target="ViewBlogArticle" description="${contentName} [${contentId}]">
+ <hyperlink description="${contentName} [${contentId}]" target="ViewBlogArticle">
<parameter param-name="articleContentId" from-field="contentId"/>
<parameter param-name="blogContentId" from-field="parameters.blogContentId"/>
</hyperlink>
diff --git a/applications/content/widget/forum/ForumForms.xml b/applications/content/widget/forum/ForumForms.xml
index c61db94..ec59a2e 100644
--- a/applications/content/widget/forum/ForumForms.xml
+++ b/applications/content/widget/forum/ForumForms.xml
@@ -23,7 +23,7 @@
<form name="ListForumGroups" type="list" list-name="forumGroups" separate-columns="true" target="updateForumGroup"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="select" widget-style="buttontext" entry-name="contentId" parameter-name="contentId">
- <hyperlink target="findForums" description="${uiLabelMap.FormFieldTitle_forums}">
+ <hyperlink description="${uiLabelMap.FormFieldTitle_forums}" target="findForums">
<parameter param-name="forumGroupId" from-field="contentId"/>
</hyperlink>
</field>
@@ -47,7 +47,7 @@
<field name="caContentAssocTypeId"><hidden value="${caContentAssocTypeId}"/></field>
<field name="contentTypeId"><hidden/></field>
<field name="select" widget-style="buttontext" entry-name="contentId" parameter-name="contentId">
- <hyperlink target="findForumMessages" description="${uiLabelMap.ContentForumMessages}">
+ <hyperlink description="${uiLabelMap.ContentForumMessages}" target="findForumMessages">
<parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/>
<parameter param-name="forumId" from-field="contentId"/>
</hyperlink>
@@ -57,7 +57,7 @@
<field name="thruDate" entry-name="caThruDate"><date-time/></field>
<field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
<field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="updateForum" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="updateForum">
<parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/>
<parameter param-name="caContentIdTo" from-field="contentId"/>
<parameter param-name="caContentId"/>
@@ -112,7 +112,7 @@
<field name="fromDate"><display/></field>
<field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="text-link"/></field>
<field name="deleteButton" title="${uiLabelMap.CommonDelete}">
- <hyperlink target="deleteForumGroupRole" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteForumGroupRole">
<parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/>
<parameter param-name="contentIdTo"/>
<parameter param-name="contentId"/>
@@ -158,7 +158,7 @@
<field name="fromDate" entry-name="caFromDate"><display description="${groovy:caFromDate!=null?caFromDate.toString().substring(0,10):""}"/></field>
<field name="thruDate" entry-name="caThruDate"><display description="${groovy:caThruDate!=null?caThruDate.toString().substring(0,10):""}"/></field>
<field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="updateForumMessage" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="updateForumMessage">
<parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/>
<parameter param-name="forumId" from-field="${parameters.forumId}"/>
<parameter param-name="caContentIdTo"/>
@@ -171,7 +171,7 @@
<field name="messageText" entry-name="contentData.resultData.electronicText.textData" parameter-name="textData"><textarea rows="8"/></field>
<field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
<field name="responseButton" title="${uiLabelMap.FormFieldTitle_reponse}" widget-style="buttontext">
- <hyperlink target="addForumMessage" description="${uiLabelMap.FormFieldTitle_reponse}">
+ <hyperlink description="${uiLabelMap.FormFieldTitle_reponse}" target="addForumMessage">
<parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/>
<parameter param-name="forumId" from-field="parameters.forumId"/>
<parameter param-name="forumMessageIdTo" from-field="contentId"/>
diff --git a/applications/content/widget/layout/LayoutForms.xml b/applications/content/widget/layout/LayoutForms.xml
index f33bf7a..a5d07a2 100644
--- a/applications/content/widget/layout/LayoutForms.xml
+++ b/applications/content/widget/layout/LayoutForms.xml
@@ -94,7 +94,7 @@
<submit button-type="button"/>
</field>
<field name="createLink" title=" " widget-style="buttontext" position="1">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonCreateNew}" target="EditLayoutTemplate?mode=add&contentIdTo=TEMPLATE_MASTER"/>
+ <hyperlink description="${uiLabelMap.CommonCreateNew}" target="EditLayoutTemplate?mode=add&contentIdTo=TEMPLATE_MASTER" also-hidden="false"/>
</field>
-->
</form>
@@ -154,13 +154,13 @@
</service>
</actions>
<field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${contentId}" target="EditLayout">
+ <hyperlink description="${contentId}" target="EditLayout" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="drDataResourceId"/>
</hyperlink>
</field>
<field name="dummy" title="${uiLabelMap.ContentClip}" widget-style="buttontext" map-name="dummy">
- <hyperlink also-hidden="false" description="${contentId}" target="clipFindLayout">
+ <hyperlink description="${contentId}" target="clipFindLayout" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="drDataResourceId"/>
<parameter param-name="viewSize"/>
@@ -173,7 +173,7 @@
<field name="drObjectInfo"><display/></field>
<!--
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeLayout">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeLayout" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="contentIdTo"/>
<parameter param-name="contentAssocTypeId"/>
@@ -186,7 +186,7 @@
<form name="ListListLayout" default-entity-name="ContentAssocDataResourceViewFrom" list-name="layoutList" target="" title="" type="list" paginate-target="FindLayout"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="contentId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${contentId}" target="EditLayout">
+ <hyperlink description="${contentId}" target="EditLayout" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="drDataResourceId"/>
</hyperlink>
@@ -195,7 +195,7 @@
<field name="description"><display/></field>
<field name="drObjectInfo"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeLayout">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeLayout" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="contentIdTo" from-field="caContentIdTo"/>
<parameter param-name="contentAssocTypeId" from-field="caContentAssocTypeId"/>
@@ -388,7 +388,7 @@
<form name="ListRelatedLayouts" default-entity-name="ContentDataResourceView" list-name="entityList" target="" title="" type="list" paginate-target="FindLayout"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${contentId}" target="EditLayout">
+ <hyperlink description="${contentId}" target="EditLayout" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="drDataResourceId"/>
</hyperlink>
diff --git a/applications/content/widget/survey/SurveyForms.xml b/applications/content/widget/survey/SurveyForms.xml
index e478b6b..94bf01a 100644
--- a/applications/content/widget/survey/SurveyForms.xml
+++ b/applications/content/widget/survey/SurveyForms.xml
@@ -214,7 +214,7 @@
<field name="surveyId"><hidden value="${surveyId}"/></field>
<field name="parentCategoryId">
<drop-down allow-empty="true">
- <entity-options entity-name="SurveyQuestionCategory" description="${description} [${surveyQuestionCategoryId}]" key-field-name="surveyQuestionCategoryId">
+ <entity-options entity-name="SurveyQuestionCategory" key-field-name="surveyQuestionCategoryId" description="${description} [${surveyQuestionCategoryId}]">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -270,7 +270,7 @@
</actions>
<auto-fields-entity entity-name="SurveyResponse" default-field-type="display"/>
<field name="surveyResponseId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${surveyResponseId}" target="EditSurveyResponse">
+ <hyperlink description="${surveyResponseId}" target="EditSurveyResponse" also-hidden="false">
<parameter param-name="surveyResponseId"/>
</hyperlink>
</field>
@@ -299,7 +299,7 @@
</actions>
<auto-fields-entity entity-name="Survey" default-field-type="display"/>
<field name="surveyId" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${surveyId}" target="javascript:set_value('${surveyId}')"/>
+ <hyperlink description="${surveyId}" target="javascript:set_value('${surveyId}')" also-hidden="false" target-type="plain"/>
</field>
</form>
@@ -322,7 +322,7 @@
</actions>
<auto-fields-entity entity-name="SurveyResponse" default-field-type="display"/>
<field name="surveyResponseId" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${surveyResponseId}" target="javascript:set_value('${surveyResponseId}')"/>
+ <hyperlink description="${surveyResponseId}" target="javascript:set_value('${surveyResponseId}')" also-hidden="false" target-type="plain"/>
</field>
</form>
</forms>
diff --git a/applications/content/widget/website/WebAnalyticsForms.xml b/applications/content/widget/website/WebAnalyticsForms.xml
index 14b6928..5465721 100644
--- a/applications/content/widget/website/WebAnalyticsForms.xml
+++ b/applications/content/widget/website/WebAnalyticsForms.xml
@@ -37,7 +37,7 @@
<display-entity entity-name="WebAnalyticsType" description="${description} [${webAnalyticsTypeId}]"/>
</field>
<field name="webAnalyticsCode">
- <hyperlink target="EditWebAnalyticsConfig" description="${webAnalyticsCode}">
+ <hyperlink description="${webAnalyticsCode}" target="EditWebAnalyticsConfig">
<parameter param-name="productStoreId"/>
<parameter param-name="webAnalyticsTypeId"/>
<parameter param-name="webSiteId"/>
@@ -45,7 +45,7 @@
</field>
<field name="webSiteId"><hidden value="${webSiteId}"/></field>
<field name="removeButton" title="${uiLabelMap.CommonRemove}" widget-style="buttontext">
- <hyperlink target="deleteWebAnalyticsConfig" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteWebAnalyticsConfig">
<parameter param-name="webSiteId"/>
<parameter param-name="webAnalyticsTypeId"/>
</hyperlink>
diff --git a/applications/content/widget/website/WebSiteForms.xml b/applications/content/widget/website/WebSiteForms.xml
index baf455d..2a2f786 100644
--- a/applications/content/widget/website/WebSiteForms.xml
+++ b/applications/content/widget/website/WebSiteForms.xml
@@ -93,7 +93,7 @@
</service>
</actions>
<field name="pathAlias" sort-field="true" widget-style="buttontext">
- <hyperlink target="EditWebSitePathAlias?webSiteId=${webSiteId}&pathAlias=${pathAlias}" description="${pathAlias}"></hyperlink>
+ <hyperlink description="${pathAlias}" target="EditWebSitePathAlias?webSiteId=${webSiteId}&pathAlias=${pathAlias}"></hyperlink>
</field>
<field name="aliasTo" sort-field="true"><display/></field>
<field name="contentId" sort-field="true">
@@ -107,7 +107,7 @@
<field name="fromDate" sort-field="true"><display/></field>
<field name="thruDate" sort-field="true"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeWebSitePathAlias" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeWebSitePathAlias" also-hidden="false">
<parameter param-name="webSiteId"/>
<parameter param-name="pathAlias"/>
</hyperlink>
@@ -161,7 +161,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="RemoveWebSiteContent" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="RemoveWebSiteContent" also-hidden="false">
<parameter param-name="webSiteId"/>
<parameter param-name="contentId"/>
<parameter param-name="webSiteContentTypeId"/>
@@ -226,7 +226,7 @@
<field name="thruDate"></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeWebSiteRole" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeWebSiteRole" also-hidden="false">
<parameter param-name="webSiteId" from-field="webSiteRole.webSiteId"/>
<parameter param-name="partyId" from-field="webSiteRole.partyId"/>
<parameter param-name="roleTypeId" from-field="webSiteRole.roleTypeId"/>
@@ -310,7 +310,7 @@
<field name="thruDate"><date-time/></field>
<field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit/></field>
<field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteWebSiteContactList" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWebSiteContactList">
<parameter param-name="webSiteId"/>
<parameter param-name="contactListId"/>
<parameter param-name="fromDate"/>
diff --git a/applications/datamodel/entitydef/accounting-entitymodel.xml b/applications/datamodel/entitydef/accounting-entitymodel.xml
index 5adc9be..c9e4ab8 100644
--- a/applications/datamodel/entitydef/accounting-entitymodel.xml
+++ b/applications/datamodel/entitydef/accounting-entitymodel.xml
@@ -4316,4 +4316,7 @@
<key-map field-name="fixedAssetId"/>
</relation>
</extend-entity>
+ <extend-entity entity-name="TaxAuthorityRateProduct">
+ <field name="isTaxInShippingPrice" type="indicator"></field>
+ </extend-entity>
</entitymodel>
diff --git a/applications/humanres/minilang/HumanResEvents.xml b/applications/humanres/minilang/HumanResEvents.xml
index d9b5b4e..696c310 100644
--- a/applications/humanres/minilang/HumanResEvents.xml
+++ b/applications/humanres/minilang/HumanResEvents.xml
@@ -35,11 +35,11 @@
</entity-and>
<if-not-empty field="emplPositionFulfillment">
<set field="parameters.fromDate" from-field="emplPositionFulfillment[0].fromDate"/>
- <set-service-fields service-name="deleteEmplPositionFulfillment" to-map="delFullfillCtx" map="parameters"/>
+ <set-service-fields service-name="deleteEmplPositionFulfillment" map="parameters" to-map="delFullfillCtx"/>/>
<call-service service-name="deleteEmplPositionFulfillment" in-map-name="delFullfillCtx"></call-service>
</if-not-empty>
- <set-service-fields service-name="deleteEmplPosition" to-map="delEmlpCtx" map="parameters"/>
+ <set-service-fields service-name="deleteEmplPosition" map="parameters" to-map="delEmlpCtx"/>/>
<call-service service-name="deleteEmplPosition" in-map-name="delEmlpCtx"></call-service>
</simple-method>
<simple-method method-name="removeInternalOrg" short-description="">
diff --git a/applications/humanres/minilang/HumanResServices.xml b/applications/humanres/minilang/HumanResServices.xml
index 6ec4b82..5d31c85 100644
--- a/applications/humanres/minilang/HumanResServices.xml
+++ b/applications/humanres/minilang/HumanResServices.xml
@@ -96,7 +96,7 @@
<field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/>
</entity-and>
<if-not-empty field="emplPositionTypeRates">
- <first-from-list entry="emplPositionTypeRate" list="emplPositionTypeRates"/>
+ <first-from-list list="emplPositionTypeRates" entry="emplPositionTypeRate"/>
<now-timestamp field="emplPositionTypeRate.thruDate"/>
<store-value value-field="emplPositionTypeRate"/>
</if-not-empty>
@@ -143,14 +143,14 @@
<entity-and entity-name="Employment" list="employments" filter-by-date="true">
<field-map field-name="partyIdTo" from-field="parameters.partyId"/>
</entity-and>
- <first-from-list entry="employment" list="employments"/>
+ <first-from-list list="employments" entry="employment"/>
<field-to-result field="employment"/>
<!-- position -->
<entity-and entity-name="EmplPositionAndFulfillment" list="emplPositionAndFulfillments" filter-by-date="true">
<field-map field-name="employeePartyId" from-field="parameters.partyId"/>
<field-map field-name="partyId" from-field="employment.partyIdFrom"/>
</entity-and>
- <first-from-list entry="emplPositionAndFulfillment" list="emplPositionAndFulfillments"/>
+ <first-from-list list="emplPositionAndFulfillments" entry="emplPositionAndFulfillment"/>
<field-to-result field="emplPositionAndFulfillment" result-name="emplPosition"/>
<!-- position type -->
<if-not-empty field="emplPositionAndFulfillment">
@@ -165,7 +165,7 @@
<field-map field-name="emplPositionTypeId" from-field="emplPositionType.emplPositionTypeId"/>
<field-map field-name="rateCurrencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
</entity-and>
- <first-from-list entry="rateAmount" list="rateAmounts"/>
+ <first-from-list list="rateAmounts" entry="rateAmount"/>
<field-to-result field="rateAmount" result-name="emplPositionRateAmount"/>
</simple-method>
diff --git a/applications/humanres/minilang/UpgradeServices.xml b/applications/humanres/minilang/UpgradeServices.xml
index 127cd82..e978647 100644
--- a/applications/humanres/minilang/UpgradeServices.xml
+++ b/applications/humanres/minilang/UpgradeServices.xml
@@ -24,7 +24,7 @@
<simple-method method-name="migrateSalaryStep" short-description="Migrate data from OldSalaryStep to SalaryStep">
<entity-condition entity-name="OldSalaryStep" list="oldSalarySteps"/>
<now field="fromDate"/>
- <entity-one value-field="systemUserLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<iterate list="oldSalarySteps" entry="oldSalaryStep">
diff --git a/applications/humanres/widget/CommonScreens.xml b/applications/humanres/widget/CommonScreens.xml
index 2c3351a..b2dd0a5 100644
--- a/applications/humanres/widget/CommonScreens.xml
+++ b/applications/humanres/widget/CommonScreens.xml
@@ -217,7 +217,7 @@
<not><if-empty field="perfReview"/></not>
</condition>
<actions>
- <entity-one value-field="partyNameView" entity-name="PartyNameView">
+ <entity-one entity-name="PartyNameView" value-field="partyNameView">
<field-map field-name="partyId" from-field="perfReview.employeePartyId"/>
</entity-one>
</actions>
@@ -423,7 +423,7 @@
<decorator-section name="body">
<section>
<condition>
- <if-has-permission action="_VIEW" permission="HUMANRES"/>
+ <if-has-permission permission="HUMANRES" action="_VIEW"/>
</condition>
<widgets>
<decorator-section-include name="body"/>
diff --git a/applications/humanres/widget/EmployeeScreens.xml b/applications/humanres/widget/EmployeeScreens.xml
index 5b58126..c1e974d 100644
--- a/applications/humanres/widget/EmployeeScreens.xml
+++ b/applications/humanres/widget/EmployeeScreens.xml
@@ -316,7 +316,7 @@
<set field="tabButtonItem" value="PayrollHistory"/>
<set field="partyId" from-field="parameters.partyId"/>
<set field="parameters.sortField" from-field="parameters.sortField" default-value="invoiceDate DESC"/>
- <entity-condition list="payroll" entity-name="InvoiceAndType">
+ <entity-condition entity-name="InvoiceAndType" list="payroll">
<condition-list combine="and">
<condition-expr field-name="partyIdFrom" operator="equals" from-field="partyId"/>
<condition-expr field-name="invoiceTypeId" operator="equals" value="PAYROL_INVOICE"/>
diff --git a/applications/humanres/widget/forms/EmplLeaveForms.xml b/applications/humanres/widget/forms/EmplLeaveForms.xml
index 91bc49f..65fe78b 100644
--- a/applications/humanres/widget/forms/EmplLeaveForms.xml
+++ b/applications/humanres/widget/forms/EmplLeaveForms.xml
@@ -77,14 +77,14 @@
</field>
<field name="leaveStatus"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="updateLeave" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext" use-when="hasAdminPermission">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonUpdate}" target="EditEmplLeave">
+ <hyperlink description="${uiLabelMap.CommonUpdate}" target="EditEmplLeave" also-hidden="false">
<parameter param-name="partyId"/>
<parameter param-name="leaveTypeId"/>
<parameter param-name="fromDate"/>
</hyperlink>
</field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext" use-when="hasAdminPermission">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteEmplLeave">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEmplLeave" also-hidden="false">
<parameter param-name="partyId"/>
<parameter param-name="leaveTypeId"/>
<parameter param-name="fromDate"/>
@@ -158,7 +158,7 @@
</field>
<field name="leaveStatus"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="UpdateStatus" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext">
- <hyperlink target="EditEmplLeaveStatus" description="${uiLabelMap.CommonUpdate}" >
+ <hyperlink description="${uiLabelMap.CommonUpdate}" target="EditEmplLeaveStatus" >
<parameter param-name="partyId"/>
<parameter param-name="fromDate"/>
<parameter param-name="leaveTypeId"/>
diff --git a/applications/humanres/widget/forms/EmplPositionForms.xml b/applications/humanres/widget/forms/EmplPositionForms.xml
index a38752c..c435b66 100644
--- a/applications/humanres/widget/forms/EmplPositionForms.xml
+++ b/applications/humanres/widget/forms/EmplPositionForms.xml
@@ -33,7 +33,7 @@
</actions>
<auto-fields-entity entity-name="EmplPosition" default-field-type="display"/>
<field name="emplPositionId" title="${uiLabelMap.HumanResEmployeePositionId}" widget-style="linktext">
- <hyperlink also-hidden="false" description="${emplPositionId}" target="emplPositionView">
+ <hyperlink description="${emplPositionId}" target="emplPositionView" also-hidden="false">
<parameter param-name="emplPositionId"/>
</hyperlink>
</field>
@@ -118,7 +118,7 @@
<field name="fromDate" title="${uiLabelMap.CommonDate}"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteEmplPositionFulfillment" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEmplPositionFulfillment" also-hidden="false">
<parameter param-name="emplPositionId"/>
<parameter param-name="partyId"/>
<parameter param-name="fromDate"/>
@@ -183,7 +183,7 @@
<field name="comments"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteEmplPositionReportingStruct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEmplPositionReportingStruct" also-hidden="false">
<parameter param-name="emplPositionIdReportingTo"/>
<parameter param-name="emplPositionIdManagedBy"/>
<parameter param-name="fromDate"/>
@@ -214,7 +214,7 @@
<field name="fromDate"><display /></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteEmplPositionResponsibility" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEmplPositionResponsibility" also-hidden="false">
<parameter param-name="emplPositionId"/>
<parameter param-name="responsibilityTypeId"/>
<parameter param-name="fromDate"/>
@@ -246,7 +246,7 @@
<field name="fromDate"><display /></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteValidResponsibility" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteValidResponsibility" also-hidden="false">
<parameter param-name="emplPositionTypeId" from-field="emplPositionId"/>
<parameter param-name="responsibilityTypeId"/>
<parameter param-name="fromDate"/>
diff --git a/applications/humanres/widget/forms/EmployeeForms.xml b/applications/humanres/widget/forms/EmployeeForms.xml
index b3cd72c..3ef981a 100644
--- a/applications/humanres/widget/forms/EmployeeForms.xml
+++ b/applications/humanres/widget/forms/EmployeeForms.xml
@@ -96,7 +96,7 @@
<field name="rating"><text/></field>
<field name="skillLevel"><text/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteEmployeeSkill" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEmployeeSkill" also-hidden="false">
<parameter param-name="skillTypeId"/>
<parameter param-name="partyId"/>
</hyperlink>
@@ -163,7 +163,7 @@
</field>
<field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteEmployeeQualification" also-hidden="false" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEmployeeQualification" also-hidden="false">
<parameter param-name="partyId"/>
<parameter param-name="partyQualTypeId"/>
<parameter param-name="fromDate"/>
@@ -229,7 +229,7 @@
</display-entity>
</field>
<field name="position" entry-name="emplPositionType.emplPositionTypeId">
- <hyperlink target="emplPositionView" description="${employmentData.emplPositionType.description} [${employmentData.emplPosition.emplPositionId}]">
+ <hyperlink description="${employmentData.emplPositionType.description} [${employmentData.emplPosition.emplPositionId}]" target="emplPositionView">
<parameter param-name="emplPositionId" from-field="employmentData.emplPosition.emplPositionId"/>
</hyperlink>
</field>
diff --git a/applications/humanres/widget/forms/EmploymentAppForms.xml b/applications/humanres/widget/forms/EmploymentAppForms.xml
index 8f5c434..fe52402 100644
--- a/applications/humanres/widget/forms/EmploymentAppForms.xml
+++ b/applications/humanres/widget/forms/EmploymentAppForms.xml
@@ -61,7 +61,7 @@
<field name="referredByPartyId" title="${uiLabelMap.FormFieldTitle_referredByPartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field name="applicationDate" title="${uiLabelMap.FormFieldTitle_applicationDate}"><date-time/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteEmploymentApp" description="${uiLabelMap.CommonDelete}" also-hidden="true">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEmploymentApp" also-hidden="true">
<parameter param-name="applicationId"/>
<parameter param-name="partyId"/>
<parameter param-name="referredByPartyId"/>
diff --git a/applications/humanres/widget/forms/EmploymentForms.xml b/applications/humanres/widget/forms/EmploymentForms.xml
index 56d79f2..26172b1 100644
--- a/applications/humanres/widget/forms/EmploymentForms.xml
+++ b/applications/humanres/widget/forms/EmploymentForms.xml
@@ -59,7 +59,7 @@
</actions>
<field name="partyIdFrom" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}"><display></display></field>
<field name="partyIdTo" title="${uiLabelMap.HumanResEmployeePartyIdTo}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${partyIdTo}" target="EmployeeProfile">
+ <hyperlink description="${partyIdTo}" target="EmployeeProfile" also-hidden="false">
<parameter param-name="partyId" from-field="partyIdTo"/>
</hyperlink>
</field>
@@ -70,7 +70,7 @@
<field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display/></field>
<field name="terminationTypeId"><display/></field>
<field name="editLink" title=" " widget-style="buttontext">
- <hyperlink target="EditEmployment" description="${uiLabelMap.CommonEdit}">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditEmployment">
<parameter param-name="partyIdFrom"/>
<parameter param-name="partyIdTo"/>
<parameter param-name="roleTypeIdFrom"/>
@@ -91,7 +91,7 @@
</actions>
<field name="partyIdFrom" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}"><display></display></field>
<field name="partyIdTo" title="${uiLabelMap.HumanResEmployeePartyIdTo}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${partyIdTo}" target="viewprofile">
+ <hyperlink description="${partyIdTo}" target="viewprofile" also-hidden="false">
<parameter param-name="partyId" from-field="partyIdTo"/>
</hyperlink>
</field>
@@ -100,7 +100,7 @@
<field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display/></field>
<field name="terminationTypeId"><display/></field>
<field name="editLink" title=" " widget-style="buttontext">
- <hyperlink target="EditEmployment" description="${uiLabelMap.CommonEdit}">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditEmployment">
<parameter param-name="partyIdFrom"/>
<parameter param-name="partyIdTo"/>
<parameter param-name="roleTypeIdFrom"/>
@@ -117,7 +117,7 @@
<field name="roleTypeIdTo"><hidden value="EMPLOYEE"/></field>
<field name="partyIdFrom" use-when="employment==null" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}" required-field="true">
<drop-down allow-empty="false">
- <entity-options entity-name="PartyRole" description="${partyId}" key-field-name="partyId">
+ <entity-options entity-name="PartyRole" key-field-name="partyId" description="${partyId}">
<entity-constraint name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
</entity-options>
</drop-down>
@@ -177,7 +177,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deletePayHistory" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePayHistory">
<parameter param-name="roleTypeIdFrom"/>
<parameter param-name="roleTypeIdTo"/>
<parameter param-name="partyIdFrom"/>
@@ -209,7 +209,7 @@
<field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deletePartyBenefit" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyBenefit">
<parameter param-name="benefitTypeId"/>
<parameter param-name="roleTypeIdFrom"/>
<parameter param-name="roleTypeIdTo"/>
@@ -264,7 +264,7 @@
<field name="fromDate"><display/></field>
<field name="thruDate"><date-time/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deletePayrollPreference" description="${uiLabelMap.CommonDelete}" also-hidden="true">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePayrollPreference" also-hidden="true">
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
<parameter param-name="payrollPreferenceSeqId"/>
@@ -362,7 +362,7 @@
<field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteUnemploymentClaim" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteUnemploymentClaim">
<parameter param-name="unemploymentClaimId"/>
<parameter param-name="roleTypeIdFrom"/>
<parameter param-name="roleTypeIdTo"/>
diff --git a/applications/humanres/widget/forms/GlobalHRSettingForms.xml b/applications/humanres/widget/forms/GlobalHRSettingForms.xml
index cfe388a..1cd33bb 100644
--- a/applications/humanres/widget/forms/GlobalHRSettingForms.xml
+++ b/applications/humanres/widget/forms/GlobalHRSettingForms.xml
@@ -29,7 +29,7 @@
<field name="skillTypeId" title="${uiLabelMap.HumanResSkillTypeId}"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteSkillType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSkillType" also-hidden="false">
<parameter param-name="skillTypeId"/>
</hyperlink>
</field>
@@ -51,7 +51,7 @@
<auto-fields-service service-name="updateResponsibilityType" default-field-type="hidden"/>
<field name="responsibilityTypeId" title="${uiLabelMap.HumanResResponsibilityTypeId}"><display/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteResponsibilityType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteResponsibilityType" also-hidden="false">
<parameter param-name="responsibilityTypeId"/>
</hyperlink>
</field>
@@ -74,7 +74,7 @@
<field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteTerminationType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTerminationType" also-hidden="false">
<parameter param-name="terminationTypeId"/>
</hyperlink>
</field>
@@ -111,13 +111,13 @@
</actions>
<auto-fields-service service-name="updateEmplPositionType" default-field-type="hidden"/>
<field name="emplPositionTypeId" title="${uiLabelMap.HumanResEmplPositionType}">
- <hyperlink also-hidden="false" description="${emplPositionTypeId}" target="EditEmplPositionTypes">
+ <hyperlink description="${emplPositionTypeId}" target="EditEmplPositionTypes" also-hidden="false">
<parameter param-name="emplPositionTypeId"/>
</hyperlink>
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteEmplPositionType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEmplPositionType" also-hidden="false">
<parameter param-name="emplPositionTypeId"/>
</hyperlink>
</field>
@@ -205,7 +205,7 @@
<field name="description"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteTerminationReason" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTerminationReason" also-hidden="false">
<parameter param-name="terminationReasonId"/>
</hyperlink>
</field>
@@ -226,7 +226,7 @@
<field name="jobInterviewTypeId"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteJobInterviewType">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteJobInterviewType" also-hidden="false">
<parameter param-name="jobInterviewTypeId"/>
</hyperlink>
</field>
@@ -247,7 +247,7 @@
<field name="parentTypeId" title="${uiLabelMap.HumanResPreRequisiteSkill}" widget-style="buttontext"><text/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteTrainingTypes">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTrainingTypes" also-hidden="false">
<parameter param-name="trainingClassTypeId"/>
</hyperlink>
</field>
@@ -276,7 +276,7 @@
<field name="leaveTypeId"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteEmplLeaveType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEmplLeaveType" also-hidden="false">
<parameter param-name="leaveTypeId"/>
</hyperlink>
</field>
@@ -299,7 +299,7 @@
<field name="emplLeaveReasonTypeId"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteEmplLeaveReasonType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEmplLeaveReasonType" also-hidden="false">
<parameter param-name="emplLeaveReasonTypeId"/>
</hyperlink>
</field>
diff --git a/applications/humanres/widget/forms/LookupForms.xml b/applications/humanres/widget/forms/LookupForms.xml
index 70e978d..821329c 100644
--- a/applications/humanres/widget/forms/LookupForms.xml
+++ b/applications/humanres/widget/forms/LookupForms.xml
@@ -46,7 +46,7 @@
</actions>
<auto-fields-entity entity-name="Budget" default-field-type="display"/>
<field name="budgetId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${budgetId}" target="javascript:set_value('${budgetId}')"/>
+ <hyperlink description="${budgetId}" target="javascript:set_value('${budgetId}')" also-hidden="false" target-type="plain"/>
</field>
</form>
<form name="LookupBudgetItem" type="single" target="LookupBudgetItem"
@@ -74,7 +74,7 @@
</actions>
<auto-fields-entity entity-name="BudgetItem" default-field-type="display"/>
<field name="budgetItemSeqId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${budgetItemSeqId}" target="javascript:set_value('${budgetItemSeqId}')"/>
+ <hyperlink description="${budgetItemSeqId}" target="javascript:set_value('${budgetItemSeqId}')" also-hidden="false" target-type="plain"/>
</field>
</form>
<form name="LookupEmplPosition" type="single" target="LookupEmplPosition"
@@ -108,7 +108,7 @@
</service>
</actions>
<field name="emplPositionId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${emplPositionId}" target="javascript:set_value('${emplPositionId}')"/>
+ <hyperlink description="${emplPositionId}" target="javascript:set_value('${emplPositionId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="statusId"><display/></field>
<field name="partyId"><display/></field>
@@ -134,7 +134,7 @@
</service>
</actions>
<field name="terminationReasonId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${terminationReasonId}" target="javascript:set_value('${terminationReasonId}')"/>
+ <hyperlink description="${terminationReasonId}" target="javascript:set_value('${terminationReasonId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="description"><display/></field>
</form>
@@ -157,7 +157,7 @@
</service>
</actions>
<field name="salaryStepSeqId" title="${uiLabelMap.HumanResLookupSalaryStepSeqId}" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${salaryStepSeqId}" target="javascript:set_value('${salaryStepSeqId}')"/>
+ <hyperlink description="${salaryStepSeqId}" target="javascript:set_value('${salaryStepSeqId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="fromDate" title="${uiLabelMap.CommonFrom}"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThru}"><display/></field>
@@ -181,7 +181,7 @@
</service>
</actions>
<field name="payGradeId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${payGradeId}" target="javascript:set_value('${payGradeId}')"/>
+ <hyperlink description="${payGradeId}" target="javascript:set_value('${payGradeId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="description"><display/></field>
</form>
@@ -203,7 +203,7 @@
</service>
</actions>
<field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResLookupPayrollPreferenceSeqId}" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${payrollPreferenceSeqId}" target="javascript:set_value('${payrollPreferenceSeqId}')"/>
+ <hyperlink description="${payrollPreferenceSeqId}" target="javascript:set_value('${payrollPreferenceSeqId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="description"><display/></field>
</form>
@@ -225,7 +225,7 @@
</service>
</actions>
<field name="unemploymentClaimId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${unemploymentClaimId}" target="javascript:set_value('${unemploymentClaimId}')"/>
+ <hyperlink description="${unemploymentClaimId}" target="javascript:set_value('${unemploymentClaimId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="description"><display/></field>
</form>
@@ -247,7 +247,7 @@
</service>
</actions>
<field name="agreementItemSeqId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${agreementItemSeqId}" target="javascript:set_value('${agreementItemSeqId}')"/>
+ <hyperlink description="${agreementItemSeqId}" target="javascript:set_value('${agreementItemSeqId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="description"><display/></field>
</form>
@@ -269,7 +269,7 @@
</service>
</actions>
<field name="perfReviewId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${perfReviewId}" target="javascript:set_value('${perfReviewId}')"/>
+ <hyperlink description="${perfReviewId}" target="javascript:set_value('${perfReviewId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="description"><display/></field>
</form>
@@ -291,7 +291,7 @@
</service>
</actions>
<field name="resumeId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${resumeId}" target="javascript:set_value('${resumeId}')"/>
+ <hyperlink description="${resumeId}" target="javascript:set_value('${resumeId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="description"><display/></field>
</form>
@@ -313,7 +313,7 @@
</service>
</actions>
<field name="applicationId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${applicationId}" target="javascript:set_value('${applicationId}')"/>
+ <hyperlink description="${applicationId}" target="javascript:set_value('${applicationId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="description"><display/></field>
</form>
@@ -349,7 +349,7 @@
</service>
</actions>
<field name="jobRequisitionId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${jobRequisitionId}" target="javascript:set_value('${jobRequisitionId}')"/>
+ <hyperlink description="${jobRequisitionId}" target="javascript:set_value('${jobRequisitionId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="jobPostingTypeEnumId"><display/></field>
<field name="qualification"><display/></field>
@@ -373,7 +373,7 @@
</service>
</actions>
<field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${trainingClassTypeId}" target="javascript:set_value('${trainingClassTypeId}')"/>
+ <hyperlink description="${trainingClassTypeId}" target="javascript:set_value('${trainingClassTypeId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="parentTypeId" title="${uiLabelMap.HumanResPreRequisiteSkill}"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
diff --git a/applications/humanres/widget/forms/PartyQualForms.xml b/applications/humanres/widget/forms/PartyQualForms.xml
index c919a1c..322bd35 100644
--- a/applications/humanres/widget/forms/PartyQualForms.xml
+++ b/applications/humanres/widget/forms/PartyQualForms.xml
@@ -92,7 +92,7 @@
</field>
<field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deletePartyQual" also-hidden="false" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyQual" also-hidden="false">
<auto-parameters-service service-name="deletePartyQual"/>
</hyperlink>
</field>
diff --git a/applications/humanres/widget/forms/PartyResumeForms.xml b/applications/humanres/widget/forms/PartyResumeForms.xml
index bd27f85..fa7327d 100644
--- a/applications/humanres/widget/forms/PartyResumeForms.xml
+++ b/applications/humanres/widget/forms/PartyResumeForms.xml
@@ -41,7 +41,7 @@
</actions>
<auto-fields-entity entity-name="PartyResume" default-field-type="display"/>
<field name="resumeId" widget-style="linktext">
- <hyperlink also-hidden="false" description="${resumeId}" target="EditPartyResumes">
+ <hyperlink description="${resumeId}" target="EditPartyResumes" also-hidden="false">
<parameter param-name="resumeId"/>
<parameter param-name="partyId"/>
</hyperlink>
@@ -54,7 +54,7 @@
</display-entity>
</field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deletePartyResume" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyResume" also-hidden="false">
<parameter param-name="resumeId"/>
<parameter param-name="partyId"/>
</hyperlink>
diff --git a/applications/humanres/widget/forms/PartySkillForms.xml b/applications/humanres/widget/forms/PartySkillForms.xml
index 996f992..2889470 100644
--- a/applications/humanres/widget/forms/PartySkillForms.xml
+++ b/applications/humanres/widget/forms/PartySkillForms.xml
@@ -53,7 +53,7 @@
<field name="rating"><text/></field>
<field name="skillLevel"><text/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deletePartySkill" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartySkill" also-hidden="false">
<parameter param-name="skillTypeId"/>
<parameter param-name="partyId"/>
</hyperlink>
diff --git a/applications/humanres/widget/forms/PayGradeForms.xml b/applications/humanres/widget/forms/PayGradeForms.xml
index 2467179..1352322 100644
--- a/applications/humanres/widget/forms/PayGradeForms.xml
+++ b/applications/humanres/widget/forms/PayGradeForms.xml
@@ -44,7 +44,7 @@
</hyperlink>
</field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deletePayGrade" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePayGrade" also-hidden="false">
<parameter param-name="payGradeId"/>
</hyperlink>
</field>
@@ -71,7 +71,7 @@
<field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteSalaryStep" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSalaryStep">
<parameter param-name="salaryStepSeqId"/>
<parameter param-name="payGradeId"/>
<parameter param-name="fromDate"/>
diff --git a/applications/humanres/widget/forms/PerfReviewForms.xml b/applications/humanres/widget/forms/PerfReviewForms.xml
index 59e28fb..b3c529d 100644
--- a/applications/humanres/widget/forms/PerfReviewForms.xml
+++ b/applications/humanres/widget/forms/PerfReviewForms.xml
@@ -57,7 +57,7 @@
</field>
<field name="managerRoleTypeId"><ignored/></field>
<field name="perfReviewId">
- <hyperlink also-hidden="false" description="${perfReviewId}" target="EditPerfReview">
+ <hyperlink description="${perfReviewId}" target="EditPerfReview" also-hidden="false">
<parameter param-name="perfReviewId"/>
<parameter param-name="employeePartyId"/>
<parameter param-name="employeeRoleTypeId"/>
@@ -102,7 +102,7 @@
<field name="perfReviewItemTypeId"><display-entity entity-name="PerfReviewItemType"></display-entity></field>
<field name="perfRatingTypeId"><display-entity entity-name="PerfRatingType"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deletePerfReviewItem" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePerfReviewItem" also-hidden="false">
<parameter param-name="perfReviewId"/>
<parameter param-name="employeePartyId"/>
<parameter param-name="employeeRoleTypeId"/>
diff --git a/applications/humanres/widget/forms/RecruitmentForms.xml b/applications/humanres/widget/forms/RecruitmentForms.xml
index 5fe3724..7447a11 100644
--- a/applications/humanres/widget/forms/RecruitmentForms.xml
+++ b/applications/humanres/widget/forms/RecruitmentForms.xml
@@ -71,7 +71,7 @@
</service>
</actions>
<field name="jobRequisitionId" widget-style="buttontext" use-when="hasAdminPermission">
- <hyperlink target="EditJobRequisition" description="${jobRequisitionId}">
+ <hyperlink description="${jobRequisitionId}" target="EditJobRequisition">
<parameter param-name="jobRequisitionId"/>
</hyperlink>
</field>
@@ -86,12 +86,12 @@
<field name="experienceYears"><display/></field>
<field name="experienceMonths"><display/></field>
<field name="applyLink" title="${uiLabelMap.CommonApply}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonApply}" target="EditInternalJobPosting">
+ <hyperlink description="${uiLabelMap.CommonApply}" target="EditInternalJobPosting" also-hidden="false">
<parameter param-name="jobRequisitionId"/>
</hyperlink>
</field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext" use-when="hasAdminPermission">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteJobRequisition">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteJobRequisition" also-hidden="false">
<parameter param-name="jobRequisitionId"/>
</hyperlink>
</field>
@@ -174,7 +174,7 @@
</actions>
<auto-fields-entity entity-name="EmploymentApp" default-field-type="display"/>
<field name="applicationId" widget-style="buttontext">
- <hyperlink target="EditInternalJobPosting" description="${applicationId}">
+ <hyperlink description="${applicationId}" target="EditInternalJobPosting">
<parameter param-name="applicationId"/>
</hyperlink>
</field>
@@ -197,12 +197,12 @@
<field name="statusId" title="${uiLabelMap.HumanResIJPStatus}"><display/></field>
<field name="jobRequisitionId" widget-style="buttontext">
- <hyperlink target="EditJobRequisition" description="${jobRequisitionId}">
+ <hyperlink description="${jobRequisitionId}" target="EditJobRequisition">
<parameter param-name="jobRequisitionId"/>
</hyperlink>
</field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext" use-when="hasAdminPermission">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteInternalJobPosting">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteInternalJobPosting" also-hidden="false">
<parameter param-name="applicationId"/>
</hyperlink>
</field>
@@ -266,7 +266,7 @@
</actions>
<auto-fields-entity entity-name="JobInterview" default-field-type="display"/>
<field name="jobInterviewId" widget-style="buttontext">
- <hyperlink target="EditJobInterview" description="${jobInterviewId}">
+ <hyperlink description="${jobInterviewId}" target="EditJobInterview">
<parameter param-name="jobInterviewId"/>
</hyperlink>
</field>
@@ -285,7 +285,7 @@
</display-entity>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteJobInterview">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteJobInterview" also-hidden="false">
<parameter param-name="jobInterviewId"/>
</hyperlink>
</field>
@@ -371,7 +371,7 @@
</display-entity>
</field>
<field name="UpdateStatus" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext">
- <hyperlink target="EditApprovalStatus" description="${uiLabelMap.CommonUpdate}" >
+ <hyperlink description="${uiLabelMap.CommonUpdate}" target="EditApprovalStatus" >
<parameter param-name="applicationId"/>
</hyperlink>
</field>
@@ -407,7 +407,7 @@
<field name="emplPositionIdReportingTo"><lookup target-form-name="LookupEmplPosition"/></field>
<field name="internalOrganisation">
<drop-down allow-empty="true">
- <entity-options entity-name="PartyRole" description="${partyId}" key-field-name="partyId">
+ <entity-options entity-name="PartyRole" key-field-name="partyId" description="${partyId}">
<entity-constraint name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
</entity-options>
</drop-down>
@@ -435,12 +435,12 @@
</display-entity>
</field>
<field name="emplPositionId" title="${uiLabelMap.HumanResEmployeePositionId}" widget-style="linktext">
- <hyperlink also-hidden="false" description="${emplPositionId}" target="emplPositionView">
+ <hyperlink description="${emplPositionId}" target="emplPositionView" also-hidden="false">
<parameter param-name="emplPositionId"/>
</hyperlink>
</field>
<field name="emplPositionIdReportingTo" widget-style="linktext">
- <hyperlink also-hidden="false" description="${emplPositionIdReportingTo}" target="emplPositionView">
+ <hyperlink description="${emplPositionIdReportingTo}" target="emplPositionView" also-hidden="false">
<parameter param-name="emplPositionId" from-field="emplPositionIdReportingTo"/>
</hyperlink>
</field>
diff --git a/applications/manufacturing/minilang/bom/BomSimpleMethods.xml b/applications/manufacturing/minilang/bom/BomSimpleMethods.xml
index b9db260..daaa1a0 100644
--- a/applications/manufacturing/minilang/bom/BomSimpleMethods.xml
+++ b/applications/manufacturing/minilang/bom/BomSimpleMethods.xml
@@ -75,7 +75,7 @@
in-map-name="parameters" out-map-name="context"/>
<check-errors/>
<call-service service-name="createBOMAssoc" in-map-name="context">
- <result-to-field field="errorMessage" result-name="errorMessage"/>
+ <result-to-field result-name="errorMessage" field="errorMessage"/>
</call-service>
<if-not-empty field="errorMessage">
<add-error>
diff --git a/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml b/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml
index 10a519e..e6b8ed3 100644
--- a/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml
+++ b/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml
@@ -72,7 +72,7 @@
<iterate list="components" entry="component">
<if-not-empty field="component.productId">
<clear-field field="callSvcMap"/>
- <set-service-fields to-map="callSvcMap" service-name="issueProductionRunTaskComponent" map="component"/>
+ <set-service-fields service-name="issueProductionRunTaskComponent" map="component" to-map="callSvcMap"/>
<set from-field="reserveOrderEnumId" field="callSvcMap.reserveOrderEnumId"/>
<!-- calculate quantity needed if the produced run quantity is produced partially -->
<entity-and entity-name="WorkEffortAndInventoryAssign" list="issuances">
@@ -83,8 +83,8 @@
<iterate list="issuances" entry="issuance">
<calculate field="totalIssuance">
<calcop operator="add">
- <calcop field="issuance.quantity" operator="get"/>
- <calcop field="totalIssuance" operator="get"/>
+ <calcop operator="get" field="issuance.quantity"/>
+ <calcop operator="get" field="totalIssuance"/>
</calcop>
</calculate>
</iterate>
@@ -92,7 +92,7 @@
<if-compare field="totalIssuance" operator="not-equals" value="0.00">
<set field="callSvcMap.quantity" value="0.00" type="BigDecimal"/>
<calculate field="callSvcMap.quantity">
- <calcop field="component.estimatedQuantity" operator="subtract">
+ <calcop operator="subtract" field="component.estimatedQuantity">
<calcop operator="get" field="totalIssuance"/>
</calcop>
</calculate>
@@ -245,10 +245,10 @@
<set from-field="lastNonSerInventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/>
<set from-field="parameters.workEffortId" field="createDetailMap.workEffortId"/>
<calculate field="createDetailMap.availableToPromiseDiff">
- <calcop field="parameters.quantityNotIssued" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantityNotIssued"/>
</calculate>
<calculate field="createDetailMap.quantityOnHandDiff">
- <calcop field="parameters.quantityNotIssued" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantityNotIssued"/>
</calculate>
<set field="createDetailMap.reasonEnumId" from-field="parameters.reasonEnumId"/>
<set field="createDetailMap.description" from-field="parameters.description"/>
@@ -278,10 +278,10 @@
<set field="createDetailMap.inventoryItemId" from-field="createInvItemOutMap.inventoryItemId"/>
<set field="createDetailMap.workEffortId" from-field="parameters.workEffortId"/>
<calculate field="createDetailMap.availableToPromiseDiff">
- <calcop field="parameters.quantityNotIssued" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantityNotIssued"/>
</calculate>
<calculate field="createDetailMap.quantityOnHandDiff">
- <calcop field="parameters.quantityNotIssued" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantityNotIssued"/>
</calculate>
<set field="createDetailMap.reasonEnumId" from-field="parameters.reasonEnumId"/>
<set field="createDetailMap.description" from-field="parameters.description"/>
@@ -299,8 +299,8 @@
<iterate list="issuances" entry="issuance">
<calculate field="totalIssuance">
<calcop operator="add">
- <calcop field="issuance.quantity" operator="get"/>
- <calcop field="totalIssuance" operator="get"/>
+ <calcop operator="get" field="issuance.quantity"/>
+ <calcop operator="get" field="totalIssuance"/>
</calcop>
</calculate>
</iterate>
@@ -328,7 +328,7 @@
<clear-field field="issuanceCreateMap"/>
<calculate field="parameters.quantityNotIssued">
- <calcop field="parameters.quantityNotIssued" operator="subtract"><number value="1.0"/></calcop>
+ <calcop operator="subtract" field="parameters.quantityNotIssued"><number value="1.0"/></calcop>
</calculate>
</if-compare>
</if-compare>
@@ -372,10 +372,10 @@
<set from-field="parameters.workEffortId" field="createDetailMap.workEffortId"/>
<!-- update availableToPromiseDiff AND quantityOnHandDiff since this is an issuance -->
<calculate field="createDetailMap.availableToPromiseDiff">
- <calcop field="parameters.deductAmount" operator="negative"/>
+ <calcop operator="negative" field="parameters.deductAmount"/>
</calculate>
<calculate field="createDetailMap.quantityOnHandDiff">
- <calcop field="parameters.deductAmount" operator="negative"/>
+ <calcop operator="negative" field="parameters.deductAmount"/>
</calculate>
<set field="createDetailMap.reasonEnumId" from-field="parameters.reasonEnumId"/>
<set field="createDetailMap.description" from-field="parameters.description"/>
@@ -454,10 +454,10 @@
<set from-field="parameters.workEffortId" field="createDetailMap.workEffortId"/>
<!-- update availableToPromiseDiff AND quantityOnHandDiff since this is an issuance -->
<calculate field="createDetailMap.availableToPromiseDiff">
- <calcop field="deductAmount" operator="negative"/>
+ <calcop operator="negative" field="deductAmount"/>
</calculate>
<calculate field="createDetailMap.quantityOnHandDiff">
- <calcop field="deductAmount" operator="negative"/>
+ <calcop operator="negative" field="deductAmount"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
<field-to-result field="deductAmount" result-name="quantityIssued"/>
diff --git a/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml b/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml
index e5c4f50..8967fcd 100644
--- a/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml
+++ b/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml
@@ -67,7 +67,7 @@
<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 entry="relatedResult" list="relatedResultList"/>
+ <first-from-list list="relatedResultList" entry="relatedResult"/>
<if-not-empty field="relatedResult">
<add-error>
<fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarExceptionDayUseCalendar"/>
@@ -75,7 +75,7 @@
<check-errors/>
</if-not-empty>
<get-related value-field="lookupPKMap" relation-name="TechDataCalendarExcWeek" list="relatedResultList"/>
- <first-from-list entry="relatedResult" list="relatedResultList"/>
+ <first-from-list list="relatedResultList" entry="relatedResult"/>
<if-not-empty field="relatedResult">
<add-error>
<fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarExceptionWeekUseCalendar"/>
@@ -124,7 +124,7 @@
<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 entry="relatedResult" list="relatedResultList"/>
+ <first-from-list list="relatedResultList" entry="relatedResult"/>
<if-not-empty field="relatedResult">
<add-error>
<fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarUseCalendarWeek"/>
@@ -132,7 +132,7 @@
<check-errors/>
</if-not-empty>
<get-related value-field="lookupPKMap" relation-name="TechDataCalendarExcWeek" list="relatedResultList"/>
- <first-from-list entry="relatedResult" list="relatedResultList"/>
+ <first-from-list list="relatedResultList" entry="relatedResult"/>
<if-not-empty field="relatedResult">
<add-error>
<fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarWeekExceptionUseCalendarWeek"/>
diff --git a/applications/manufacturing/minilang/test/ProductionRunTests.xml b/applications/manufacturing/minilang/test/ProductionRunTests.xml
index b1e8fc5..8029071 100644
--- a/applications/manufacturing/minilang/test/ProductionRunTests.xml
+++ b/applications/manufacturing/minilang/test/ProductionRunTests.xml
@@ -66,7 +66,7 @@
<entity-and entity-name="WorkEffortGoodStandard" list="productionRunProducts">
<field-map field-name="workEffortId" from-field="productionRunId"/>
</entity-and>
- <first-from-list entry="productionRunProduct" list="productionRunProducts"/>
+ <first-from-list list="productionRunProducts" entry="productionRunProduct"/>
<assert>
<not><if-empty field="productionRunProduct"/></not>
@@ -78,7 +78,7 @@
<entity-and entity-name="WorkEffort" list="productionRunTasks">
<field-map field-name="workEffortParentId" from-field="productionRunId"/>
</entity-and>
- <first-from-list entry="productionRunTask" list="productionRunTasks"/>
+ <first-from-list list="productionRunTasks" entry="productionRunTask"/>
<assert>
<not><if-empty field="productionRunTask"/></not>
@@ -97,7 +97,7 @@
<entity-and entity-name="WorkEffortCostCalc" list="costCalcs">
<field-map field-name="workEffortId" from-field="productionRunTask.workEffortId" />
</entity-and>
- <first-from-list entry="costCalc" list="costCalcs"/>
+ <first-from-list list="costCalcs" entry="costCalc"/>
<assert>
<not><if-empty field="costCalc" /></not>
@@ -110,7 +110,7 @@
<field-map field-name="workEffortId" from-field="productionRunTask.workEffortId"/>
<field-map field-name="productId" value="MAT_A_COST"/>
</entity-and>
- <first-from-list entry="productionRunMaterialA" list="productionRunMaterials"/>
+ <first-from-list list="productionRunMaterials" entry="productionRunMaterialA"/>
<assert>
<not><if-empty field="productionRunMaterialA"/></not>
<if-compare field="productionRunMaterialA.workEffortGoodStdTypeId" operator="equals" value="PRUNT_PROD_NEEDED"/>
@@ -120,7 +120,7 @@
<field-map field-name="workEffortId" from-field="productionRunTask.workEffortId"/>
<field-map field-name="productId" value="MAT_B_COST"/>
</entity-and>
- <first-from-list entry="productionRunMaterialB" list="productionRunMaterials"/>
+ <first-from-list list="productionRunMaterials" entry="productionRunMaterialB"/>
<assert>
<not><if-empty field="productionRunMaterialB"/></not>
<if-compare field="productionRunMaterialB.workEffortGoodStdTypeId" operator="equals" value="PRUNT_PROD_NEEDED"/>
@@ -163,7 +163,7 @@
<entity-and entity-name="WorkEffort" list="productionRunTasks">
<field-map field-name="workEffortParentId" from-field="productionRunId"/>
</entity-and>
- <first-from-list entry="productionRunTask" list="productionRunTasks"/>
+ <first-from-list list="productionRunTasks" entry="productionRunTask"/>
<assert>
<if-compare field="productionRunHeader.currentStatusId" operator="equals" value="PRUN_SCHEDULED"/>
@@ -205,7 +205,7 @@
<entity-and entity-name="WorkEffort" list="productionRunTasks">
<field-map field-name="workEffortParentId" from-field="productionRunId"/>
</entity-and>
- <first-from-list entry="productionRunTask" list="productionRunTasks"/>
+ <first-from-list list="productionRunTasks" entry="productionRunTask"/>
<assert>
<if-compare field="productionRunHeader.currentStatusId" operator="equals" value="PRUN_DOC_PRINTED"/>
@@ -247,7 +247,7 @@
<entity-and entity-name="WorkEffort" list="productionRunTasks">
<field-map field-name="workEffortParentId" from-field="productionRunId"/>
</entity-and>
- <first-from-list entry="productionRunTask" list="productionRunTasks"/>
+ <first-from-list list="productionRunTasks" entry="productionRunTask"/>
<call-class-method class-name="org.apache.ofbiz.base.util.UtilDateTime" method-name="getInterval" ret-field="originalProductionRunEstimatedTime">
<field field="productionRunHeader.estimatedStartDate" type="Timestamp"/>
@@ -320,7 +320,7 @@
<entity-and entity-name="WorkEffort" list="productionRunTasks">
<field-map field-name="workEffortParentId" from-field="productionRunId"/>
</entity-and>
- <first-from-list entry="productionRunTask" list="productionRunTasks"/>
+ <first-from-list list="productionRunTasks" entry="productionRunTask"/>
<assert>
<if-compare field="productionRunHeader.currentStatusId" operator="equals" value="PRUN_CANCELLED"/>
@@ -330,7 +330,7 @@
<entity-and entity-name="WorkEffortGoodStandard" list="productionRunProducts">
<field-map field-name="workEffortId" from-field="productionRunId"/>
</entity-and>
- <first-from-list entry="productionRunProduct" list="productionRunProducts"/>
+ <first-from-list list="productionRunProducts" entry="productionRunProduct"/>
<assert>
<not><if-empty field="productionRunProduct"/></not>
@@ -342,7 +342,7 @@
<field-map field-name="workEffortId" from-field="productionRunTask.workEffortId"/>
<field-map field-name="productId" value="MAT_A_COST"/>
</entity-and>
- <first-from-list entry="productionRunMaterialA" list="productionRunMaterials"/>
+ <first-from-list list="productionRunMaterials" entry="productionRunMaterialA"/>
<assert>
<not><if-empty field="productionRunMaterialA"/></not>
<if-compare field="productionRunMaterialA.workEffortGoodStdTypeId" operator="equals" value="PRUNT_PROD_NEEDED"/>
@@ -352,7 +352,7 @@
<field-map field-name="workEffortId" from-field="productionRunTask.workEffortId"/>
<field-map field-name="productId" value="MAT_B_COST"/>
</entity-and>
- <first-from-list entry="productionRunMaterialB" list="productionRunMaterials"/>
+ <first-from-list list="productionRunMaterials" entry="productionRunMaterialB"/>
<assert>
<not><if-empty field="productionRunMaterialB"/></not>
<if-compare field="productionRunMaterialB.workEffortGoodStdTypeId" operator="equals" value="PRUNT_PROD_NEEDED"/>
@@ -784,7 +784,7 @@
<entity-and entity-name="WorkEffort" list="productionRunTasks">
<field-map field-name="workEffortParentId" from-field="productionRunId"/>
</entity-and>
- <first-from-list entry="productionRunTask" list="productionRunTasks"/>
+ <first-from-list list="productionRunTasks" entry="productionRunTask"/>
<assert>
<if-compare field="productionRunHeader.currentStatusId" operator="equals" value="PRUN_COMPLETED"/>
@@ -839,7 +839,7 @@
<entity-and entity-name="WorkEffort" list="productionRunTasks">
<field-map field-name="workEffortParentId" from-field="productionRunId"/>
</entity-and>
- <first-from-list entry="productionRunTask" list="productionRunTasks"/>
+ <first-from-list list="productionRunTasks" entry="productionRunTask"/>
<assert>
<if-compare field="productionRunHeader.currentStatusId" operator="equals" value="PRUN_CLOSED"/>
@@ -873,7 +873,7 @@
<field-map field-name="orderId" from-field="orderId"/>
<field-map field-name="productId" from-field="productId"/>
</entity-and>
- <first-from-list entry="orderItem" list="orderItems"/>
+ <first-from-list list="orderItems" entry="orderItem"/>
<assert>
<not><if-empty field="orderItem"/></not>
</assert>
@@ -882,7 +882,7 @@
<field-map field-name="orderId" from-field="orderId"/>
<field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/>
</entity-and>
- <first-from-list entry="originalOrderItemShipGrpInvRes" list="orderItemShipGrpInvRess"/>
+ <first-from-list list="orderItemShipGrpInvRess" entry="originalOrderItemShipGrpInvRes"/>
<assert>
<not><if-empty field="originalOrderItemShipGrpInvRes"/></not>
</assert>
@@ -894,7 +894,7 @@
<call-service service-name="createProductionRunsForOrder" in-map-name="serviceCtx">
<result-to-field result-name="productionRuns"/>
</call-service>
- <first-from-list entry="productionRunId" list="productionRuns"/>
+ <first-from-list list="productionRuns" entry="productionRunId"/>
<assert><not><if-empty field="productionRunId"/></not></assert>
<check-errors/>
@@ -904,7 +904,7 @@
<entity-and entity-name="WorkEffort" list="productionRunTasks">
<field-map field-name="workEffortParentId" from-field="productionRunId"/>
</entity-and>
- <first-from-list entry="productionRunTask" list="productionRunTasks"/>
+ <first-from-list list="productionRunTasks" entry="productionRunTask"/>
<assert>
<if-compare field="productionRunHeader.workEffortTypeId" operator="equals" value="PROD_ORDER_HEADER"/>
@@ -917,7 +917,7 @@
<entity-and entity-name="WorkEffortGoodStandard" list="productionRunProducts">
<field-map field-name="workEffortId" from-field="productionRunId"/>
</entity-and>
- <first-from-list entry="productionRunProduct" list="productionRunProducts"/>
+ <first-from-list list="productionRunProducts" entry="productionRunProduct"/>
<assert>
<not><if-empty field="productionRunProduct"/></not>
@@ -930,7 +930,7 @@
<field-map field-name="workEffortId" from-field="productionRunId"/>
<field-map field-name="orderId" from-field="orderId"/>
</entity-and>
- <first-from-list entry="workOrderItemFulfillment" list="workOrderItemFulfillments"/>
+ <first-from-list list="workOrderItemFulfillments" entry="workOrderItemFulfillment"/>
<assert>
<not><if-empty field="workOrderItemFulfillment"/></not>
<not><if-empty field="workOrderItemFulfillment.orderItemSeqId"/></not>
@@ -990,7 +990,7 @@
<set field="serviceCtx.statusId" value="REQ_APPROVED"/>
<call-service service-name="updateRequirement" in-map-name="serviceCtx"/>
- <entity-condition list="workEfforts" entity-name="WorkEffort">
+ <entity-condition entity-name="WorkEffort" list="workEfforts">
<condition-list>
<condition-expr field-name="lastUpdatedStamp" operator="greater-equals" from-field="nowTime"/>
<condition-expr field-name="workEffortTypeId" value="PROD_ORDER_HEADER"/>
@@ -1015,7 +1015,7 @@
<entity-and entity-name="WorkEffortGoodStandard" list="productionRunProducts">
<field-map field-name="workEffortId" from-field="productionRunHeader.workEffortId"/>
</entity-and>
- <first-from-list entry="productionRunProduct" list="productionRunProducts"/>
+ <first-from-list list="productionRunProducts" entry="productionRunProduct"/>
<assert>
<not><if-empty field="productionRunProduct"/></not>
diff --git a/applications/manufacturing/widget/manufacturing/BomForms.xml b/applications/manufacturing/widget/manufacturing/BomForms.xml
index 8e54931..e6c28cc 100644
--- a/applications/manufacturing/widget/manufacturing/BomForms.xml
+++ b/applications/manufacturing/widget/manufacturing/BomForms.xml
@@ -86,12 +86,12 @@
<field name="fromDate"><display/></field>
<field name="thruDate"><display/></field>
<field name="updateLink" title=" " widget-style="buttontext">
- <hyperlink target="EditProductManufacturingRules" description="${uiLabelMap.CommonSelect}" >
+ <hyperlink description="${uiLabelMap.CommonSelect}" target="EditProductManufacturingRules" >
<parameter param-name="ruleId"/>
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="DeleteProductManufacturingRule" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="DeleteProductManufacturingRule" also-hidden="false">
<parameter param-name="ruleId"/>
</hyperlink>
</field>
@@ -144,7 +144,7 @@
<form name="ListBom" type="list" list-name="ListProductBom" odd-row-style="alternate-row"
default-table-style="basic-table hover-bar" paginate-target="FindBom">
<field name="productId" title="${uiLabelMap.ProductProductId}" use-when="">
- <hyperlink target="EditProductBom" description="${productId}">
+ <hyperlink description="${productId}" target="EditProductBom">
<parameter param-name="productId"/>
<parameter param-name="productAssocTypeId"/>
</hyperlink>
diff --git a/applications/manufacturing/widget/manufacturing/CalendarForms.xml b/applications/manufacturing/widget/manufacturing/CalendarForms.xml
index c8b86c5..c1d1728 100644
--- a/applications/manufacturing/widget/manufacturing/CalendarForms.xml
+++ b/applications/manufacturing/widget/manufacturing/CalendarForms.xml
@@ -26,12 +26,12 @@
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="calendarWeekId" title="${uiLabelMap.ManufacturingCalendarWeekId}"><display/></field>
<field name="updateLink" title=" " widget-style="buttontext">
- <hyperlink target="EditCalendar" description="${uiLabelMap.CommonUpdate}" >
+ <hyperlink description="${uiLabelMap.CommonUpdate}" target="EditCalendar" >
<parameter param-name="calendarId"/>
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="RemoveCalendar" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="RemoveCalendar" also-hidden="false">
<parameter param-name="calendarId"/>
</hyperlink>
</field>
@@ -41,12 +41,12 @@
<field name="calendarWeekId" title="${uiLabelMap.ManufacturingCalendarWeekId}"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="updateLink" title=" " widget-style="buttontext">
- <hyperlink target="EditCalendarWeek" description="${uiLabelMap.CommonUpdate}" >
+ <hyperlink description="${uiLabelMap.CommonUpdate}" target="EditCalendarWeek" >
<parameter param-name="calendarWeekId"/>
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="RemoveCalendarWeek" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="RemoveCalendarWeek" also-hidden="false">
<parameter param-name="calendarWeekId"/>
</hyperlink>
</field>
@@ -59,13 +59,13 @@
<field name="exceptionCapacity" title="${uiLabelMap.ManufacturingCalendarCapacity}" ><display/></field>
<field name="usedCapacity" title="${uiLabelMap.ManufacturingUsedCapacity}" ><display/></field>
<field name="updateLink" title=" " widget-style="buttontext">
- <hyperlink target="EditCalendarExceptionDay" description="${uiLabelMap.CommonSelect}" >
+ <hyperlink description="${uiLabelMap.CommonSelect}" target="EditCalendarExceptionDay" >
<parameter param-name="calendarId"/>
<parameter param-name="exceptionDateStartTime"/>
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="RemoveCalendarExceptionDay" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="RemoveCalendarExceptionDay" also-hidden="false">
<parameter param-name="calendarId"/>
<parameter param-name="exceptionDateStartTime"/>
</hyperlink>
@@ -110,13 +110,13 @@
<display description="${calendarWeek.description} "/>
</field>
<field name="updateLink" title=" " widget-style="buttontext">
- <hyperlink target="EditCalendarExceptionWeek" description="${uiLabelMap.CommonSelect}" >
+ <hyperlink description="${uiLabelMap.CommonSelect}" target="EditCalendarExceptionWeek" >
<parameter param-name="calendarId" from-field="calendarExceptionWeek.calendarId"/>
<parameter param-name="exceptionDateStart" from-field="calendarExceptionWeek.exceptionDateStart"/>
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="RemoveCalendarExceptionWeek" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="RemoveCalendarExceptionWeek" also-hidden="false">
<parameter param-name="calendarId" from-field="calendarExceptionWeek.calendarId"/>
<parameter param-name="exceptionDateStart" from-field="calendarExceptionWeek.exceptionDateStart"/>
</hyperlink>
diff --git a/applications/manufacturing/widget/manufacturing/CalendarScreens.xml b/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
index 9532379..e787409 100644
--- a/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
+++ b/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
@@ -71,7 +71,7 @@
<property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
- <entity-condition list="techDataCalendars" entity-name="TechDataCalendar"/>
+ <entity-condition entity-name="TechDataCalendar" list="techDataCalendars"/>
</actions>
<widgets>
<decorator-screen name="CommonCalendarDecorator">
@@ -97,7 +97,7 @@
<property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
- <entity-condition list="calendarWeeks" entity-name="TechDataCalendarWeek"/>
+ <entity-condition entity-name="TechDataCalendarWeek" list="calendarWeeks"/>
</actions>
<widgets>
<decorator-screen name="CommonCalendarDecorator">
diff --git a/applications/manufacturing/widget/manufacturing/CostForms.xml b/applications/manufacturing/widget/manufacturing/CostForms.xml
index a92a857..70a56dc 100644
--- a/applications/manufacturing/widget/manufacturing/CostForms.xml
+++ b/applications/manufacturing/widget/manufacturing/CostForms.xml
@@ -24,7 +24,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="CostComponentCalc" default-field-type="display"/>
<field name="costComponentCalcId" widget-style="buttontext">
- <hyperlink target="EditCostCalcs" description="${costComponentCalcId}" also-hidden="false">
+ <hyperlink description="${costComponentCalcId}" target="EditCostCalcs" also-hidden="false">
<parameter param-name="costComponentCalcId"/>
</hyperlink>
</field>
@@ -37,7 +37,7 @@
<display-entity entity-name="CustomMethod" key-field-name="customMethodId"/>
</field>
<field name="removeCostComponentCalc" title=" " widget-style="buttontext">
- <hyperlink target="removeCostComponentCalc" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeCostComponentCalc" also-hidden="false">
<parameter param-name="costComponentCalcId"/>
</hyperlink>
</field>
diff --git a/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml b/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml
index c6cd006..b00ab07 100644
--- a/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml
+++ b/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml
@@ -41,7 +41,7 @@
</service>
</actions>
<field name="workEffortId" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${workEffortId}" target="javascript:set_value('${workEffortId}')"/>
+ <hyperlink description="${workEffortId}" target="javascript:set_value('${workEffortId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="workEffortName" title="${uiLabelMap.ManufacturingRoutingName}"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
@@ -76,7 +76,7 @@
</service>
</actions>
<field name="workEffortId" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${workEffortId}" target="javascript:set_value('${workEffortId}')"/>
+ <hyperlink description="${workEffortId}" target="javascript:set_value('${workEffortId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="workEffortName" title="${uiLabelMap.ManufacturingTaskName}"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
diff --git a/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml b/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
index 47c03fc..ae91b28 100644
--- a/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
+++ b/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
@@ -103,13 +103,13 @@
</service>
</actions>
<row-actions>
- <entity-one value-field="product" entity-name="Product"/>
- <entity-one value-field="uom" entity-name="Uom">
+ <entity-one entity-name="Product" value-field="product"/>
+ <entity-one entity-name="Uom" value-field="uom">
<field-map field-name="uomId" from-field="product.quantityUomId"/>
</entity-one>
</row-actions>
<field name="workEffortId" title=" " widget-style="buttontext">
- <hyperlink target="ShowProductionRun" description="${workEffortId}" also-hidden="false">
+ <hyperlink description="${workEffortId}" target="ShowProductionRun" also-hidden="false">
<parameter param-name="productionRunId" from-field="workEffortId"/>
</hyperlink>
</field>
@@ -154,7 +154,7 @@
<form name="ListProductionRunOrderItems" type="list" target="EditProductionRun" title="" list-name="orderItems"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="orderId" widget-style="buttontext">
- <hyperlink target="/ordermgr/control/orderview" description="${orderId}/${orderItemSeqId}" also-hidden="false" target-type="inter-app">
+ <hyperlink description="${orderId}/${orderItemSeqId}" target="/ordermgr/control/orderview" also-hidden="false" target-type="inter-app">
<parameter param-name="orderId"/>
</hyperlink>
</field>
@@ -221,7 +221,7 @@
<!--<field name="estimatedMilliSeconds" title="${uiLabelMap.ManufacturingTaskEstimatedMilliSeconds}" ><display/></field>-->
<field name="estimatedTotalMilliSeconds" title="${uiLabelMap.ManufacturingTaskEstimatedTotalMilliSeconds}" ><display/></field>
<field name="editLink" title=" " widget-style="smallSubmit">
- <hyperlink target="ProductionRunTasks" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="ProductionRunTasks" also-hidden="false">
<parameter param-name="routingTaskId" from-field="workEffortId"/>
<parameter param-name="productionRunId" from-field="workEffortParentId"/>
</hyperlink>
@@ -233,7 +233,7 @@
<parameter param-name="fromDate"/>
<parameter param-name="workEffortAssocTypeId" value="ROUTING_COMPONENT"/>
</hyperlink>-->
- <hyperlink target="deleteProductionRunRoutingTask" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductionRunRoutingTask" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="productionRunId" from-field="workEffortParentId"/>
</hyperlink>
@@ -243,7 +243,7 @@
<form name="ListProductionRunComponents" type="list" target="EditProductionRun" title="" list-name="productionRunComponents"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
- <entity-one value-field="product" entity-name="Product" use-cache="true"/>
+ <entity-one entity-name="Product" value-field="product" use-cache="true"/>
</row-actions>
<field name="workEffortId" title="${uiLabelMap.ManufacturingRoutingTaskId}">
<display-entity entity-name="WorkEffort" description="${workEffortName} [${workEffortId}]"/>
@@ -352,7 +352,7 @@
</field>
<field name="secondaryLocationSeqId" use-when="estimatedQuantity != issuedQuantity">
<drop-down allow-empty="true">
- <entity-options entity-name="ProductFacilityLocation" description="${locationSeqId}" key-field-name="locationSeqId">
+ <entity-options entity-name="ProductFacilityLocation" key-field-name="locationSeqId" description="${locationSeqId}">
<entity-constraint name="productId" env-name="productId"/>
<entity-constraint name="facilityId" env-name="facilityId"/>
</entity-options>
@@ -385,34 +385,34 @@
<field name="actualMilliSeconds" title="${uiLabelMap.ManufacturingTaskActualMilliSeconds}" ><display/></field>
<field name="quantityProduced" title="${uiLabelMap.ManufacturingQuantityProduced}" ><display/></field>
<field name="startLink" title=" " widget-style="smallSubmit" use-when=""${startTaskId}".equals("${workEffortId}")">
- <hyperlink target="changeProductionRunTaskStatus" description="${uiLabelMap.ManufacturingStartProductionRunTask}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.ManufacturingStartProductionRunTask}" target="changeProductionRunTaskStatus" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="productionRunId" from-field="workEffortParentId"/>
</hyperlink>
</field>
<field name="issueLinkAtp" title=" " widget-style="smallSubmit" use-when=""${issueTaskId}".equals("${workEffortId}")">
- <hyperlink target="issueProductionRunRoutingTask" description="${uiLabelMap.ManufacturingIssueAvailableProductionRunTask}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.ManufacturingIssueAvailableProductionRunTask}" target="issueProductionRunRoutingTask" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="productionRunId" from-field="workEffortParentId"/>
<parameter param-name="failIfItemsAreNotAvailable" value="Y"/>
</hyperlink>
</field>
<field name="issueLinkQoh" title=" " widget-style="smallSubmit" use-when=""${issueTaskId}".equals("${workEffortId}")">
- <hyperlink target="issueProductionRunRoutingTask" description="${uiLabelMap.ManufacturingIssueProductionRunTask}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.ManufacturingIssueProductionRunTask}" target="issueProductionRunRoutingTask" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="productionRunId" from-field="workEffortParentId"/>
<parameter param-name="failIfItemsAreNotAvailable" value="N"/>
</hyperlink>
</field>
<field name="declareLink" title=" " widget-style="smallSubmit" use-when=""PRUN_RUNNING".equals("${currentStatusId}")">
- <hyperlink target="ProductionRunDeclaration" description="${uiLabelMap.ManufacturingDeclareProductionRunTask}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.ManufacturingDeclareProductionRunTask}" target="ProductionRunDeclaration" also-hidden="false">
<parameter param-name="actionForm" value="EditRoutingTask"/>
<parameter param-name="routingTaskId" from-field="workEffortId"/>
<parameter param-name="productionRunId" from-field="workEffortParentId"/>
</hyperlink>
</field>
<field name="completeLink" title=" " widget-style="smallSubmit" use-when=""${completeTaskId}".equals("${workEffortId}")">
- <hyperlink target="changeProductionRunTaskStatus" description="${uiLabelMap.ManufacturingCompleteProductionRunTask}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.ManufacturingCompleteProductionRunTask}" target="changeProductionRunTaskStatus" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="productionRunId" from-field="workEffortParentId"/>
</hyperlink>
@@ -449,7 +449,7 @@
</field>
<field name="secondaryLocationSeqId">
<drop-down allow-empty="true">
- <entity-options entity-name="ProductFacilityLocation" description="${locationSeqId}" key-field-name="locationSeqId">
+ <entity-options entity-name="ProductFacilityLocation" key-field-name="locationSeqId" description="${locationSeqId}">
<entity-constraint name="productId" env-name="productId"/>
<entity-constraint name="facilityId" env-name="facilityId"/>
</entity-options>
@@ -558,7 +558,7 @@
<display description="default ${drObjectInfo}"/>
</field>
<field name="drObjectInfo" title="${uiLabelMap.CommonContent}" use-when="${groovy: drDataResourceTypeId != null && (drDataResourceTypeId.contains("FILE") || drDataResourceTypeId.equals("IMAGE_OBJECT"))}">
- <hyperlink target="/content/control/ViewBinaryDataResource" target-type="content" target-window="productionRunContentWindow" description="${drObjectInfo}">
+ <hyperlink description="${drObjectInfo}" target="/content/control/ViewBinaryDataResource" target-type="content" target-window="productionRunContentWindow">
<parameter param-name="dataResourceId" from-field="drDataResourceId"/>
</hyperlink>
</field>
@@ -566,7 +566,7 @@
<display-entity entity-name="ElectronicText" key-field-name="dataResourceId" description="${textData}"></display-entity>
</field>
<field name="deleteLink" title=" " widget-style="smallSubmit">
- <hyperlink description="${uiLabelMap.CommonDelete}" also-hidden="false" target="deleteProductionRunContent">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductionRunContent" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="workEffortContentTypeId"/>
<parameter param-name="contentId"/>
@@ -590,7 +590,7 @@
<display description="default ${drObjectInfo}"/>
</field>
<field name="drObjectInfo" title="${uiLabelMap.CommonContent}" use-when="${groovy: drDataResourceTypeId != null && (drDataResourceTypeId.contains("FILE") || drDataResourceTypeId.equals("IMAGE_OBJECT"))}">
- <hyperlink target="/content/control/ViewBinaryDataResource" target-type="content" target-window="productionRunContentWindow" description="${drObjectInfo}">
+ <hyperlink description="${drObjectInfo}" target="/content/control/ViewBinaryDataResource" target-type="content" target-window="productionRunContentWindow">
<parameter param-name="dataResourceId" from-field="drDataResourceId"/>
</hyperlink>
</field>
@@ -622,7 +622,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="smallSubmit"
use-when="!"${declarationScreen}".equals("Y")">
- <hyperlink description="${uiLabelMap.CommonDelete}" also-hidden="false" target="removeWorkEffortFixedAssetAssign">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeWorkEffortFixedAssetAssign" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="fixedAssetId"/>
<parameter param-name="fromDate"/>
@@ -733,7 +733,7 @@
<form name="ListShipmentPlan" type="list" target="" title="" list-name="shipmentPlan"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="orderId" widget-style="buttontext">
- <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}">
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app">
<parameter param-name="orderId" from-field="orderId"/>
</hyperlink>
</field>
@@ -752,7 +752,7 @@
<!-- total issued quantity -->
<field name="totIssuedQuantity"><display/></field>
<field name="productionRunId" widget-style="buttontext">
- <hyperlink target="ShowProductionRun" description="${productionRunId}" also-hidden="false">
+ <hyperlink description="${productionRunId}" target="ShowProductionRun" also-hidden="false">
<parameter param-name="productionRunId" from-field="productionRunId"/>
</hyperlink>
</field>
@@ -764,7 +764,7 @@
<form name="ListShipmentPlans" type="list" target="" title="" list-name="shipmentPlans"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
<field name="shipmentId" widget-style="buttontext" sort-field="true">
- <hyperlink target="/facility/control/ViewShipment" target-type="inter-app" description="${shipmentId}">
+ <hyperlink description="${shipmentId}" target="/facility/control/ViewShipment" target-type="inter-app">
<parameter param-name="shipmentId" from-field="shipmentId"/>
</hyperlink>
</field>
@@ -773,7 +773,7 @@
</field>
<field name="estimatedShipDate" sort-field="true"><display/></field>
<field name="viewShipmentPlanLink" title=" " widget-style="buttontext">
- <hyperlink target="WorkWithShipmentPlans" description="${uiLabelMap.CommonView}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonView}" target="WorkWithShipmentPlans" also-hidden="false">
<parameter param-name="shipmentId"/>
</hyperlink>
</field>
@@ -808,7 +808,7 @@
<form name="MandatoryWorkEfforts" type="list" target="" title="" list-name="mandatoryWorkEfforts"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="workEffortIdFrom" title=" " widget-style="buttontext">
- <hyperlink target="ShowProductionRun" description="${workEffortIdFrom}" also-hidden="false" link-type="anchor">
+ <hyperlink description="${workEffortIdFrom}" target="ShowProductionRun" also-hidden="false" link-type="anchor">
<parameter param-name="productionRunId" from-field="workEffortIdFrom"/>
</hyperlink>
</field>
@@ -834,7 +834,7 @@
<display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${actualCompletionDate} " cache="true"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeProductionRunAssoc" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeProductionRunAssoc" also-hidden="false">
<parameter param-name="workEffortIdFrom"/>
<parameter param-name="workEffortIdTo" from-field="productionRunId"/>
<parameter param-name="fromDate" from-field="estimatedStartDate"/>
@@ -846,7 +846,7 @@
<form name="DependentWorkEfforts" type="list" target="" title="" list-name="dependentWorkEfforts"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="workEffortIdTo" title=" " widget-style="buttontext">
- <hyperlink target="ShowProductionRun" description="${workEffortIdTo}" also-hidden="false" link-type="anchor">
+ <hyperlink description="${workEffortIdTo}" target="ShowProductionRun" also-hidden="false" link-type="anchor">
<parameter param-name="productionRunId" from-field="workEffortIdTo"/>
</hyperlink>
</field>
@@ -872,7 +872,7 @@
<display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${actualCompletionDate} " cache="true"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeProductionRunAssoc" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeProductionRunAssoc" also-hidden="false">
<parameter param-name="workEffortIdFrom" from-field="productionRunId"/>
<parameter param-name="workEffortIdTo"/>
<parameter param-name="fromDate" from-field="estimatedStartDate"/>
@@ -956,7 +956,7 @@
<form name="ProductionRunTaskComponents" type="list" target="updateProductionRunComponent" paginate-target="ProductionRunComponents" title="" list-name="records"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
- <entity-one value-field="product" entity-name="Product" use-cache="true"/>
+ <entity-one entity-name="Product" value-field="product" use-cache="true"/>
</row-actions>
<field name="productId"><display/></field>
<field name="internalName" map-name="product" title="${uiLabelMap.ProductInternalName}"><display/></field>
@@ -966,7 +966,7 @@
<field name="quantityUomId" map-name="product" title="${uiLabelMap.CommonUom}"><display-entity entity-name="Uom" key-field-name="uomId" description="${abbreviation}"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="smallSubmit">
- <hyperlink target="deleteProductionRunComponent" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductionRunComponent" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="fromDate"/>
<parameter param-name="productId"/>
@@ -981,7 +981,7 @@
<set field="quantityOnHandDiff" value="${groovy:-1*quantityOnHandDiff}" type="BigDecimal"/>
</row-actions>
<field name="inventoryItemId" widget-style="buttontext">
- <hyperlink target="/facility/control/EditInventoryItem" description="${inventoryItemId}" also-hidden="false" target-type="inter-app">
+ <hyperlink description="${inventoryItemId}" target="/facility/control/EditInventoryItem" also-hidden="false" target-type="inter-app">
<parameter param-name="inventoryItemId"/>
</hyperlink>
</field>
diff --git a/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml b/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
index ef7ca99..1cec32f 100644
--- a/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
+++ b/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
@@ -176,13 +176,13 @@
</field>
<!--
<field name="costComponentCalcView" entry-name="costComponentCalcId" title=" " widget-style="buttontext">
- <hyperlink target="viewCostComponentCalc" description="${uiLabelMap.CommonViewFormula}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonViewFormula}" target="viewCostComponentCalc" also-hidden="false">
<parameter param-name="costComponentCalcId"/>
</hyperlink>
</field>
-->
<field name="calcelWorkEffortCostCalc" title=" " widget-style="buttontext">
- <hyperlink target="removeRoutingTaskCost" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeRoutingTaskCost" also-hidden="false">
<parameter param-name="costComponentCalcId"/>
<parameter param-name="costComponentTypeId"/>
<parameter param-name="fromDate"/>
@@ -221,7 +221,7 @@
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
<field name="editRouting" title=" " widget-style="buttontext">
- <hyperlink target="EditRouting" description="${uiLabelMap.ManufacturingEditRouting}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.ManufacturingEditRouting}" target="EditRouting" also-hidden="false">
<parameter param-name="workEffortId" from-field="workEffortIdFrom"/>
</hyperlink>
</field>
@@ -234,7 +234,7 @@
<field name="workEffortIdFrom"><hidden/></field>
<field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"><display/></field>
<field name="workEffortIdTo" title="${uiLabelMap.ManufacturingTaskName}" widget-style="buttontext">
- <hyperlink target="EditRoutingTask" description="[${workEffortIdTo}] ${workEffortToName}" also-hidden="false">
+ <hyperlink description="[${workEffortIdTo}] ${workEffortToName}" target="EditRoutingTask" also-hidden="false">
<parameter param-name="workEffortId" from-field="workEffortIdTo"/>
</hyperlink>
</field>
@@ -244,7 +244,7 @@
<field name="workEffortToSetup" title="${uiLabelMap.ManufacturingTaskEstimatedSetupMillis}" ><display/></field>
<field name="workEffortToRun" title="${uiLabelMap.ManufacturingTaskEstimatedMilliSeconds}" ><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="RemoveRoutingTaskAssoc" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="RemoveRoutingTaskAssoc" also-hidden="false">
<parameter param-name="workEffortId" from-field="workEffortIdFrom"/>
<parameter param-name="workEffortIdFrom"/>
<parameter param-name="workEffortIdTo"/>
@@ -312,7 +312,7 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
<field name="estimatedQuantity" title="${uiLabelMap.ManufacturingQuantity}"><display/></field>
<field name="editLink" title=" " widget-style="buttontext" >
- <hyperlink target="EditRoutingProductLink" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditRoutingProductLink" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="productId"/>
<parameter param-name="fromDate"/>
@@ -320,7 +320,7 @@
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeRoutingProductLink" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeRoutingProductLink" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="productId"/>
<parameter param-name="fromDate"/>
@@ -336,7 +336,7 @@
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
<field name="editLink" title=" " widget-style="buttontext">
- <hyperlink target="EditRoutingTaskProduct" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditRoutingTaskProduct" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="productId"/>
<parameter param-name="fromDate"/>
@@ -344,7 +344,7 @@
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeRoutingTaskProduct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeRoutingTaskProduct" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="productId"/>
<parameter param-name="fromDate"/>
diff --git a/applications/marketing/minilang/marketing/contact/ContactListServices.xml b/applications/marketing/minilang/marketing/contact/ContactListServices.xml
index b728d03..61f709a 100644
--- a/applications/marketing/minilang/marketing/contact/ContactListServices.xml
+++ b/applications/marketing/minilang/marketing/contact/ContactListServices.xml
@@ -138,7 +138,7 @@
</condition-list>
<order-by field-name="-statusDate"/>
</entity-condition>
- <first-from-list entry="lastRecord" list="lookupList"/>
+ <first-from-list list="lookupList" entry="lastRecord"/>
<set field="parameters.fromDate" from-field="lastRecord.fromDate"/>
</if-empty>
@@ -169,7 +169,7 @@
</entity-and>
<if-not-empty field="contactListPartyStatusList">
<set-service-fields service-name="updateContactListParty" map="parameters" to-map="updateContactListPartyMap"/>
- <entity-one value-field="systemUserLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="updateContactListPartyMap.userLogin" from-field="systemUserLogin"/>
@@ -191,7 +191,7 @@
<check-errors/>
</if-compare>
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<if-empty field="parameters.partyId">
@@ -243,9 +243,9 @@
<field-map field-name="partyId" from-field="parameters.partyId"/>
<field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
</entity-and>
- <first-from-list entry="partyContactWithPurpose" list="partyContactWithPurposes"/>
+ <first-from-list list="partyContactWithPurposes" entry="partyContactWithPurpose"/>
<set field="email" from-field="partyContactWithPurpose.infoString"/>
- <set-service-fields service-name="unsubscribeContactListParty" to-map="unsubscribeContactListPartyCtx" map="parameters"/>
+ <set-service-fields service-name="unsubscribeContactListParty" map="parameters" to-map="unsubscribeContactListPartyCtx"/>/>
<set field="unsubscribeContactListPartyCtx.email" from-field="email"/>
<call-service service-name="unsubscribeContactListParty" in-map-name="unsubscribeContactListPartyCtx"/>
</simple-method>
@@ -302,7 +302,7 @@
</condition-list>
<order-by field-name="-statusDate"/>
</entity-condition>
- <first-from-list entry="lastContactListPartyStatus" list="lastContactListPartyStatusList"/>
+ <first-from-list list="lastContactListPartyStatusList" entry="lastContactListPartyStatus"/>
<!-- only require an optInVerifyCode if there was one in place -->
<if-not-empty field="lastContactListPartyStatus.optInVerifyCode">
@@ -369,7 +369,7 @@
</condition-list>
<order-by field-name="-statusDate"/>
</entity-condition>
- <first-from-list entry="contactListPartyStatus" list="lastContactListPartyStatusList"/>
+ <first-from-list list="lastContactListPartyStatusList" entry="contactListPartyStatus"/>
<!-- TODO: if preferredContactMech.contactMechTypeId != EMAIL_ADDRESS, return an error -->
<!-- TODO: if preferredContactMech is empty, should we try to find the ContactMech we want based on the Party? -->
@@ -416,7 +416,7 @@
<field-map field-name="contactListId" from-field="parameters.contactListId"/>
<field-map field-name="fromDate" from-field="parameters.fromDate"/>
</entity-and>
- <first-from-list entry="entryWebSiteContactList" list="webSiteContactList"/>
+ <first-from-list list="webSiteContactList" entry="entryWebSiteContactList"/>
<set-pk-fields value-field="entryWebSiteContactList" map="parameters"/>
<set-nonpk-fields map="parameters" value-field="entryWebSiteContactList"/>
<store-value value-field="entryWebSiteContactList"/>
@@ -432,7 +432,7 @@
<!-- service to use in contact list communications to handle opt-out links based on the communication event sent -->
<simple-method method-name="optOutOfListFromCommEvent" short-description="Contact List Opt Out From Communication Event" login-required="false">
- <entity-one value-field="commEvent" entity-name="CommunicationEvent"/>
+ <entity-one entity-name="CommunicationEvent" value-field="commEvent"/>
<if>
<condition>
<and>
@@ -493,8 +493,8 @@
<simple-method method-name="sendContactListPartySubscribeEmail" short-description="Send contact list party subscribe email" login-required="true">
<set field="productStoreId" type="String" from-field="parameters.productStoreId"/>
- <entity-one value-field="contactList" entity-name="ContactList"/>
- <entity-one value-field="contactListParty" entity-name="ContactListParty"/>
+ <entity-one entity-name="ContactList" value-field="contactList"/>
+ <entity-one entity-name="ContactListParty" value-field="contactListParty"/>
<!-- get the latest accepted status -->
<!-- look up the last ContactListPartyStatus with statusId=CLPT_ACCEPTED -->
<entity-condition entity-name="ContactListPartyStatus" list="lastContactListPartyStatusList">
@@ -506,10 +506,10 @@
</condition-list>
<order-by field-name="-statusDate"/>
</entity-condition>
- <first-from-list entry="contactListPartyStatus" list="lastContactListPartyStatusList"/>
+ <first-from-list list="lastContactListPartyStatusList" entry="contactListPartyStatus"/>
<if-empty field="productStoreId">
- <entity-one value-field="webSite" entity-name="WebSite">
+ <entity-one entity-name="WebSite" value-field="webSite">
<field-map field-name="webSiteId" from-field="contactList.verifyEmailWebSiteId"/>
</entity-one>
<set field="productStoreId" from-field="webSite.productStoreId"/>
@@ -568,12 +568,12 @@
</condition-list>
<order-by field-name="-statusDate"/>
</entity-condition>
- <first-from-list entry="contactListPartyStatus" list="lastContactListPartyStatusList"/>
+ <first-from-list list="lastContactListPartyStatusList" entry="contactListPartyStatus"/>
<set field="productStoreId" type="String" from-field="parameters.productStoreId"/>
- <entity-one value-field="contactList" entity-name="ContactList"/>
+ <entity-one entity-name="ContactList" value-field="contactList"/>
<if-empty field="productStoreId">
- <entity-one value-field="webSite" entity-name="WebSite">
+ <entity-one entity-name="WebSite" value-field="webSite">
<field-map field-name="webSiteId" from-field="contactList.verifyEmailWebSiteId"/>
</entity-one>
<set field="productStoreId" from-field="webSite.productStoreId"/>
@@ -620,9 +620,9 @@
</simple-method>
<simple-method method-name="sendContactListPartyUnSubscribeEmail" short-description="Send contact list party unsubscribe email" login-required="true">
<set field="productStoreId" type="String" from-field="parameters.productStoreId"/>
- <entity-one value-field="contactList" entity-name="ContactList"/>
+ <entity-one entity-name="ContactList" value-field="contactList"/>
<if-empty field="productStoreId">
- <entity-one value-field="webSite" entity-name="WebSite">
+ <entity-one entity-name="WebSite" value-field="webSite">
<field-map field-name="webSiteId" from-field="contactList.verifyEmailWebSiteId"/>
</entity-one>
<set field="productStoreId" from-field="webSite.productStoreId"/>
diff --git a/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml b/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml
index db79e862..4d99055 100644
--- a/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml
+++ b/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml
@@ -104,7 +104,7 @@
<set field="trackingCodeOrder" from-field="trackingCodeOrders[0]"/>
<log level="info" message="Create Tracking Code Order Return For ${trackingCodeOrder}"/>
<if-not-empty field="trackingCodeOrder">
- <set-service-fields to-map="trackingCodeOrderReturnContext" service-name="createTrackingCodeOrderReturn" map="trackingCodeOrder"/>
+ <set-service-fields service-name="createTrackingCodeOrderReturn" map="trackingCodeOrder" to-map="trackingCodeOrderReturnContext"/>
<set field="trackingCodeOrderReturnContext.returnId" from-field="parameters.returnId"/>
<set field="trackingCodeOrderReturnContext.orderId" from-field="trackingCodeOrder.orderId"/>
<set field="trackingCodeOrderReturnContext.trackingCodeTypeId" value="PARTNER_MGD"/>
diff --git a/applications/marketing/widget/ContactListForms.xml b/applications/marketing/widget/ContactListForms.xml
index 02a37e9..c4f6c1a 100644
--- a/applications/marketing/widget/ContactListForms.xml
+++ b/applications/marketing/widget/ContactListForms.xml
@@ -78,7 +78,7 @@
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
<!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> -->
- <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> -->
+ <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" target-type="inter-app"/></field> -->
</form>
<form name="FindContactLists" target="FindContactLists" title="" type="single"
@@ -122,7 +122,7 @@
</service>
</actions>
<field name="contactListId" widget-style="buttontext" title="${uiLabelMap.MarketingContactListContactListId}">
- <hyperlink target="EditContactList" description="${contactListId}" also-hidden="false">
+ <hyperlink description="${contactListId}" target="EditContactList" also-hidden="false">
<parameter param-name="contactListId"/>
</hyperlink>
</field>
@@ -135,7 +135,7 @@
<field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity entity-name="MarketingCampaign" description="${campaignName}"/></field>
<!-- deleting contact lists is a bit more complicated than this... don't like have a link like this for top level entities
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeContactList" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContactList" also-hidden="false">
<parameter param-name="contactListId"/>
</hyperlink>
</field>
@@ -156,7 +156,7 @@
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down no-current-selected-key="CLPT_ACCEPTED">
<entity-options entity-name="StatusItem">
- <entity-constraint name="statusTypeId" value="CONTACTLST_PARTY" operator="equals"/>
+ <entity-constraint name="statusTypeId" operator="equals" value="CONTACTLST_PARTY"/>
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -169,7 +169,7 @@
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
<field use-when="partyId!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+ <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false"/></field>
</form>
@@ -226,14 +226,14 @@
<display-entity entity-name="ContactMechDetail" key-field-name="contactMechId" description="[${contactMechId}]: [${infoString}] [${tnCountryCode}-${tnAreaCode}-${tnContactNumber}] [${paAddress1}, ${paAddress1}, ${paCity}, ${paStateProvinceGeoId}, ${paPostalCode}, ${paPostalCodeExt} ${paCountryGeoId}]"/>
</field>
<field name="editLink" use-when="${groovy:thruDate == null || isDateAfterNow == true}" widget-style="buttontext">
- <hyperlink target="EditContactListParty" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditContactListParty" also-hidden="false">
<parameter param-name="contactListId"/>
<parameter param-name="partyId"/>
<parameter param-name="fromDate"/>
</hyperlink>
</field>
<field name="expireLink" use-when="${groovy:thruDate == null || isDateAfterNow == true}" widget-style="buttontext">
- <hyperlink target="expireContactListParty" description="${uiLabelMap.CommonExpire}" link-type="hidden-form" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonExpire}" target="expireContactListParty" link-type="hidden-form" also-hidden="false">
<parameter param-name="contactListId"/>
<parameter param-name="partyId"/>
<parameter param-name="fromDate"/>
@@ -409,7 +409,7 @@
<field name="content" title="${uiLabelMap.CommonContent} -- ${communicationEventType.description}"><textarea cols="60" rows="10" visual-editor-enable="true"/></field>
<field name="note" title="${uiLabelMap.CommonNote}"><textarea cols="60" rows="3"/></field>
<field name="submitButton" title=" ${uiLabelMap.CommonSave} "><submit button-type="button"/></field>
- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+ <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false"/></field>
<sort-order>
<field-group title="${uiLabelMap.CommonAdvancedFeatures}" collapsible="true" initially-collapsed="true">
@@ -522,7 +522,7 @@
</service>
</actions>
<field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${contactListId}" target="javascript:set_value('${contactListId}')" target-type="plain"/>
+ <hyperlink description="${contactListId}" target="javascript:set_value('${contactListId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><display/></field>
<field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}"><display-entity entity-name="ContactListType"/></field>
@@ -569,7 +569,7 @@
</service>
</actions>
<field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" target-type="plain"/>
+ <hyperlink description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}">
<display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/>
@@ -658,7 +658,7 @@
<field name="thruDate"><date-time/></field>
<field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit/></field>
<field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteWebSiteContactList" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWebSiteContactList">
<parameter param-name="webSiteId"/>
<parameter param-name="contactListId"/>
<parameter param-name="fromDate"/>
diff --git a/applications/marketing/widget/DataSourceForms.xml b/applications/marketing/widget/DataSourceForms.xml
index 7da3232..4f5dc9b 100644
--- a/applications/marketing/widget/DataSourceForms.xml
+++ b/applications/marketing/widget/DataSourceForms.xml
@@ -39,7 +39,7 @@
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
<!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> -->
- <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> -->
+ <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" target-type="inter-app"/></field> -->
</form>
<form name="ListDataSource" target="ListDataSource" title="" type="list"
@@ -48,14 +48,14 @@
<entity-condition entity-name="DataSource"/>
</actions>
<field name="dataSourceId" widget-style="buttontext" title="${uiLabelMap.DataSourceDataSourceId}">
- <hyperlink target="EditDataSource" description="${dataSourceId}" also-hidden="false">
+ <hyperlink description="${dataSourceId}" target="EditDataSource" also-hidden="false">
<parameter param-name="dataSourceId"/>
</hyperlink>
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}"><display-entity entity-name="DataSourceType"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteDataSource" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteDataSource" also-hidden="false">
<parameter param-name="dataSourceId"/>
</hyperlink>
</field>
@@ -95,12 +95,12 @@
<field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="editLink" title=" " widget-style="buttontext">
- <hyperlink target="EditDataSourceType" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditDataSourceType" also-hidden="false">
<parameter param-name="dataSourceTypeId"/>
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteDataSourceType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteDataSourceType" also-hidden="false">
<parameter param-name="dataSourceTypeId"/>
</hyperlink>
</field>
@@ -130,7 +130,7 @@
</service>
</actions>
<field name="dataSourceId" title="${uiLabelMap.DataSourceDataSourceId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${dataSourceId}" target="javascript:set_value('${dataSourceId}')" target-type="plain"/>
+ <hyperlink description="${dataSourceId}" target="javascript:set_value('${dataSourceId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}"><display-entity entity-name="DataSourceType"/></field>
@@ -153,7 +153,7 @@
</service>
</actions>
<field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${dataSourceTypeId}" target="javascript:set_value('${dataSourceTypeId}')" target-type="plain"/>
+ <hyperlink description="${dataSourceTypeId}" target="javascript:set_value('${dataSourceTypeId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
</form>
diff --git a/applications/marketing/widget/LookupForms.xml b/applications/marketing/widget/LookupForms.xml
index fe1e54b..0daf835 100644
--- a/applications/marketing/widget/LookupForms.xml
+++ b/applications/marketing/widget/LookupForms.xml
@@ -41,7 +41,7 @@
</service>
</actions>
<field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}">
- <hyperlink also-hidden="false" target-type="plain" description="${segmentGroupId}" target="javascript:set_value('${segmentGroupId}')"/>
+ <hyperlink description="${segmentGroupId}" target="javascript:set_value('${segmentGroupId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="segmentGroupTypeId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupTypeId}"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
@@ -56,13 +56,13 @@
</entity-and>
</actions>
<field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}">
- <hyperlink also-hidden="false" target-type="intra-app" description="${segmentGroupId}" target="viewSegmentGroup">
+ <hyperlink description="${segmentGroupId}" target="viewSegmentGroup" also-hidden="false" target-type="intra-app">
<parameter param-name="segmentGroupId"/>
</hyperlink>
</field>
<field name="partyClassificationGroupId" title="${uiLabelMap.MarketingSegmentGroupPartyClassificationGroupId}"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteSegmentGroupClass" description="[${uiLabelMap.CommonDelete}]" also-hidden="false">
+ <hyperlink description="[${uiLabelMap.CommonDelete}]" target="deleteSegmentGroupClass" also-hidden="false">
<parameter param-name="segmentGroupId"/>
<parameter param-name="partyClassificationGroupId"/>
</hyperlink>
@@ -97,7 +97,7 @@
</actions>
<auto-fields-entity entity-name="SalesForecast" default-field-type="display"/>
<field name="salesForecastId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${salesForecastId}" target="javascript:set_value('${salesForecastId}')"/>
+ <hyperlink description="${salesForecastId}" target="javascript:set_value('${salesForecastId}')" also-hidden="false" target-type="plain"/>
</field>
</form>
</forms>
diff --git a/applications/marketing/widget/MarketingCampaignForms.xml b/applications/marketing/widget/MarketingCampaignForms.xml
index c636682..7c8fa46 100644
--- a/applications/marketing/widget/MarketingCampaignForms.xml
+++ b/applications/marketing/widget/MarketingCampaignForms.xml
@@ -60,7 +60,7 @@
<hidden value="${donePage}"/>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
- <field name="cancelLink" widget-style="buttontext" title=" "><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field>
+ <field name="cancelLink" widget-style="buttontext" title=" "><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" target-type="inter-app"/></field>
</form>
<form name="ListMarketingCampaign" type="list" paginate-target="FindMarketingCampaign"
@@ -69,7 +69,7 @@
<entity-condition entity-name="MarketingCampaign"/>
</actions>
<field name="marketingCampaignId" widget-style="buttontext" title="${uiLabelMap.MarketingCampaignId}">
- <hyperlink target="EditMarketingCampaign" description="${marketingCampaignId}" also-hidden="false">
+ <hyperlink description="${marketingCampaignId}" target="EditMarketingCampaign" also-hidden="false">
<parameter param-name="marketingCampaignId"/>
</hyperlink>
</field>
@@ -114,7 +114,7 @@
</display-entity>-->
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeMarketingCampaignRole" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeMarketingCampaignRole" also-hidden="false">
<parameter param-name="marketingCampaignId"/>
<parameter param-name="roleTypeId"/>
<parameter param-name="partyId"/>
@@ -139,7 +139,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
<field name="cancelLink" widget-style="buttontext" title=" ">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false">
<parameter param-name="marketingCampaignId"/>
</hyperlink>
</field>
diff --git a/applications/marketing/widget/SegmentForms.xml b/applications/marketing/widget/SegmentForms.xml
index 4afe53a..e8e0c44 100644
--- a/applications/marketing/widget/SegmentForms.xml
+++ b/applications/marketing/widget/SegmentForms.xml
@@ -33,7 +33,7 @@
</service>
</actions>
<field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}">
- <hyperlink also-hidden="false" description="${segmentGroupId}" target="viewSegmentGroup">
+ <hyperlink description="${segmentGroupId}" target="viewSegmentGroup" also-hidden="false">
<parameter param-name="segmentGroupId"/>
</hyperlink>
</field>
@@ -41,7 +41,7 @@
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="productStoreId" title="${uiLabelMap.MarketingSegmentGroupProductStoreId}"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteSegmentGroup" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSegmentGroup" also-hidden="false">
<parameter param-name="segmentGroupId"/>
</hyperlink>
</field>
@@ -98,7 +98,7 @@
<field name="segmentGroupId"><hidden/></field>
<field name="partyClassificationGroupId"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteSegmentGroupClassification" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSegmentGroupClassification" also-hidden="false">
<parameter param-name="segmentGroupId"/>
<parameter param-name="partyClassificationGroupId"/>
</hyperlink>
@@ -124,7 +124,7 @@
<field name="segmentGroupId"><hidden/></field>
<field name="geoId" title="${uiLabelMap.CommonGeoId}"><display-entity entity-name="Geo" description="${geoName} [Code:${geoCode}][ID:${geoId}]"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteSegmentGroupGeo" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSegmentGroupGeo" also-hidden="false">
<parameter param-name="segmentGroupId"/>
<parameter param-name="geoId"/>
</hyperlink>
@@ -168,7 +168,7 @@
</field>
<field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"><display-entity entity-name="RoleType"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteSegmentGroupRole" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSegmentGroupRole" also-hidden="false">
<parameter param-name="segmentGroupId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
diff --git a/applications/marketing/widget/TrackingCodeForms.xml b/applications/marketing/widget/TrackingCodeForms.xml
index e3fd0b8..723fe01 100644
--- a/applications/marketing/widget/TrackingCodeForms.xml
+++ b/applications/marketing/widget/TrackingCodeForms.xml
@@ -64,7 +64,7 @@
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
<!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> -->
- <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> -->
+ <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" target-type="inter-app"/></field> -->
</form>
<form name="ListTrackingCode" target="ListTrackingCode" title="" type="list"
@@ -73,7 +73,7 @@
<entity-condition entity-name="TrackingCode"/>
</actions>
<field name="trackingCodeId" widget-style="buttontext" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}">
- <hyperlink target="EditTrackingCode" description="${trackingCodeId}" also-hidden="false">
+ <hyperlink description="${trackingCodeId}" target="EditTrackingCode" also-hidden="false">
<parameter param-name="trackingCodeId"/>
</hyperlink>
</field>
@@ -83,7 +83,7 @@
<field name="prodCatalogId"><display-entity description="${catalogName}" entity-name="ProdCatalog"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteTrackingCode" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTrackingCode" also-hidden="false">
<parameter param-name="trackingCodeId"/>
</hyperlink>
</field>
@@ -164,7 +164,7 @@
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/> </field>
- <field name="cancelLink" title="${uiLabelMap.CommonCancel}" widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+ <field name="cancelLink" title="${uiLabelMap.CommonCancel}" widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false"/></field>
</form>
<form name="FindTrackingCodeVisits" target="ListTrackingCodeVisits" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
@@ -241,7 +241,7 @@
</service>
</actions>
<field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${trackingCodeId}" target="javascript:set_value('${trackingCodeId}')" target-type="plain"/>
+ <hyperlink description="${trackingCodeId}" target="javascript:set_value('${trackingCodeId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="description" title="${uiLabelMap.MarketingTrackingCodeDescription}"><display/></field>
<field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType"/></field>
@@ -268,7 +268,7 @@
</service>
</actions>
<field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${visitId}" target="javascript:set_value('${visitId}')" target-type="plain"/>
+ <hyperlink description="${visitId}" target="javascript:set_value('${visitId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="partyId" title="${uiLabelMap.MarketingTrackingCodeVisitPartyId}">
<display-entity description="${partyId}" entity-name="Party" key-field-name="partyId"/>
@@ -297,7 +297,7 @@
<field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
<!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> -->
- <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> -->
+ <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" target-type="inter-app"/></field> -->
</form>
<form name="ListTrackingCodeType" target="ListTrackingCodeType" title="" type="list"
@@ -306,14 +306,14 @@
<entity-condition entity-name="TrackingCodeType"/>
</actions>
<field name="trackingCodeTypeId" widget-style="buttontext" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}">
- <hyperlink target="EditTrackingCodeType" description="${trackingCodeTypeId}" also-hidden="false">
+ <hyperlink description="${trackingCodeTypeId}" target="EditTrackingCodeType" also-hidden="false">
<parameter param-name="trackingCodeTypeId"/>
</hyperlink>
</field>
<field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteTrackingCodeType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTrackingCodeType" also-hidden="false">
<parameter param-name="trackingCodeTypeId"/>
</hyperlink>
</field>
@@ -335,7 +335,7 @@
</service>
</actions>
<field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${trackingCodeTypeId}" target="javascript:set_value('${trackingCodeTypeId}')" target-type="plain"/>
+ <hyperlink description="${trackingCodeTypeId}" target="javascript:set_value('${trackingCodeTypeId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><display/></field>
</form>
diff --git a/applications/marketing/widget/sfa/AccountScreens.xml b/applications/marketing/widget/sfa/AccountScreens.xml
index b7eb06e..119f59f 100644
--- a/applications/marketing/widget/sfa/AccountScreens.xml
+++ b/applications/marketing/widget/sfa/AccountScreens.xml
@@ -133,7 +133,7 @@
<widgets>
<section>
<actions>
- <entity-condition list="states" entity-name="Geo">
+ <entity-condition entity-name="Geo" list="states">
<condition-list combine="or">
<condition-expr field-name="geoTypeId" value="STATE"/>
<condition-expr field-name="geoTypeId" value="PROVINCE"/>
@@ -141,7 +141,7 @@
</condition-list>
<order-by field-name="geoName"/>
</entity-condition>
- <entity-condition list="countries" entity-name="Geo">
+ <entity-condition entity-name="Geo" list="countries">
<condition-list combine="or">
<condition-expr field-name="geoTypeId" value="COUNTRY"/>
</condition-list>
diff --git a/applications/marketing/widget/sfa/forms/AccountForms.xml b/applications/marketing/widget/sfa/forms/AccountForms.xml
index 7545ec9..2e5a700 100644
--- a/applications/marketing/widget/sfa/forms/AccountForms.xml
+++ b/applications/marketing/widget/sfa/forms/AccountForms.xml
@@ -138,7 +138,7 @@
<set field="existRelationship" from-field="existRelationships[0]"/>
</row-actions>
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
- <hyperlink target="viewprofile" description="${partyName} [${partyId}]" >
+ <hyperlink description="${partyName} [${partyId}]" target="viewprofile" >
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
</hyperlink>
@@ -152,7 +152,7 @@
<display-entity entity-name="Geo" description="${geoName}" key-field-name="geoId"/>
</field>
<field name="relatedCompany" use-when="relatedCompanyPartyId!=null" title="${uiLabelMap.PartyRelatedCompany}">
- <hyperlink target="viewprofile" description="${groovy:org.apache.ofbiz.party.party.PartyHelper.getPartyName(delegator,relatedCompanyPartyId,true);} [${relatedCompanyPartyId}]">
+ <hyperlink description="${groovy:org.apache.ofbiz.party.party.PartyHelper.getPartyName(delegator,relatedCompanyPartyId,true);} [${relatedCompanyPartyId}]" target="viewprofile">
<parameter param-name="partyId" from-field="relatedCompanyPartyId"/>
</hyperlink>
</field>
@@ -161,7 +161,7 @@
<form name="ListAccounts" extends="ListAccounts">
<field name="assignToMe" use-when="existRelationship==null&&!"false".equals(parameters.get("all"))"
title="${uiLabelMap.SfaAssignToMe}" widget-style="buttontext">
- <hyperlink target="createPartyRelationshipAndRole" description="${uiLabelMap.SfaAssignToMe}">
+ <hyperlink description="${uiLabelMap.SfaAssignToMe}" target="createPartyRelationshipAndRole">
<parameter param-name="partyIdFrom" from-field="userLogin.partyId"/>
<parameter param-name="roleTypeIdFrom"/>
<parameter param-name="roleTypeIdTo"/>
diff --git a/applications/marketing/widget/sfa/forms/CommonForms.xml b/applications/marketing/widget/sfa/forms/CommonForms.xml
index 1420fff..de46007 100644
--- a/applications/marketing/widget/sfa/forms/CommonForms.xml
+++ b/applications/marketing/widget/sfa/forms/CommonForms.xml
@@ -41,7 +41,7 @@
<set field="postalAddress" from-field="postalAddresses[0]" type="Object"/>
</row-actions>
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
- <hyperlink target="viewprofile" description="${partyName} [${partyId}]" target-window="_blank">
+ <hyperlink description="${partyName} [${partyId}]" target="viewprofile" target-window="_blank">
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
</hyperlink>
diff --git a/applications/marketing/widget/sfa/forms/ContactForms.xml b/applications/marketing/widget/sfa/forms/ContactForms.xml
index b597282..b93e50c 100644
--- a/applications/marketing/widget/sfa/forms/ContactForms.xml
+++ b/applications/marketing/widget/sfa/forms/ContactForms.xml
@@ -58,13 +58,13 @@
</service>
</actions>
<field name="export" title="${uiLabelMap.SfaVCard}">
- <hyperlink target="createVCardFromContact" description="${uiLabelMap.SfaVCard}">
+ <hyperlink description="${uiLabelMap.SfaVCard}" target="createVCardFromContact">
<parameter param-name="partyId"/>
</hyperlink>
</field>
<field name="assignToMe" use-when="existRelationship==null&&!"false".equals(parameters.get("all"))"
title="${uiLabelMap.SfaAssignToMe}" widget-style="buttontext">
- <hyperlink target="createPartyRelationshipAndRole" description="${uiLabelMap.SfaAssignToMe}">
+ <hyperlink description="${uiLabelMap.SfaAssignToMe}" target="createPartyRelationshipAndRole">
<parameter param-name="partyIdFrom" from-field="userLogin.partyId"/>
<parameter param-name="roleTypeIdFrom"/>
<parameter param-name="roleTypeIdTo"/>
@@ -175,7 +175,7 @@
<field name="emailAddress" title="${uiLabelMap.CommonEmail}"><text size="15"/></field>
<field name="contactListId" title="${uiLabelMap.MarketingContactList}">
<drop-down allow-empty="true">
- <entity-options entity-name="ContactList" description="${groovy:contactListName.substring(0,Math.min(contactListName.length(), 12))}..." key-field-name="contactListId"/>
+ <entity-options entity-name="ContactList" key-field-name="contactListId" description="${groovy:contactListName.substring(0,Math.min(contactListName.length(), 12))}..."/>
</drop-down>
</field>
<field name="quickAdd"><hidden value="Y"/></field>
diff --git a/applications/marketing/widget/sfa/forms/EventForms.xml b/applications/marketing/widget/sfa/forms/EventForms.xml
index 15cc875..9c77565 100644
--- a/applications/marketing/widget/sfa/forms/EventForms.xml
+++ b/applications/marketing/widget/sfa/forms/EventForms.xml
@@ -33,17 +33,17 @@
<field name="deleteLink"><hidden/></field>
<field name="currentStatusId"><hidden/></field>
<field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${workEffortName} [${workEffortId}]" target="/workeffort/control/WorkEffortSummary" target-type="inter-app">
+ <hyperlink description="${workEffortName} [${workEffortId}]" target="/workeffort/control/WorkEffortSummary" also-hidden="false" target-type="inter-app">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
<field name="assignedByUserLoginId" title="${uiLabelMap.SfaAssignedBy}">
- <hyperlink target="/partymgr/control/viewprofile" description="${assignByPartyName.firstName} ${assignByPartyName.middleName} ${assignByPartyName.lastName} ${assignByPartyName.groupName} [${assignByPartyName.partyId}]" target-type="inter-app">
+ <hyperlink description="${assignByPartyName.firstName} ${assignByPartyName.middleName} ${assignByPartyName.lastName} ${assignByPartyName.groupName} [${assignByPartyName.partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="assignByPartyName.partyId"/>
</hyperlink>
</field>
<field name="complete" title="${uiLabelMap.SfaComplete}" widget-style="buttontext">
- <hyperlink target="updateWorkEffort" description="${uiLabelMap.SfaComplete}">
+ <hyperlink description="${uiLabelMap.SfaComplete}" target="updateWorkEffort">
<parameter param-name="workEffortId"/>
<parameter param-name="currentStatusId" value="CAL_COMPLETED"/>
</hyperlink>
diff --git a/applications/marketing/widget/sfa/forms/ForecastForms.xml b/applications/marketing/widget/sfa/forms/ForecastForms.xml
index 965ba0d..689fd09 100644
--- a/applications/marketing/widget/sfa/forms/ForecastForms.xml
+++ b/applications/marketing/widget/sfa/forms/ForecastForms.xml
@@ -38,7 +38,7 @@
</actions>
<auto-fields-entity entity-name="SalesForecast" default-field-type="display"/>
<field name="salesForecastId" widget-style="buttontext">
- <hyperlink target="EditSalesForecast" description="${salesForecastId}" also-hidden="false">
+ <hyperlink description="${salesForecastId}" target="EditSalesForecast" also-hidden="false">
<parameter param-name="salesForecastId"/>
</hyperlink>
</field>
@@ -105,7 +105,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title="" widget-style="buttontext">
- <hyperlink target="deleteSalesForecastDetail" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSalesForecastDetail" also-hidden="false">
<parameter param-name="salesForecastId"/>
<parameter param-name="salesForecastDetailId"/>
</hyperlink>
diff --git a/applications/marketing/widget/sfa/forms/LeadForms.xml b/applications/marketing/widget/sfa/forms/LeadForms.xml
index ae4cb2a..2768581 100644
--- a/applications/marketing/widget/sfa/forms/LeadForms.xml
+++ b/applications/marketing/widget/sfa/forms/LeadForms.xml
@@ -85,7 +85,7 @@
</field>
<field name="partyGroupId" title="${uiLabelMap.SfaAccountName}" tooltip="${uiLabelMap.SfaSelectExistingAccountOrLeaveBlankToCreateNew}" use-when="parameters.get("partyGroupId")==""">
<drop-down allow-empty="true" current-description="">
- <entity-options entity-name="PartyRole" description="${groovy:org.apache.ofbiz.party.party.PartyHelper.getPartyName(delegator, partyId, false)} : [partyId]" key-field-name="partyId">
+ <entity-options entity-name="PartyRole" key-field-name="partyId" description="${groovy:org.apache.ofbiz.party.party.PartyHelper.getPartyName(delegator, partyId, false)} : [partyId]">
<entity-constraint name="roleTypeId" operator="equals" value="ACCOUNT"/>
</entity-options>
</drop-down>
@@ -126,7 +126,7 @@
<field name="emailAddress" title="${uiLabelMap.CommonEmail}"><text size="15"/></field>
<field name="contactListId" title="${uiLabelMap.MarketingContactList}">
<drop-down allow-empty="true">
- <entity-options entity-name="ContactList" description="${groovy:contactListName.substring(0,Math.min(contactListName.length(), 12))}..." key-field-name="contactListId"/>
+ <entity-options entity-name="ContactList" key-field-name="contactListId" description="${groovy:contactListName.substring(0,Math.min(contactListName.length(), 12))}..."/>
</drop-down>
</field>
<field name="quickAdd"><hidden value="Y"/></field>
@@ -196,7 +196,7 @@
<form name="ListLeads" extends="listLeads">
<field name="assignToMe" use-when="existRelationship==null&&!"false".equals(parameters.get("all"))"
title="${uiLabelMap.SfaAssignToMe}" widget-style="buttontext">
- <hyperlink target="createPartyRelationshipAndRole" description="${uiLabelMap.SfaAssignToMe}">
+ <hyperlink description="${uiLabelMap.SfaAssignToMe}" target="createPartyRelationshipAndRole">
<parameter param-name="partyIdFrom" from-field="userLogin.partyId"/>
<parameter param-name="roleTypeIdFrom"/>
<parameter param-name="roleTypeIdTo"/>
diff --git a/applications/marketing/widget/sfa/forms/LookupForms.xml b/applications/marketing/widget/sfa/forms/LookupForms.xml
index 5bee142..661ae3d 100644
--- a/applications/marketing/widget/sfa/forms/LookupForms.xml
+++ b/applications/marketing/widget/sfa/forms/LookupForms.xml
@@ -23,19 +23,19 @@
<form name="ListLookupAccount" extends="ListAccounts" extends-resource="component://marketing/widget/sfa/forms/AccountForms.xml">
<field name="partyId">
- <hyperlink also-hidden="false" target-type="plain" description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')"/>
+ <hyperlink description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="relatedCompany"><hidden/></field>
</form>
<form name="ListLookupLead" extends="listLeads" extends-resource="component://marketing/widget/sfa/forms/LeadForms.xml">
<field name="partyId">
- <hyperlink also-hidden="false" target-type="plain" description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')"/>
+ <hyperlink description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="relatedCompany"><hidden/></field>
</form>
<form name="ListLookupAccountLead" extends="ListAccountLeads" extends-resource="component://marketing/widget/sfa/forms/AccountForms.xml">
<field name="partyId">
- <hyperlink also-hidden="false" target-type="plain" description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')"/>
+ <hyperlink description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="relatedCompany"><hidden/></field>
</form>
diff --git a/applications/marketing/widget/sfa/forms/OpportunityForms.xml b/applications/marketing/widget/sfa/forms/OpportunityForms.xml
index bf00e02..7d99a8f 100644
--- a/applications/marketing/widget/sfa/forms/OpportunityForms.xml
+++ b/applications/marketing/widget/sfa/forms/OpportunityForms.xml
@@ -68,7 +68,7 @@
</row-actions>
<field name="salesOpportunityId"><hidden/></field>
<field name="opportunityName" title="${uiLabelMap.SfaOpportunityName}">
- <hyperlink target="EditSalesOpportunity" description="${opportunityName}[${salesOpportunityId}] ${roleTypeId}">
+ <hyperlink description="${opportunityName}[${salesOpportunityId}] ${roleTypeId}" target="EditSalesOpportunity">
<parameter param-name="salesOpportunityId"/>
</hyperlink>
</field>
@@ -86,7 +86,7 @@
<field name="nextStepDate" position="1" title="${uiLabelMap.SfaNextStepDate}" sort-field="true"><display/></field>
<field name="estimatedCloseDate" title="${uiLabelMap.SfaCloseDate}"><display/></field>
<field name="editButton" title="${uiLabelMap.CommonClose}" use-when="estimatedCloseDate == void || estimatedCloseDate == null || org.apache.ofbiz.base.util.UtilValidate.isDateAfterNow(estimatedCloseDate) || opportunityStageId != "SOSTG_CLOSED"" widget-style="buttontext">
- <hyperlink target="closeSalesOpportunity" description="${uiLabelMap.CommonClose}">
+ <hyperlink description="${uiLabelMap.CommonClose}" target="closeSalesOpportunity">
<parameter param-name="salesOpportunityId"/>
<parameter param-name="opportunityStageId" value="SOSTG_CLOSED"/>
</hyperlink>
diff --git a/applications/order/minilang/opportunity/OpportunityServices.xml b/applications/order/minilang/opportunity/OpportunityServices.xml
index c79aa22..2f5196f 100644
--- a/applications/order/minilang/opportunity/OpportunityServices.xml
+++ b/applications/order/minilang/opportunity/OpportunityServices.xml
@@ -138,7 +138,7 @@
<field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/>
<field-map field-name="salesOpportunityId" from-field="parameters.salesOpportunityId"/>
</entity-and>
- <first-from-list entry="lookedUpValue" list="salesOpportunityRoles"/>
+ <first-from-list list="salesOpportunityRoles" entry="lookedUpValue"/>
<field-to-result field="lookedUpValue.partyId" result-name="partyId"/>
</simple-method>
</simple-methods>
diff --git a/applications/order/minilang/order/OrderDeliveryServices.xml b/applications/order/minilang/order/OrderDeliveryServices.xml
index 16ebd98..b3302b2 100644
--- a/applications/order/minilang/order/OrderDeliveryServices.xml
+++ b/applications/order/minilang/order/OrderDeliveryServices.xml
@@ -87,7 +87,7 @@
<set field="curUserPcmFindMap.partyId" from-field="userLogin.partyId"/>
<set field="curUserPcmFindMap.contactMechTypeId" value="EMAIL_ADDRESS"/>
<find-by-and entity-name="PartyAndContactMech" map="curUserPcmFindMap" list="curUserPartyAndContactMechs"/>
- <first-from-list entry="curUserPartyAndContactMech" list="curUserPartyAndContactMechs"/>
+ <first-from-list list="curUserPartyAndContactMechs" entry="curUserPartyAndContactMech"/>
<string-append field="sendEmailMap.sendFrom" string="${curUserPartyAndContactMech.infoString}" prefix=","/>
<!-- find email addresses of all parties in SHIPMENT_CLERK roleTypeId, set as sendTo -->
diff --git a/applications/order/minilang/order/OrderReturnServices.xml b/applications/order/minilang/order/OrderReturnServices.xml
index 9307119..28d779f 100644
--- a/applications/order/minilang/order/OrderReturnServices.xml
+++ b/applications/order/minilang/order/OrderReturnServices.xml
@@ -183,7 +183,7 @@
<check-errors/>
<!-- tally up the return total amount -->
<calculate field="returnTotalAmount">
- <calcop field="returnTotalAmount" operator="add">
+ <calcop operator="add" field="returnTotalAmount">
<calcop operator="multiply">
<calcop operator="get" field="returnItem.returnPrice"/>
<calcop operator="get" field="returnItem.returnQuantity"/>
@@ -235,7 +235,7 @@
</entity-and>
<iterate list="returnAdjustments" entry="returnAdjustment">
<calculate field="returnTotalAmount">
- <calcop field="returnTotalAmount" operator="add">
+ <calcop operator="add" field="returnTotalAmount">
<calcop operator="get" field="returnAdjustment.amount"/>
</calcop>
</calculate>
@@ -521,7 +521,7 @@
<iterate-map key="returnItemSeqId" value="value" map="totalsMap">
<set field="filterMap.returnItemSeqId" from="returnItemSeqId"/>
<filter-list-by-and list="returnItems" map="filterMap" to-list="items"/>
- <first-from-list entry="item" list="items"/>
+ <first-from-list list="items" entry="item"/>
<set field="item.receivedQuantity" from="value" type="BigDecimal"/>
<set-service-fields service-name="updateReturnItem" map="item" to-map="serviceInMap"/>
<if-compare-field field="value" to-field="item.returnQuantity" operator="greater-equals" type="BigDecimal">
@@ -606,7 +606,7 @@
<condition-expr field-name="roleTypeId" operator="equals" from-field="roleTypeId"/>
</condition-list>
</entity-condition>
- <first-from-list entry="orderRole" list="orderRoles"/>
+ <first-from-list list="orderRoles" entry="orderRole"/>
<!-- create the return header -->
<set from-field="orderHeader.originFacilityId" field="createHeaderCtx.destinationFacilityId"/>
<set value="Y" field="updateHeaderCtx.needsInventoryReceive"/>
@@ -1093,7 +1093,7 @@
<make-value value-field="returnContactMechMap" entity-name="ReturnContactMech"/>
<set-pk-fields map="parameters" value-field="returnContactMechMap"/>
- <entity-one value-field="returnHeader" entity-name="ReturnHeader"/>
+ <entity-one entity-name="ReturnHeader" value-field="returnHeader"/>
<set from-field="parameters.returnId" field="createReturnContactMechMap.returnId"/>
<set from-field="parameters.contactMechPurposeTypeId" field="createReturnContactMechMap.contactMechPurposeTypeId"/>
<set from-field="parameters.contactMechId" field="createReturnContactMechMap.contactMechId"/>
@@ -1126,7 +1126,7 @@
<condition-expr field-name="roleTypeId" operator="equals" value="BILL_TO_CUSTOMER"/>
</condition-list>
</entity-condition>
- <first-from-list entry="orderRole" list="orderRoles"/>
+ <first-from-list list="orderRoles" entry="orderRole"/>
<get-related-one relation-name="ProductStore" value-field="orderHeader" to-value-field="productStore"/>
diff --git a/applications/order/minilang/order/OrderServices.xml b/applications/order/minilang/order/OrderServices.xml
index 8d29a9d..c72442f 100644
--- a/applications/order/minilang/order/OrderServices.xml
+++ b/applications/order/minilang/order/OrderServices.xml
@@ -101,11 +101,11 @@
</if-not-empty>
<call-service service-name="createRequirement" in-map-name="inputMap">
- <result-to-field field="parameters.requirementId" result-name="requirementId"/>
+ <result-to-field result-name="requirementId" field="parameters.requirementId"/>
</call-service>
<!-- create the OrderRequirementCommitment to record the Requirement created for an order item -->
- <set-service-fields to-map="orderReqCommitParams" service-name="createOrderRequirementCommitment" map="parameters"/>
+ <set-service-fields service-name="createOrderRequirementCommitment" map="parameters" to-map="orderReqCommitParams"/>
<call-service service-name="createOrderRequirementCommitment" in-map-name="orderReqCommitParams"/>
<field-to-result field="parameters.requirementId" result-name="requirementId"/>
@@ -122,8 +122,8 @@
<set from-field="inventoryItem.productId" field="inputMap.productId"/>
<set from-field="inventoryItem.facilityId" field="inputMap.facilityId"/>
<call-service service-name="getInventoryAvailableByFacility" in-map-name="inputMap">
- <result-to-field field="quantityOnHandTotal" result-name="quantityOnHandTotal"/>
- <result-to-field field="availableToPromiseTotal" result-name="availableToPromiseTotal"/>
+ <result-to-field result-name="quantityOnHandTotal" field="quantityOnHandTotal"/>
+ <result-to-field result-name="availableToPromiseTotal" field="availableToPromiseTotal"/>
</call-service>
<clear-field field="inputMap"/>
</simple-method>
@@ -198,7 +198,7 @@
<!-- No requirements are created if we are already under stock -->
<if-compare-field field="quantityOnHandTotal" to-field="productFacility.minimumStock" operator="greater-equals" type="BigDecimal">
<calculate field="newQuantityOnHand">
- <calcop field="quantityOnHandTotal" operator="subtract">
+ <calcop operator="subtract" field="quantityOnHandTotal">
<calcop operator="get" field="parameters.quantity"/>
</calcop>
</calculate>
@@ -214,7 +214,7 @@
</if-not-empty>
<set value="PRODUCT_REQUIREMENT" field="inputMap.requirementTypeId"/>
<call-service service-name="createRequirement" in-map-name="inputMap">
- <result-to-field field="parameters.requirementId" result-name="requirementId"/>
+ <result-to-field result-name="requirementId" field="parameters.requirementId"/>
</call-service>
<field-to-result field="parameters.requirementId" result-name="requirementId"/>
</if-compare-field>
@@ -245,7 +245,7 @@
<!-- this service is supposed to be called after inventory is reserved, so inventory should have been updated already -->
<if-compare-field field="availableToPromiseTotal" to-field="productFacility.minimumStock" operator="less" type="BigDecimal">
<calculate field="oldAvailableToPromise">
- <calcop field="availableToPromiseTotal" operator="add">
+ <calcop operator="add" field="availableToPromiseTotal">
<calcop operator="get" field="parameters.quantity"/>
</calcop>
</calculate>
@@ -261,7 +261,7 @@
</if-not-empty>
<set value="PRODUCT_REQUIREMENT" field="inputMap.requirementTypeId"/>
<call-service service-name="createRequirement" in-map-name="inputMap">
- <result-to-field field="parameters.requirementId" result-name="requirementId"/>
+ <result-to-field result-name="requirementId" field="parameters.requirementId"/>
</call-service>
<field-to-result field="parameters.requirementId" result-name="requirementId"/>
</if-compare-field>
@@ -298,7 +298,7 @@
<if-compare-field field="availableToPromiseTotal" to-field="minimumStock" operator="less" type="BigDecimal">
<!-- what is the right quantity? It is the lesser of the actual quantity and the quantity required to bring us back up to minimum stock -->
<calculate field="quantityShortfall">
- <calcop field="minimumStock" operator="subtract">
+ <calcop operator="subtract" field="minimumStock">
<calcop operator="get" field="availableToPromiseTotal"/>
</calcop>
</calculate>
@@ -383,8 +383,8 @@
<set from-field="productFacility.productId" field="inputMap.productId"/>
<set from-field="productFacility.facilityId" field="inputMap.facilityId"/>
<call-service service-name="getInventoryAvailableByFacility" in-map-name="inputMap">
- <result-to-field field="quantityOnHandTotal" result-name="quantityOnHandTotal"/>
- <result-to-field field="availableToPromiseTotal" result-name="availableToPromiseTotal"/>
+ <result-to-field result-name="quantityOnHandTotal" field="quantityOnHandTotal"/>
+ <result-to-field result-name="availableToPromiseTotal" field="availableToPromiseTotal"/>
</call-service>
<if-compare field="requirementMethodId" operator="equals" value="PRODRQM_STOCK">
@@ -406,7 +406,7 @@
</if-not-empty>
<calculate field="quantityShortfall">
- <calcop field="productFacility.minimumStock" operator="subtract">
+ <calcop operator="subtract" field="productFacility.minimumStock">
<calcop operator="get" field="currentQuantity"/>
</calcop>
</calculate>
@@ -417,7 +417,7 @@
<set value="PRODUCT_REQUIREMENT" field="inputMap.requirementTypeId"/>
<set from-field="parameters.facilityId" field="inputMap.facilityId"/>
<call-service service-name="createRequirement" in-map-name="inputMap">
- <result-to-field field="requirementId" result-name="requirementId"/>
+ <result-to-field result-name="requirementId" field="requirementId"/>
</call-service>
<log level="info" message="Requirement creted with id [${requirementId}] for product with id [${productFacility.productId}]."/>
</if-compare-field>
@@ -563,7 +563,7 @@
</condition>
<then>
<clear-field field="cancelOrderItemInMap"/>
- <set-service-fields service-name="cancelOrderItemNoActions" to-map="cancelOrderItemInMap" map="parameters"/>
+ <set-service-fields service-name="cancelOrderItemNoActions" map="parameters" to-map="cancelOrderItemInMap"/>/>
<set from-field="orderItem.orderItemSeqId" field="cancelOrderItemInMap.orderItemSeqId"/>
<call-service service-name="cancelOrderItemNoActions" in-map-name="cancelOrderItemInMap"/>
</then>
@@ -594,7 +594,7 @@
</iterate>
<!-- Recalculate the promotions for the order -->
- <set-service-fields service-name="loadCartFromOrder" to-map="loadCartFromOrderInMap" map="parameters"/>
+ <set-service-fields service-name="loadCartFromOrder" map="parameters" to-map="loadCartFromOrderInMap"/>/>
<set value="true" field="loadCartFromOrderInMap.skipInventoryChecks" type="Boolean"/>
<set value="true" field="loadCartFromOrderInMap.skipProductChecks" type="Boolean"/>
<call-service service-name="loadCartFromOrder" in-map-name="loadCartFromOrderInMap">
@@ -694,7 +694,7 @@
<set field="inputMap.shipGroupSeqId" from-field="shipGroup.shipGroupSeqId"/>
<set field="inputMap.shipmentMethod" value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId}@${shipGroup.carrierRoleTypeId}"/>
<set field="inputMap.oldContactMechId" from-field="parameters.oldContactMechId"/>
- <set-service-fields to-map="orderItemShipGroupMap" service-name="updateOrderItemShipGroup" map="inputMap"/>
+ <set-service-fields service-name="updateOrderItemShipGroup" map="inputMap" to-map="orderItemShipGroupMap"/>
<call-service service-name="updateOrderItemShipGroup" in-map-name="orderItemShipGroupMap" include-user-login="true"/>
</iterate>
</if-not-empty>
@@ -772,7 +772,7 @@
</else>
</if-compare>
<get-related value-field="orderItemShipGroup" relation-name="OrderItemShipGrpInvRes" list="orderItemShipGroupInvResList" order-by-list="orderByList"/>
- <first-from-list entry="orderItemShipGroupInvRes" list="orderItemShipGroupInvResList"/>
+ <first-from-list list="orderItemShipGroupInvResList" entry="orderItemShipGroupInvRes"/>
<field-to-result field="orderItemShipGroupInvRes.promisedDatetime" result-name="estimatedShipDate"/>
</simple-method>
@@ -800,7 +800,7 @@
<set field="inputMap.paymentMethodTypeId" from-field="paymentMethod.paymentMethodTypeId"/>
<!--In this method we calls createOrderPaymentPreference and returns orderPaymentPreferenceId field to authOrderPaymentPreference -->
<call-service service-name="createOrderPaymentPreference" in-map-name="inputMap" include-user-login="true">
- <result-to-field field="parameters.orderPaymentPreferenceId" result-name="orderPaymentPreferenceId"/>
+ <result-to-field result-name="orderPaymentPreferenceId" field="parameters.orderPaymentPreferenceId"/>
</call-service>
<field-to-result field="parameters.orderPaymentPreferenceId" result-name="orderPaymentPreferenceId"/>
</simple-method>
@@ -971,7 +971,7 @@
<field-map field-name="partyId" from-field="partyId"/>
<field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
</entity-and>
- <first-from-list entry="pcmp" list="pcmpList"/>
+ <first-from-list list="pcmpList" entry="pcmp"/>
<if-not-empty field="pcmp">
<set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/>
<call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
@@ -1236,7 +1236,7 @@
<simple-method method-name="cancelAllBackOrders" short-description="Cancels those back orders from suppliers whose cancel back order date (cancelBackOrderDate) has passed the current date">
<now-timestamp field="nowTimestamp"/>
- <entity-condition list="orders" entity-name="OrderHeader">
+ <entity-condition entity-name="OrderHeader" list="orders">
<condition-list combine="and">
<condition-expr field-name="orderTypeId" operator="equals" value="PURCHASE_ORDER"/>
<condition-expr field-name="statusId" operator="not-equals" value="ORDER_CANCELLED"/>
@@ -1292,26 +1292,26 @@
</else>
</if-compare-field>
<if-compare-field field="diffPercentage" operator="greater" to-field="percentAllowed" type="BigDecimal">
- <set-service-fields map="parameters" to-map="updateOrderItemShipGroupContext" service-name="updateOrderItemShipGroup"/>
+ <set-service-fields service-name="updateOrderItemShipGroup" map="parameters" to-map="updateOrderItemShipGroupContext"/>/>
<call-service service-name="updateOrderItemShipGroup" in-map-name="updateOrderItemShipGroupContext"/>
- <set-service-fields map="parameters" to-map="updateOrderAdjustmentContext" service-name="updateOrderAdjustment"/>
+ <set-service-fields service-name="updateOrderAdjustment" map="parameters" to-map="updateOrderAdjustmentContext"/>/>
<call-service service-name="updateOrderAdjustment" in-map-name="updateOrderAdjustmentContext"/>
- <set-service-fields map="parameters" to-map="updateShipmentRouteSegmentContext" service-name="updateShipmentRouteSegment"/>
+ <set-service-fields service-name="updateShipmentRouteSegment" map="parameters" to-map="updateShipmentRouteSegmentContext"/>/>
<clear-field field="updateShipmentRouteSegmentContext.trackingIdNumber"/>
<clear-field field="updateShipmentRouteSegmentContext.trackingDigest"/>
<clear-field field="updateShipmentRouteSegmentContext.carrierServiceStatusId"/>
<call-service service-name="updateShipmentRouteSegment" in-map-name="updateShipmentRouteSegmentContext"/>
- <set-service-fields map="parameters" to-map="upsShipmentConfirmContext" service-name="upsShipmentConfirm"/>
+ <set-service-fields service-name="upsShipmentConfirm" map="parameters" to-map="upsShipmentConfirmContext"/>/>
<call-service service-name="upsShipmentConfirm" in-map-name="upsShipmentConfirmContext"/>
<else>
- <set-service-fields map="parameters" to-map="updateOrderItemShipGroupContext" service-name="updateOrderItemShipGroup"/>
+ <set-service-fields service-name="updateOrderItemShipGroup" map="parameters" to-map="updateOrderItemShipGroupContext"/>/>
<call-service service-name="updateOrderItemShipGroup" in-map-name="updateOrderItemShipGroupContext"/>
- <set-service-fields map="parameters" to-map="updateShipmentRouteSegmentContext" service-name="updateShipmentRouteSegment"/>
+ <set-service-fields service-name="updateShipmentRouteSegment" map="parameters" to-map="updateShipmentRouteSegmentContext"/>/>
<clear-field field="updateShipmentRouteSegmentContext.trackingIdNumber"/>
<clear-field field="updateShipmentRouteSegmentContext.trackingDigest"/>
<clear-field field="updateShipmentRouteSegmentContext.carrierServiceStatusId"/>
<call-service service-name="updateShipmentRouteSegment" in-map-name="updateShipmentRouteSegmentContext"/>
- <set-service-fields map="parameters" to-map="upsShipmentConfirmContext" service-name="upsShipmentConfirm"/>
+ <set-service-fields service-name="upsShipmentConfirm" map="parameters" to-map="upsShipmentConfirmContext"/>/>
<call-service service-name="upsShipmentConfirm" in-map-name="upsShipmentConfirmContext"/>
</else>
</if-compare-field>
@@ -1337,10 +1337,10 @@
</simple-method>
<simple-method method-name="createOrderPaymentApplication" short-description="Create Order Payment Application">
- <entity-one value-field="paymentMap" entity-name="Payment"/>
+ <entity-one entity-name="Payment" value-field="paymentMap"/>
<set field="createCtx.amountApplied" from-field="paymentMap.amount" type="BigDecimal"/>
<set field="createCtx.paymentId" from-field="paymentMap.paymentId"/>
- <entity-one value-field="orderPaymentPreMap" entity-name="OrderPaymentPreference">
+ <entity-one entity-name="OrderPaymentPreference" value-field="orderPaymentPreMap">
<field-map field-name="orderPaymentPreferenceId" from-field="paymentMap.paymentPreferenceId"/>
</entity-one>
<entity-and entity-name="OrderItemBilling" list="orderItemBilList">
diff --git a/applications/order/minilang/order/OrderSimpleMethods.xml b/applications/order/minilang/order/OrderSimpleMethods.xml
index 3f8b19f..54fa4f8 100644
--- a/applications/order/minilang/order/OrderSimpleMethods.xml
+++ b/applications/order/minilang/order/OrderSimpleMethods.xml
@@ -71,9 +71,9 @@
<set field="totalsMap[receipt.orderItemSeqId]" value="0" type="BigDecimal"/>
</if-empty>
<calculate field="totalsMap[receipt.orderItemSeqId]">
- <calcop field="totalsMap[receipt.orderItemSeqId]" operator="add">
- <calcop field="receipt.quantityAccepted" operator="get"/>
- <calcop field="receipt.quantityRejected" operator="get"/>
+ <calcop operator="add" field="totalsMap[receipt.orderItemSeqId]">
+ <calcop operator="get" field="receipt.quantityAccepted"/>
+ <calcop operator="get" field="receipt.quantityRejected"/>
</calcop>
</calculate>
<set from-field="receipt.orderId" field="newLookupMap.orderId"/>
diff --git a/applications/order/minilang/quote/QuoteServices.xml b/applications/order/minilang/quote/QuoteServices.xml
index 5672706..7585779 100644
--- a/applications/order/minilang/quote/QuoteServices.xml
+++ b/applications/order/minilang/quote/QuoteServices.xml
@@ -121,7 +121,7 @@
<!-- create a non existing ID; if we have a productStoreId do it for the payToPartyId of that ProductStore according to PartyAcctgPreferences, otherwise get from standard sequence -->
<entity-one entity-name="ProductStore" value-field="productStore"/>
<if-not-empty field="productStore.payToPartyId">
- <set-service-fields service-name="getNextQuoteId" to-map="getNextQuoteIdContext" map="parameters"/>
+ <set-service-fields service-name="getNextQuoteId" map="parameters" to-map="getNextQuoteIdContext"/>/>
<set field="getNextQuoteIdContext.partyId" from-field="productStore.payToPartyId"/>
<call-service service-name="getNextQuoteId" in-map-name="getNextQuoteIdContext">
<result-to-field result-name="quoteId" field="newEntity.quoteId"/>
@@ -197,7 +197,7 @@
<check-errors/>
<entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
<check-errors/>
- <set-service-fields service-name="createQuote" to-map="createQuoteInMap" map="quote"/>
+ <set-service-fields service-name="createQuote" map="quote" to-map="createQuoteInMap"/>/>
<clear-field field="createQuoteInMap.statusId"/>
<call-service service-name="createQuote" in-map-name="createQuoteInMap">
<result-to-field result-name="quoteId" field="quoteIdTo"/>
@@ -207,7 +207,7 @@
<get-related value-field="quote" relation-name="QuoteItem" list="quoteItems"/>
<iterate list="quoteItems" entry="quoteItem">
<clear-field field="createQuoteItemInMap"/>
- <set-service-fields service-name="createQuoteItem" to-map="createQuoteItemInMap" map="quoteItem"/>
+ <set-service-fields service-name="createQuoteItem" map="quoteItem" to-map="createQuoteItemInMap"/>/>
<set from-field="quoteIdTo" field="createQuoteItemInMap.quoteIdTo"/>
<set from-field="parameters.copyQuoteAdjustments" field="createQuoteItemInMap.copyQuoteAdjustments"/>
<call-service service-name="copyQuoteItem" in-map-name="createQuoteItemInMap"/>
@@ -219,7 +219,7 @@
<iterate list="quoteAdjustments" entry="quoteAdjustment">
<if-empty field="quoteAdjustment.quoteItemSeqId">
<clear-field field="createQuoteAdjustmentInMap"/>
- <set-service-fields service-name="createQuoteAdjustment" to-map="createQuoteAdjustmentInMap" map="quoteAdjustment"/>
+ <set-service-fields service-name="createQuoteAdjustment" map="quoteAdjustment" to-map="createQuoteAdjustmentInMap"/>/>
<set from-field="quoteIdTo" field="createQuoteAdjustmentInMap.quoteId"/>
<call-service service-name="createQuoteAdjustment" in-map-name="createQuoteAdjustmentInMap"/>
</if-empty>
@@ -231,7 +231,7 @@
<iterate list="quoteRoles" entry="quoteRole">
<if-compare field="quoteRole.roleTypeId" value="REQ_TAKER" operator="not-equals">
<clear-field field="createQuoteRoleInMap"/>
- <set-service-fields service-name="createQuoteRole" to-map="createQuoteRoleInMap" map="quoteRole"/>
+ <set-service-fields service-name="createQuoteRole" map="quoteRole" to-map="createQuoteRoleInMap"/>/>
<set from-field="quoteIdTo" field="createQuoteRoleInMap.quoteId"/>
<call-service service-name="createQuoteRole" in-map-name="createQuoteRoleInMap"/>
</if-compare>
@@ -242,7 +242,7 @@
<get-related value-field="quote" relation-name="QuoteAttribute" list="quoteAttributes"/>
<iterate list="quoteAttributes" entry="quoteAttribute">
<clear-field field="createQuoteAttributeInMap"/>
- <set-service-fields service-name="createQuoteAttribute" to-map="createQuoteAttributeInMap" map="quoteAttribute"/>
+ <set-service-fields service-name="createQuoteAttribute" map="quoteAttribute" to-map="createQuoteAttributeInMap"/>/>
<set from-field="quoteIdTo" field="createQuoteAttributeInMap.quoteId"/>
<call-service service-name="createQuoteAttribute" in-map-name="createQuoteAttributeInMap"/>
</iterate>
@@ -252,7 +252,7 @@
<get-related value-field="quote" relation-name="QuoteCoefficient" list="quoteCoefficients"/>
<iterate list="quoteCoefficients" entry="quoteCoefficient">
<clear-field field="createQuoteCoefficientInMap"/>
- <set-service-fields service-name="createQuoteCoefficient" to-map="createQuoteCoefficientInMap" map="quoteCoefficient"/>
+ <set-service-fields service-name="createQuoteCoefficient" map="quoteCoefficient" to-map="createQuoteCoefficientInMap"/>/>
<set from-field="quoteIdTo" field="createQuoteCoefficientInMap.quoteId"/>
<call-service service-name="createQuoteCoefficient" in-map-name="createQuoteCoefficientInMap"/>
</iterate>
@@ -261,7 +261,7 @@
<get-related value-field="quote" relation-name="QuoteTerm" list="quoteTerms"/>
<iterate list="quoteTerms" entry="quoteTerm">
<clear-field field="createQuoteTermInMap"/>
- <set-service-fields service-name="createQuoteTerm" to-map="createQuoteTermInMap" map="quoteTerm"/>
+ <set-service-fields service-name="createQuoteTerm" map="quoteTerm" to-map="createQuoteTermInMap"/>/>
<set from-field="quoteIdTo" field="createQuoteTermInMap.quoteId"/>
<call-service service-name="createQuoteTerm" in-map-name="createQuoteTermInMap"/>
</iterate>
@@ -450,7 +450,7 @@
<entity-one entity-name="QuoteItem" value-field="quoteItem" auto-field-map="true"/>
<check-errors/>
- <set-service-fields service-name="createQuoteItem" to-map="createQuoteItemInMap" map="quoteItem"/>
+ <set-service-fields service-name="createQuoteItem" map="quoteItem" to-map="createQuoteItemInMap"/>/>
<set from-field="parameters.quoteIdTo" field="createQuoteItemInMap.quoteId"/>
<set from-field="parameters.quoteItemSeqId" field="createQuoteItemInMap.quoteItemSeqId"/>
<if-empty field="parameters.quoteIdTo">
@@ -470,7 +470,7 @@
<get-related value-field="quoteItem" relation-name="QuoteAdjustment" list="quoteAdjustments"/>
<iterate list="quoteAdjustments" entry="quoteAdjustment">
<clear-field field="createQuoteAdjustmentInMap"/>
- <set-service-fields service-name="createQuoteAdjustment" to-map="createQuoteAdjustmentInMap" map="quoteAdjustment"/>
+ <set-service-fields service-name="createQuoteAdjustment" map="quoteAdjustment" to-map="createQuoteAdjustmentInMap"/>/>
<set from-field="quoteIdTo" field="createQuoteAdjustmentInMap.quoteId"/>
<set from-field="quoteItemSeqId" field="createQuoteAdjustmentInMap.quoteItemSeqId"/>
<call-service service-name="createQuoteAdjustment" in-map-name="createQuoteAdjustmentInMap"/>
@@ -651,7 +651,7 @@
<iterate list="quoteItems" entry="quoteItem">
<if-compare field="quoteItem.isPromo" value="Y" operator="equals">
<clear-field field="removeQuoteItemInMap"/>
- <set-service-fields service-name="removeQuoteItem" to-map="removeQuoteItemInMap" map="parameters"/>
+ <set-service-fields service-name="removeQuoteItem" map="parameters" to-map="removeQuoteItemInMap"/>/>
<set from-field="quoteItem.quoteItemSeqId" field="removeQuoteItemInMap.quoteItemSeqId"/>
<call-service service-name="removeQuoteItem" in-map-name="removeQuoteItemInMap"/>
</if-compare>
@@ -662,12 +662,12 @@
<!-- make sure this is not a manual adjustments -->
<if-not-empty field="quoteAdjustment.productPromoId">
<clear-field field="removeQuoteAdjustmentInMap"/>
- <set-service-fields service-name="removeQuoteAdjustment" to-map="removeQuoteAdjustmentInMap" map="parameters"/>
+ <set-service-fields service-name="removeQuoteAdjustment" map="parameters" to-map="removeQuoteAdjustmentInMap"/>/>
<set from-field="quoteAdjustment.quoteAdjustmentId" field="removeQuoteAdjustmentInMap.quoteAdjustmentId"/>
<call-service service-name="removeQuoteAdjustment" in-map-name="removeQuoteAdjustmentInMap"/>
</if-not-empty>
</iterate>
- <set-service-fields service-name="loadCartFromQuote" to-map="loadCartFromQuoteInMap" map="parameters"/>
+ <set-service-fields service-name="loadCartFromQuote" map="parameters" to-map="loadCartFromQuoteInMap"/>/>
<set value="false" field="loadCartFromQuoteInMap.applyQuoteAdjustments"/>
<call-service service-name="loadCartFromQuote" in-map-name="loadCartFromQuoteInMap">
<result-to-field result-name="shoppingCart" field="cart"/>
@@ -680,7 +680,7 @@
<!-- this is a new (promo) item -->
<!-- a new quote item is created -->
<clear-field field="createQuoteItemInMap"/>
- <set-service-fields service-name="createQuoteItem" to-map="createQuoteItemInMap" map="parameters"/>
+ <set-service-fields service-name="createQuoteItem" map="parameters" to-map="createQuoteItemInMap"/>/>
<call-object-method obj-field="item" method-name="getProductId" ret-field="createQuoteItemInMap.productId"/>
<call-object-method obj-field="item" method-name="getQuantity" ret-field="createQuoteItemInMap.quantity"/>
<set value="Y" field="createQuoteItemInMap.isPromo"/>
@@ -915,7 +915,7 @@
</call-service>
<check-errors/>
- <entity-condition list="custRequestItems" entity-name="CustRequestItem">
+ <entity-condition entity-name="CustRequestItem" list="custRequestItems">
<condition-list combine="and">
<condition-expr field-name="custRequestId" operator="equals" from-field="custRequest.custRequestId"/>
<condition-expr field-name="statusId" operator="not-equals" value="CRQ_CANCELLED"/>
diff --git a/applications/order/minilang/reports/NetBeforeOverheadEvent.xml b/applications/order/minilang/reports/NetBeforeOverheadEvent.xml
index eb9f3d1..e11ee0a 100644
--- a/applications/order/minilang/reports/NetBeforeOverheadEvent.xml
+++ b/applications/order/minilang/reports/NetBeforeOverheadEvent.xml
@@ -27,7 +27,7 @@
<set field="DateMonth" value="12"/>
<set field="mount1" from-field="DateMonth" type="Integer"/>
<calculate field="mount2" type="Integer">
- <calcop field="mount1" operator="subtract">
+ <calcop operator="subtract" field="mount1">
<number value="1"/>
</calcop>
</calculate>
diff --git a/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml b/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml
index 4b678ab..dca40a5 100644
--- a/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml
+++ b/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml
@@ -57,7 +57,7 @@
<set field="count1" value="-1"/>
<iterate list="saleschannels" entry="saleschannel">
<calculate field="count1">
- <calcop field="count1" operator="add">
+ <calcop operator="add" field="count1">
<number value="1"/>
</calcop>
</calculate>
@@ -77,7 +77,7 @@
</if-compare-field>
<if-compare-field field="countdate.salesChannelEnumId" to-field="checksalesChannel1" operator="not-equals">
<calculate field="count2">
- <calcop field="count2" operator="add">
+ <calcop operator="add" field="count2">
<number value="1"/>
</calcop>
</calculate>
@@ -93,12 +93,12 @@
<set field="count4" value="0"/>
<iterate list="starschemas" entry="starschema">
<calculate field="count3">
- <calcop field="count3" operator="add">
+ <calcop operator="add" field="count3">
<number value="1"/>
</calcop>
</calculate>
<calculate field="count4">
- <calcop field="count4" operator="add">
+ <calcop operator="add" field="count4">
<number value="1"/>
</calcop>
</calculate>
diff --git a/applications/order/minilang/reports/ProductDemandReportEvent.xml b/applications/order/minilang/reports/ProductDemandReportEvent.xml
index 98e4f1d..1bc445b 100644
--- a/applications/order/minilang/reports/ProductDemandReportEvent.xml
+++ b/applications/order/minilang/reports/ProductDemandReportEvent.xml
@@ -26,17 +26,17 @@
<set field="year" from-field="Year" type="Integer"/>
<set field="week1" from-field="Week" type="Integer"/>
<calculate field="week2" type="Integer">
- <calcop field="week1" operator="subtract">
+ <calcop operator="subtract" field="week1">
<number value="1"/>
</calcop>
</calculate>
<calculate field="week3" type="Integer">
- <calcop field="week1" operator="subtract">
+ <calcop operator="subtract" field="week1">
<number value="2"/>
</calcop>
</calculate>
<calculate field="week4" type="Integer">
- <calcop field="week1" operator="subtract">
+ <calcop operator="subtract" field="week1">
<number value="3"/>
</calcop>
</calculate>
diff --git a/applications/order/minilang/reports/SalesReportEvent.xml b/applications/order/minilang/reports/SalesReportEvent.xml
index dc89d12..a8123e1 100644
--- a/applications/order/minilang/reports/SalesReportEvent.xml
+++ b/applications/order/minilang/reports/SalesReportEvent.xml
@@ -61,7 +61,7 @@
<if-not-empty field="thruWeek">
<if-compare field="thruWeek" operator="less-equals" value="3" type="Integer">
<calculate field="lastYear">
- <calcop field="thisYear" operator="subtract">
+ <calcop operator="subtract" field="thisYear">
<number value="1"/>
</calcop>
</calculate>
@@ -93,7 +93,7 @@
</entity-condition>
<else>
<calculate field="fromWeek">
- <calcop field="thruWeek" operator="subtract">
+ <calcop operator="subtract" field="thruWeek">
<number value="3"/>
</calcop>
</calculate>
@@ -132,7 +132,7 @@
<if-not-empty field="thruMonth">
<if-compare field="thruMonth" operator="less-equals" value="3" type="Integer">
<calculate field="lastYear">
- <calcop field="thisYear" operator="subtract">
+ <calcop operator="subtract" field="thisYear">
<number value="1"/>
</calcop>
</calculate>
@@ -244,7 +244,7 @@
</if-compare>
<else>
<calculate field="fromMonth">
- <calcop field="thruMonth" operator="subtract">
+ <calcop operator="subtract" field="thruMonth">
<number value="3"/>
</calcop>
</calculate>
diff --git a/applications/order/minilang/request/CustRequestServices.xml b/applications/order/minilang/request/CustRequestServices.xml
index a5bc71e..ffd05f3 100644
--- a/applications/order/minilang/request/CustRequestServices.xml
+++ b/applications/order/minilang/request/CustRequestServices.xml
@@ -106,7 +106,7 @@
</simple-method>
<simple-method method-name="deleteCustRequest" short-description="Delete a draft Customer Request with no relations yet">
- <entity-one value-field="custRequest" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest"/>
<if-compare operator="not-equals" value="CRQ_DRAFT" field="custRequest.statusId">
<add-error ><fail-property resource="OrderErrorUiLabels" property="OrderCheckCustRequestDraftStatusForDelete"/></add-error>
</if-compare>
@@ -175,7 +175,7 @@
<field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
</entity-and>
<if-not-empty field="custRequestItems">
- <first-from-list entry="custRequestItem" list="custRequestItems"/>
+ <first-from-list list="custRequestItems" entry="custRequestItem"/>
<set-service-fields service-name="updateCustRequestItem" to-map="updateItem" map="custRequestItem"/>
<set field="updateItem.story" from-field="parameters.story"/>
<call-service service-name="updateCustRequestItem" in-map-name="updateItem"/>
@@ -420,7 +420,7 @@
<entity-one entity-name="CustRequestItem" value-field="custRequestItem" auto-field-map="true"/>
<check-errors/>
- <set-service-fields service-name="createCustRequestItem" to-map="createCustRequestItemInMap" map="custRequestItem"/>
+ <set-service-fields service-name="createCustRequestItem" map="custRequestItem" to-map="createCustRequestItemInMap"/>/>
<set field="createCustRequestItemInMap.custRequestId" from-field="parameters.custRequestIdTo"/>
<set field="createCustRequestItemInMap.custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/>
<if-empty field="parameters.custRequestIdTo">
@@ -440,7 +440,7 @@
<get-related value-field="custRequestItem" relation-name="QuoteItem" list="quoteItems"/>
<iterate list="quoteItems" entry="quoteItem">
<clear-field field="createQuoteItemInMap"/>
- <set-service-fields service-name="createQuoteItem" to-map="createQuoteItemInMap" map="quoteItem"/>
+ <set-service-fields service-name="createQuoteItem" map="quoteItem" to-map="createQuoteItemInMap"/>/>
<set field="createQuoteItemInMap.custRequestId" from-field="custRequestIdTo"/>
<set field="createQuoteItemInMap.custRequestItemSeqId" from-field="custRequestItemSeqId"/>
<clear-field field="createQuoteItemInMap.quoteItemSeqId"/>
diff --git a/applications/order/minilang/requirement/RequirementServices.xml b/applications/order/minilang/requirement/RequirementServices.xml
index 832e2a3..fdebcd5 100644
--- a/applications/order/minilang/requirement/RequirementServices.xml
+++ b/applications/order/minilang/requirement/RequirementServices.xml
@@ -168,7 +168,7 @@
<set field="inputMap.quantity" from-field="requirement.quantity"/>
<set field="inputMap.sendDate" from-field="requirement.requiredByDate"/>
<call-service service-name="createInventoryTransfersForProduct" in-map-name="inputMap">
- <result-to-field field="quantityNotTransferred" result-name="quantityNotTransferred"/>
+ <result-to-field result-name="quantityNotTransferred" field="quantityNotTransferred"/>
</call-service>
<check-errors/>
<if-compare field="quantityNotTransferred" value="0.0" operator="greater" type="BigDecimal">
diff --git a/applications/order/minilang/shoppinglist/ShoppingListServices.xml b/applications/order/minilang/shoppinglist/ShoppingListServices.xml
index 9cb05e2..8e7e563 100644
--- a/applications/order/minilang/shoppinglist/ShoppingListServices.xml
+++ b/applications/order/minilang/shoppinglist/ShoppingListServices.xml
@@ -154,7 +154,7 @@
<store-value value-field="shoppingList"/>
</if-compare-field>
<else>
- <first-from-list entry="shoppingListItem" list="shoppingListItems"/>
+ <first-from-list list="shoppingListItems" entry="shoppingListItem"/>
<calculate field="totalquantity" >
<calcop operator="add" field="shoppingListItem.quantity">
<calcop operator="get" field="parameters.quantity"/>
@@ -252,7 +252,7 @@
</if-not-empty>
<set field="itemPrice" from-field="shoppingListItem.modifiedPrice" default-value="${calcPriceOutMap.price}"/>
<calculate field="totalPrice">
- <calcop field="totalPrice" operator="add"/>
+ <calcop operator="add" field="totalPrice"/>
<calcop operator="multiply">
<calcop operator="get" field="itemPrice"/>
<calcop operator="get" field="shoppingListItem.quantity"/>
@@ -272,8 +272,8 @@
<result-to-field result-name="totalPrice" field="calcPriceOutMap.totalPrice"/>
</call-service>
<calculate field="totalPrice">
- <calcop field="totalPrice" operator="get"/>
- <calcop field="calcPriceOutMap.totalPrice" operator="get"/>
+ <calcop operator="get" field="totalPrice"/>
+ <calcop operator="get" field="calcPriceOutMap.totalPrice"/>
</calculate>
<clear-field field="calcChildPriceInMap"/>
</iterate>
diff --git a/applications/order/minilang/test/QuoteTests.xml b/applications/order/minilang/test/QuoteTests.xml
index 06eebea..198d249 100644
--- a/applications/order/minilang/test/QuoteTests.xml
+++ b/applications/order/minilang/test/QuoteTests.xml
@@ -40,7 +40,7 @@
</assert>
<!-- Confirm the database changes -->
- <entity-one value-field="quoteWorkEffort" entity-name="QuoteWorkEffort">
+ <entity-one entity-name="QuoteWorkEffort" value-field="quoteWorkEffort">
<field-map field-name="quoteId" from-field="serviceCtx.quoteId"/>
<field-map field-name="workEffortId" from-field="serviceCtx.workEffortId"/>
</entity-one>
@@ -75,7 +75,7 @@
<assert><if-compare field="serviceResult.responseMessage" operator="equals" value="error"/></assert>
<!-- Confirm the database changes, in this case nothing should have changed -->
- <entity-condition list="quoteWorkEfforts" entity-name="QuoteWorkEffort">
+ <entity-condition entity-name="QuoteWorkEffort" list="quoteWorkEfforts">
<condition-list>
<condition-expr field-name="lastUpdatedStamp" operator="greater-equals" from-field="startTime"/>
<condition-expr field-name="quoteId" from-field="serviceCtx.quoteId"/>
@@ -118,7 +118,7 @@
<assert>
<not><if-empty field="workEfforts"/></not>
</assert>
- <entity-one value-field="quoteWorkEffort" entity-name="QuoteWorkEffort">
+ <entity-one entity-name="QuoteWorkEffort" value-field="quoteWorkEffort">
<field-map field-name="quoteId" from-field="serviceCtx.quoteId"/>
<field-map field-name="workEffortId" from-field="serviceResult.workEffortId"/>
</entity-one>
@@ -145,7 +145,7 @@
<field-map field-name="quoteId" from-field="serviceCtx.quoteId"/>
<field-map field-name="quoteItemSeqId" from-field="serviceCtx.quoteItemSeqId"/>
</entity-and>
- <first-from-list entry="quoteTerm" list="quoteTermList"/>
+ <first-from-list list="quoteTermList" entry="quoteTerm"/>
<assert>
<not><if-empty field="quoteTerm"/></not>
<if-compare-field operator="equals" to-field="quoteTerm.termTypeId" field="serviceCtx.termTypeId"/>
@@ -174,7 +174,7 @@
<results-to-map map-name="serviceResult"/>
</call-service>
<!-- Confirm that a matching Quoteterm was updated -->
- <entity-one value-field="quoteTerm" entity-name="QuoteTerm">
+ <entity-one entity-name="QuoteTerm" value-field="quoteTerm">
<field-map field-name="termTypeId" from-field="serviceCtx.termTypeId"/>
<field-map field-name="quoteId" from-field="serviceCtx.quoteId"/>
<field-map field-name="quoteItemSeqId" from-field="serviceCtx.quoteItemSeqId"/>
@@ -202,7 +202,7 @@
<call-service service-name="deleteQuoteTerm" in-map-name="serviceCtx">
<results-to-map map-name="serviceResult"/>
</call-service>
- <entity-one value-field="quoteTerm" entity-name="QuoteTerm">
+ <entity-one entity-name="QuoteTerm" value-field="quoteTerm">
<field-map field-name="termTypeId" from-field="serviceCtx.termTypeId"/>
<field-map field-name="quoteId" from-field="serviceCtx.quoteId"/>
<field-map field-name="quoteItemSeqId" from-field="serviceCtx.quoteItemSeqId"/>
diff --git a/applications/order/minilang/test/ShoppingCartTests.xml b/applications/order/minilang/test/ShoppingCartTests.xml
index 9817a07..f152043 100644
--- a/applications/order/minilang/test/ShoppingCartTests.xml
+++ b/applications/order/minilang/test/ShoppingCartTests.xml
@@ -618,7 +618,7 @@
<field field="testParams" type="java.util.Map"/>
</call-object-method>
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="DemoCustomer"/>
</entity-one>
<script>groovy:
@@ -664,11 +664,11 @@
<field field="response" type="javax.servlet.http.HttpServletResponse"/>
</call-class-method>
<log level="info" message="===== >>> Event : destroyCart, Response = ${result}"/>
- <entity-condition list="orderHeaders" entity-name="OrderHeader">
+ <entity-condition entity-name="OrderHeader" list="orderHeaders">
<condition-expr field-name="orderTypeId" value="SALES_ORDER"/>
<order-by field-name="-entryDate"/>
</entity-condition>
- <first-from-list entry="orderHeader" list="orderHeaders"/>
+ <first-from-list list="orderHeaders" entry="orderHeader"/>
<set field="orderId" from-field="orderHeader.orderId"/>
<log level="info" message="======== Test order with id: [${orderId}] has been approved: [${approved}]========"/>
@@ -703,7 +703,7 @@
<field-map field-name="orderId" from-field="orderMap.orderId"/>
<field-map field-name="productId" value="GZ-2644"/>
</entity-and>
- <first-from-list entry="orderItem" list="orderItems"/>
+ <first-from-list list="orderItems" entry="orderItem"/>
<set field="map.orderId" from="orderMap.orderId"/>
<set field="map.contactMechId" value="9015"/>
diff --git a/applications/order/widget/ordermgr/CustRequestForms.xml b/applications/order/widget/ordermgr/CustRequestForms.xml
index 635f902..b5fa011 100644
--- a/applications/order/widget/ordermgr/CustRequestForms.xml
+++ b/applications/order/widget/ordermgr/CustRequestForms.xml
@@ -115,7 +115,7 @@
<field name="lastModifiedDate" sort-field="true"><display/></field>
<!--field name="statusId"><hidden value="CRQ_REJECTED"/></field-->
<field name="rejectButton">
- <hyperlink target="setCustRequestStatus" description="${uiLabelMap.FormFieldTitle_rejectButton}">
+ <hyperlink description="${uiLabelMap.FormFieldTitle_rejectButton}" target="setCustRequestStatus">
<parameter param-name="custRequestId"/>
<parameter param-name="statusId" value="CRQ_REJECTED"/>
</hyperlink>
@@ -226,7 +226,7 @@
<form name="ViewRequestWorkEfforts" type="list" list-name="requestWorkEfforts"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="workEffortId">
- <hyperlink target="/workeffort/control/WorkEffortSummary" description="${workEffortName} [${workEffortId}]" target-type="inter-app">
+ <hyperlink description="${workEffortName} [${workEffortId}]" target="/workeffort/control/WorkEffortSummary" target-type="inter-app">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
@@ -552,7 +552,7 @@
<field name="custRequestTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="CustRequestType"/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
<field name="fromPartyId" title="${uiLabelMap.PartyPartyId}">
- <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultTo.fullName} [${custRequest.fromPartyId}]">
+ <hyperlink description="${partyNameResultTo.fullName} [${custRequest.fromPartyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
<parameter param-name="partyId" from-field="custRequest.fromPartyId"/>
</hyperlink>
</field>
@@ -641,7 +641,7 @@
<field name="mimeTypeId"><display/></field>
<field name="fromDate"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext" use-when="tabButtonItem!=void&&tabButtonItem.equals("custRequestContent")">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteCustRequestContent">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteCustRequestContent" also-hidden="false">
<parameter param-name="custRequestId"/>
<parameter param-name="contentId"/>
<parameter param-name="fromDate"/>
diff --git a/applications/order/widget/ordermgr/CustRequestScreens.xml b/applications/order/widget/ordermgr/CustRequestScreens.xml
index d9c6700..170ab0b 100644
--- a/applications/order/widget/ordermgr/CustRequestScreens.xml
+++ b/applications/order/widget/ordermgr/CustRequestScreens.xml
@@ -534,7 +534,7 @@
<actions>
<set field="custRequestSortField" from-field="parameters.custRequestSortField" default-value="-custRequestDate"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
- <entity-condition list="custRequests" entity-name="CustReqAndTypeAndPartyRel">
+ <entity-condition entity-name="CustReqAndTypeAndPartyRel" list="custRequests">
<condition-list combine="and">
<condition-expr field-name="statusId" operator="equals" value="CRQ_SUBMITTED"/>
<condition-list combine="and">
@@ -586,7 +586,7 @@
</condition>
<actions>
<set field="screenletTitle" from-field="uiLabelMap.OrderOpenMyCustomerRequests"/>
- <entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
+ <entity-condition entity-name="CustRequestInfoAndWorkEffortAndPartyRel" list="custRequests">
<condition-list combine="and">
<condition-expr field-name="partyIdFrom" operator="equals" from-field="myCompanyId" ignore-if-empty="true"/>
<condition-expr field-name="fromPartyId" operator="equals" from-field="fromPartyId" ignore-if-empty="true"/>
@@ -609,7 +609,7 @@
</condition>
<actions>
<set field="screenletTitle" from-field="uiLabelMap.OrderCompletedMyCustomerRequests"/>
- <entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
+ <entity-condition entity-name="CustRequestInfoAndWorkEffortAndPartyRel" list="custRequests">
<condition-list combine="and">
<condition-expr field-name="partyIdFrom" operator="equals" from-field="myCompanyId" ignore-if-empty="true"/>
<condition-expr field-name="fromPartyId" operator="equals" from-field="fromPartyId" ignore-if-empty="true"/>
@@ -627,7 +627,7 @@
</condition>
<actions>
<set field="screenletTitle" from-field="uiLabelMap.OrderCancelledMyCustomerRequests"/>
- <entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
+ <entity-condition entity-name="CustRequestInfoAndWorkEffortAndPartyRel" list="custRequests">
<condition-list combine="and">
<condition-expr field-name="partyIdFrom" operator="equals" from-field="myCompanyId" ignore-if-null="true"/>
<condition-expr field-name="fromPartyId" operator="equals" from-field="fromPartyId" ignore-if-empty="true"/>
diff --git a/applications/order/widget/ordermgr/FieldLookupForms.xml b/applications/order/widget/ordermgr/FieldLookupForms.xml
index b2e200d..dae633e 100644
--- a/applications/order/widget/ordermgr/FieldLookupForms.xml
+++ b/applications/order/widget/ordermgr/FieldLookupForms.xml
@@ -100,14 +100,14 @@
<field name="postalCode"><text-find/></field>
<field name="countryGeoId">
<drop-down allow-empty="true">
- <entity-options entity-name="Geo" description="${geoName}" key-field-name="geoId">
+ <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}">
<entity-constraint name="geoTypeId" value="COUNTRY"/>
</entity-options>
</drop-down>
</field>
<field name="stateProvinceGeoId">
<drop-down allow-empty="true">
- <entity-options entity-name="Geo" description="${geoName}" key-field-name="geoId">
+ <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}">
<entity-constraint name="geoTypeId" value="STATE"/>
</entity-options>
</drop-down>
@@ -129,7 +129,7 @@
</actions>
<auto-fields-entity entity-name="OrderHeaderAndShipGroups" default-field-type="hidden"/>
<field name="orderId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${orderId}" target="javascript:set_value('${orderId}')"/>
+ <hyperlink description="${orderId}" target="javascript:set_value('${orderId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="orderTypeId"><display-entity entity-name="OrderType"/></field>
<field name="partyId"><display/></field>
@@ -167,14 +167,14 @@
<field name="postalCode"><text-find/></field>
<field name="countryGeoId">
<drop-down allow-empty="true">
- <entity-options entity-name="Geo" description="${geoName}" key-field-name="geoId">
+ <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}">
<entity-constraint name="geoTypeId" value="COUNTRY"/>
</entity-options>
</drop-down>
</field>
<field name="stateProvinceGeoId">
<drop-down allow-empty="true">
- <entity-options entity-name="Geo" description="${geoName}" key-field-name="geoId">
+ <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}">
<entity-constraint name="geoTypeId" value="STATE"/>
</entity-options>
</drop-down>
@@ -245,7 +245,7 @@
</actions>
<auto-fields-entity entity-name="CustRequest" default-field-type="hidden"/>
<field name="custRequestId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${custRequestId}" target="javascript:set_value('${custRequestId}')"/>
+ <hyperlink description="${custRequestId}" target="javascript:set_value('${custRequestId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="custRequestName"><display/></field>
<field name="priority"><display/></field>
@@ -291,7 +291,7 @@
<auto-fields-entity entity-name="CustRequestItem" default-field-type="hidden"/>
<field name="custRequestId"><display/></field>
<field name="custRequestItemSeqId" widget-style="buttontext" >
- <hyperlink also-hidden="false" target-type="plain" description="${custRequestItemSeqId}" target="javascript:set_value('${custRequestItemSeqId}')"/>
+ <hyperlink description="${custRequestItemSeqId}" target="javascript:set_value('${custRequestItemSeqId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="priority"><display/></field>
<field name="custRequestResolutionId"><display-entity also-hidden="false" entity-name="CustRequestResolution"/></field>
@@ -351,7 +351,7 @@
</actions>
<auto-fields-entity entity-name="Quote" default-field-type="display"/>
<field name="quoteId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${quoteId}" target="javascript:set_value('${quoteId}')"/>
+ <hyperlink description="${quoteId}" target="javascript:set_value('${quoteId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="quoteTypeId" title="${uiLabelMap.OrderOrderQuoteTypeId}"><display-entity entity-name="QuoteType"/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity also-hidden="false" entity-name="StatusItem"/></field>
@@ -418,15 +418,15 @@
</actions>
<auto-fields-entity entity-name="QuoteItem" default-field-type="display"/>
<field name="quoteId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${quoteId}" target="javascript:set_value('${quoteId}')"/>
+ <hyperlink description="${quoteId}" target="javascript:set_value('${quoteId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="quoteId"><hidden/></field>
<field name="quoteItemSeqId"><hidden/></field>
<field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${groovy:isPromo==null}">
- <hyperlink also-hidden="false" target-type="plain" description="${quoteItemSeqId}" target="javascript:set_value('${quoteItemSeqId}')"/>
+ <hyperlink description="${quoteItemSeqId}" target="javascript:set_value('${quoteItemSeqId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${groovy: 'N'.equals(isPromo)}">
- <hyperlink also-hidden="false" target-type="plain" description="${quoteItemSeqId}" target="javascript:set_value('${quoteItemSeqId}')"/>
+ <hyperlink description="${quoteItemSeqId}" target="javascript:set_value('${quoteItemSeqId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" use-when="${groovy: 'Y'.equals(isPromo)}"><display/></field>
<field name="productId">
diff --git a/applications/order/widget/ordermgr/OrderEntryForms.xml b/applications/order/widget/ordermgr/OrderEntryForms.xml
index 6323b62..bf17a2a1 100644
--- a/applications/order/widget/ordermgr/OrderEntryForms.xml
+++ b/applications/order/widget/ordermgr/OrderEntryForms.xml
@@ -89,7 +89,7 @@
<auto-fields-entity entity-name="Quote" default-field-type="display"/>
<field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${quoteId}" target="loadCartFromQuote">
+ <hyperlink description="${quoteId}" target="loadCartFromQuote" also-hidden="false">
<parameter param-name="quoteId"/>
</hyperlink>
</field>
@@ -112,12 +112,12 @@
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="addFromList" title=" " widget-style="buttontext">
- <hyperlink target="addFromShoppingList" description="${uiLabelMap.OrderToAddSelectedItemsToShoppingList}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.OrderToAddSelectedItemsToShoppingList}" target="addFromShoppingList" also-hidden="false">
<parameter param-name="shoppingListId"/>
</hyperlink>
</field>
<field name="addAllFromList" title=" " widget-style="buttontext">
- <hyperlink target="addAllFromShoppingList" description="${uiLabelMap.OrderQuickAdd}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.OrderQuickAdd}" target="addAllFromShoppingList" also-hidden="false">
<parameter param-name="shoppingListId"/>
</hyperlink>
</field>
@@ -129,7 +129,7 @@
<display-entity entity-name="Product" description="${productId} - ${description}"/>
</field>
<field name="addToCart" title=" " widget-style="buttontext">
- <hyperlink target="additem/editShoppingList" description="${uiLabelMap.CommonAdd} ${quantity} ${uiLabelMap.OrderAddQntToOrder}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonAdd} ${quantity} ${uiLabelMap.OrderAddQntToOrder}" target="additem/editShoppingList" also-hidden="false">
<parameter param-name="shoppingListId"/>
<parameter param-name="shoppingListItemSeqId"/>
<parameter param-name="add_product_id" from-field="productId"/>
@@ -140,12 +140,12 @@
</form>
<form name="AddFromShoppingListAll" type="single" target="">
<field name="addAllFromList" title=" " widget-style="buttontext">
- <hyperlink target="addAllFromShoppingList" description="${uiLabelMap.OrderQuickAdd}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.OrderQuickAdd}" target="addAllFromShoppingList" also-hidden="false">
<parameter param-name="shoppingListId"/>
</hyperlink>
</field>
<field name="returnToOrderEntry" title=" " widget-style="buttontext">
- <hyperlink target="orderentry" description="${uiLabelMap.OrderOrderReturn}" also-hidden="false"/>
+ <hyperlink description="${uiLabelMap.OrderOrderReturn}" target="orderentry" also-hidden="false"/>
</field>
</form>
diff --git a/applications/order/widget/ordermgr/OrderForms.xml b/applications/order/widget/ordermgr/OrderForms.xml
index f7bfcbc..6c5630e 100644
--- a/applications/order/widget/ordermgr/OrderForms.xml
+++ b/applications/order/widget/ordermgr/OrderForms.xml
@@ -88,7 +88,7 @@
</actions>
<auto-fields-entity entity-name="OrderHeader" default-field-type="display"/>
<field name="orderId" widget-style="buttontext">
- <hyperlink target="EditOrderHeader" description="[${orderId}]">
+ <hyperlink description="[${orderId}]" target="EditOrderHeader">
<parameter param-name="orderId"/>
</hyperlink>
</field>
@@ -103,7 +103,7 @@
<field name="orderItemSeqId"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeOrderTerm" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeOrderTerm" also-hidden="false">
<parameter param-name="orderId"/>
<parameter param-name="termTypeId"/>
<parameter param-name="orderItemSeqId"/>
@@ -240,7 +240,7 @@
<display-entity entity-name="OrderType"/>
</field>
<field name="orderId" title="${uiLabelMap.OrderOrderId}">
- <hyperlink target="orderview" description="${orderId}">
+ <hyperlink description="${orderId}" target="orderview">
<parameter param-name="orderId"/>
</hyperlink>
</field>
diff --git a/applications/order/widget/ordermgr/OrderReturnScreens.xml b/applications/order/widget/ordermgr/OrderReturnScreens.xml
index b6160ed..b397f72 100644
--- a/applications/order/widget/ordermgr/OrderReturnScreens.xml
+++ b/applications/order/widget/ordermgr/OrderReturnScreens.xml
@@ -110,7 +110,7 @@
<actions>
<set field="titleProperty" value="PageTitleReturnList"/>
<set field="headerItem" value="return"/>
- <entity-condition list="returnList" entity-name="ReturnHeader"/>
+ <entity-condition entity-name="ReturnHeader" list="returnList"/>
</actions>
<widgets>
<decorator-screen name="CommonOrderReturnDecorator" location="${parameters.orderReturnDecoratorLocation}">
diff --git a/applications/order/widget/ordermgr/QuoteForms.xml b/applications/order/widget/ordermgr/QuoteForms.xml
index 9766b4e..1a72272 100644
--- a/applications/order/widget/ordermgr/QuoteForms.xml
+++ b/applications/order/widget/ordermgr/QuoteForms.xml
@@ -85,7 +85,7 @@
</actions>
<auto-fields-entity entity-name="Quote" default-field-type="display"/>
<field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${quoteId}" target="ViewQuote">
+ <hyperlink description="${quoteId}" target="ViewQuote" also-hidden="false">
<parameter param-name="quoteId"/>
</hyperlink>
</field>
@@ -165,7 +165,7 @@
<field name="roleTypeId" title="${uiLabelMap.PartyRoleType}"><display-entity also-hidden="false" entity-name="RoleType"/></field>
<field name="quoteId"><hidden/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeQuoteRole" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeQuoteRole" also-hidden="false">
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
<parameter param-name="quoteId"/>
@@ -193,13 +193,13 @@
<field name="quoteId"><hidden/></field>
<field name="quoteItemSeqId"><hidden/></field>
<field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${groovy:isPromo==null}">
- <hyperlink also-hidden="false" description="${quoteItemSeqId}" target="EditQuoteItem">
+ <hyperlink description="${quoteItemSeqId}" target="EditQuoteItem" also-hidden="false">
<parameter param-name="quoteId"/>
<parameter param-name="quoteItemSeqId"/>
</hyperlink>
</field>
<field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${groovy: 'N'.equals(isPromo)}">
- <hyperlink also-hidden="false" description="${quoteItemSeqId}" target="EditQuoteItem">
+ <hyperlink description="${quoteItemSeqId}" target="EditQuoteItem" also-hidden="false">
<parameter param-name="quoteId"/>
<parameter param-name="quoteItemSeqId"/>
</hyperlink>
@@ -220,14 +220,14 @@
<field name="uomId"><hidden/></field>
<!--<field name="custRequestId"><display description="${custRequestId} - ${custRequestItemSeqId}"/></field>-->
<field name="custRequestId" title="${uiLabelMap.CommonViewRequest}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${custRequestId}-${custRequestItemSeqId}" target="requestitem">
+ <hyperlink description="${custRequestId}-${custRequestItemSeqId}" target="requestitem" also-hidden="false">
<parameter param-name="custRequestId"/>
<parameter param-name="custRequestItemSeqId"/>
</hyperlink>
</field>
<field name="custRequestItemSeqId"><hidden/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeQuoteItem" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeQuoteItem" also-hidden="false">
<parameter param-name="quoteItemSeqId"/>
<parameter param-name="quoteId"/>
</hyperlink>
@@ -284,7 +284,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="ListQuoteAttributes">
<auto-fields-entity entity-name="QuoteAttribute" default-field-type="display"/>
<field name="attrName" title="${uiLabelMap.OrderOrderQuoteAttributeName}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${attrName}" target="EditQuoteAttribute">
+ <hyperlink description="${attrName}" target="EditQuoteAttribute" also-hidden="false">
<parameter param-name="quoteId"/>
<parameter param-name="attrName"/>
</hyperlink>
@@ -292,7 +292,7 @@
<field name="attrValue" title="${uiLabelMap.OrderOrderQuoteAttributeValue}"></field>
<field name="quoteId"><hidden/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeQuoteAttribute" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeQuoteAttribute" also-hidden="false">
<parameter param-name="attrName"/>
<parameter param-name="quoteId"/>
</hyperlink>
@@ -313,7 +313,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="ListQuoteCoefficients">
<auto-fields-entity entity-name="QuoteCoefficient" default-field-type="display"/>
<field name="coeffName" title="${uiLabelMap.OrderOrderQuoteCoeffName}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${coeffName}" target="EditQuoteCoefficient">
+ <hyperlink description="${coeffName}" target="EditQuoteCoefficient" also-hidden="false">
<parameter param-name="quoteId"/>
<parameter param-name="coeffName"/>
</hyperlink>
@@ -321,7 +321,7 @@
<field name="coeffValue" title="${uiLabelMap.OrderOrderQuoteCoeffValue}"></field>
<field name="quoteId"><hidden/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeQuoteCoefficient" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeQuoteCoefficient" also-hidden="false">
<parameter param-name="coeffName"/>
<parameter param-name="quoteId"/>
</hyperlink>
@@ -348,7 +348,7 @@
<field name="custRequestItemSeqId"><hidden/></field>
<field name="quoteId"><hidden/></field>
<field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext">
- <hyperlink also-hidden="true" description="${quoteItemSeqId}" target="EditQuoteItem">
+ <hyperlink description="${quoteItemSeqId}" target="EditQuoteItem" also-hidden="true">
<parameter param-name="quoteId"/>
<parameter param-name="quoteItemSeqId"/>
</hyperlink>
@@ -382,7 +382,7 @@
<field name="createdDate"><hidden/></field>
<field name="createdByUserLogin"><hidden/></field>
<field name="quoteAdjustmentId" title="${uiLabelMap.OrderOrderQuoteAdjustmentId}" widget-style="buttontext" use-when="${groovy:productPromoId==null}">
- <hyperlink also-hidden="false" description="${quoteAdjustmentId}" target="EditQuoteAdjustment">
+ <hyperlink description="${quoteAdjustmentId}" target="EditQuoteAdjustment" also-hidden="false">
<parameter param-name="quoteId"/>
<parameter param-name="quoteAdjustmentId"/>
</hyperlink>
@@ -392,7 +392,7 @@
<display-entity entity-name="OrderAdjustmentType" key-field-name="orderAdjustmentTypeId"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeQuoteAdjustment" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeQuoteAdjustment" also-hidden="false">
<parameter param-name="quoteAdjustmentId"/>
<parameter param-name="quoteId"/>
</hyperlink>
@@ -437,7 +437,7 @@
<field name="custRequestItemSeqId"><hidden/></field>
<field name="quoteId"><hidden/></field>
<field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext">
- <hyperlink also-hidden="true" description="${quoteItemSeqId}" target="EditQuoteItem">
+ <hyperlink description="${quoteItemSeqId}" target="EditQuoteItem" also-hidden="true">
<parameter param-name="quoteId"/>
<parameter param-name="quoteItemSeqId"/>
</hyperlink>
@@ -470,7 +470,7 @@
<display-entity entity-name="Uom" key-field-name="uomId"/>
</field>
<field name="editLink" title=" " widget-style="buttontext">
- <hyperlink target="EditQuoteTerm" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditQuoteTerm" also-hidden="false">
<parameter param-name="termTypeId"/>
<parameter param-name="quoteItemSeqId"/>
<parameter param-name="quoteId"/>
@@ -479,7 +479,7 @@
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteQuoteTerm" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteQuoteTerm" also-hidden="false">
<parameter param-name="termTypeId"/>
<parameter param-name="quoteItemSeqId"/>
<parameter param-name="quoteId"/>
@@ -488,7 +488,7 @@
</form>
<form name="ListQuoteTermItem" extends="ListQuoteTerms">
<field name="editLink" title=" " widget-style="buttontext">
- <hyperlink target="EditQuoteTermItem" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditQuoteTermItem" also-hidden="false">
<parameter param-name="termTypeId"/>
<parameter param-name="quoteItemSeqId"/>
<parameter param-name="quoteId"/>
@@ -497,7 +497,7 @@
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteQuoteTermFromItem" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteQuoteTermFromItem" also-hidden="false">
<parameter param-name="termTypeId"/>
<parameter param-name="quoteItemSeqId"/>
<parameter param-name="quoteId"/>
@@ -555,7 +555,7 @@
<field name="quoteId"><hidden/></field>
<field name="noteId"><hidden/></field>
<field name="editLink" title=" " widget-style="buttontext">
- <hyperlink target="EditQuoteNote" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditQuoteNote" also-hidden="false">
<parameter param-name="quoteId"/>
<parameter param-name="noteId"/>
</hyperlink>
diff --git a/applications/order/widget/ordermgr/QuoteScreens.xml b/applications/order/widget/ordermgr/QuoteScreens.xml
index b08b06e..c93a798 100644
--- a/applications/order/widget/ordermgr/QuoteScreens.xml
+++ b/applications/order/widget/ordermgr/QuoteScreens.xml
@@ -748,7 +748,7 @@
<entity-and entity-name="QuoteItem" list="quoteItemList">
<field-map field-name="quoteId" from-field="parameters.quoteId"/>
</entity-and>
- <entity-one value-field="quote" entity-name="Quote">
+ <entity-one entity-name="Quote" value-field="quote">
<field-map field-name="quoteId" from-field="parameters.quoteId"/>
</entity-one>
<set field="quoteStatusId" from-field="quote.statusId"/>
diff --git a/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml b/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
index ea4a08a..8181301 100644
--- a/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
+++ b/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
@@ -28,7 +28,7 @@
</actions>
<field name="quoteId"><hidden/></field>
<field name="workEffortId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${workEffortName} [${workEffortId}]" target="EditQuoteWorkEffort">
+ <hyperlink description="${workEffortName} [${workEffortId}]" target="EditQuoteWorkEffort" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="quoteId"/>
</hyperlink>
@@ -40,7 +40,7 @@
<field name="actualStartDate"><display/></field>
<field name="actualEndDate"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteQuoteWorkEffort">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteQuoteWorkEffort" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="quoteId"/>
</hyperlink>
diff --git a/applications/order/widget/ordermgr/ReportForms.xml b/applications/order/widget/ordermgr/ReportForms.xml
index 24fbc13..b81d585 100644
--- a/applications/order/widget/ordermgr/ReportForms.xml
+++ b/applications/order/widget/ordermgr/ReportForms.xml
@@ -131,7 +131,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="OpenOrderItemsReport">
<field name="orderDate" title="${uiLabelMap.OrderDate}"><display/></field>
<field name="orderId" title="${uiLabelMap.OrderOrderId}" widget-style="buttontext">
- <hyperlink target="orderview" description="${orderId}">
+ <hyperlink description="${orderId}" target="orderview">
<parameter param-name="orderId"/>
</hyperlink>
</field>
@@ -169,14 +169,14 @@
header-row-style="header-row" default-table-style="basic-table" target-window="_BLANK">
<field name="fromPartyId" title="${uiLabelMap.AccountingFromParty}">
<drop-down allow-empty="true">
- <entity-options entity-name="PartyRoleAndPartyDetail" description="${groupName} ${firstName} ${lastName} [${partyId}]" key-field-name="partyId">
+ <entity-options entity-name="PartyRoleAndPartyDetail" key-field-name="partyId" description="${groupName} ${firstName} ${lastName} [${partyId}]">
<entity-constraint name="roleTypeId" operator="equals" value="SUPPLIER"/>
</entity-options>
</drop-down>
</field>
<field name="toPartyId" title="${uiLabelMap.AccountingToPartyId}">
<check all-checked="false">
- <entity-options entity-name="PartyAcctgPrefAndGroup" description="${groupName} ${firstName} ${lastName} [${partyId}]" key-field-name="partyId"/>
+ <entity-options entity-name="PartyAcctgPrefAndGroup" key-field-name="partyId" description="${groupName} ${firstName} ${lastName} [${partyId}]"/>
</check>
</field>
<field name="orderStatusId">
diff --git a/applications/order/widget/ordermgr/RequirementForms.xml b/applications/order/widget/ordermgr/RequirementForms.xml
index 67c47f9..82b7bf7 100644
--- a/applications/order/widget/ordermgr/RequirementForms.xml
+++ b/applications/order/widget/ordermgr/RequirementForms.xml
@@ -236,7 +236,7 @@
<form name="ApproveRequirements" type="multi" use-row-submit="true" target="approveRequirements" title="" list-name="requirements"
paginate-target="ApproveRequirements" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="requirementId" widget-style="buttontext">
- <hyperlink also-hidden="true" description="${requirementId}" target="EditRequirement">
+ <hyperlink description="${requirementId}" target="EditRequirement" also-hidden="true">
<parameter param-name="requirementId"/>
</hyperlink>
</field>
@@ -300,12 +300,12 @@
</service>
</actions>
<field name="requirementId" widget-style="buttontext">
- <hyperlink also-hidden="true" description="${requirementId}" target="EditRequirement">
+ <hyperlink description="${requirementId}" target="EditRequirement" also-hidden="true">
<parameter param-name="requirementId"/>
</hyperlink>
</field>
<field name="productId" widget-style="buttontext">
- <hyperlink also-hidden="true" target-type="inter-app" description="${productId}" target="/catalog/control/EditProductInventoryItems" target-window="top">
+ <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" target-window="top" also-hidden="true" target-type="inter-app">
<parameter param-name="productId"/>
</hyperlink>
</field>
@@ -319,7 +319,7 @@
</display-entity>
</field>
<field name="supplierProductId" title="${uiLabelMap.ProductSupplierProductId}">
- <hyperlink target="/catalog/control/EditProductSuppliers?productId=${productId}" description="${supplierProductId}" target-type="inter-app"/>
+ <hyperlink description="${supplierProductId}" target="/catalog/control/EditProductSuppliers?productId=${productId}" target-type="inter-app"/>
</field>
<field name="idValue" title="${uiLabelMap.ProductUPCA}"><display/></field>
<field name="minimumOrderQuantity" widget-area-style="align-text"><display/></field>
@@ -334,12 +334,12 @@
<field name="billToCustomerPartyId"><hidden value="${parameters.billToCustomerPartyId}"/></field>
<field name="supplierPartyId"><hidden value="${parameters.partyId}"/></field>
<field name="requirementId" widget-style="buttontext">
- <hyperlink also-hidden="true" description="${requirementId}" target="EditRequirement">
+ <hyperlink description="${requirementId}" target="EditRequirement" also-hidden="true">
<parameter param-name="requirementId"/>
</hyperlink>
</field>
<field name="productId" widget-style="buttontext">
- <hyperlink also-hidden="true" target-type="inter-app" description="${productId}" target="/catalog/control/EditProductInventoryItems" target-window="top">
+ <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" target-window="top" also-hidden="true" target-type="inter-app">
<parameter param-name="productId"/>
</hyperlink>
</field>
@@ -367,7 +367,7 @@
header-row-style="header-row" default-table-style="basic-table">
<field name="orderId" id-name="orderId_o_0"><text/></field>
<field name="submitButton" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.OrderInputQuickPurchaseOrder}" target="javascript:document.ApprovedProductRequirements.orderId_o_0.value=document.ApprovedProductRequirementsSubmit.orderId_o_0.value;document.ApprovedProductRequirements.submit()"/>
+ <hyperlink description="${uiLabelMap.OrderInputQuickPurchaseOrder}" target="javascript:document.ApprovedProductRequirements.orderId_o_0.value=document.ApprovedProductRequirementsSubmit.orderId_o_0.value;document.ApprovedProductRequirements.submit()" also-hidden="false" target-type="plain"/>
</field>
</form>
<form name="ApprovedProductRequirementsSummary" type="single" default-map-name="quantityReport" target="ApprovedProductRequirements"
@@ -391,7 +391,7 @@
<field name="productId" title="${uiLabelMap.OrderVendorRequirementCount}" widget-area-style="align-text"><display also-hidden="false"/></field>
<field name="billToCustomerPartyId">
<drop-down allow-empty="false">
- <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${lastName} ${groupName} (${partyId})" key-field-name="partyId">
+ <entity-options entity-name="PartyRoleAndPartyDetail" key-field-name="partyId" description="${firstName} ${lastName} ${groupName} (${partyId})">
<entity-constraint name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
<entity-order-by field-name="firstName"/>
<entity-order-by field-name="lastName"/>
@@ -402,7 +402,7 @@
<field name="prepareFind"><hidden value="Y"/></field>
<field name="facilityId">
<drop-down allow-empty="false">
- <entity-options entity-name="Facility" description="${facilityName} (${facilityId})" key-field-name="facilityId">
+ <entity-options entity-name="Facility" key-field-name="facilityId" description="${facilityName} (${facilityId})">
<entity-order-by field-name="facilityName"/>
</entity-options>
</drop-down>
diff --git a/applications/party/minilang/communication/CommunicationEventServices.xml b/applications/party/minilang/communication/CommunicationEventServices.xml
index bf4973c..5acece7 100644
--- a/applications/party/minilang/communication/CommunicationEventServices.xml
+++ b/applications/party/minilang/communication/CommunicationEventServices.xml
@@ -135,7 +135,7 @@
<field-map field-name="contactMechId" from-field="newEntity.contactMechIdFrom"/>
<field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
</entity-and>
- <first-from-list entry="partyContactMech" list="partyContactMechs"/>
+ <first-from-list list="partyContactMechs" entry="partyContactMech"/>
<set field="newEntity.partyIdFrom" from-field="partyContactMech.partyId"/>
</if-not-empty>
</if-empty>
@@ -157,7 +157,7 @@
<field-map field-name="contactMechId" from-field="newEntity.contactMechIdTo"/>
<field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
</entity-and>
- <first-from-list entry="partyContactMech" list="partyContactMechs"/>
+ <first-from-list list="partyContactMechs" entry="partyContactMech"/>
<set field="newEntity.partyIdTo" from-field="partyContactMech.partyId"/>
</if-not-empty>
</if-empty>
@@ -261,7 +261,7 @@
<field-map field-name="contactMechId" from-field="parameters.contactMechIdTo"/>
<field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
</entity-and>
- <first-from-list entry="partyContactMech" list="partyContactMechs"/>
+ <first-from-list list="partyContactMechs" entry="partyContactMech"/>
<set field="parameters.partyIdTo" from-field="partyContactMech.partyId"/>
</if-not-empty>
</if-empty>
@@ -443,7 +443,7 @@
<field-map field-name="contactMechTypeId" from-field="communicationEventType.contactMechTypeId"/>
<order-by field-name="-fromDate"/>
</entity-and>
- <first-from-list entry="contactMech" list="contactMechs"/>
+ <first-from-list list="contactMechs" entry="contactMech"/>
<set field="newEntity.contactMechId" from-field="contactMech.contactMechId"/>
</if-not-empty>
</if-empty>
@@ -451,7 +451,7 @@
</if-empty>
</simple-method>
<simple-method method-name="updateCommunicationEventRole" short-description="Create a CommunicationEventRole">
- <entity-one value-field="eventRole" entity-name="CommunicationEventRole"/>
+ <entity-one entity-name="CommunicationEventRole" value-field="eventRole"/>
<if-not-empty field="eventRole">
<set-nonpk-fields map="parameters" value-field="eventRole"/>
<store-value value-field="eventRole"/>
@@ -558,7 +558,7 @@
</entity-one>
<if-not-empty field="communicationEventRole">
<if-compare operator="not-equals" value="COM_ROLE_COMPLETED" field="comunnicationEventRole.statusId">
- <set-service-fields service-name="updateCommunicationEventRole" to-map="updateRole" map="communicationEventRole"/>
+ <set-service-fields service-name="updateCommunicationEventRole" map="communicationEventRole" to-map="updateRole"/>/>
<set field="updateRole.statusId" value="COM_ROLE_COMPLETED"/>
<call-service service-name="updateCommunicationEventRole" in-map-name="updateRole"/>
@@ -580,7 +580,7 @@
<field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/>
<field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-and>
- <first-from-list entry="eventRole" list="communicationEventRoles"/>
+ <first-from-list list="communicationEventRoles" entry="eventRole"/>
<set field="parameters.roleTypeId" from-field="eventRole.roleTypeId"/>
<else>
<entity-one entity-name="CommunicationEventRole" value-field="eventRole"/>
diff --git a/applications/party/minilang/contact/PartyContactMechServices.xml b/applications/party/minilang/contact/PartyContactMechServices.xml
index 993685b..c12c273 100644
--- a/applications/party/minilang/contact/PartyContactMechServices.xml
+++ b/applications/party/minilang/contact/PartyContactMechServices.xml
@@ -80,7 +80,7 @@
<set-pk-fields value-field="partyContactMechMap" map="parameters"/>
<find-by-and entity-name="PartyContactMech" list="partyContactMechs" map="partyContactMechMap"/>
<filter-list-by-date list="partyContactMechs" to-list="validPartyContactMechs"/>
- <first-from-list entry="partyContactMech" list="validPartyContactMechs"/>
+ <first-from-list list="validPartyContactMechs" entry="partyContactMech"/>
<if-empty field="partyContactMech">
<add-error><fail-property resource="PartyUiLabels" property="PartyCannotUpdateContactBecauseNotWithSpecifiedParty"/></add-error>
</if-empty>
@@ -152,7 +152,7 @@
<set-pk-fields value-field="partyContactMechMap" map="parameters"/>
<find-by-and entity-name="PartyContactMech" list="partyContactMechs" map="partyContactMechMap"/>
<filter-list-by-date list="partyContactMechs" to-list="validPartyContactMechs"/>
- <first-from-list entry="partyContactMech" list="validPartyContactMechs"/>
+ <first-from-list list="validPartyContactMechs" entry="partyContactMech"/>
<if-empty field="partyContactMech">
<add-error>
<fail-property resource="PartyUiLabels" property="PartyContactMechNotFoundCannotDelete"/>
@@ -269,7 +269,7 @@
<check-errors/>
<!-- if e-mail address already exists simply return -->
- <entity-condition list="partyAndContactMechs" entity-name="PartyAndContactMech">
+ <entity-condition entity-name="PartyAndContactMech" list="partyAndContactMechs">
<condition-list combine="and">
<condition-expr field-name="partyId" from-field="parameters.partyId"/>
<condition-expr field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
@@ -279,7 +279,7 @@
<filter-list-by-date list="partyAndContactMechs"/>
<if-not-empty field="partyAndContactMechs">
<log level="info" message="E-mail address: ${parameters.emailAddress} already exists, did not add again.."/>
- <first-from-list entry="existsPartyAndContactMech" list="partyAndContactMechs"/>
+ <first-from-list list="partyAndContactMechs" entry="existsPartyAndContactMech"/>
<field-to-result field="existsPartyAndContactMech.contactMechId" result-name="contactMechId"/>
<field-to-request field="existsPartyAndContactMech.contactMechId" request-name="contactMechId"/>
<return/>
@@ -419,7 +419,7 @@
<simple-method method-name="createPostalAddressAndPurposes" short-description="Create postal address, purposes and set them defaults" login-required="false">
<if-not-empty field="parameters.roleTypeId">
- <entity-one value-field="partyRole" entity-name="PartyRole" />
+ <entity-one entity-name="PartyRole" value-field="partyRole" />
<if-empty field="partyRole">
<set field="roleTypeId" from-field="parameters.roleTypeId"/>
<add-error><fail-property resource="PartyUiLabels" property="PartyRoleTypeNotFoundForTheParty"/></add-error>
@@ -446,7 +446,7 @@
<field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
</entity-and>
<if-not-empty field="pcmpList">
- <first-from-list entry="pcmp" list="pcmpList"/>
+ <first-from-list list="pcmpList" entry="pcmp"/>
<set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/>
<call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
<clear-field field="serviceInMap"/>
@@ -465,7 +465,7 @@
<field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
</entity-and>
<if-not-empty field="pcmpList">
- <first-from-list entry="pcmp" list="pcmpList"/>
+ <first-from-list list="pcmpList" entry="pcmp"/>
<set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/>
<call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
</if-not-empty>
diff --git a/applications/party/minilang/customer/CustomerEvents.xml b/applications/party/minilang/customer/CustomerEvents.xml
index 5f8ebb0..006125c 100644
--- a/applications/party/minilang/customer/CustomerEvents.xml
+++ b/applications/party/minilang/customer/CustomerEvents.xml
@@ -262,7 +262,7 @@
<!-- the above copy is okay since we checked already that they are the same -->
<call-service service-name="createPersonAndUserLogin" in-map-name="personUserLoginContext">
<result-to-field result-name="partyId" field="tempMap.partyId"/>
- <result-to-field field="createdUserLogin" result-name="newUserLogin"/>
+ <result-to-field result-name="newUserLogin" field="createdUserLogin"/>
</call-service>
<set-current-user-login value-field="createdUserLogin"/>
diff --git a/applications/party/minilang/party/PartyInvitationServices.xml b/applications/party/minilang/party/PartyInvitationServices.xml
index ddb1406..c5b7a56 100644
--- a/applications/party/minilang/party/PartyInvitationServices.xml
+++ b/applications/party/minilang/party/PartyInvitationServices.xml
@@ -92,7 +92,7 @@
<if-not-empty field="partyInvitationRoleAssocs">
<set field="createPartyRoleCtx.partyId" from-field="parameters.partyId"/>
<iterate list="partyInvitationRoleAssocs" entry="partyInvitationRoleAssoc">
- <entity-one value-field="partyRole" entity-name="PartyRole">
+ <entity-one entity-name="PartyRole" value-field="partyRole">
<field-map field-name="roleTypeId" from-field="partyInvitationRoleAssoc.roleTypeId"/>
</entity-one>
<if-empty field="partyRole">
diff --git a/applications/party/minilang/party/PartyServices.xml b/applications/party/minilang/party/PartyServices.xml
index 499f279..bae36007 100644
--- a/applications/party/minilang/party/PartyServices.xml
+++ b/applications/party/minilang/party/PartyServices.xml
@@ -180,7 +180,7 @@
<simple-method method-name="createPartyIdentifications" short-description="create mass party identification with association between value and type">
<set field="partyIdentCtx.partyId" from-field="parameters.partyId"/>
<iterate-map key="key" value="value" map="parameters.identifications">
- <entity-one value-field="identificationType" entity-name="PartyIdentificationType" use-cache="true">
+ <entity-one entity-name="PartyIdentificationType" value-field="identificationType" use-cache="true">
<field-map field-name="partyIdentificationTypeId" from-field="value"/>
</entity-one>
<if-not-empty field="identificationType">
@@ -245,7 +245,7 @@
<!-- locate the file extension to use based on mime-type -->
<set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
<find-by-and entity-name="FileExtension" map="extenLookup" list="extensions"/>
- <first-from-list entry="extension" list="extensions"/>
+ <first-from-list list="extensions" entry="extension"/>
<set-service-fields service-name="createDataResource" map="parameters" to-map="dataResource"/>
<!-- create the data resource object -->
<set from-field="parameters._uploadedFile_fileName" field="dataResource.dataResourceName"/>
@@ -339,7 +339,7 @@
<!-- locate the file extension to use based on mime-type -->
<set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
<find-by-and entity-name="FileExtension" map="extenLookup" list="extensions"/>
- <first-from-list entry="extension" list="extensions"/>
+ <first-from-list list="extensions" entry="extension"/>
<set-service-fields service-name="createDataResource" map="parameters" to-map="dataResource"/>
<!-- create the data resource object -->
<!-- create the data resource object -->
@@ -619,7 +619,7 @@
</entity-and>
</if-empty>
<if-not-empty field="emailAddresses">
- <first-from-list entry="emailAddress" list="emailAddresses"/>
+ <first-from-list list="emailAddresses" entry="emailAddress"/>
<field-to-result field="emailAddress.infoString" result-name="emailAddress"/>
<field-to-result field="emailAddress.contactMechId" result-name="contactMechId"/>
</if-not-empty>
@@ -673,7 +673,7 @@
<else>
<find-by-and entity-name="PartyAndContactMech" map="findMap" list="telephoneAll1"/>
<filter-list-by-date list="telephoneAll1" to-list="telephoneAll2"/>
- <first-from-list entry="telephone" list="telephoneAll2"/>
+ <first-from-list list="telephoneAll2" entry="telephone"/>
<field-to-result field="telephone.contactMechId" result-name="contactMechId"/>
<if-not-empty field="telephone.tnCountryCode">
<field-to-result field="telephone.tnCountryCode" result-name="countryCode"/>
@@ -746,7 +746,7 @@
<else>
<find-by-and entity-name="PartyAndContactMech" map="findMap" list="addressAll1"/>
<filter-list-by-date list="addressAll1" to-list="addressAll2"/>
- <first-from-list entry="address" list="addressAll2"/>
+ <first-from-list list="addressAll2" entry="address"/>
<field-to-result field="address.contactMechId" result-name="contactMechId"/>
<if-not-empty field="address.paAddress1">
<field-to-result field="address.paAddress1" result-name="address1"/>
@@ -836,7 +836,7 @@
<simple-method method-name="createPartyRelationshipContactAccount" short-description="create a company/contact relationship and add the related roles">
<set field="roleMap.partyId" from-field="parameters.accountPartyId"/>
<set field="roleMap.roleTypeId" value="ACCOUNT"/>
- <entity-one value-field="partyRole" entity-name="PartyRole">
+ <entity-one entity-name="PartyRole" value-field="partyRole">
<field-map field-name="partyId" from-field="roleMap.partyId"/>
<field-map field-name="roleTypeId" from-field="roleMap.roleTypeId"/>
</entity-one>
@@ -845,7 +845,7 @@
</if-empty>
<set field="roleMap.partyId" from-field="parameters.contactPartyId"/>
<set field="roleMap.roleTypeId" value="CONTACT"/>
- <entity-one value-field="partyRole" entity-name="PartyRole">
+ <entity-one entity-name="PartyRole" value-field="partyRole">
<field-map field-name="partyId" from-field="roleMap.partyId"/>
<field-map field-name="roleTypeId" from-field="roleMap.roleTypeId"/>
</entity-one>
@@ -876,7 +876,7 @@
<entity-and entity-name="WebSite" list="webSites">
<field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/>
</entity-and>
- <first-from-list entry="webSite" list="webSites"/>
+ <first-from-list list="webSites" entry="webSite"/>
<if-not-empty field="storeEmail.bodyScreenLocation">
<entity-one entity-name="Person" value-field="person"/>
<set field="bodyParameters.person" from-field="person"/>
@@ -909,7 +909,7 @@
<entity-and entity-name="WebSite" list="webSites">
<field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/>
</entity-and>
- <first-from-list entry="webSite" list="webSites"/>
+ <first-from-list list="webSites" entry="webSite"/>
<if-not-empty field="storeEmail.bodyScreenLocation">
<if-not-empty field="parameters.updatedUserLogin.partyId">
<set field="partyId" from-field="parameters.updatedUserLogin.partyId"/>
@@ -923,7 +923,7 @@
<condition-expr field-name="partyId" operator="equals" from-field="partyId"/>
</condition-list>
</entity-condition>
- <first-from-list entry="partyContactDetailByPurpose" list="partyContactDetailByPurposes"/>
+ <first-from-list list="partyContactDetailByPurposes" entry="partyContactDetailByPurpose"/>
<entity-one entity-name="PartyAndPerson" value-field="partyAndPerson"/>
<set field="bodyParameters.partyAndPerson" from-field="partyAndPerson"/>
<set field="contactMechId" from-field="partyContactDetailByPurpose.contactMechId"/>
@@ -1043,7 +1043,7 @@
<entity-and entity-name="WebSite" list="webSites">
<field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/>
</entity-and>
- <first-from-list entry="webSite" list="webSites"/>
+ <first-from-list list="webSites" entry="webSite"/>
<if-not-empty field="storeEmail.bodyScreenLocation">
<entity-one entity-name="UserLogin" value-field="userLoginParty"/>
<set field="parameters.partyId" from-field="userLoginParty.partyId"/>
@@ -1053,7 +1053,7 @@
<condition-expr field-name="partyId" operator="equals" from-field="parameters.partyId"/>
</condition-list>
</entity-condition>
- <first-from-list entry="partyContactDetailByPurpose" list="partyContactDetailByPurposes"/>
+ <first-from-list list="partyContactDetailByPurposes" entry="partyContactDetailByPurpose"/>
<entity-one entity-name="Person" value-field="person"/>
<set field="bodyParameters.person" from-field="person"/>
<set field="emailParams.bodyParameters" from-field="bodyParameters"/>
diff --git a/applications/party/minilang/party/PartySimpleMethods.xml b/applications/party/minilang/party/PartySimpleMethods.xml
index 4673f5e..818d2e1 100644
--- a/applications/party/minilang/party/PartySimpleMethods.xml
+++ b/applications/party/minilang/party/PartySimpleMethods.xml
@@ -236,7 +236,7 @@
<simple-method method-name="deleteBillingAccount" short-description="delete billing account">
<now-timestamp field="nowTimestamp"/>
<set field="parameters.thruDate" from-field="nowTimestamp"/>
- <set-service-fields service-name="updateBillingAccount" to-map="deleteBillingAccountCtx" map="parameters"/>
+ <set-service-fields service-name="updateBillingAccount" map="parameters" to-map="deleteBillingAccountCtx"/>/>
<call-service service-name="updateBillingAccount" in-map-name="deleteBillingAccountCtx"/>
</simple-method>
</simple-methods>
diff --git a/applications/party/widget/partymgr/CommunicationEventForms.xml b/applications/party/widget/partymgr/CommunicationEventForms.xml
index 0c9ce88..3028165 100644
--- a/applications/party/widget/partymgr/CommunicationEventForms.xml
+++ b/applications/party/widget/partymgr/CommunicationEventForms.xml
@@ -174,10 +174,10 @@
<field name="contentMimeTypeId"><hidden value="text/plain"/></field>
<field name="content" title="${uiLabelMap.CommonContent}" encode-output="false"><textarea cols="72" rows="15" default-value="${parameters.content}"/></field>
<field name="send" title=" " position="1" use-when="communicationEvent!=null">
- <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.CommonSend}" target="javascript:(document.EditEmail.form.value='list'),(document.EditEmail.submit())"/>
+ <hyperlink description="${uiLabelMap.CommonSend}" target="javascript:(document.EditEmail.form.value='list'),(document.EditEmail.submit())" also-hidden="false" target-type="plain"/>
</field>
<field name="save" title=" " position="2" use-when="communicationEvent!=null">
- <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.CommonSave}" target="javascript:(document.EditEmail.form.value='list'),(document.EditEmail.statusId.value='COM_PENDING'),(document.EditEmail.submit())"/>
+ <hyperlink description="${uiLabelMap.CommonSave}" target="javascript:(document.EditEmail.form.value='list'),(document.EditEmail.statusId.value='COM_PENDING'),(document.EditEmail.submit())" also-hidden="false" target-type="plain"/>
</field>
<field name="createButton" use-when="communicationEvent==null"><submit/></field>
<field name="dummy" position="320"><hidden/></field>
@@ -211,7 +211,7 @@
target="javascript:(document.EditInternalNote.form.value='list'),(document.EditInternalNote.statusId.value='COM_ENTERED'),(document.EditInternalNote.datetimeStarted.value='${nowDate}'),(document.EditInternalNote.submit())"/>
</field>
<field name="save" title=" " position="2" use-when="communicationEvent!=null">
- <hyperlink also-hidden="true" target-type="plain" description="${uiLabelMap.CommonSave}" target="javascript:(document.EditInternalNote.form.value='list'),(document.EditInternalNote.submit())"/>
+ <hyperlink description="${uiLabelMap.CommonSave}" target="javascript:(document.EditInternalNote.form.value='list'),(document.EditInternalNote.submit())" also-hidden="true" target-type="plain"/>
</field>
<field name="createButton" use-when="communicationEvent==null"><submit/></field>
<field name="dummy" position="320"><hidden/></field>
@@ -470,7 +470,7 @@
</service>
</actions>
<field name="orderId" title="${uiLabelMap.FormFieldTitle_orderId}">
- <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" description="${orderId}" target-type="inter-app"/>
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app"/>
</field>
<field name="communicationEventId">
<hyperlink description="${communicationEventId}" target="ViewCommunicationEvent">
@@ -657,7 +657,7 @@
<display-entity entity-name="CommunicationEventPrpTyp"/>
</field>
<field name="removeLink" title=" " widget-style="smallSubmit">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeCommunicationEventPurpose">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeCommunicationEventPurpose" also-hidden="false">
<parameter param-name="communicationEventPrpTypId"/>
<parameter param-name="communicationEventId"/>
</hyperlink>
@@ -733,7 +733,7 @@
<field name="fromDate"><hidden/></field>
<field name="my"><hidden/></field>
<field name="contentName">
- <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="ViewSimpleContent">
+ <hyperlink description="${contentName} [${contentId}]" target="ViewSimpleContent" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="dataResourceId"/>
<parameter param-name="communicationEventId"/>
@@ -832,7 +832,7 @@
</field>
<field name="surveyResponseLink" map-name="dummy" widget-style="smallSubmit"
use-when=""DOCUMENT".equals(contentTypeId) && dataResource!=null && dataResource.get("relatedDetailId")==null && templateDataResource!=null && templateDataResource.get("relatedDetailId")!=null">
- <hyperlink description="Create Response (for Survey ${templateDataResource.relatedDetailId})" target="EditSurveyResponse" also-hidden="false" target-window="_blank">
+ <hyperlink description="Create Response (for Survey ${templateDataResource.relatedDetailId})" target="EditSurveyResponse" target-window="_blank" also-hidden="false">
<parameter param-name="surveyId" from-field="templateDataResource.relatedDetailId"/>
</hyperlink>
</field>
@@ -1010,7 +1010,7 @@
<set field="orderTypeId" from-field="orderHeader.orderTypeId"/>
</row-actions>
<field name="orderId" title="${uiLabelMap.FormFieldTitle_orderId}" widget-style="buttontext">
- <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" description="${orderId}" target-type="inter-app"/>
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app"/>
</field>
<field name="communicationEventId"><hidden/></field>
<field name="orderTypeId" title="${uiLabelMap.OrderOrderType}">
diff --git a/applications/party/widget/partymgr/CommunicationEventScreens.xml b/applications/party/widget/partymgr/CommunicationEventScreens.xml
index 192cb94..fa2239a 100644
--- a/applications/party/widget/partymgr/CommunicationEventScreens.xml
+++ b/applications/party/widget/partymgr/CommunicationEventScreens.xml
@@ -31,7 +31,7 @@
<decorator-section name="pre-body">
<section>
<condition>
- <if-has-permission action="_VIEW" permission="PARTYMGR"/>
+ <if-has-permission permission="PARTYMGR" action="_VIEW"/>
</condition>
<widgets>
<include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="CommEventTabBar"/>
@@ -42,7 +42,7 @@
<decorator-section name="body">
<section>
<condition>
- <if-has-permission action="_VIEW" permission="PARTYMGR"/>
+ <if-has-permission permission="PARTYMGR" action="_VIEW"/>
</condition>
<widgets>
<decorator-section-include name="body"/>
@@ -71,7 +71,7 @@
<decorator-section name="body">
<section>
<condition>
- <if-has-permission action="_VIEW" permission="PARTYMGR"/>
+ <if-has-permission permission="PARTYMGR" action="_VIEW"/>
</condition>
<widgets>
<decorator-section-include name="body"/>
diff --git a/applications/party/widget/partymgr/LookupForms.xml b/applications/party/widget/partymgr/LookupForms.xml
index fdf8570..dfec4e2 100644
--- a/applications/party/widget/partymgr/LookupForms.xml
+++ b/applications/party/widget/partymgr/LookupForms.xml
@@ -47,7 +47,7 @@
</actions>
<!--<auto-fields-entity entity-name="PartyNameView" default-field-type="display"/>-->
<field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
+ <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
<display-entity also-hidden="false" entity-name="PartyType"/>
@@ -87,7 +87,7 @@
</row-actions>
<!--<auto-fields-entity entity-name="PartyNameView" default-field-type="display"/>-->
<field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${contactMechId}')"/>
+ <hyperlink description="${partyId}" target="javascript:set_value('${contactMechId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="name" title="${uiLabelMap.PartyName}"><display/></field>
<field name="infoString" title="${uiLabelMap.PartyEmailAddress}"><display/></field>
@@ -117,7 +117,7 @@
<script location="component://party/groovyScripts/party/FindLookUp.groovy"/>
</actions>
<field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
+ <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
<display-entity also-hidden="false" entity-name="PartyType"/>
@@ -158,7 +158,7 @@
</service>
</actions>
<field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
+ <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
<display-entity also-hidden="false" entity-name="PartyType"/>
@@ -186,7 +186,7 @@
</actions>
<!--<auto-fields-entity entity-name="Person" default-field-type="display"/>-->
<field name="partyId" widget-style="smallSubmit" title="${uiLabelMap.PartyPartyId}">
- <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
+ <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="firstName" title="${uiLabelMap.PartyFirstName}"><display/></field>
<field name="middleName" title="${uiLabelMap.PartyMiddleInitial}"><display/></field>
@@ -222,7 +222,7 @@
<display description="${partyId}"/>
</field>
<field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')"/>
+ <hyperlink description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')" also-hidden="false" target-type="plain"/>
</field>
<field name="lastName" title="${uiLabelMap.PartyName}"><display description="${firstName} ${middleName} ${lastName} ${groupName}"/></field>
</form>
@@ -248,7 +248,7 @@
<script location="component://party/groovyScripts/party/FindLookUp.groovy"/>
</actions>
<field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')"/>
+ <hyperlink description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')" also-hidden="false" target-type="plain"/>
</field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
<display description="${partyId}"/>
@@ -276,7 +276,7 @@
<field name="groupName" title="${uiLabelMap.PartyGroupName}"><display/></field>
<field name="comments" title="${uiLabelMap.PartyComments}"><display/></field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
+ <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
</field>
</form>
@@ -307,7 +307,7 @@
</actions>
<field name="partyClassificationGroupId" title=" " widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${partyClassificationGroupId}" target="javascript:set_value('${partyClassificationGroupId}')"/>
+ <hyperlink description="${partyClassificationGroupId}" target="javascript:set_value('${partyClassificationGroupId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="partyClassificationTypeId"><display/></field>
<field name="parentGroupId"><display/></field>
@@ -367,7 +367,7 @@
</service>
</actions>
<field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" target-type="plain"/>
+ <hyperlink description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}">
<display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/>
diff --git a/applications/party/widget/partymgr/PartyClassificationForms.xml b/applications/party/widget/partymgr/PartyClassificationForms.xml
index c0d70f9..3daa590 100644
--- a/applications/party/widget/partymgr/PartyClassificationForms.xml
+++ b/applications/party/widget/partymgr/PartyClassificationForms.xml
@@ -36,7 +36,7 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="deleteLink" title=" " widget-style="smallSubmit">
- <hyperlink target="deletePartyClassification" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyClassification" also-hidden="false">
<parameter param-name="partyClassificationGroupId"/>
<parameter param-name="partyId"/>
<parameter param-name="fromDate"/>
@@ -50,7 +50,7 @@
<entity-condition entity-name="PartyClassificationGroup"/>
</actions>
<field name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}" widget-style="buttontext">
- <hyperlink target="EditPartyClassificationGroup" description="${partyClassificationGroupId}" also-hidden="false">
+ <hyperlink description="${partyClassificationGroupId}" target="EditPartyClassificationGroup" also-hidden="false">
<parameter param-name="partyClassificationGroupId"/>
</hyperlink>
</field>
@@ -60,7 +60,7 @@
<field name="parentGroupId"><display/></field>
<field name="description" title=" "><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deletePartyClassificationGroup" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyClassificationGroup" also-hidden="false">
<parameter param-name="partyClassificationGroupId"/>
</hyperlink>
</field>
@@ -98,7 +98,7 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<!-- <field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false">
<parameter param-name="segmentGroupId"/>
</hyperlink>
</field> -->
@@ -114,7 +114,7 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<!-- <field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false">
<parameter param-name="segmentGroupId"/>
</hyperlink>
</field> -->
@@ -141,7 +141,7 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="deleteLink" title=" " widget-style="smallSubmit">
- <hyperlink target="deletePartyClassification" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyClassification" also-hidden="false">
<parameter param-name="partyClassificationGroupId"/>
<parameter param-name="partyId"/>
<parameter param-name="fromDate"/>
diff --git a/applications/party/widget/partymgr/PartyContactListForms.xml b/applications/party/widget/partymgr/PartyContactListForms.xml
index e7ae680..01ad53f 100644
--- a/applications/party/widget/partymgr/PartyContactListForms.xml
+++ b/applications/party/widget/partymgr/PartyContactListForms.xml
@@ -76,7 +76,7 @@
<field name="statusId">
<drop-down no-current-selected-key="CLPT_PENDING">
<entity-options entity-name="StatusItem">
- <entity-constraint name="statusTypeId" value="CONTACTLST_PARTY" operator="equals"/>
+ <entity-constraint name="statusTypeId" operator="equals" value="CONTACTLST_PARTY"/>
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -98,7 +98,7 @@
<entity-condition entity-name="ContactList"/>
</actions>
<field name="contactListId" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${contactListId}" target="javascript:set_value('${contactListId}')"/>
+ <hyperlink description="${contactListId}" target="javascript:set_value('${contactListId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="contactListName"><display/></field>
<field name="contactListTypeId"><display-entity entity-name="ContactListType"/></field>
diff --git a/applications/party/widget/partymgr/PartyContactListScreens.xml b/applications/party/widget/partymgr/PartyContactListScreens.xml
index 7c467eb..97efab4 100644
--- a/applications/party/widget/partymgr/PartyContactListScreens.xml
+++ b/applications/party/widget/partymgr/PartyContactListScreens.xml
@@ -35,7 +35,7 @@
<section>
<!-- do check for PARTYMGR, _VIEW permission -->
<condition>
- <if-has-permission action="_VIEW" permission="PARTYMGR"/>
+ <if-has-permission permission="PARTYMGR" action="_VIEW"/>
</condition>
<widgets>
<screenlet id="AddPartyContactListPanel" title="${uiLabelMap.PartyContactListPartyCreate}" collapsible="true">
diff --git a/applications/party/widget/partymgr/PartyForms.xml b/applications/party/widget/partymgr/PartyForms.xml
index 240ff74..774f4ec 100644
--- a/applications/party/widget/partymgr/PartyForms.xml
+++ b/applications/party/widget/partymgr/PartyForms.xml
@@ -144,7 +144,7 @@
</service>
</row-actions>
<field name="partyId" sort-field="true">
- <hyperlink target="viewprofile" description="${partyId}">
+ <hyperlink description="${partyId}" target="viewprofile">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -256,7 +256,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -291,7 +291,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -355,7 +355,7 @@
<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 target="backHome" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+ <field name="cancelLink" title=" " widget-style="smallSubmit"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="backHome" also-hidden="false"/></field>
</form>
<form name="UpdatePassword" type="single" target="updatePassword"
@@ -371,7 +371,7 @@
<field name="newPasswordVerify"><password/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -389,7 +389,7 @@
<field name="userLdapDn" use-when="!"true".equals(ldapEnabled)"><ignored/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -502,7 +502,7 @@
<field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="smallSubmit">
- <hyperlink target="deletePartyTaxAuthInfo" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyTaxAuthInfo" also-hidden="false">
<parameter param-name="partyId"/>
<parameter param-name="taxAuthPartyId"/>
<parameter param-name="taxAuthGeoId"/>
@@ -526,7 +526,7 @@
<field name="note"><textarea cols="70" rows="10"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -693,7 +693,7 @@
<display-entity entity-name="RoleType"/>
</field>
<field name="deleteLink" title=" " widget-style="smallSubmit">
- <hyperlink target="deleteSegmentGroupRole" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSegmentGroupRole" also-hidden="false">
<parameter param-name="segmentGroupId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
@@ -716,7 +716,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<!-- <field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false">
<parameter param-name="segmentGroupId"/>
</hyperlink>
</field> -->
@@ -730,7 +730,7 @@
<field use-when="attribute!=null" name="attrName" tooltip="${uiLabelMap.PartyNotModifRecreateAttribute}"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${cancelPage}" also-hidden="false">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -850,7 +850,7 @@
<field name="fromDate"><display type="date-time"></display></field>
<field name="thruDate"><display type="date-time"></display></field>
<field name="editLink" title=" " widget-style="smallSubmit">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditPartyContents">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditPartyContents" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="partyId"/>
<parameter param-name="dataResourceId"/>
@@ -859,7 +859,7 @@
</hyperlink>
</field>
<field name="remove" title=" " widget-style="smallSubmit">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonRemove}" target="removePartyContent">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removePartyContent" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="partyId"/>
<parameter param-name="dataResourceId"/>
@@ -916,7 +916,7 @@
<field name="fromDate"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit">
- <hyperlink target="updatePartyCarrierAccount" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="updatePartyCarrierAccount" also-hidden="false">
<parameter param-name="partyId"/>
<parameter param-name="carrierPartyId"/>
<parameter param-name="fromDate"/>
@@ -931,7 +931,7 @@
<field name="partyId"><hidden/></field>
<field name="carrierPartyId">
<drop-down allow-empty="false">
- <entity-options entity-name="PartyRole" description="${partyId}" key-field-name="partyId">
+ <entity-options entity-name="PartyRole" key-field-name="partyId" description="${partyId}">
<entity-constraint name="roleTypeId" operator="equals" value="CARRIER"/>
<entity-constraint name="partyId" operator="not-equals" value="_NA_"/>
</entity-options>
@@ -1197,7 +1197,7 @@
<field name="description" title="${uiLabelMap.PartyRole}"><display/></field>
<field name="parentTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
<field name="remove">
- <hyperlink target="deleterole" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleterole">
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
</hyperlink>
@@ -1280,7 +1280,7 @@
</form>
<form name="PartySalesOpportunities" type="list" list-name="salesOpportunities" default-table-style="basic-table hover-bar">
<field name="opportunityName" title="${uiLabelMap.SfaOpportunityName}">
- <hyperlink target="ViewSalesOpportunity" description="${opportunityName} [${salesOpportunityId}]">
+ <hyperlink description="${opportunityName} [${salesOpportunityId}]" target="ViewSalesOpportunity">
<parameter param-name="salesOpportunityId"/>
</hyperlink>
</field>
@@ -1301,7 +1301,7 @@
<field name="partyIdentTypeDesc"><display /></field>
<field name="idValue"><display /></field>
<field name="delete">
- <hyperlink target="deletePartyIdentification" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyIdentification">
<parameter param-name="partyId"/>
<parameter param-name="partyIdentificationTypeId"/>
</hyperlink>
@@ -1372,7 +1372,7 @@
<field name="thruDate"><display/></field>
<field name="sequenceNum"><display/></field>
<field name="editLink" widget-style="buttontext" title="${uiLabelMap.CommonEdit}">
- <hyperlink target="FindProductStoreRoles" description="${uiLabelMap.CommonEdit}">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="FindProductStoreRoles">
<parameter param-name="partyId"/>
<parameter param-name="productStoreId"/>
<parameter param-name="roleTypeId"/>
@@ -1380,7 +1380,7 @@
</hyperlink>
</field>
<field name="deleteLink" widget-style="buttontext" title="${uiLabelMap.CommonDelete}">
- <hyperlink target="storeRemoveRole" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="storeRemoveRole">
<parameter param-name="partyId"/>
<parameter param-name="productStoreId"/>
<parameter param-name="roleTypeId"/>
diff --git a/applications/party/widget/partymgr/PartyInvitationForms.xml b/applications/party/widget/partymgr/PartyInvitationForms.xml
index 5614df9..6a2cc3f 100644
--- a/applications/party/widget/partymgr/PartyInvitationForms.xml
+++ b/applications/party/widget/partymgr/PartyInvitationForms.xml
@@ -58,7 +58,7 @@
</service>
</actions>
<field name="partyInvitationId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${partyInvitationId}" target="editPartyInvitation">
+ <hyperlink description="${partyInvitationId}" target="editPartyInvitation" also-hidden="false">
<parameter param-name="partyInvitationId"/>
</hyperlink>
</field>
@@ -69,7 +69,7 @@
<field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="lastInviteDate"><display/></field>
<field name="remove" title=" " widget-style="buttontext">
- <hyperlink target="deletePartyInvitation" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyInvitation">
<parameter param-name="partyInvitationId" from-field="partyInvitationId"/>
</hyperlink>
</field>
@@ -107,7 +107,7 @@
</entity-condition>
</actions>
<field name="partyInvitationId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${partyInvitationId}" target="editPartyInvitation">
+ <hyperlink description="${partyInvitationId}" target="editPartyInvitation" also-hidden="false">
<parameter param-name="partyInvitationId"/>
</hyperlink>
</field>
@@ -119,7 +119,7 @@
</display-entity>
</field>
<field name="remove" title=" " widget-style="buttontext">
- <hyperlink target="deletePartyInvitationGroupAssoc" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyInvitationGroupAssoc">
<parameter param-name="partyInvitationId"/>
<parameter param-name="partyIdTo"/>
</hyperlink>
@@ -150,13 +150,13 @@
</entity-condition>
</actions>
<field name="partyInvitationId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${partyInvitationId}" target="editPartyInvitation">
+ <hyperlink description="${partyInvitationId}" target="editPartyInvitation" also-hidden="false">
<parameter param-name="partyInvitationId"/>
</hyperlink>
</field>
<field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"><display-entity entity-name="RoleType"/></field>
<field name="remove" title=" " widget-style="buttontext">
- <hyperlink target="deletePartyInvitationRoleAssoc" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyInvitationRoleAssoc">
<parameter param-name="partyInvitationId"/>
<parameter param-name="roleTypeId"/>
</hyperlink>
diff --git a/applications/party/widget/partymgr/PaymentMethodForms.xml b/applications/party/widget/partymgr/PaymentMethodForms.xml
index f7c2a76..435c8a2 100644
--- a/applications/party/widget/partymgr/PaymentMethodForms.xml
+++ b/applications/party/widget/partymgr/PaymentMethodForms.xml
@@ -26,14 +26,14 @@
<field name="partyId"><hidden/></field>
<field name="avsDeclineString" title="${uiLabelMap.PartyAvsString}"><text size="60" maxlength="250"/></field>
<field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="smallSubmit"><submit button-type="text-link"/></field>
- <field name="cancelLink" title=" " widget-style="smallSubmit"><hyperlink target="backHome" also-hidden="false" description="[${uiLabelMap.CommonCancelDone}]"/></field>
+ <field name="cancelLink" title=" " widget-style="smallSubmit"><hyperlink description="[${uiLabelMap.CommonCancelDone}]" target="backHome" also-hidden="false"/></field>
</form>
<form name="EditBillingAccount" type="single" target="updateBillingAccount" extends="EditBillingAccount" extends-resource="component://accounting/widget/BillingAccountForms.xml">
<field name="submitButton"><hidden/></field>
<field name="saveButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="button"/></field>
<field name="cancelLink" title=" " widget-style="buttontext">
- <hyperlink target="viewprofile" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="viewprofile">
<parameter param-name="partyId" from-field="partyId"/>
</hyperlink>
</field>
diff --git a/applications/product/minilang/product/catalog/CatalogServices.xml b/applications/product/minilang/product/catalog/CatalogServices.xml
index 3a730ce..f85a81f 100644
--- a/applications/product/minilang/product/catalog/CatalogServices.xml
+++ b/applications/product/minilang/product/catalog/CatalogServices.xml
@@ -100,7 +100,7 @@
<simple-method method-name="checkImageUrlForAllCategories" short-description="Check for image url exists or not for All categories" login-required="false">
<!-- Get all the categories from top category -->
- <set-service-fields to-map="categoryFindContext" service-name="getAllCategories" map="parameters"/>
+ <set-service-fields service-name="getAllCategories" map="parameters" to-map="categoryFindContext"/>
<call-service service-name="getAllCategories" in-map-name="categoryFindContext">
<result-to-field result-name="categories" field="categories"/>
</call-service>
@@ -121,7 +121,7 @@
<simple-method method-name="checkImageUrlForCategoryAndProduct" short-description="Check for image url exists or not for category and product " login-required="false">
<!--set from-field="parameters.categoryId" field="productCategoryContext.categoryId"/ -->
- <set-service-fields to-map="productCategoryContext" service-name="getProductCategoryMembers" map="parameters"/>
+ <set-service-fields service-name="getProductCategoryMembers" map="parameters" to-map="productCategoryContext"/>
<call-service service-name="getProductCategoryMembers" in-map-name="productCategoryContext" >
<result-to-field result-name="categoryMembers" field="categoryMembers"/>
<result-to-field result-name="category" field="category"/>
@@ -462,7 +462,7 @@
<iterate list="parameters.productCategories" entry="productCategoryList">
<!-- Create Product Category Alternative URLs -->
<if-empty field="category">
- <entity-condition list="productCategoryContentAndInfoList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true">
+ <entity-condition entity-name="ProductCategoryContentAndInfo" list="productCategoryContentAndInfoList" filter-by-date="true" use-cache="true">
<condition-list combine="and">
<condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
<condition-expr field-name="prodCatContentTypeId" value="ALTERNATIVE_URL"/>
@@ -475,7 +475,7 @@
<set field="createSimpleTextContentForCategoryCtx.localeString" value="en"/>
<set field="createSimpleTextContentForCategoryCtx.productCategoryId" from-field="productCategoryList.productCategoryId"/>
<if-empty field="productCategoryList.categoryName">
- <entity-condition list="productCategoryContentList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true">
+ <entity-condition entity-name="ProductCategoryContentAndInfo" list="productCategoryContentList" filter-by-date="true" use-cache="true">
<condition-list combine="and">
<condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
<condition-expr field-name="prodCatContentTypeId" value="CATEGORY_NAME"/>
@@ -483,7 +483,7 @@
<order-by field-name="-fromDate"/>
</entity-condition>
<if-not-empty field="productCategoryContentList">
- <first-from-list entry="productCategoryContent" list="productCategoryContentList"/>
+ <first-from-list list="productCategoryContentList" entry="productCategoryContent"/>
<set field="getContentAndDataResourceCtx.contentId" from-field="productCategoryContent.contentId"/>
<call-service service-name="getContentAndDataResource" in-map-name="getContentAndDataResourceCtx">
<result-to-field result-name="resultData" field="resultMap"/>
@@ -517,7 +517,7 @@
<!-- Create Product Alternative URLs -->
<if-empty field="product">
- <entity-condition list="productCategoryMemberList" entity-name="ProductCategoryMember" filter-by-date="true" use-cache="true">
+ <entity-condition entity-name="ProductCategoryMember" list="productCategoryMemberList" filter-by-date="true" use-cache="true">
<condition-list combine="and">
<condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
</condition-list>
@@ -525,7 +525,7 @@
</entity-condition>
<iterate list="productCategoryMemberList" entry="productCategoryMember">
<set field="product.productId" from-field="productCategoryMember.productId"/>
- <entity-condition list="ProductContentAndInfoList" entity-name="ProductContentAndInfo" filter-by-date="true" use-cache="true">
+ <entity-condition entity-name="ProductContentAndInfo" list="ProductContentAndInfoList" filter-by-date="true" use-cache="true">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="product.productId"/>
<condition-expr field-name="productContentTypeId" value="ALTERNATIVE_URL"/>
@@ -533,7 +533,7 @@
<order-by field-name="-fromDate"/>
</entity-condition>
<if-empty field="ProductContentAndInfoList">
- <entity-one value-field="productMap" entity-name="Product">
+ <entity-one entity-name="Product" value-field="productMap">
<field-map field-name="productId" from-field="product.productId"/>
</entity-one>
<set field="createSimpleTextContentForProductCtx.fromDate" from-field="now"/>
@@ -582,7 +582,7 @@
</entity-and>
<iterate list="productCategoryRollups" entry="productCategoryRollup">
<!-- append product category to list -->
- <entity-one value-field="productCategory" entity-name="ProductCategory">
+ <entity-one entity-name="ProductCategory" value-field="productCategory">
<field-map field-name="productCategoryId" from-field="productCategoryRollup.productCategoryId"/>
</entity-one>
<field-to-list list="parameters.productCategories" field="productCategory"/>
diff --git a/applications/product/minilang/product/category/CategoryContentServices.xml b/applications/product/minilang/product/category/CategoryContentServices.xml
index 3db80c9..496ff62 100644
--- a/applications/product/minilang/product/category/CategoryContentServices.xml
+++ b/applications/product/minilang/product/category/CategoryContentServices.xml
@@ -74,7 +74,7 @@
</entity-and>
<if-not-empty field="productCategoryContents">
<first-from-list entry="productCategoryContent" list="productCategoryContents"/>
- <entity-one value-field="electronicText" entity-name="ElectronicText">
+ <entity-one entity-name="ElectronicText" value-field="electronicText">
<field-map field-name="dataResourceId" from-field="productCategoryContent.dataResourceId"/>
</entity-one>
<if-not-empty field="electronicText">
@@ -96,7 +96,7 @@
</entity-and>
<if-not-empty field="productCategoryContents">
<first-from-list entry="productCategoryContent" list="productCategoryContents"/>
- <entity-one value-field="electronicText" entity-name="ElectronicText">
+ <entity-one entity-name="ElectronicText" value-field="electronicText">
<field-map field-name="dataResourceId" from-field="productCategoryContent.dataResourceId"/>
</entity-one>
<if-not-empty field="electronicText">
@@ -118,7 +118,7 @@
</entity-and>
<if-not-empty field="productCategoryContents">
<first-from-list entry="productCategoryContent" list="productCategoryContents"/>
- <entity-one value-field="electronicText" entity-name="ElectronicText">
+ <entity-one entity-name="ElectronicText" value-field="electronicText">
<field-map field-name="dataResourceId" from-field="productCategoryContent.dataResourceId"/>
</entity-one>
<if-not-empty field="electronicText">
diff --git a/applications/product/minilang/product/category/CategoryServices.xml b/applications/product/minilang/product/category/CategoryServices.xml
index e79f38d..4baf781 100644
--- a/applications/product/minilang/product/category/CategoryServices.xml
+++ b/applications/product/minilang/product/category/CategoryServices.xml
@@ -107,7 +107,7 @@
<!-- ================================================================ -->
<simple-method method-name="addProductToCategories" short-description="Add Product to Multiple Categories">
- <set-service-fields service-name="addProductToCategory" to-map="addProductToCategoryMap" map="parameters"/>
+ <set-service-fields service-name="addProductToCategory" map="parameters" to-map="addProductToCategoryMap"/>/>
<if-instance-of field="parameters.categories" class="java.util.List">
<iterate list="parameters.categories" entry="category">
<set field="addProductToCategoryMap.productCategoryId" from-field="category"/>
@@ -747,7 +747,7 @@
<set field="callingMethodName" from-field="resourceDescription"/>
<set field="checkAction" from-field="parameters.mainAction" default-value="UPDATE"/>
- <entity-condition list="prodCatalogCategoryList" entity-name="ProdCatalogCategory" filter-by-date="true">
+ <entity-condition entity-name="ProdCatalogCategory" list="prodCatalogCategoryList" filter-by-date="true">
<condition-list combine="and">
<condition-expr field-name="productCategoryId" from-field="parameters.productCategoryId"/>
<condition-list combine="or">
@@ -833,13 +833,13 @@
<set field="week" value="52"/>
<else>
<calculate field="week">
- <calcop field="week" operator="subtract">
+ <calcop operator="subtract" field="week">
<number value="1"/>
</calcop>
</calculate>
<if-compare field="week" operator="equals" value="1">
<calculate field="year">
- <calcop field="year" operator="subtract">
+ <calcop operator="subtract" field="year">
<number value="1"/>
</calcop>
</calculate>
diff --git a/applications/product/minilang/product/cost/CostServices.xml b/applications/product/minilang/product/cost/CostServices.xml
index 31fac2e..7b233ec 100644
--- a/applications/product/minilang/product/cost/CostServices.xml
+++ b/applications/product/minilang/product/cost/CostServices.xml
@@ -57,7 +57,7 @@
<!-- Services to get the product and tasks costs -->
<simple-method method-name="getProductCost" short-description="Gets the product's costs (from CostComponent or ProductPrice)">
- <entity-condition list="costComponents" entity-name="CostComponent" filter-by-date="true">
+ <entity-condition entity-name="CostComponent" list="costComponents" filter-by-date="true">
<condition-list>
<condition-expr field-name="productId" operator="equals" from-field="parameters.productId"/>
<condition-expr field-name="costUomId" operator="equals" from-field="parameters.currencyUomId"/>
@@ -67,8 +67,8 @@
<set field="productCost" value="0" type="BigDecimal"/>
<iterate list="costComponents" entry="costComponent">
<calculate field="productCost" decimal-scale="6">
- <calcop field="costComponent.cost" operator="add">
- <calcop field="productCost" operator="get"/>
+ <calcop operator="add" field="costComponent.cost">
+ <calcop operator="get" field="productCost"/>
</calcop>
</calculate>
<!--set field="productCost" value="${costComponent.cost + productCost}" type="BigDecimal"/-->
@@ -158,8 +158,8 @@
</call-service>
<calculate field="estimatedTaskTime" decimal-scale="6">
- <calcop field="totalEstimatedTaskTime" operator="subtract">
- <calcop field="setupTime" operator="get"/>
+ <calcop operator="subtract" field="totalEstimatedTaskTime">
+ <calcop operator="get" field="setupTime"/>
</calcop>
</calculate>
@@ -179,18 +179,18 @@
</if-not-empty>
<calculate field="taskCost" decimal-scale="6">
<calcop operator="add">
- <calcop field="estimatedTaskTime" operator="multiply">
- <calcop field="usageCost.amount" operator="get"/>
+ <calcop operator="multiply" field="estimatedTaskTime">
+ <calcop operator="get" field="usageCost.amount"/>
</calcop>
- <calcop field="setupTime" operator="multiply">
- <calcop field="setupCost.amount" operator="get"/>
+ <calcop operator="multiply" field="setupTime">
+ <calcop operator="get" field="setupCost.amount"/>
</calcop>
</calcop>
</calculate>
<!-- Time is converted from milliseconds to hours -->
<calculate field="taskCost" decimal-scale="6">
- <calcop field="taskCost" operator="divide">
+ <calcop operator="divide" field="taskCost">
<number value="3600000"/>
</calcop>
</calculate>
@@ -207,18 +207,18 @@
<if-not-empty field="costComponentCalc.perMilliSecond">
<if-compare operator="not-equals" value="0" field="costComponentCalc.perMilliSecond" type="BigDecimal">
<calculate field="totalCostComponentTime" decimal-scale="6">
- <calcop field="totalEstimatedTaskTime" operator="divide">
- <calcop field="costComponentCalc.perMilliSecond" operator="get"/>
+ <calcop operator="divide" field="totalEstimatedTaskTime">
+ <calcop operator="get" field="costComponentCalc.perMilliSecond"/>
</calcop>
</calculate>
<calculate field="totalCostComponentCost" decimal-scale="6">
- <calcop field="totalCostComponentTime" operator="multiply">
- <calcop field="costComponentCalc.variableCost" operator="get"/>
+ <calcop operator="multiply" field="totalCostComponentTime">
+ <calcop operator="get" field="costComponentCalc.variableCost"/>
</calcop>
</calculate>
<calculate field="totalCostComponentCost" decimal-scale="6">
- <calcop field="totalCostComponentCost" operator="add">
- <calcop field="costComponentCalc.fixedCost" operator="get"/>
+ <calcop operator="add" field="totalCostComponentCost">
+ <calcop operator="get" field="costComponentCalc.fixedCost"/>
</calcop>
</calculate>
<set field="costsByType.${wecc.costComponentTypeId}" from-field="totalCostComponentCost"/>
@@ -271,9 +271,9 @@
<result-to-field result-name="productCost"/>
</call-service>
<calculate field="totalProductsCost" decimal-scale="6">
- <calcop field="totalProductsCost" operator="add">
- <calcop field="componentMap.quantity" operator="multiply">
- <calcop field="productCost" operator="get"/>
+ <calcop operator="add" field="totalProductsCost">
+ <calcop operator="multiply" field="componentMap.quantity">
+ <calcop operator="get" field="productCost"/>
</calcop>
</calcop>
</calculate>
@@ -287,7 +287,7 @@
<result-to-field result-name="productCost"/>
</call-service>
<calculate field="totalProductsCost" decimal-scale="6">
- <calcop field="productCost" operator="get"/>
+ <calcop operator="get" field="productCost"/>
</calculate>
</else>
</if-not-empty>
@@ -308,15 +308,15 @@
<result-to-field result-name="costsByType" field="costsByType"/>
</call-service>
<calculate field="totalTaskCost" decimal-scale="6">
- <calcop field="totalTaskCost" operator="add">
- <calcop field="taskCost" operator="get"/>
+ <calcop operator="add" field="totalTaskCost">
+ <calcop operator="get" field="taskCost"/>
</calcop>
</calculate>
<iterate-map map="costsByType" key="costType" value="costAmount">
<if-not-empty field="totalCostsByType.${costType}">
<calculate field="totalCostsByType.${costType}" decimal-scale="6">
- <calcop field="costAmount" operator="add">
- <calcop field="totalCostsByType.${costType}" operator="get"/>
+ <calcop operator="add" field="costAmount">
+ <calcop operator="get" field="totalCostsByType.${costType}"/>
</calcop>
</calculate>
<else>
@@ -324,17 +324,17 @@
</else>
</if-not-empty>
<calculate field="totalOtherTaskCost" decimal-scale="6">
- <calcop field="totalOtherTaskCost" operator="add">
- <calcop field="costAmount" operator="get"/>
+ <calcop operator="add" field="totalOtherTaskCost">
+ <calcop operator="get" field="costAmount"/>
</calcop>
</calculate>
</iterate-map>
</iterate>
<calculate field="totalCost" decimal-scale="6">
- <calcop field="totalTaskCost" operator="add">
- <calcop field="totalProductsCost" operator="get"/>
- <calcop field="totalOtherTaskCost" operator="get"/>
+ <calcop operator="add" field="totalTaskCost">
+ <calcop operator="get" field="totalProductsCost"/>
+ <calcop operator="get" field="totalOtherTaskCost"/>
</calcop>
</calculate>
@@ -397,8 +397,8 @@
<call-service service-name="recreateCostComponent" in-map-name="callSvcMap"/>
<!--set field="totalCost" value="${totalCost + productCostAdjustment}" type="BigDecimal"/-->
<calculate field="totalCost" decimal-scale="6">
- <calcop field="totalCost" operator="add">
- <calcop field="productCostAdjustment" operator="get"/>
+ <calcop operator="add" field="totalCost">
+ <calcop operator="get" field="productCostAdjustment"/>
</calcop>
</calculate>
</else>
diff --git a/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml b/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml
index a7c9e87..9f757c6 100644
--- a/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml
+++ b/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml
@@ -45,10 +45,10 @@
<field-map field-name="productContentTypeId" value="DEFAULT_IMAGE"/>
</entity-and>
<if-not-empty field="productContentAndInfos">
- <first-from-list entry="productContentAndInfo" list="productContentAndInfos"/>
+ <first-from-list list="productContentAndInfos" entry="productContentAndInfo"/>
<script location="component://product/groovyScripts/catalog/imagemanagement/SetDefaultImage.groovy"/>
- <entity-one value-field="product" entity-name="Product">
+ <entity-one entity-name="Product" value-field="product">
<field-map field-name="productId" from-field="parameters.productId"/>
</entity-one>
<set field="product.originalImageUrl" from-field="productContentAndInfo.drObjectInfo"/>
diff --git a/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml b/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml
index a4b265a..154c302 100644
--- a/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml
+++ b/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml
@@ -189,7 +189,7 @@
<remove-value value-field="contentKeyword"/>
</iterate>
- <entity-one value-field="content" entity-name="Content">
+ <entity-one entity-name="Content" value-field="content">
<field-map field-name="contentId" from-field="parameters.contentId"/>
</entity-one>
<set field="removeContentPKMap.contentId" from-field="parameters.contentId"/>
@@ -204,7 +204,7 @@
<remove-value value-field="dataResourceRoles[0]"/>
</if-not-empty>
- <entity-one value-field="dataResource" entity-name="DataResource">
+ <entity-one entity-name="DataResource" value-field="dataResource">
<field-map field-name="dataResourceId" from-field="dataResourceId"/>
</entity-one>
<set field="removeImageFile.productId" from-field="parameters.productId"/>
@@ -220,7 +220,7 @@
</simple-method>
<simple-method method-name="setImageDetail" short-description="Set Image Detail">
- <entity-one value-field="productContent" entity-name="ProductContent"/>
+ <entity-one entity-name="ProductContent" value-field="productContent"/>
<set field="productContent.sequenceNum" from-field="parameters.sequenceNum" type="Long"/>
<store-value value-field="productContent"/>
<if-not-empty field="parameters.sequenceNum">
@@ -230,12 +230,12 @@
</if-not-empty>
<!-- set caption -->
- <entity-one value-field="content" entity-name="Content"/>
+ <entity-one entity-name="Content" value-field="content"/>
<set field="content.description" from-field="parameters.description"/>
<store-value value-field="content"/>
<if-compare field="content.statusId" operator="equals" value="IM_APPROVED">
- <entity-one value-field="dataResource" entity-name="DataResource">
+ <entity-one entity-name="DataResource" value-field="dataResource">
<field-map field-name="dataResourceId" from-field="content.dataResourceId"/>
</entity-one>
<set field="dataResource.isPublic" from-field="parameters.drIsPublic"/>
@@ -268,7 +268,7 @@
<field-map field-name="contentId" from-field="parameters.contentId"/>
<field-map field-name="roleTypeId" value="IMAGEAPPROVER"/>
</entity-and>
- <first-from-list entry="contentApproval" list="contentApprovals"/>
+ <first-from-list list="contentApprovals" entry="contentApproval"/>
<set field="contentApproval.approvalStatusId" from-field="parameters.checkStatusId"/>
<store-value value-field="contentApproval"/>
</else>
@@ -307,7 +307,7 @@
<field-map field-name="contentId" from-field="parameters.contentId"/>
<field-map field-name="productContentTypeId" value="IMAGE"/>
</entity-and>
- <first-from-list entry="productContent" list="productContents"/>
+ <first-from-list list="productContents" entry="productContent"/>
<set field="productContent.purchaseFromDate" from-field="nowTimestamp"/>
<store-value value-field="productContent"/>
<else>
@@ -327,7 +327,7 @@
<field-map field-name="contentId" from-field="parameters.contentId"/>
<field-map field-name="productContentTypeId" value="IMAGE"/>
</entity-and>
- <first-from-list entry="productContent" list="productContents"/>
+ <first-from-list list="productContents" entry="productContent"/>
<set field="productContent.purchaseFromDate" from-field="nowTimestamp"/>
<store-value value-field="productContent"/>
@@ -353,7 +353,7 @@
<field-map field-name="contentId" from-field="parameters.contentId"/>
<field-map field-name="productContentTypeId" value="IMAGE"/>
</entity-and>
- <first-from-list entry="productContent" list="productContents"/>
+ <first-from-list list="productContents" entry="productContent"/>
<set field="productContent.purchaseFromDate" from-field="nowTimestamp"/>
<store-value value-field="productContent"/>
@@ -397,7 +397,7 @@
<field-map field-name="contentId" from-field="parameters.contentId"/>
<field-map field-name="productContentTypeId" value="IMAGE"/>
</entity-and>
- <first-from-list entry="productContent" list="productContents"/>
+ <first-from-list list="productContents" entry="productContent"/>
<set field="productContent.thruDate" from-field="nowTimestam"/>
<store-value value-field="productContent"/>
</simple-method>
diff --git a/applications/product/minilang/product/inventory/InventoryIssueServices.xml b/applications/product/minilang/product/inventory/InventoryIssueServices.xml
index 3521141..c7e2ca6 100644
--- a/applications/product/minilang/product/inventory/InventoryIssueServices.xml
+++ b/applications/product/minilang/product/inventory/InventoryIssueServices.xml
@@ -43,7 +43,7 @@
<iterate list="orderItemList" entry="orderItem">
<if-not-empty field="orderItem.productId">
<clear-field field="callSvcMap"/>
- <set-service-fields to-map="callSvcMap" service-name="issueImmediatelyFulfilledOrderItem" map="orderItem"/>
+ <set-service-fields service-name="issueImmediatelyFulfilledOrderItem" map="orderItem" to-map="callSvcMap"/>
<set field="callSvcMap.orderHeader" from-field="orderHeader"/>
<set field="callSvcMap.orderItem" from-field="orderItem"/>
<set field="callSvcMap.productStore" from-field="productStore"/>
@@ -140,10 +140,10 @@
<set field="createDetailMap.orderItemSeqId" from-field="parameters.orderItemSeqId"/>
<set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId"/>
<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="parameters.quantityNotIssued" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantityNotIssued"/>
</calculate>
<calculate field="createDetailMap.quantityOnHandDiff" decimal-scale="6">
- <calcop field="parameters.quantityNotIssued" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantityNotIssued"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
@@ -175,10 +175,10 @@
<set field="createDetailMap.orderItemSeqId" from-field="parameters.orderItemSeqId"/>
<set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId"/>
<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="parameters.quantityNotIssued" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantityNotIssued"/>
</calculate>
<calculate field="createDetailMap.quantityOnHandDiff" decimal-scale="6">
- <calcop field="parameters.quantityNotIssued" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantityNotIssued"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
@@ -210,7 +210,7 @@
<clear-field field="issuanceCreateMap"/>
<calculate field="parameters.quantityNotIssued">
- <calcop field="parameters.quantityNotIssued" operator="subtract"><number value="1.0"/></calcop>
+ <calcop operator="subtract" field="parameters.quantityNotIssued"><number value="1.0"/></calcop>
</calculate>
</if-compare>
</if-compare>
@@ -251,10 +251,10 @@
<set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId"/>
<!-- update availableToPromiseDiff AND quantityOnHandDiff since this is an issuance -->
<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="parameters.deductAmount" operator="negative"/>
+ <calcop operator="negative" field="parameters.deductAmount"/>
</calculate>
<calculate field="createDetailMap.quantityOnHandDiff" decimal-scale="6">
- <calcop field="parameters.deductAmount" operator="negative"/>
+ <calcop operator="negative" field="parameters.deductAmount"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
<clear-field field="createDetailMap"/>
diff --git a/applications/product/minilang/product/inventory/InventoryReserveServices.xml b/applications/product/minilang/product/inventory/InventoryReserveServices.xml
index 8b02b86..911dac1 100644
--- a/applications/product/minilang/product/inventory/InventoryReserveServices.xml
+++ b/applications/product/minilang/product/inventory/InventoryReserveServices.xml
@@ -173,7 +173,7 @@
<set from-field="parameters.orderItemSeqId" field="createDetailMap.orderItemSeqId"/>
<set from-field="parameters.shipGroupSeqId" field="createDetailMap.shipGroupSeqId"/>
<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="parameters.quantityNotReserved" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantityNotReserved"/>
</calculate>
<if-not-empty field="parameters.reserveReasonEnumId"><set from-field="parameters.reserveReasonEnumId" field="createDetailMap.reasonEnumId"/></if-not-empty>
@@ -242,7 +242,7 @@
<set from-field="parameters.orderItemSeqId" field="createDetailMap.orderItemSeqId"/>
<set from-field="parameters.shipGroupSeqId" field="createDetailMap.shipGroupSeqId"/>
<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="parameters.quantityNotReserved" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantityNotReserved"/>
</calculate>
<if-not-empty field="parameters.reserveReasonEnumId"><set from-field="parameters.reserveReasonEnumId" field="createDetailMap.reasonEnumId"/></if-not-empty>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
@@ -315,7 +315,7 @@
<set field="createDetailMap.availableToPromiseDiff" value="-1" type="BigDecimal"/>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
</if-compare>
- <set-service-fields map="parameters" to-map="cancelOrderItemShipGrpInvResMap" service-name="cancelOrderItemShipGrpInvRes"/>
+ <set-service-fields service-name="cancelOrderItemShipGrpInvRes" map="parameters" to-map="cancelOrderItemShipGrpInvResMap"/>/>
<set field="cancelOrderItemShipGrpInvResMap.cancelQuantity" from-field="parameters.quantity"/>
<!-- Step 1 cancel our reservation, we'll later reserve Inventory we want-->
<call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOrderItemShipGrpInvResMap"/>
@@ -343,9 +343,9 @@
<!--Step 2 Check if its reserved for other order -->
<set field="inventoryReservationLookUp.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
<find-by-and map="inventoryReservationLookUp" list="invReservations" entity-name="OrderItemShipGrpInvRes"/>
- <first-from-list entry="inventoryItemReservation" list="invReservations"/>
+ <first-from-list list="invReservations" entry="inventoryItemReservation"/>
<if-not-empty field="inventoryItemReservation">
- <set-service-fields map="inventoryItemReservation" to-map="cancelOrderItemShipGrpInvResMap" service-name="cancelOrderItemShipGrpInvRes"/>
+ <set-service-fields service-name="cancelOrderItemShipGrpInvRes" map="inventoryItemReservation" to-map="cancelOrderItemShipGrpInvResMap"/>/>
<call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOrderItemShipGrpInvResMap"/>
<!-- Hold our inventoryItem -->
<refresh-value value-field="inventoryItem"/>
@@ -420,7 +420,7 @@
<clear-field field="reserveOisgirMap"/>
<calculate field="parameters.quantityNotReserved">
- <calcop field="parameters.quantityNotReserved" operator="subtract"><number value="1.0"/></calcop>
+ <calcop operator="subtract" field="parameters.quantityNotReserved"><number value="1.0"/></calcop>
</calculate>
</if-compare>
</if-compare>
@@ -454,7 +454,7 @@
<set from-field="parameters.orderId" field="createDetailMap.orderId"/>
<set from-field="parameters.orderItemSeqId" field="createDetailMap.orderItemSeqId"/>
<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="parameters.deductAmount" operator="negative"/>
+ <calcop operator="negative" field="parameters.deductAmount"/>
</calculate>
<if-not-empty field="ebayReserveReasonEnumId"><set from-field="parameters.reserveReasonEnumId" field="createDetailMap.reasonEnumId"/></if-not-empty>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
diff --git a/applications/product/minilang/product/inventory/InventoryServices.xml b/applications/product/minilang/product/inventory/InventoryServices.xml
index dc8728d..7bb7623 100644
--- a/applications/product/minilang/product/inventory/InventoryServices.xml
+++ b/applications/product/minilang/product/inventory/InventoryServices.xml
@@ -333,7 +333,7 @@
<field-map field-name="inventoryItemId" from-field="parameters.inventoryItemId"/>
<order-by field-name="-statusDatetime"/>
</entity-and>
- <first-from-list entry="oldInventoryItemStatus" list="oldInventoryItemStatusList"/>
+ <first-from-list list="oldInventoryItemStatusList" entry="oldInventoryItemStatus"/>
<if-not-empty field="oldInventoryItemStatus">
<set field="oldInventoryItemStatus.statusEndDatetime" from-field="nowTimestamp"/>
<store-value value-field="oldInventoryItemStatus"/>
@@ -493,7 +493,7 @@
<find-by-and entity-name="ProductAssoc" map="getAssoc" list="assocs"/>
<if-not-empty field="assocs">
<filter-list-by-date list="assocs" to-list="assocsDate"/>
- <first-from-list entry="assoc" list="assocsDate"/>
+ <first-from-list list="assocsDate" entry="assoc"/>
<if-not-empty field="assoc">
<get-related-one value-field="assoc" relation-name="MainProduct" to-value-field="virtProduct"/>
<if-empty field="product.salesDiscWhenNotAvail">
@@ -669,7 +669,7 @@
</condition-list>
<select-field field-name="quantityOnHandSum"/>
</entity-condition>
- <first-from-list entry="inventoryItemDetailTotal" list="inventoryItemDetailTotals"/>
+ <first-from-list list="inventoryItemDetailTotals" entry="inventoryItemDetailTotal"/>
<set field="quantityOnHandTotal" from-field="inventoryItemDetailTotal.quantityOnHandSum" type="BigDecimal" default-value="0"/>
<field-to-result field="quantityOnHandTotal" result-name="quantityOnHandTotal"/>
</simple-method>
@@ -689,7 +689,7 @@
</condition-list>
<select-field field-name="quantityOnHandSum"/>
</entity-condition>
- <first-from-list entry="inventoryItemDetailTotal" list="inventoryItemDetailTotals"/>
+ <first-from-list list="inventoryItemDetailTotals" entry="inventoryItemDetailTotal"/>
<set field="quantityOnHandTotal" from-field="${inventoryItemDetailTotal.quantityOnHandSum * -1}" type="BigDecimal" default-value="0"/>
<field-to-result field="quantityOnHandTotal" result-name="quantityOnHandTotal"/>
</simple-method>
@@ -977,7 +977,7 @@
<set field="locationTypeEnumIds" value="${groovy: ['FLT_PICKLOC', 'FLT_BULK', null]}"/>
<iterate list="locationTypeEnumIds" entry="locationTypeEnumId">
<find-by-and entity-name="InventoryItemAndLocation" map="lookupFieldMap" list="inventoryItemAndLocations" use-iterator="true" order-by-list="orderByList"/>
- <entity-condition list="inventoryItemAndLocations" entity-name="InventoryItemAndLocation">
+ <entity-condition entity-name="InventoryItemAndLocation" list="inventoryItemAndLocations">
<condition-list>
<condition-expr field-name="locationTypeEnumId" value="${locationTypeEnumId}" ignore-if-empty="true" ignore-if-null="true"/>
<condition-expr field-name="productId" value="${parameters.productId}"/>
@@ -1116,7 +1116,7 @@
</if-empty>
</simple-method>
<simple-method method-name="setLastInventoryCount" short-description="Service that updates stock availability of products">
- <entity-one value-field="inventoryItem" entity-name="InventoryItem" auto-field-map="false">
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem" auto-field-map="false">
<field-map field-name="inventoryItemId" from-field="parameters.inventoryItemId"/>
</entity-one>
<entity-and entity-name="ProductFacility" list="productFacilities">
@@ -1140,15 +1140,15 @@
</simple-method>
<simple-method method-name="createUpdateFacilityGeoPoint" short-description="Create or update GeoPoint assigned to facility">
<if-empty field="parameters.geoPointId">
- <set-service-fields service-name="createGeoPoint" to-map="createGeoPointMap" map="parameters"/>
+ <set-service-fields service-name="createGeoPoint" map="parameters" to-map="createGeoPointMap"/>/>
<call-service service-name="createGeoPoint" in-map-name="createGeoPointMap">
<result-to-field result-name="geoPointId" field="geoPointId"/>
</call-service>
- <entity-one value-field="facility" entity-name="Facility"/>
+ <entity-one entity-name="Facility" value-field="facility"/>
<set field="facility.geoPointId" from-field="geoPointId"/>
<store-value value-field="facility"/>
<else>
- <set-service-fields service-name="updateGeoPoint" to-map="updateGeoPointMap" map="parameters"/>
+ <set-service-fields service-name="updateGeoPoint" map="parameters" to-map="updateGeoPointMap"/>/>
<call-service service-name="updateGeoPoint" in-map-name="updateGeoPointMap"/>
</else>
</if-empty>
diff --git a/applications/product/minilang/product/inventory/StockMoveServices.xml b/applications/product/minilang/product/inventory/StockMoveServices.xml
index 568ed49..9b5756c 100644
--- a/applications/product/minilang/product/inventory/StockMoveServices.xml
+++ b/applications/product/minilang/product/inventory/StockMoveServices.xml
@@ -84,7 +84,7 @@
<string-to-list string="Error in stock move, could not find a pick/primary location for facility [${parameters.facilityId}] and product [${productId}]" list="warningMessageList"/>
<else>
<!-- should generally only be one pick/primary location, just choose the first... -->
- <first-from-list entry="productFacilityLocationView" list="productFacilityLocationViewList"/>
+ <first-from-list list="productFacilityLocationViewList" entry="productFacilityLocationView"/>
<get-related-one value-field="productFacilityLocationView" relation-name="FacilityLocation" to-value-field="moveInfo.facilityLocationTo"/>
<get-related-one value-field="productFacilityLocationView" relation-name="ProductFacilityLocation" to-value-field="moveInfo.targetProductFacilityLocation"/>
@@ -92,7 +92,7 @@
<calculate field="moveInfo.totalQuantity"><number value="0"/></calculate>
<iterate list="perProductOiirailList" entry="perProductOiirail">
<calculate field="moveInfo.totalQuantity">
- <calcop field="moveInfo.totalQuantity" operator="add"><calcop field="perProductOiirail.quantity" operator="get"/></calcop>
+ <calcop operator="add" field="moveInfo.totalQuantity"><calcop operator="get" field="perProductOiirail.quantity"/></calcop>
</calculate>
</iterate>
@@ -107,12 +107,12 @@
<calculate field="totalAvailableToPromise"><number value="0"/></calculate>
<iterate list="inventoryItemList" entry="inventoryItem">
<calculate field="totalQuantityOnHand">
- <calcop field="totalQuantityOnHand" operator="get"/>
- <calcop field="inventoryItem.quantityOnHandTotal" operator="get"/>
+ <calcop operator="get" field="totalQuantityOnHand"/>
+ <calcop operator="get" field="inventoryItem.quantityOnHandTotal"/>
</calculate>
<calculate field="totalAvailableToPromise">
- <calcop field="totalAvailableToPromise" operator="get"/>
- <calcop field="inventoryItem.availableToPromiseTotal" operator="get"/>
+ <calcop operator="get" field="totalAvailableToPromise"/>
+ <calcop operator="get" field="inventoryItem.availableToPromiseTotal"/>
</calculate>
</iterate>
<set from-field="totalQuantityOnHand" field="moveInfo.quantityOnHandTotalFrom"/>
@@ -130,10 +130,10 @@
<calculate field="targetTotalQuantityOnHand"><number value="0"/></calculate>
<iterate list="targetInventoryItemList" entry="inventoryItem">
<calculate field="targetTotalAvailableToPromise">
- <calcop field="targetTotalAvailableToPromise" operator="add"><calcop field="inventoryItem.availableToPromiseTotal" operator="get"/></calcop>
+ <calcop operator="add" field="targetTotalAvailableToPromise"><calcop operator="get" field="inventoryItem.availableToPromiseTotal"/></calcop>
</calculate>
<calculate field="targetTotalQuantityOnHand">
- <calcop field="targetTotalQuantityOnHand" operator="add"><calcop field="inventoryItem.quantityOnHandTotal" operator="get"/></calcop>
+ <calcop operator="add" field="targetTotalQuantityOnHand"><calcop operator="get" field="inventoryItem.quantityOnHandTotal"/></calcop>
</calculate>
</iterate>
<set from-field="targetTotalAvailableToPromise" field="moveInfo.availableToPromiseTotalTo"/>
@@ -148,7 +148,7 @@
<!-- if trying to move more from the location than is there, find the difference and put it in targetLocationSimpleMoveQuantity[moveInfo.targetProductFacilityLocation.locationSeqId] -->
<calculate field="moveInfo.totalQuantity">
- <calcop field="moveInfo.totalQuantity" operator="add"><calcop field="moveInfo.targetProductFacilityLocation.moveQuantity" operator="get"/></calcop>
+ <calcop operator="add" field="moveInfo.totalQuantity"><calcop operator="get" field="moveInfo.targetProductFacilityLocation.moveQuantity"/></calcop>
</calculate>
<else>
<!--
@@ -158,13 +158,13 @@
targetLocationSimpleMoveQuantity[moveInfo.targetProductFacilityLocation.locationSeqId]
-->
<calculate field="moveInfo.totalQuantity">
- <calcop field="moveInfo.totalQuantity" operator="add"><calcop field="targetLocationSimpleMoveQuantity[moveInfo.targetProductFacilityLocation.locationSeqId]" operator="get"/></calcop>
+ <calcop operator="add" field="moveInfo.totalQuantity"><calcop operator="get" field="targetLocationSimpleMoveQuantity[moveInfo.targetProductFacilityLocation.locationSeqId]"/></calcop>
</calculate>
</else>
</if-empty>
<if-compare-field field="totalQuantityOnHand" to-field="moveInfo.totalQuantity" operator="less" type="BigDecimal">
<calculate field="targetLocationSimpleMoveQuantity[moveInfo.targetProductFacilityLocation.locationSeqId]">
- <calcop field="moveInfo.totalQuantity" operator="subtract"><calcop field="totalQuantityOnHand" operator="get"/></calcop>
+ <calcop operator="subtract" field="moveInfo.totalQuantity"><calcop operator="get" field="totalQuantityOnHand"/></calcop>
</calculate>
<set from-field="totalQuantityOnHand" field="moveInfo.totalQuantity"/>
</if-compare-field>
@@ -274,10 +274,10 @@
<calculate field="totalAvailableToPromise"><number value="0"/></calculate>
<iterate list="perLocationInventoryItemAndLocList" entry="inventoryItem">
<calculate field="totalQuantityOnHand">
- <calcop field="totalQuantityOnHand" operator="add"><calcop field="inventoryItem.quantityOnHandTotal" operator="get"/></calcop>
+ <calcop operator="add" field="totalQuantityOnHand"><calcop operator="get" field="inventoryItem.quantityOnHandTotal"/></calcop>
</calculate>
<calculate field="totalAvailableToPromise">
- <calcop field="totalAvailableToPromise" operator="add"><calcop field="inventoryItem.availableToPromiseTotal" operator="get"/></calcop>
+ <calcop operator="add" field="totalAvailableToPromise"><calcop operator="get" field="inventoryItem.availableToPromiseTotal"/></calcop>
</calculate>
</iterate>
<else>
@@ -295,7 +295,7 @@
<then>
<set from-field="productSave" field="moveInfo.product"/>
<set from-field="targetFacilityLocationSave" field="moveInfo.facilityLocationTo"/>
- <first-from-list entry="InventoryItemAndLocation" list="perLocationInventoryItemAndLocList"/>
+ <first-from-list list="perLocationInventoryItemAndLocList" entry="InventoryItemAndLocation"/>
<get-related-one value-field="InventoryItemAndLocation" relation-name="FacilityLocation" to-value-field="moveInfo.facilityLocationFrom"/>
<get-related-one value-field="productFacilityLocationQuantityTest" relation-name="ProductFacilityLocation" to-value-field="moveInfo.targetProductFacilityLocation"/>
<set from-field="productFacilityLocationQuantityTest.availableToPromiseTotal" field="moveInfo.availableToPromiseTotalTo"/>
@@ -308,14 +308,14 @@
trying to move more from the location than is there, find the difference and put it in targetLocationMoveQuantity -->
<if-compare-field field="totalAvailableToPromise" to-field="targetLocationMoveQuantity" operator="less" type="BigDecimal">
<calculate field="targetLocationMoveQuantity">
- <calcop field="targetLocationMoveQuantity" operator="subtract"><calcop field="totalAvailableToPromise" operator="get"/></calcop>
+ <calcop operator="subtract" field="targetLocationMoveQuantity"><calcop operator="get" field="totalAvailableToPromise"/></calcop>
</calculate>
<set from-field="totalAvailableToPromise" field="moveInfo.totalQuantity"/>
<calculate field="fromLocationTotalAvailableToPromise[locationSeqId]"><number value="0"/></calculate>
<else>
<set from-field="targetLocationMoveQuantity" field="moveInfo.totalQuantity"/>
<calculate field="fromLocationTotalAvailableToPromise[locationSeqId]">
- <calcop field="totalAvailableToPromise" operator="subtract"><calcop field="targetLocationMoveQuantity" operator="get"/></calcop>
+ <calcop operator="subtract" field="totalAvailableToPromise"><calcop operator="get" field="targetLocationMoveQuantity"/></calcop>
</calculate>
<calculate field="targetLocationMoveQuantity"><number value="0"/></calculate>
</else>
@@ -402,10 +402,10 @@
<clear-field field="createNonOisgirDetailMap"/>
<set from-field="inventoryItem.inventoryItemId" field="createNonOisgirDetailMap.inventoryItemId"/>
<calculate field="createNonOisgirDetailMap.availableToPromiseDiff">
- <calcop field="currentQuantityToMove" operator="negative"/>
+ <calcop operator="negative" field="currentQuantityToMove"/>
</calculate>
<calculate field="createNonOisgirDetailMap.quantityOnHandDiff">
- <calcop field="currentQuantityToMove" operator="negative"/>
+ <calcop operator="negative" field="currentQuantityToMove"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createNonOisgirDetailMap"/>
@@ -508,9 +508,9 @@
</if-empty>
<calculate field="reservedQuantityLeftOver" type="BigDecimal">
- <calcop field="orderItemShipGrpInvRes.quantity" operator="get"/>
- <calcop field="orderItemShipGrpInvRes.quantityNotAvailable" operator="negative"/>
- <calcop field="currentQuantityToMove" operator="negative"/>
+ <calcop operator="get" field="orderItemShipGrpInvRes.quantity"/>
+ <calcop operator="negative" field="orderItemShipGrpInvRes.quantityNotAvailable"/>
+ <calcop operator="negative" field="currentQuantityToMove"/>
</calculate>
<!-- now one other little trick: reservedQuantityLeftOver is not empty and if orderItemShipGrpInvRes.quantityNotAvailable is greater than reservedQuantityLeftOver, then the difference should be moved -->
<if>
@@ -539,10 +539,10 @@
<set from-field="inventoryItem.inventoryItemId" field="createOisgirDetailMap.inventoryItemId"/>
<set from-field="targetInventoryItem.inventoryItemId" field="createOisgirTargetDetailMap.inventoryItemId"/>
<calculate field="createOisgirDetailMap.quantityOnHandDiff">
- <calcop field="currentQuantityToMove" operator="negative"/>
+ <calcop operator="negative" field="currentQuantityToMove"/>
</calculate>
<calculate field="createOisgirTargetDetailMap.quantityOnHandDiff">
- <calcop field="currentQuantityToMove" operator="get"/>
+ <calcop operator="get" field="currentQuantityToMove"/>
</calculate>
<!--
@@ -554,10 +554,10 @@
<if-not-empty field="orderItemShipGrpInvRes.quantityNotAvailable">
<if-compare field="orderItemShipGrpInvRes.quantityNotAvailable" operator="greater" value="0" type="BigDecimal">
<calculate field="createOisgirDetailMap.availableToPromiseDiff">
- <calcop field="quantityNotAvailableToMove" operator="get"/>
+ <calcop operator="get" field="quantityNotAvailableToMove"/>
</calculate>
<calculate field="createOisgirTargetDetailMap.availableToPromiseDiff">
- <calcop field="quantityNotAvailableToMove" operator="negative"/>
+ <calcop operator="negative" field="quantityNotAvailableToMove"/>
</calculate>
</if-compare>
</if-not-empty>
@@ -567,21 +567,21 @@
<!-- create the new and remove or update the old OISGIRs -->
<calculate field="targetOrderItemShipGrpInvRes.quantity" type="BigDecimal">
- <calcop field="currentQuantityToMove" operator="get"/>
- <calcop field="quantityNotAvailableToMove" operator="get"/>
+ <calcop operator="get" field="currentQuantityToMove"/>
+ <calcop operator="get" field="quantityNotAvailableToMove"/>
</calculate>
<calculate field="targetOrderItemShipGrpInvRes.quantityNotAvailable" type="BigDecimal">
- <calcop field="quantityNotAvailableToMove" operator="get"/>
+ <calcop operator="get" field="quantityNotAvailableToMove"/>
</calculate>
<create-value value-field="targetOrderItemShipGrpInvRes"/>
<calculate field="orderItemShipGrpInvRes.quantity">
- <calcop field="orderItemShipGrpInvRes.quantity" operator="get"/>
- <calcop field="currentQuantityToMove" operator="negative"/>
- <calcop field="quantityNotAvailableToMove" operator="negative"/>
+ <calcop operator="get" field="orderItemShipGrpInvRes.quantity"/>
+ <calcop operator="negative" field="currentQuantityToMove"/>
+ <calcop operator="negative" field="quantityNotAvailableToMove"/>
</calculate>
<calculate field="orderItemShipGrpInvRes.quantityNotAvailable">
- <calcop field="orderItemShipGrpInvRes.quantityNotAvailable" operator="get"/>
- <calcop field="quantityNotAvailableToMove" operator="negative"/>
+ <calcop operator="get" field="orderItemShipGrpInvRes.quantityNotAvailable"/>
+ <calcop operator="negative" field="quantityNotAvailableToMove"/>
</calculate>
<store-value value-field="orderItemShipGrpInvRes"/>
@@ -603,12 +603,12 @@
<!-- deduct the orderItemShipGrpInvRes.quantity from quantityLeftToProcess -->
<calculate field="quantityLeftToProcess">
- <calcop field="quantityLeftToProcess" operator="get"/>
- <calcop field="currentQuantityToMove" operator="negative"/>
+ <calcop operator="get" field="quantityLeftToProcess"/>
+ <calcop operator="negative" field="currentQuantityToMove"/>
</calculate>
<calculate field="remainingQuantityOnHand">
- <calcop field="remainingQuantityOnHand" operator="subtract"/>
- <calcop field="currentQuantityToMove" operator="negative"/>
+ <calcop operator="subtract" field="remainingQuantityOnHand"/>
+ <calcop operator="negative" field="currentQuantityToMove"/>
</calculate>
<!-- part of the following log data prep: <refresh-value value-field="targetInventoryItem"/> -->
<!-- <log level="info" message="Just update targetInventoryItem from OISGIR [${targetInventoryItem}]"/> -->
diff --git a/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml b/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml
index d406df3..1536701 100644
--- a/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml
+++ b/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml
@@ -104,7 +104,7 @@
<field-map field-name="productStoreGroupId" value="_NA_"/>
</entity-and>
<!-- should just be one -->
- <first-from-list entry="productPrice" list="productPriceList"/>
+ <first-from-list list="productPriceList" entry="productPrice"/>
<set field="productPrice.price" from-field="parameters.price"/>
<store-value value-field="productPrice"/>
</if-not-empty>
diff --git a/applications/product/minilang/product/product/ProductContentServices.xml b/applications/product/minilang/product/product/ProductContentServices.xml
index 895c292..caefa57 100644
--- a/applications/product/minilang/product/product/ProductContentServices.xml
+++ b/applications/product/minilang/product/product/ProductContentServices.xml
@@ -159,7 +159,7 @@
<!-- ProductPromoContent -->
<simple-method method-name="removeProductPromoContent" short-description="Remove Content From Product Promo">
- <set-service-fields service-name="updateProductPromoContent" to-map="updateProductPromoContentMap" map="parameters"/>
+ <set-service-fields service-name="updateProductPromoContent" map="parameters" to-map="updateProductPromoContentMap"/>/>
<if-empty field="updateProductPromoContentMap.thruDate">
<now-timestamp field="updateProductPromoContentMap.thruDate"/>
</if-empty>
@@ -175,7 +175,7 @@
</entity-and>
<if-not-empty field="productContents">
<first-from-list entry="productContent" list="productContents"/>
- <entity-one value-field="electronicText" entity-name="ElectronicText">
+ <entity-one entity-name="ElectronicText" value-field="electronicText">
<field-map field-name="dataResourceId" from-field="productContent.dataResourceId"/>
</entity-one>
<if-not-empty field="electronicText">
@@ -197,7 +197,7 @@
</entity-and>
<if-not-empty field="productContents">
<first-from-list entry="productContent" list="productContents"/>
- <entity-one value-field="electronicText" entity-name="ElectronicText">
+ <entity-one entity-name="ElectronicText" value-field="electronicText">
<field-map field-name="dataResourceId" from-field="productContent.dataResourceId"/>
</entity-one>
<if-not-empty field="electronicText">
@@ -219,7 +219,7 @@
</entity-and>
<if-not-empty field="productContents">
<first-from-list entry="productContent" list="productContents"/>
- <entity-one value-field="electronicText" entity-name="ElectronicText">
+ <entity-one entity-name="ElectronicText" value-field="electronicText">
<field-map field-name="dataResourceId" from-field="productContent.dataResourceId"/>
</entity-one>
<if-not-empty field="electronicText">
diff --git a/applications/product/minilang/product/product/ProductServices.xml b/applications/product/minilang/product/product/ProductServices.xml
index 1e0d967..93c21e3 100644
--- a/applications/product/minilang/product/product/ProductServices.xml
+++ b/applications/product/minilang/product/product/ProductServices.xml
@@ -36,7 +36,7 @@
<else>
<check-id field="newEntity.productId"/>
<check-errors />
- <entity-one value-field="dummyProduct" entity-name="Product"><field-map field-name="productId" from-field="parameters.productId"/></entity-one>
+ <entity-one entity-name="Product" value-field="dummyProduct"><field-map field-name="productId" from-field="parameters.productId"/></entity-one>
<if-not-empty field="dummyProduct">
<add-error ><fail-property resource="CommonErrorUiLabels" property="CommonErrorDuplicateKey" /></add-error>
</if-not-empty>
@@ -426,8 +426,8 @@
<create-value value-field="productCalculatedInfo"/>
<else>
<calculate field="productCalculatedInfo.totalTimesViewed" type="Long">
- <calcop field="productCalculatedInfo.totalTimesViewed" operator="add">
- <calcop field="parameters.weight" operator="get"></calcop>
+ <calcop operator="add" field="productCalculatedInfo.totalTimesViewed">
+ <calcop operator="get" field="parameters.weight"></calcop>
</calcop>
</calculate>
<store-value value-field="productCalculatedInfo"/>
@@ -914,7 +914,7 @@
<field-map field-name="productIdTo" from-field="orderItem.productId"/>
<field-map field-name="productAssocTypeId" value="PRODUCT_VARIANT"/>
</entity-and>
- <first-from-list entry="variantProductAssoc" list="variantProductAssocs"/>
+ <first-from-list list="variantProductAssocs" entry="variantProductAssoc"/>
<set field="productId" from-field="variantProductAssoc.productId"/>
</if-compare>
@@ -922,10 +922,10 @@
<field-map field-name="productId" from-field="productId"/>
</entity-and>
<if-not-empty field="productGroupOrders">
- <first-from-list entry="productGroupOrder" list="productGroupOrders"/>
+ <first-from-list list="productGroupOrders" entry="productGroupOrder"/>
<calculate field="productGroupOrder.soldOrderQty">
- <calcop field="productGroupOrder.soldOrderQty" operator="add">
- <calcop field="orderItem.quantity" operator="get"/>
+ <calcop operator="add" field="productGroupOrder.soldOrderQty">
+ <calcop operator="get" field="orderItem.quantity"/>
</calcop>
</calculate>
<store-value value-field="productGroupOrder"/>
@@ -956,7 +956,7 @@
<field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/>
</entity-and>
<if-not-empty field="orderItemGroupOrders">
- <first-from-list entry="orderItemGroupOrder" list="orderItemGroupOrders"/>
+ <first-from-list list="orderItemGroupOrders" entry="orderItemGroupOrder"/>
<entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder">
<field-map field-name="groupOrderId" from-field="orderItemGroupOrder.groupOrderId"/>
</entity-one>
@@ -970,8 +970,8 @@
</else>
</if-not-empty>
<calculate field="productGroupOrder.soldOrderQty">
- <calcop field="productGroupOrder.soldOrderQty" operator="subtract">
- <calcop field="cancelQuantity" operator="get"/>
+ <calcop operator="subtract" field="productGroupOrder.soldOrderQty">
+ <calcop operator="get" field="cancelQuantity"/>
</calcop>
</calculate>
</if-compare>
@@ -1017,7 +1017,7 @@
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>
- <entity-one value-field="productReview" entity-name="ProductReview"/>
+ <entity-one entity-name="ProductReview" value-field="productReview"/>
<if-not-empty field="productReview">
<if-compare-field field="productReview.statusId" to-field="parameters.statusId" operator="not-equals">
<entity-one entity-name="StatusValidChange" value-field="statusChange">
diff --git a/applications/product/minilang/product/storage/FacilityContactMechServices.xml b/applications/product/minilang/product/storage/FacilityContactMechServices.xml
index 6e1afc0..2fdeea8 100644
--- a/applications/product/minilang/product/storage/FacilityContactMechServices.xml
+++ b/applications/product/minilang/product/storage/FacilityContactMechServices.xml
@@ -64,7 +64,7 @@
<field-map field-name="facilityId" from-field="parameters.facilityId"/>
<field-map field-name="contactMechId" from-field="parameters.contactMechId"/>
</entity-and>
- <first-from-list entry="facilityContactMech" list="facilityContactMechs"/>
+ <first-from-list list="facilityContactMechs" entry="facilityContactMech"/>
<if-empty field="facilityContactMech">
<add-error>
<fail-property resource="PartyUiLabels" property="PartyCannotUpdateContactBecauseNotWithSpecifiedParty"/>
@@ -131,7 +131,7 @@
<find-by-and entity-name="FacilityContactMech" list="facilityContactMechs" map="facilityContactMechMap"/>
<filter-list-by-date list="facilityContactMechs" to-list="validFacilityContactMechs"/>
- <first-from-list entry="facilityContactMech" list="validFacilityContactMechs"/>
+ <first-from-list list="validFacilityContactMechs" entry="facilityContactMech"/>
<if-empty field="facilityContactMech">
<add-error>
<fail-property resource="PartyUiLabels" property="PartyContactMechNotFoundCannotDelete"/>
diff --git a/applications/product/minilang/product/store/ProductStoreServices.xml b/applications/product/minilang/product/store/ProductStoreServices.xml
index d964bad..ecf7d77 100644
--- a/applications/product/minilang/product/store/ProductStoreServices.xml
+++ b/applications/product/minilang/product/store/ProductStoreServices.xml
@@ -159,7 +159,7 @@
</add-error>
<check-errors/>
</if-empty>
- <set-service-fields map="parameters" to-map="callServiceMap" service-name="reserveProductInventoryByFacility"/>
+ <set-service-fields service-name="reserveProductInventoryByFacility" map="parameters" to-map="callServiceMap"/>/>
<set from-field="productStore.inventoryFacilityId" field="callServiceMap.facilityId"/>
<set from-field="requireInventory" field="callServiceMap.requireInventory"/>
<set from-field="productStore.reserveOrderEnumId" field="callServiceMap.reserveOrderEnumId"/>
@@ -203,7 +203,7 @@
<first-from-list list="productStoreFacilities" entry="storeFound"/>
</if-empty>
<set from-field="storeFound.facilityId" field="facilityId" default-value=""/>
- <set-service-fields map="parameters" to-map="callServiceMap" service-name="reserveProductInventoryByFacility"/>
+ <set-service-fields service-name="reserveProductInventoryByFacility" map="parameters" to-map="callServiceMap"/>/>
<set from-field="facilityId" field="callServiceMap.facilityId"/>
<set from-field="requireInventory" field="callServiceMap.requireInventory"/>
<set from-field="productStore.reserveOrderEnumId" field="callServiceMap.reserveOrderEnumId"/>
@@ -230,7 +230,7 @@
</add-error>
<check-errors/>
</if-empty>
- <set-service-fields map="parameters" to-map="callServiceMap" service-name="reserveProductInventoryByFacility"/>
+ <set-service-fields service-name="reserveProductInventoryByFacility" map="parameters" to-map="callServiceMap"/>/>
<set from-field="facilityId" field="callServiceMap.facilityId"/>
<set from-field="requireInventory" field="callServiceMap.requireInventory"/>
<set from-field="productStore.reserveOrderEnumId" field="callServiceMap.reserveOrderEnumId"/>
@@ -420,7 +420,7 @@
<set value="Y" field="availableOrNotRequired"/>
<field-to-result field="availableOrNotRequired"/>
<else>
- <set-service-fields map="parameters" to-map="callServiceMap" service-name="isStoreInventoryAvailable"/>
+ <set-service-fields service-name="isStoreInventoryAvailable" map="parameters" to-map="callServiceMap"/>/>
<call-service service-name="isStoreInventoryAvailable" in-map-name="callServiceMap">
<result-to-result result-name="available" service-result-name="availableOrNotRequired"/>
</call-service>
@@ -512,12 +512,12 @@
</simple-method>
<simple-method method-name="checkProductStoreGroupRollup" short-description="When product store group hierarchy has been operate, synchronize primaryParentGroupId with ProductStoreGroupRollup">
- <entity-one value-field="productStoreGroup" entity-name="ProductStoreGroup"/>
+ <entity-one entity-name="ProductStoreGroup" value-field="productStoreGroup"/>
<if-empty field="parameters.primaryParentGroupId">
- <entity-one value-field="productStoreGroupRollup" entity-name="ProductStoreGroupRollup"/>
+ <entity-one entity-name="ProductStoreGroupRollup" value-field="productStoreGroupRollup"/>
<if-not-empty field="productStoreGroupRollup">
<set field="productStoreGroup.primaryParentGroupId"/>
- <set-service-fields service-name="updateProductStoreGroup" to-map="productStoreGroupMap" map="productStoreGroup"/>
+ <set-service-fields service-name="updateProductStoreGroup" map="productStoreGroup" to-map="productStoreGroupMap"/>/>
<call-service service-name="updateProductStoreGroup" in-map-name="productStoreGroupMap"/>
</if-not-empty>
<else>
diff --git a/applications/product/minilang/product/subscription/SubscriptionServices.xml b/applications/product/minilang/product/subscription/SubscriptionServices.xml
index faad52d..d640a78 100644
--- a/applications/product/minilang/product/subscription/SubscriptionServices.xml
+++ b/applications/product/minilang/product/subscription/SubscriptionServices.xml
@@ -38,7 +38,7 @@
<field-map field-name="productId" from-field="parameters.productId"/>
<order-by field-name="-fromDate"/>
</entity-and>
- <first-from-list entry="resource" list="resourceList"/>
+ <first-from-list list="resourceList" entry="resource"/>
<if-not-empty field="resource">
<set-nonpk-fields map="resource" value-field="newEntity"/>
</if-not-empty>
@@ -62,7 +62,7 @@
<set field="found" value="false" type="Boolean"/>
<else>
<set field="found" value="true" type="Boolean"/>
- <first-from-list entry="subscription" list="pfResultList"/>
+ <first-from-list list="pfResultList" entry="subscription"/>
<field-to-result field="subscription.subscriptionId" result-name="subscriptionId"/>
</else>
</if-empty>
diff --git a/applications/product/minilang/product/test/GroupOrderTest.xml b/applications/product/minilang/product/test/GroupOrderTest.xml
index ef032da..78c7a6b 100644
--- a/applications/product/minilang/product/test/GroupOrderTest.xml
+++ b/applications/product/minilang/product/test/GroupOrderTest.xml
@@ -36,7 +36,7 @@
<field field="nowTimestamp" type="java.sql.Timestamp"/>
<field field="days" type="int"/>
</call-class-method>
- <entity-one value-field="systemUserLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="createProductGroupOrderMap.userLogin" from-field="systemUserLogin"/>
@@ -58,7 +58,7 @@
<field field="response" type="javax.servlet.http.HttpServletResponse"/>
</call-class-method>
<log level="info" message="===== >>> Event : routeOrderEntry, Response : ${result}"/>
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<script>groovy:
@@ -132,7 +132,7 @@
<entity-and entity-name="OrderItemGroupOrder" list="orderItemGroupOrders">
<field-map field-name="groupOrderId" from-field="groupOrderId"/>
</entity-and>
- <first-from-list entry="orderItemGroupOrder" list="orderItemGroupOrders"/>
+ <first-from-list list="orderItemGroupOrders" entry="orderItemGroupOrder"/>
<entity-one entity-name="OrderItem" value-field="orderItem">
<field-map field-name="orderId" from-field="orderItemGroupOrder.orderId"/>
<field-map field-name="orderItemSeqId" from-field="orderItemGroupOrder.orderItemSeqId"/>
@@ -158,7 +158,7 @@
<field field="nowTimestamp" type="java.sql.Timestamp"/>
<field field="days" type="int"/>
</call-class-method>
- <entity-one value-field="systemUserLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="createProductGroupOrderMap.userLogin" from-field="systemUserLogin"/>
@@ -180,7 +180,7 @@
<field field="response" type="javax.servlet.http.HttpServletResponse"/>
</call-class-method>
<log level="info" message="===== >>> Event : routeOrderEntry, Response : ${result}"/>
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<script>groovy:
@@ -254,7 +254,7 @@
<entity-and entity-name="OrderItemGroupOrder" list="orderItemGroupOrders">
<field-map field-name="groupOrderId" from-field="groupOrderId"/>
</entity-and>
- <first-from-list entry="orderItemGroupOrder" list="orderItemGroupOrders"/>
+ <first-from-list list="orderItemGroupOrders" entry="orderItemGroupOrder"/>
<entity-one entity-name="OrderItem" value-field="orderItem">
<field-map field-name="orderId" from-field="orderItemGroupOrder.orderId"/>
<field-map field-name="orderItemSeqId" from-field="orderItemGroupOrder.orderItemSeqId"/>
diff --git a/applications/product/minilang/product/test/ProductTagTest.xml b/applications/product/minilang/product/test/ProductTagTest.xml
index 2b481b3..2ca243e 100644
--- a/applications/product/minilang/product/test/ProductTagTest.xml
+++ b/applications/product/minilang/product/test/ProductTagTest.xml
@@ -33,7 +33,7 @@
Step 8) Check all product tags is created.
-->
<!-- Step 1 -->
- <entity-one value-field="systemUserLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="request" from-field="parameters.request"/>
diff --git a/applications/product/minilang/shipment/issuance/IssuanceServices.xml b/applications/product/minilang/shipment/issuance/IssuanceServices.xml
index d4cba60..d140caf 100644
--- a/applications/product/minilang/shipment/issuance/IssuanceServices.xml
+++ b/applications/product/minilang/shipment/issuance/IssuanceServices.xml
@@ -45,7 +45,7 @@
<set field="updateContext.statusId" value="INV_DELIVERED"/>
<call-service service-name="updateInventoryItem" in-map-name="updateContext"/>
- <entity-one value-field="product" entity-name="Product">
+ <entity-one entity-name="Product" value-field="product">
<field-map field-name="productId" from-field="inventoryItem.productId"/>
</entity-one>
<if>
@@ -185,7 +185,7 @@
<make-value entity-name="OrderShipment" value-field="orderShipmentLookupPk"/>
<set-pk-fields value-field="orderShipmentLookupPk" map="parameters"/>
<find-by-and entity-name="OrderShipment" map="orderShipmentLookupPk" list="orderShipments"/>
- <first-from-list entry="orderShipment" list="orderShipments"/>
+ <first-from-list list="orderShipments" entry="orderShipment"/>
<!-- will create qtyForShipmentItem -->
<call-simple-method method-name="calcQtyForShipmentItemInline"/>
@@ -210,7 +210,7 @@
<else>
<!-- A reduction in the quantity, so OrderShipment must exist. -->
<calculate field="orderShipment.quantity">
- <calcop field="orderShipment.quantity" operator="subtract">
+ <calcop operator="subtract" field="orderShipment.quantity">
<calcop operator="get" field="parameters.quantity"/>
</calcop>
</calculate>
@@ -267,7 +267,7 @@
<set from-field="shipmentItem.shipmentItemSeqId" field="createDetailMap.shipmentItemSeqId"/>
<set from-field="itemIssuanceId" field="createDetailMap.itemIssuanceId"/>
<calculate field="createDetailMap.quantityOnHandDiff" decimal-scale="6">
- <calcop field="parameters.quantity" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantity"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
<clear-field field="createDetailMap"/>
@@ -319,7 +319,7 @@
<iterate list="itemIssuances" entry="itemIssuance">
<if-compare-field field="itemIssuance.inventoryItemId" operator="not-equals" to-field="parameters.inventoryItemId">
<calculate field="otherInventoryItemQuantity">
- <calcop field="otherInventoryItemQuantity" operator="add">
+ <calcop operator="add" field="otherInventoryItemQuantity">
<calcop operator="get" field="itemIssuance.quantity"/>
</calcop>
</calculate>
@@ -331,13 +331,13 @@
from the current one should be ignored as we calculate the adjustment to make.
-->
<calculate field="orderShipmentAmount">
- <calcop field="orderShipment.quantity" operator="subtract">
+ <calcop operator="subtract" field="orderShipment.quantity">
<calcop operator="get" field="otherInventoryItemQuantity"/>
</calcop>
</calculate>
<!-- qtyForShipmentItem is the quantity we will add to the ShipmentItem -->
<calculate field="qtyForShipmentItem">
- <calcop field="parameters.quantity" operator="subtract">
+ <calcop operator="subtract" field="parameters.quantity">
<calcop operator="get" field="orderShipmentAmount"/>
</calcop>
</calculate>
@@ -356,7 +356,7 @@
</condition-list>
<order-by field-name="shipmentItemSeqId"/>
</entity-condition>
- <first-from-list entry="shipmentItem" list="shipmentItems"/>
+ <first-from-list list="shipmentItems" entry="shipmentItem"/>
</if-not-empty>
<if-empty field="shipmentItem">
@@ -400,14 +400,14 @@
<make-value entity-name="OrderShipment" value-field="orderShipmentLookupPk"/>
<set-pk-fields value-field="orderShipmentLookupPk" map="orderShipmentCreate"/>
<find-by-and entity-name="OrderShipment" map="orderShipmentLookupPk" list="orderShipments"/>
- <first-from-list entry="orderShipment" list="orderShipments"/>
+ <first-from-list list="orderShipments" entry="orderShipment"/>
<if-empty field="orderShipment">
<set from-field="parameters.quantity" field="orderShipmentCreate.quantity"/>
<call-service service-name="createOrderShipment" in-map-name="orderShipmentCreate"/>
<else>
<calculate field="orderShipment.quantity">
- <calcop field="orderShipment.quantity" operator="add">
+ <calcop operator="add" field="orderShipment.quantity">
<calcop operator="get" field="parameters.quantity"/>
</calcop>
</calculate>
@@ -428,7 +428,7 @@
<order-by field-name="-issuedDateTime"/>
</entity-and>
<if-not-empty field="itemIssuances">
- <first-from-list entry="itemIssuance" list="itemIssuances"/>
+ <first-from-list list="itemIssuances" entry="itemIssuance"/>
<set field="itemIssuance.quantity" value="${itemIssuance.quantity$bigDecimal + parameters.quantity$bigDecimal}" type="BigDecimal"/>
<store-value value-field="itemIssuance"/>
<set field="itemIssuanceId" from-field="itemIssuance.itemIssuanceId"/>
@@ -472,7 +472,7 @@
</if-empty>
<!-- Add ItemIssuanceRole for party that issues this... -->
- <entity-one value-field="itemIssuanceRole" entity-name="ItemIssuanceRole">
+ <entity-one entity-name="ItemIssuanceRole" value-field="itemIssuanceRole">
<field-map field-name="itemIssuanceId" from-field="itemIssuanceId"/>
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="roleTypeId" value="PACKER"/>
@@ -523,10 +523,10 @@
<set from-field="fixedAssetMaint.maintHistSeqId" field="createDetailMap.maintHistSeqId"/>
<set from-field="itemIssuanceId" field="createDetailMap.itemIssuanceId"/>
<calculate field="createDetailMap.quantityOnHandDiff" decimal-scale="6">
- <calcop field="parameters.quantity" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantity"/>
</calculate>
<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="parameters.quantity" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantity"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
</simple-method>
@@ -545,10 +545,10 @@
<set from-field="itemIssuance.maintHistSeqId" field="createDetailMap.maintHistSeqId"/>
<set from-field="itemIssuance.itemIssuanceId" field="createDetailMap.itemIssuanceId"/>
<calculate field="createDetailMap.quantityOnHandDiff" decimal-scale="6">
- <calcop field="oldQuantity" operator="add"/>
+ <calcop operator="add" field="oldQuantity"/>
</calculate>
<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="oldQuantity" operator="add"/>
+ <calcop operator="add" field="oldQuantity"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
</simple-method>
@@ -577,7 +577,7 @@
<!-- get the quantity that can be cancelled ItemIssuance -->
<calculate field="qtyIssuedLeft">
- <calcop field="itemIssuance.quantity" operator="subtract">
+ <calcop operator="subtract" field="itemIssuance.quantity">
<calcop operator="get" field="itemIssuance.cancelQuantity"/>
</calcop>
</calculate>
@@ -699,10 +699,10 @@
<set field="createDetailMap.shipmentId" from-field="shipmentId"/>
<set field="createDetailMap.shipmentItemSeqId" from-field="shipmentItemSeqId"/>
<calculate field="createDetailMap.quantityOnHandDiff" decimal-scale="6">
- <calcop field="parameters.quantity" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantity"/>
</calculate>
<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="parameters.quantity" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantity"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
</simple-method>
diff --git a/applications/product/minilang/shipment/picklist/PicklistServices.xml b/applications/product/minilang/shipment/picklist/PicklistServices.xml
index 9074d8e..e3a3c30 100644
--- a/applications/product/minilang/shipment/picklist/PicklistServices.xml
+++ b/applications/product/minilang/shipment/picklist/PicklistServices.xml
@@ -398,7 +398,7 @@
<clear-field field="orderHeaderInfo"/>
<calculate field="numberSoFar" type="Long">
- <calcop field="numberSoFar" operator="add"><number value="1"/></calcop>
+ <calcop operator="add" field="numberSoFar"><number value="1"/></calcop>
</calculate>
<log level="info" message="Added order #${orderHeader.orderId} to pick list [${numberSoFar} of ${parameters.maxNumberOfOrders}] - ${pickThisOrder} / ${allPickStarted}"/>
<set field="pickMoveInfoMap[groupName].groupName" from-field="groupName"/>
@@ -480,7 +480,7 @@
</if>
<calculate field="numberSoFar" type="Long">
- <calcop field="numberSoFar" operator="add"><number value="1"/></calcop>
+ <calcop operator="add" field="numberSoFar"><number value="1"/></calcop>
</calculate>
</iterate>
-->
@@ -511,8 +511,8 @@
<clear-field field="inventoryItemOrderItemList"/>
<if-not-empty field="inventoryItemQuantities[inventoryItemId]">
<calculate field="inventoryItemQuantities[inventoryItemId]">
- <calcop field="inventoryItemQuantities[inventoryItemId]" operator="add">
- <calcop field="orderItemShipGrpInvRes.quantity" operator="get"/>
+ <calcop operator="add" field="inventoryItemQuantities[inventoryItemId]">
+ <calcop operator="get" field="orderItemShipGrpInvRes.quantity"/>
</calcop>
</calculate>
<else>
@@ -523,8 +523,8 @@
<clear-field field="inventoryItem"/>
<!-- update total quantity reserved, picked, etc per line item to check to see if all and not more is reserved -->
<calculate field="reservedQuantity">
- <calcop field="reservedQuantity" operator="add">
- <calcop field="orderItemShipGrpInvRes.quantity" operator="get"/>
+ <calcop operator="add" field="reservedQuantity">
+ <calcop operator="get" field="orderItemShipGrpInvRes.quantity"/>
</calcop>
</calculate>
</iterate>
@@ -544,8 +544,8 @@
<calculate field="issuedQuantity"><number value="0"/></calculate>
<iterate list="itemIssuances" entry="itemIssuance">
<calculate field="issuedQuantity">
- <calcop field="issuedQuantity" operator="get"/>
- <calcop field="itemIssuance.quantity" operator="get"/>
+ <calcop operator="get" field="issuedQuantity"/>
+ <calcop operator="get" field="itemIssuance.quantity"/>
</calculate>
</iterate>
<calculate field="reservedIssuedQuantity">
@@ -648,7 +648,7 @@
<result-to-field result-name="picklistBinId"/>
</call-service>
- <calculate field="binLocationNumber" type="Long"><calcop field="binLocationNumber" operator="add"/><number value="1"/></calculate>
+ <calculate field="binLocationNumber" type="Long"><calcop operator="add" field="binLocationNumber"/><number value="1"/></calculate>
<set field="itemsInBin" type="Long" value="0"/>
<iterate list="orderHeaderInfo.orderItemInfoList" entry="orderItemInfo">
@@ -669,8 +669,8 @@
<set field="quantityToSubtract" from-field="orderItemShipGrpInvRes.quantityNotAvailable"/>
<log level="info" message="Subtracting ${quantityToSubtract} from ${quantityToPick}"/>
<calculate field="quantityToPick">
- <calcop field="quantityToPick" operator="subtract">
- <calcop field="quantityToSubtract" operator="get"/>
+ <calcop operator="subtract" field="quantityToPick">
+ <calcop operator="get" field="quantityToSubtract"/>
</calcop>
</calculate>
</then>
@@ -921,7 +921,7 @@
<!-- In order to check if there is a link between the lot and the productId,
we retrieve all the inventoryItems with this lotId ... -->
- <entity-condition list="inventoryItemList" entity-name="InventoryItem">
+ <entity-condition entity-name="InventoryItem" list="inventoryItemList">
<condition-expr field-name="lotId" from-field="parameters.lotId" operator="equals"/>
</entity-condition>
@@ -948,8 +948,8 @@
<!-- Check the stock of this lot -->
<call-service service-name="getInventoryAvailableByFacility" in-map-name="inputMap">
- <result-to-field field="quantityOnHandTotal" result-name="quantityOnHandTotal"/>
- <result-to-field field="availableToPromiseTotal" result-name="availableToPromiseTotal"/>
+ <result-to-field result-name="quantityOnHandTotal" field="quantityOnHandTotal"/>
+ <result-to-field result-name="availableToPromiseTotal" field="availableToPromiseTotal"/>
</call-service>
<if>
@@ -977,7 +977,7 @@
<remove-value value-field="picklistItem"/>
<!-- ... and its OrderItemShipGrpInvRes -->
- <set-service-fields map="parameters" to-map="cancelOrderItemShipGrpInvResMap" service-name="cancelOrderItemShipGrpInvRes"/>
+ <set-service-fields service-name="cancelOrderItemShipGrpInvRes" map="parameters" to-map="cancelOrderItemShipGrpInvResMap"/>/>
<call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOrderItemShipGrpInvResMap"/>
<clear-field field="inputMap"/>
@@ -1023,7 +1023,7 @@
<call-service service-name="reserveProductInventoryByFacility" in-map-name="inputMap"/>
</if-compare-field>
- <entity-condition list="oisgirs" entity-name="OrderItemShipGrpInvRes">
+ <entity-condition entity-name="OrderItemShipGrpInvRes" list="oisgirs">
<condition-list>
<condition-expr from-field="parameters.orderId" field-name="orderId" operator="equals"/>
<condition-expr from-field="parameters.shipGroupSeqId" field-name="shipGroupSeqId" operator="equals"/>
@@ -1033,7 +1033,7 @@
<set from-field="picklistItem.picklistBinId" field="picklistBinId"/>
- <entity-condition list="picklistItemList" entity-name="PicklistItem">
+ <entity-condition entity-name="PicklistItem" list="picklistItemList">
<condition-list>
<condition-expr from-field="parameters.orderId" field-name="orderId" operator="equals"/>
<condition-expr from-field="parameters.shipGroupSeqId" field-name="shipGroupSeqId" operator="equals"/>
@@ -1260,14 +1260,14 @@
<!-- make the pickQuantity and quantityByPicklistBinIdMap -->
<iterate list="facilityLocationInfo.picklistItemInfoList" entry="picklistItemInfo">
<calculate field="facilityLocationInfo.pickQuantity">
- <calcop field="facilityLocationInfo.pickQuantity" operator="add">
- <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
+ <calcop operator="add" field="facilityLocationInfo.pickQuantity">
+ <calcop operator="get" field="picklistItemInfo.picklistItem.quantity"/>
</calcop>
</calculate>
<calculate field="facilityLocationInfo.quantityByPicklistBinIdMap[picklistItemInfo.picklistBin.picklistBinId]">
- <calcop field="facilityLocationInfo.quantityByPicklistBinIdMap[picklistItemInfo.picklistBin.picklistBinId]" operator="add">
- <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
+ <calcop operator="add" field="facilityLocationInfo.quantityByPicklistBinIdMap[picklistItemInfo.picklistBin.picklistBinId]">
+ <calcop operator="get" field="picklistItemInfo.picklistItem.quantity"/>
</calcop>
</calculate>
@@ -1313,13 +1313,13 @@
<!-- make the pickQuantity and quantityByPicklistBinIdMap -->
<iterate list="productInfo.picklistItemInfoList" entry="picklistItemInfo">
<calculate field="productInfo.pickQuantity">
- <calcop field="productInfo.pickQuantity" operator="add"/>
- <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
+ <calcop operator="add" field="productInfo.pickQuantity"/>
+ <calcop operator="get" field="picklistItemInfo.picklistItem.quantity"/>
</calculate>
<calculate field="productInfo.quantityByPicklistBinIdMap[picklistItemInfo.picklistBin.picklistBinId]">
- <calcop field="productInfo.quantityByPicklistBinIdMap[picklistItemInfo.picklistBin.picklistBinId]" operator="add">
- <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
+ <calcop operator="add" field="productInfo.quantityByPicklistBinIdMap[picklistItemInfo.picklistBin.picklistBinId]">
+ <calcop operator="get" field="picklistItemInfo.picklistItem.quantity"/>
</calcop>
</calculate>
</iterate>
@@ -1526,8 +1526,8 @@
<!-- before destroying inventoryItemInfo, add info to the productInfoMap -->
<set from-field="inventoryItemInfo.product" field="productInfoMap.${inventoryItemInfo.product.productId}.product"/>
<calculate field="productInfoMap.${inventoryItemInfo.product.productId}.quantity">
- <calcop field="productInfoMap.${inventoryItemInfo.product.productId}.quantity" operator="get"/>
- <calcop field="inventoryItemInfo.quantity" operator="get"/>
+ <calcop operator="get" field="productInfoMap.${inventoryItemInfo.product.productId}.quantity"/>
+ <calcop operator="get" field="inventoryItemInfo.quantity"/>
</calculate>
<set from-field="inventoryItemInfo.inventoryItem" field="productInfoMap.${inventoryItemInfo.product.productId}.inventoryItemList[]"/>
<!-- put orderItems in Map by orderId:orderItemSeqId to make sure they are unique -->
diff --git a/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml b/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml
index 8b919aa..46eb92c 100644
--- a/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml
+++ b/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml
@@ -47,7 +47,7 @@
</if-not-empty>
<set field="affectAccounting" type="Boolean" value="true"/>
- <entity-one value-field="product" entity-name="Product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<if>
<condition>
<or>
@@ -382,7 +382,7 @@
</condition-list>
<order-by field-name="shipmentItemSeqId"/>
</entity-condition>
- <first-from-list entry="shipmentItem" list="shipmentItems"/>
+ <first-from-list list="shipmentItems" entry="shipmentItem"/>
</if-not-empty>
<if-empty field="shipmentItem">
@@ -418,7 +418,7 @@
<field-map field-name="shipmentItemSeqId" from-field="shipmentItem.shipmentItemSeqId"/>
<field-map field-name="shipGroupSeqId" from-field="orderItemShipGroupAssoc.shipGroupSeqId"/>
</entity-and>
- <first-from-list entry="orderShipment" list="orderShipments"/>
+ <first-from-list list="orderShipments" entry="orderShipment"/>
<if-compare-field field="totalIssuedQuantity" operator="less" to-field="receivedQuantity" type="BigDecimal">
<set field="quantityToAdd" value="${receivedQuantity$bigDecimal - totalIssuedQuantity$bigDecimal}" type="BigDecimal"/>
<set field="shipmentItem.quantity" value="${shipmentItem.quantity$bigDecimal + quantityToAdd$bigDecimal}" type="BigDecimal"/>
@@ -454,7 +454,7 @@
</simple-method>
<simple-method method-name="updateIssuanceShipmentAndPoOnReceiveInventory" short-description="Update issuance, shipment and order items if quantity received is higher than quantity on purchase order">
- <entity-one value-field="orderItem" entity-name="OrderItem"/>
+ <entity-one entity-name="OrderItem" value-field="orderItem"/>
<if-not-empty field="parameters.orderCurrencyUnitPrice">
<if-compare-field field="parameters.orderCurrencyUnitPrice" operator="not-equals" to-field="orderItem.unitPrice" type="BigDecimal">
<set field="orderItem.unitPrice" from-field="parameters.orderCurrencyUnitPrice" type="BigDecimal"/>
@@ -479,7 +479,7 @@
<calcop operator="get" field="orderItem.quantity"/>
</calcop>
</calculate>
- <first-from-list entry="orderItemShipGroupAssoc" list="orderItemShipGroupAssocs"/>
+ <first-from-list list="orderItemShipGroupAssocs" entry="orderItemShipGroupAssoc"/>
<calculate field="oisgaQuantity" type="BigDecimal" decimal-scale="2" rounding-mode="HalfUp">
<calcop operator="add">
<calcop operator="get" field="orderItemShipGroupAssoc.quantity"/>
@@ -504,7 +504,7 @@
</condition-list>
<order-by field-name="shipmentItemSeqId"/>
</entity-condition>
- <first-from-list entry="shipmentItem" list="shipmentItems"/>
+ <first-from-list list="shipmentItems" entry="shipmentItem"/>
<set field="shipmentItem.quantity" value="${shipmentItem.quantity$bigDecimal + quantityToAdd$bigDecimal}" type="BigDecimal"/>
<store-value value-field="shipmentItem"/>
@@ -514,7 +514,7 @@
<field-map field-name="shipmentId" from-field="parameters.shipmentId"/>
<field-map field-name="shipmentItemSeqId" from-field="shipmentItem.shipmentItemSeqId"/>
</entity-and>
- <first-from-list entry="orderShipment" list="orderShipments"/>
+ <first-from-list list="orderShipments" entry="orderShipment"/>
<set field="orderShipment.quantity" value="${orderShipment.quantity$bigDecimal + quantityToAdd$bigDecimal}" type="BigDecimal"/>
<store-value value-field="orderShipment"/>
<!--
diff --git a/applications/product/minilang/shipment/shipment/ShipmentServices.xml b/applications/product/minilang/shipment/shipment/ShipmentServices.xml
index 8c65e2c..695cb65 100644
--- a/applications/product/minilang/shipment/shipment/ShipmentServices.xml
+++ b/applications/product/minilang/shipment/shipment/ShipmentServices.xml
@@ -495,7 +495,7 @@
<if-empty field="shipment.partyIdFrom">
<set value="SHIP_FROM_VENDOR" field="limitRoleMap.roleTypeId"/>
<filter-list-by-and list="orderRoles" map="limitRoleMap" to-list="limitOrderRoles"/>
- <first-from-list entry="limitOrderRole" list="limitOrderRoles"/>
+ <first-from-list list="limitOrderRoles" entry="limitOrderRole"/>
<if-not-empty field="limitOrderRole">
<set from-field="limitOrderRole.partyId" field="shipment.partyIdFrom"/>
</if-not-empty>
@@ -505,7 +505,7 @@
<if-empty field="shipment.partyIdFrom">
<set value="VENDOR" field="limitRoleMap.roleTypeId"/>
<filter-list-by-and list="orderRoles" map="limitRoleMap" to-list="limitOrderRoles"/>
- <first-from-list entry="limitOrderRole" list="limitOrderRoles"/>
+ <first-from-list list="limitOrderRoles" entry="limitOrderRole"/>
<if-not-empty field="limitOrderRole">
<set from-field="limitOrderRole.partyId" field="shipment.partyIdFrom"/>
</if-not-empty>
@@ -516,7 +516,7 @@
<if-empty field="shipment.partyIdTo">
<set value="SHIP_TO_CUSTOMER" field="limitRoleMap.roleTypeId"/>
<filter-list-by-and list="orderRoles" map="limitRoleMap" to-list="limitOrderRoles"/>
- <first-from-list entry="limitOrderRole" list="limitOrderRoles"/>
+ <first-from-list list="limitOrderRoles" entry="limitOrderRole"/>
<if-not-empty field="limitOrderRole">
<set from-field="limitOrderRole.partyId" field="shipment.partyIdTo"/>
</if-not-empty>
@@ -526,7 +526,7 @@
<if-empty field="shipment.partyIdTo">
<set value="CUSTOMER" field="limitRoleMap.roleTypeId"/>
<filter-list-by-and list="orderRoles" map="limitRoleMap" to-list="limitOrderRoles"/>
- <first-from-list entry="limitOrderRole" list="limitOrderRoles"/>
+ <first-from-list list="limitOrderRoles" entry="limitOrderRole"/>
<if-not-empty field="limitOrderRole">
<set from-field="limitOrderRole.partyId" field="shipment.partyIdTo"/>
</if-not-empty>
@@ -541,7 +541,7 @@
<!-- first try from orderContactMechs -->
<set value="SHIPPING_LOCATION" field="destinationContactMap.contactMechPurposeTypeId"/>
<filter-list-by-and list="orderContactMechs" map="destinationContactMap" to-list="destinationOrderContactMechs"/>
- <first-from-list entry="destinationOrderContactMech" list="destinationOrderContactMechs"/>
+ <first-from-list list="destinationOrderContactMechs" entry="destinationOrderContactMech"/>
<if-not-empty field="destinationOrderContactMech">
<set from-field="destinationOrderContactMech.contactMechId" field="shipment.destinationContactMechId"/>
<else>
@@ -554,7 +554,7 @@
<if-empty field="shipment.originContactMechId">
<set value="SHIP_ORIG_LOCATION" field="originContactMap.contactMechPurposeTypeId"/>
<filter-list-by-and list="orderContactMechs" map="originContactMap" to-list="originOrderContactMechs"/>
- <first-from-list entry="originOrderContactMech" list="originOrderContactMechs"/>
+ <first-from-list list="originOrderContactMechs" entry="originOrderContactMech"/>
<if-not-empty field="originOrderContactMech">
<set from-field="originOrderContactMech.contactMechId" field="shipment.originContactMechId"/>
<else>
@@ -568,7 +568,7 @@
<if-empty field="shipment.destinationTelecomNumberId">
<set value="PHONE_SHIPPING" field="destTelecomOrderContactMechMap.contactMechPurposeTypeId"/>
<filter-list-by-and list="orderContactMechs" map="destTelecomOrderContactMechMap" to-list="destTelecomOrderContactMechs"/>
- <first-from-list entry="destTelecomOrderContactMech" list="destTelecomOrderContactMechs"/>
+ <first-from-list list="destTelecomOrderContactMechs" entry="destTelecomOrderContactMech"/>
<if-not-empty field="destTelecomOrderContactMech">
<set from-field="destTelecomOrderContactMech.contactMechId" field="shipment.destinationTelecomNumberId"/>
<else>
@@ -576,7 +576,7 @@
<entity-and entity-name="PartyAndTelecomNumber" list="phoneNumbers" filter-by-date="true">
<field-map field-name="partyId" from-field="shipment.partyIdTo"/>
</entity-and>
- <first-from-list entry="phoneNumber" list="phoneNumbers"/>
+ <first-from-list list="phoneNumbers" entry="phoneNumber"/>
<if-not-empty field="phoneNumber">
<set from-field="phoneNumber.contactMechId" field="shipment.destinationTelecomNumberId"/>
<else>
@@ -590,7 +590,7 @@
<if-empty field="shipment.originTelecomNumberId">
<set value="PHONE_SHIP_ORIG" field="originTelecomOrderContactMechMap.contactMechPurposeTypeId"/>
<filter-list-by-and list="orderContactMechs" map="originTelecomOrderContactMechMap" to-list="originTelecomOrderContactMechs"/>
- <first-from-list entry="originTelecomOrderContactMech" list="originTelecomOrderContactMechs"/>
+ <first-from-list list="originTelecomOrderContactMechs" entry="originTelecomOrderContactMech"/>
<if-not-empty field="originTelecomOrderContactMech">
<set from-field="originTelecomOrderContactMech.contactMechId" field="shipment.originTelecomNumberId"/>
<else>
@@ -738,7 +738,7 @@
<field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
</entity-and>
- <first-from-list entry="curUserPartyAndContactMech" list="curUserPartyAndContactMechs"/>
+ <first-from-list list="curUserPartyAndContactMechs" entry="curUserPartyAndContactMech"/>
<string-append field="sendEmailMap.sendFrom" string="${curUserPartyAndContactMech.infoString}" prefix=","/>
<!-- find email addresses of partyIdFrom, set as sendTo -->
@@ -804,9 +804,9 @@
</entity-and>
<iterate list="receipts" entry="receipt">
<calculate field="issuanceQuantity">
- <calcop field="receipt.quantityAccepted" operator="get"/>
- <calcop field="receipt.quantityRejected" operator="get"/>
- <calcop field="issuanceQuantity" operator="get"/>
+ <calcop operator="get" field="receipt.quantityAccepted"/>
+ <calcop operator="get" field="receipt.quantityRejected"/>
+ <calcop operator="get" field="issuanceQuantity"/>
</calculate>
</iterate>
<set field="issuance.quantity" from-field="issuanceQuantity"/>
@@ -1077,8 +1077,8 @@
<else>
<!-- add the quantities and store it -->
<calculate field="shipmentPackageContent.quantity">
- <calcop field="shipmentPackageContent.quantity" operator="add"/>
- <calcop field="parameters.quantity" operator="get"/>
+ <calcop operator="add" field="shipmentPackageContent.quantity"/>
+ <calcop operator="get" field="parameters.quantity"/>
</calculate>
<set-service-fields service-name="updateShipmentPackageContent" map="shipmentPackageContent" to-map="updateSPCMap"/>
<call-service service-name="updateShipmentPackageContent" in-map-name="updateSPCMap"/>
@@ -1656,7 +1656,7 @@
<get-related-one to-value-field="inventoryItem" relation-name="InventoryItem" value-field="orderItemShipGrpInvRes"/>
<if-compare-field field="inventoryItem.serialNumber" operator="not-equals" to-field="parameters.serialNumber">
<!-- The inventory that we have reserved is not what we shipped. Lets reReserve, this time we'll get what we want -->
- <set-service-fields map="parameters" to-map="reserveAnInventoryItemCtx" service-name="reserveAnInventoryItem"/>
+ <set-service-fields service-name="reserveAnInventoryItem" map="parameters" to-map="reserveAnInventoryItemCtx"/>/>
<call-service service-name="reserveAnInventoryItem" in-map-name="reserveAnInventoryItemCtx">
<result-to-field result-name="inventoryItemId" field="parameters.inventoryItemId"/>
</call-service>
@@ -1893,8 +1893,8 @@
<call-service service-name="deleteOrderShipment" in-map-name="inMap"/>
<calculate field="shipmentItem.quantity">
- <calcop field="shipmentItem.quantity" operator="subtract">
- <calcop field="orderShipment.quantity" operator="get"/>
+ <calcop operator="subtract" field="shipmentItem.quantity">
+ <calcop operator="get" field="orderShipment.quantity"/>
</calcop>
</calculate>
<clear-field field="inMap"/>
@@ -1977,8 +1977,8 @@
<find-by-and entity-name="OrderShipment" map="orderShipmentLookup" list="existingOrderShipments"/>
<iterate list="existingOrderShipments" entry="orderShipment">
<calculate field="plannedQuantity">
- <calcop field="plannedQuantity" operator="add">
- <calcop field="orderShipment.quantity" operator="get"/>
+ <calcop operator="add" field="plannedQuantity">
+ <calcop operator="get" field="orderShipment.quantity"/>
</calcop>
</calculate>
</iterate>
@@ -1986,20 +1986,20 @@
<find-by-and entity-name="ItemIssuance" map="orderShipmentLookup" list="existingOrderShipments"/>
<iterate list="existingOrderShipments" entry="itemIssuance">
<calculate field="issuedQuantity">
- <calcop field="issuedQuantity" operator="get"/>
- <calcop field="itemIssuance.quantity" operator="get"/>
- <calcop field="itemIssuance.cancelQuantity" operator="negative"/>
+ <calcop operator="get" field="issuedQuantity"/>
+ <calcop operator="get" field="itemIssuance.quantity"/>
+ <calcop operator="negative" field="itemIssuance.cancelQuantity"/>
</calculate>
</iterate>
<calculate field="totPlannedOrIssuedQuantity">
- <calcop field="issuedQuantity" operator="get"/>
- <calcop field="plannedQuantity" operator="get"/>
+ <calcop operator="get" field="issuedQuantity"/>
+ <calcop operator="get" field="plannedQuantity"/>
</calculate>
<calculate field="remainingQuantity">
- <calcop field="orderItem.quantity" operator="subtract">
- <calcop field="orderItem.cancelQuantity" operator="get"/>
- <calcop field="totPlannedOrIssuedQuantity" operator="get"/>
+ <calcop operator="subtract" field="orderItem.quantity">
+ <calcop operator="get" field="orderItem.cancelQuantity"/>
+ <calcop operator="get" field="totPlannedOrIssuedQuantity"/>
</calcop>
</calculate>
<field-to-result field="remainingQuantity"/>
diff --git a/applications/product/minilang/shipment/test/ShipmentTests.xml b/applications/product/minilang/shipment/test/ShipmentTests.xml
index add5cd1..d611fee 100644
--- a/applications/product/minilang/shipment/test/ShipmentTests.xml
+++ b/applications/product/minilang/shipment/test/ShipmentTests.xml
@@ -205,7 +205,7 @@
<field-map field-name="primaryOrderId" value="DEMO10090"/>
<field-map field-name="shipmentId" value="9998"/>
</entity-and>
- <first-from-list entry="shipment" list="shipments"/>
+ <first-from-list list="shipments" entry="shipment"/>
<set field="shipRouteSegMap.shipmentId" from-field="shipment.shipmentId"/>
<entity-one entity-name="UserLogin" value-field="shipRouteSegMap.userLogin">
<field-map field-name="userLoginId" value="system"/>
diff --git a/applications/product/widget/catalog/CategoryForms.xml b/applications/product/widget/catalog/CategoryForms.xml
index 0fa18dc..1722f1f 100644
--- a/applications/product/widget/catalog/CategoryForms.xml
+++ b/applications/product/widget/catalog/CategoryForms.xml
@@ -31,7 +31,7 @@
<field name="attrValue"><text size="60"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductCategoryAttribute" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductCategoryAttribute">
<parameter param-name="productCategoryId"/>
<parameter param-name="attrName"/>
</hyperlink>
@@ -102,12 +102,12 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
-->
<field name="editLink" title="${uiLabelMap.ProductEditContent}" widget-style="buttontext">
- <hyperlink target="/content/control/EditContent" target-type="inter-app" description="${contentId}">
+ <hyperlink description="${contentId}" target="/content/control/EditContent" target-type="inter-app">
<parameter param-name="contentId"/>
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeContentFromCategory" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentFromCategory" also-hidden="false">
<parameter param-name="productCategoryId"/>
<parameter param-name="contentId"/>
<parameter param-name="prodCatContentTypeId"/>
@@ -173,7 +173,7 @@
<field name="imageUrl"><ignored/></field>
<field name="imageTwoUrl"><ignored/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductCategoryLink" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductCategoryLink" also-hidden="false">
<parameter param-name="productCategoryId"/>
<parameter param-name="linkSeqId"/>
<parameter param-name="fromDate"/>
@@ -206,7 +206,7 @@
<field name="submitButton" use-when="productCategoryLink==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
<field name="submitButton" use-when="productCategoryLink!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="clearFormButton" title=" " use-when="productCategoryLink!=null">
- <hyperlink target="EditProductCategoryLinks" target-type="intra-app" description="${uiLabelMap.CommonClear}">
+ <hyperlink description="${uiLabelMap.CommonClear}" target="EditProductCategoryLinks" target-type="intra-app">
<parameter param-name="productCategoryId"/>
</hyperlink>
</field>
@@ -214,7 +214,7 @@
<form name="ListTopCategory" type="list" list-name="noParentCategories" odd-row-style="alternate-row" default-table-style="basic-table">
<field name="productCategoryId" widget-style="buttontext">
- <hyperlink target="EditCategory" description="${productCategoryId}" also-hidden="false">
+ <hyperlink description="${productCategoryId}" target="EditCategory" also-hidden="false">
<parameter param-name="CATALOG_TOP_CATEGORY" value="${productCategoryId}"/>
<parameter param-name="productCategoryId" value="${productCategoryId}"/>
</hyperlink>
@@ -245,7 +245,7 @@
</service>
</actions>
<field name="productCategoryId" sort-field="true">
- <hyperlink also-hidden="false" description="${productCategoryId}" target="EditCategory">
+ <hyperlink description="${productCategoryId}" target="EditCategory" also-hidden="false">
<parameter param-name="productCategoryId"/>
</hyperlink>
</field>
diff --git a/applications/product/widget/catalog/CommonScreens.xml b/applications/product/widget/catalog/CommonScreens.xml
index 0ce5c37..c2b3a84 100644
--- a/applications/product/widget/catalog/CommonScreens.xml
+++ b/applications/product/widget/catalog/CommonScreens.xml
@@ -361,7 +361,7 @@
<screen name="ProductStoreGroupTree">
<section>
<actions>
- <entity-one value-field="parentProductStoreGroup" entity-name="ProductStoreGroup"/>
+ <entity-one entity-name="ProductStoreGroup" value-field="parentProductStoreGroup"/>
<entity-condition entity-name="ProductStoreGroup" list="parentProductStoreGroups">
<condition-expr field-name="primaryParentGroupId" from-field="nullField"/>
</entity-condition>
diff --git a/applications/product/widget/catalog/ConfigForms.xml b/applications/product/widget/catalog/ConfigForms.xml
index 6babb88..ca56408 100644
--- a/applications/product/widget/catalog/ConfigForms.xml
+++ b/applications/product/widget/catalog/ConfigForms.xml
@@ -35,7 +35,7 @@
<set field="typeDescription" value="${groovy: return "SINGLE".equals(configItemTypeId) ? uiLabelMap.get("ProductSingleChoice") : uiLabelMap.get("ProductMultiChoice")}"/>
</row-actions>
<field name="configItemId" title="${uiLabelMap.ProductConfigItem}" widget-style="buttontext">
- <hyperlink target="EditProductConfigItem" description="${configItemId}">
+ <hyperlink description="${configItemId}" target="EditProductConfigItem">
<parameter param-name="configItemId"/>
</hyperlink>
</field>
@@ -151,7 +151,7 @@
<auto-fields-service service-name="updateProductConfigItemContent" map-name="productContent"/>
<field name="configItemId"><hidden/></field>
<field name="contentId" title="${uiLabelMap.ProductContent_Id}" widget-style="buttontext">
- <hyperlink target="EditProductConfigItemContentContent" description="${content.description} [${productContent.contentId}]">
+ <hyperlink description="${content.description} [${productContent.contentId}]" target="EditProductConfigItemContentContent">
<parameter param-name="configItemId" from-field="productContent.configItemId"/>
<parameter param-name="contentId" from-field="productContent.contentId"/>
</hyperlink>
@@ -165,7 +165,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeContentFromProductConfigItem" description="[${uiLabelMap.CommonDelete}]" also-hidden="false">
+ <hyperlink description="[${uiLabelMap.CommonDelete}]" target="removeContentFromProductConfigItem" also-hidden="false">
<parameter param-name="configItemId" from-field="productContent.configItemId"/>
<parameter param-name="contentId" from-field="productContent.contentId"/>
<parameter param-name="confItemContentTypeId" from-field="productContent.confItemContentTypeId"/>
@@ -207,7 +207,7 @@
</actions>
<auto-fields-entity entity-name="ProductConfigAndProduct" default-field-type="hidden"/>
<field name="productId" widget-style="buttontext" >
- <hyperlink target="EditProductConfigs" description="${productId}">
+ <hyperlink description="${productId}" target="EditProductConfigs">
<parameter param-name="productId"/>
</hyperlink>
</field>
@@ -220,7 +220,7 @@
target="" header-row-style="header-row-2" paginate="true">
<auto-fields-entity entity-name="ProductConfigOption" default-field-type="display"/>
<field name="configItemId" widget-style="buttontext" title="${uiLabelMap.ProductConfigItem}">
- <hyperlink target="EditProductConfigOptions" description="${configOptionId} - ${configOptionName}">
+ <hyperlink description="${configOptionId} - ${configOptionName}" target="EditProductConfigOptions">
<parameter param-name="configItemId"/>
<parameter param-name="configOptionId"/>
</hyperlink>
@@ -228,7 +228,7 @@
<field name="configOptionId" ><hidden/></field>
<field name="configOptionName" ><hidden/></field>
<field name="remove" title="${uiLabelMap.CommonRemove}" widget-style="buttontext" >
- <hyperlink target="deleteProductConfigOption" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteProductConfigOption">
<parameter param-name="configItemId"/>
<parameter param-name="configOptionId"/>
</hyperlink>
@@ -247,12 +247,12 @@
<field name="configItemId" ><hidden/></field>
<field name="configOptionId" ><hidden/></field>
<field name="productId" widget-style="buttontext">
- <hyperlink target="EditProduct" description="${product.productId} - ${product.productName}">
+ <hyperlink description="${product.productId} - ${product.productName}" target="EditProduct">
<parameter param-name="productId" from-field="product.productId"/>
</hyperlink>
</field>
<field name="remove" widget-style="buttontext" >
- <hyperlink target="deleteProductConfigProduct" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteProductConfigProduct">
<parameter param-name="configItemId"/>
<parameter param-name="configOptionId"/>
<parameter param-name="productId" from-field="product.productId"/>
diff --git a/applications/product/widget/catalog/FeatureForms.xml b/applications/product/widget/catalog/FeatureForms.xml
index e4dd078..7092dba 100644
--- a/applications/product/widget/catalog/FeatureForms.xml
+++ b/applications/product/widget/catalog/FeatureForms.xml
@@ -48,7 +48,7 @@
</drop-down>
</field>
<field use-when="productFeature!=null&&productFeature.getString("productFeatureCategoryId")!=null" name="categoryLink" title=" " widget-style="buttontext">
- <hyperlink target="/EditFeatureCategoryFeatures" target-type="intra-app" description="${uiLabelMap.ProductGoToFeatureCategory} ${productFeature.productFeatureCategoryId}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.ProductGoToFeatureCategory} ${productFeature.productFeatureCategoryId}" target="/EditFeatureCategoryFeatures" target-type="intra-app" also-hidden="false">
<parameter param-name="productFeatureCategoryId" from-field="productFeature.productFeatureCategoryId"/>
</hyperlink>
</field>
@@ -102,7 +102,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeSupplierProductFeature" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeSupplierProductFeature">
<parameter param-name="productFeatureId"/>
<parameter param-name="partyId"/>
</hyperlink>
@@ -127,7 +127,7 @@
</service>
</actions>
<field name="productFeatureTypeId" widget-style="buttontext">
- <hyperlink target="EditFeatureType" description="${productFeatureTypeId}">
+ <hyperlink description="${productFeatureTypeId}" target="EditFeatureType">
<parameter param-name="productFeatureTypeId"/>
</hyperlink>
</field>
@@ -140,7 +140,7 @@
</display-entity>
</field>
<field name="removeFeatureType" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="removeProductFeatureType" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeProductFeatureType">
<parameter param-name="productFeatureTypeId"/>
</hyperlink>
</field>
@@ -197,7 +197,7 @@
<field name="productFeatureIactnTypeId"><display-entity entity-name="ProductFeatureIactnType"/></field>
<field name="removeFeatureInterAction" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="removeProductFeatureIactn" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeProductFeatureIactn">
<parameter param-name="productFeatureId"/>
<parameter param-name="productFeatureIdTo"/>
</hyperlink>
@@ -244,7 +244,7 @@
</field>
<field name="sequenceNum"><text size="3"/></field>
<field name="removeFeatureGroupAppl" title="${uiLabelMap.CommonRemove}" widget-style="buttontext">
- <hyperlink target="RemoveProductFeatureGroupAppl" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="RemoveProductFeatureGroupAppl">
<parameter param-name="productFeatureGroupId"/>
<parameter param-name="productFeatureId"/>
<parameter param-name="fromDate"/>
@@ -310,7 +310,7 @@
</service>
</actions>
<field name="productFeatureCategoryId" title="${uiLabelMap.CommonId}" widget-style="buttontext">
- <hyperlink target="EditFeatureCategoryFeatures" description="${productFeatureCategoryId}">
+ <hyperlink description="${productFeatureCategoryId}" target="EditFeatureCategoryFeatures">
<parameter param-name="productFeatureCategoryId"/>
</hyperlink>
</field>
@@ -345,7 +345,7 @@
<field name="updateFeaturePrice" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="lastModifiedBy" title="${uiLabelMap.ProductLastModifiedBy}"><display description="[${lastModifiedByUserLogin}] ${uiLabelMap.CommonOn} ${lastModifiedDate}"/></field>
<field name="deleteFeaturePrice" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteFeaturePrice" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteFeaturePrice" also-hidden="false">
<parameter param-name="productFeatureId"/>
<parameter param-name="productPriceTypeId"/>
<parameter param-name="currencyUomId"/>
diff --git a/applications/product/widget/catalog/FieldLookupForms.xml b/applications/product/widget/catalog/FieldLookupForms.xml
index a90dd41..3f8e093 100644
--- a/applications/product/widget/catalog/FieldLookupForms.xml
+++ b/applications/product/widget/catalog/FieldLookupForms.xml
@@ -59,13 +59,13 @@
<set field="hasVariants" value="${groovy: org.apache.ofbiz.entity.util.EntityUtil.filterByDate(delegator.findByAnd('ProductAssoc', org.apache.ofbiz.base.util.UtilMisc.toMap('productId', productId, 'productAssocTypeId', 'PRODUCT_VARIANT'), null, true)).size() > 0}" type="Boolean"/>
</row-actions>
<field name="productId" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_value('${productId}')"/>
+ <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field>
<field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
<field name="productTypeId" title="${uiLabelMap.ProductProductType}"><display-entity entity-name="ProductType"/></field>
<field name="searchVariants" title=" " widget-style="buttontext" use-when="hasVariants">
- <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct">
+ <hyperlink description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct" also-hidden="false" target-type="plain">
<parameter param-name="productId"/>
</hyperlink>
</field>
@@ -97,7 +97,7 @@
</service>
</actions>
<field name="productId" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_value('${productId}')"/>
+ <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field>
<field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
@@ -122,7 +122,7 @@
</service>
</actions>
<field name="productId" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_value('${productId}')"/>
+ <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field>
<field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
@@ -191,12 +191,12 @@
</row-actions>
<!--
<field name="productId" title=" " widget-style="buttontext" use-when="isVirtual==null||"${isVirtual}".equals("N")">
- <hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_value('${productId}')"/>
+ <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="productId" title="${uiLabelMap.ProductProductId}" use-when="isVirtual!=null&&"${isVirtual}".equals("Y")"><display/></field>
-->
<field name="productId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_value('${productId}')"/>
+ <hyperlink description="${productId}" target="javascript:set_value('${productId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
<field name="productTypeId" title="${uiLabelMap.ProductProductType}"><display-entity entity-name="ProductType"/></field>
@@ -205,7 +205,7 @@
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
<field name="searchVariants" title=" " widget-style="buttontext" use-when="hasVariants">
- <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct">
+ <hyperlink description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct" also-hidden="false" target-type="plain">
<parameter param-name="productId"/>
</hyperlink>
</field>
@@ -261,7 +261,7 @@
<auto-fields-entity entity-name="ProductCategory" default-field-type="display"/>
<field name="productCategoryTypeId"><display-entity entity-name="ProductCategoryType"/></field>
<field name="productCategoryId" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${productCategoryId}" target="javascript:set_value('${productCategoryId}')"/>
+ <hyperlink description="${productCategoryId}" target="javascript:set_value('${productCategoryId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="longDescription"><ignored/></field>
<field name="categoryImageUrl"><ignored/></field>
@@ -303,7 +303,7 @@
</actions>
<auto-fields-entity entity-name="ProductFeature" default-field-type="display"/>
<field name="productFeatureId" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')"/>
+ <hyperlink description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')" also-hidden="false" target-type="plain"/>
</field>
</form>
@@ -333,7 +333,7 @@
<!-- <auto-fields-entity entity-name="ProductStore" default-field-type="display"/> -->
<field name="productStoreId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${productStoreId}" target="javascript:set_value('${productStoreId}')"/>
+ <hyperlink description="${productStoreId}" target="javascript:set_value('${productStoreId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="primaryStoreGroupId"><display/></field>
<field name="storeName"><display/></field>
@@ -371,7 +371,7 @@
</service>
</actions>
<field name="costComponentCalcId" title="${uiLabelMap.ProductCostComponentCalcId}" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${costComponentCalcId}" target="javascript:set_value('${costComponentCalcId}')"/>
+ <hyperlink description="${costComponentCalcId}" target="javascript:set_value('${costComponentCalcId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="costGlAccountTypeId" title="${uiLabelMap.ProductCostGlAccountTypeId}"><display/></field>
diff --git a/applications/product/widget/catalog/ImageManagementForms.xml b/applications/product/widget/catalog/ImageManagementForms.xml
index 2996364..3891973 100644
--- a/applications/product/widget/catalog/ImageManagementForms.xml
+++ b/applications/product/widget/catalog/ImageManagementForms.xml
@@ -46,7 +46,7 @@
</row-actions>
<field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field>
<field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}">
- <hyperlink target="${currentFormName}" description="${drDataResourceName}">
+ <hyperlink description="${drDataResourceName}" target="${currentFormName}">
<parameter param-name="productId"/>
<parameter param-name="contentId"/>
<parameter param-name="dataResourceId"/>
@@ -59,7 +59,7 @@
<display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
- <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+ <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
</field>
</grid>
@@ -119,7 +119,7 @@
<field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" position="2"><display/></field>
<field name="fromDate" position="2"><display/></field>
<field name="viewButton" position="2" title="${uiLabelMap.CommonView}" widget-style="buttontext">
- <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+ <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -159,7 +159,7 @@
<field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" position="2"><display/></field>
<field name="fromDate" position="2"><display/></field>
<field name="viewButton" position="2" title="${uiLabelMap.CommonView}" widget-style="buttontext">
- <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+ <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
</field>
</grid>
@@ -209,7 +209,7 @@
</drop-down>
</field>
<field name="viewButton" position="2" title="${uiLabelMap.CommonView}" widget-style="buttontext">
- <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+ <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -259,7 +259,7 @@
<field name="rejectedBy" position="2" title="${uiLabelMap.ImageManagementRejectedBy}"><display/></field>
<field name="description" position="2" title="${uiLabelMap.ImageManagementRejectedReason}"><display/></field>
<field name="viewButton" position="2" title="${uiLabelMap.CommonView}" widget-style="buttontext">
- <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+ <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
</field>
</form>
@@ -319,7 +319,7 @@
<field name="sequenceNum" use-when="${groovy: return context.statusId == 'IM_APPROVED';}" title="${uiLabelMap.ImageManagementSortOrder}"><text maxlength="2" size="5"/></field>
<field name="drIsPublic" use-when="${groovy: return context.statusId == 'IM_APPROVED';}" title="${uiLabelMap.ImageManagementPublic}"><check/></field>
<field name="defaultImage" use-when="${groovy: return context.statusId == 'IM_APPROVED';}" title="${uiLabelMap.ImageManagementDefaultImage}" widget-style="buttontext">
- <hyperlink target="setDefaultImage" description="${uiLabelMap.ImageManagementSetDefault}">
+ <hyperlink description="${uiLabelMap.ImageManagementSetDefault}" target="setDefaultImage">
<parameter param-name="productId"/>
<parameter param-name="contentId"/>
<parameter param-name="contentIdTo"/>
@@ -338,10 +338,10 @@
<display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
- <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+ <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
</field>
<field name="deleteButton" title="${uiLabelMap.CommonRemove}" widget-style="buttontext">
- <hyperlink target="removeImage" description="${uiLabelMap.CommonRemove}" also-hidden="false" confirmation-message="Do you want to remove this image?">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeImage" also-hidden="false" confirmation-message="Do you want to remove this image?">
<parameter param-name="productId" from-field="productId"/>
<parameter param-name="contentId" from-field="contentId"/>
<parameter param-name="productContentTypeId" from-field="productContentTypeId"/>
@@ -422,7 +422,7 @@
<field name="previewButton" title="${uiLabelMap.CommonPreview}" use-when="frameURL != null" widget-style="smallSubmit" event="onClick" action="javascript:setTargetWindows('new');"><submit button-type="button"/></field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}" use-when="frameURL != null" widget-style="smallSubmit" event="onClick" action="javascript:setTargetWindows('_self');"><submit button-type="button"/></field>
<field name="cancelButton" title=" " widget-style="buttontext" event="onClick" action="javascript:deletePreviewFrameImage();">
- <hyperlink target="ListImageManage" description="${uiLabelMap.CommonCancel}">
+ <hyperlink description="${uiLabelMap.CommonCancel}" target="ListImageManage">
<parameter param-name="productId" from-field="parameters.productId"/>
</hyperlink>
</field>
@@ -471,7 +471,7 @@
<field name="imageRotate" widget-area-style="cropbox" title="${uiLabelMap.CommonImage}"><image value="${imageURL}" /></field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit" position="1"><submit button-type="button"/></field>
<field name="cancelButton" title=" " widget-style="buttontext">
- <hyperlink target="ListImageManage" description="${uiLabelMap.CommonCancel}">
+ <hyperlink description="${uiLabelMap.CommonCancel}" target="ListImageManage">
<parameter param-name="productId" from-field="parameters.productId"/>
</hyperlink>
</field>
@@ -561,7 +561,7 @@
<field name="fromDate"><display/></field>
<field name="status"><display description="Uploaded"/></field>
<field name="removeContent" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="removeImageUpload" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeImageUpload" also-hidden="false">
<parameter param-name="productId"/>
<parameter param-name="contentId"/>
<parameter param-name="productContentTypeId"/>
@@ -596,7 +596,7 @@
</row-actions>
<field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field>
<field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${drDataResourceName}" target="javascript:set_value('${contentId}')"/>
+ <hyperlink description="${drDataResourceName}" target="javascript:set_value('${contentId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="contentId"><display/></field>
<field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><display/></field>
@@ -605,7 +605,7 @@
<display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
- <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+ <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
</field>
</grid>
@@ -654,7 +654,7 @@
</field>
<field name="purchaseFromDate" title="${uiLabelMap.ImageManagementApprovedDate}"><display/></field>
<field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
- <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+ <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
</field>
</grid>
@@ -684,7 +684,7 @@
</row-actions>
<field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field>
<field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}">
- <hyperlink target="ListImageReplace" description="${drDataResourceName}">
+ <hyperlink description="${drDataResourceName}" target="ListImageReplace">
<parameter param-name="productId"/>
<parameter param-name="contentIdExist" from-field="contentId"/>
<parameter param-name="dataResourceIdExist" from-field="dataResourceId"/>
@@ -695,7 +695,7 @@
<display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
- <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+ <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
</field>
</grid>
@@ -725,7 +725,7 @@
</row-actions>
<field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field>
<field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}">
- <hyperlink target="ListImageReplace" description="${drDataResourceName}">
+ <hyperlink description="${drDataResourceName}" target="ListImageReplace">
<parameter param-name="productId"/>
<parameter param-name="contentIdReplace" from-field="contentId"/>
<parameter param-name="dataResourceIdReplace" from-field="dataResourceId"/>
@@ -738,7 +738,7 @@
<display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
- <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
+ <hyperlink description="${uiLabelMap.CommonView}" target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" also-hidden="false" target-type="content"/>
</field>
</grid>
@@ -750,13 +750,13 @@
</actions>
<field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field>
<field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${drDataResourceName}" target="javascript:set_value('${contentId}')"/>
+ <hyperlink description="${drDataResourceName}" target="javascript:set_value('${contentId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="contentId"><display/></field>
<field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><display/></field>
<field name="createdDate"><display/></field>
<!--<field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteImageFrame" target-window="_blank" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteImageFrame" target-window="_blank" also-hidden="false">
<parameter param-name="contentId" from-field="contentId"/>
</hyperlink>
</field>-->
@@ -787,7 +787,7 @@
</actions>
<field name="mapKey" title="${uiLabelMap.CommonSize}"><display/></field>
<field name="deleteButton" title="${uiLabelMap.CommonRemove}" use-when="${groovy: return context.mapKey != '100';}" widget-style="buttontext">
- <hyperlink target="removeImageBySize" description="${uiLabelMap.CommonRemove}" also-hidden="false" confirmation-message="Do you want to remove this size?">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeImageBySize" also-hidden="false" confirmation-message="Do you want to remove this size?">
<parameter param-name="productId" from-field="parameters.productId"/>
<parameter param-name="mapKey" from-field="mapKey"/>
</hyperlink>
diff --git a/applications/product/widget/catalog/ImageManagementScreens.xml b/applications/product/widget/catalog/ImageManagementScreens.xml
index 5555a9b..18df252 100644
--- a/applications/product/widget/catalog/ImageManagementScreens.xml
+++ b/applications/product/widget/catalog/ImageManagementScreens.xml
@@ -96,7 +96,7 @@
<field-map field-name="contentAssocTypeId" value="ALTERNATE_LOCALE" />
</entity-and>-->
- <!--<entity-one value-field="product" entity-name="Product"/>-->
+ <!--<entity-one entity-name="Product" value-field="product"/>-->
<!--<script location="component://product/groovyScripts/catalog/imagemanagement/SeoLocales.groovy"/>-->
<script location="component://product/groovyScripts/catalog/imagemanagement/ImageGallery.groovy"/>
</actions>
@@ -415,7 +415,7 @@
<actions>
<set field="userTabButtonImage" value="ImageManage"/>
<set field="productId" from-field="parameters.productId"/>
- <entity-one value-field="product" entity-name="Product"/>
+ <entity-one entity-name="Product" value-field="product"/>
</actions>
<widgets>
<decorator-screen name="ImageManagementDecorator" location="${parameters.mainDecoratorLocation}">
@@ -642,7 +642,7 @@
<set field="currentFormName" value="ListImageReplace"/>
<set field="statusForm" value="IM_APPROVED"/>
<set field="productId" from-field="parameters.productId"/>
- <entity-one value-field="product" entity-name="Product"/>
+ <entity-one entity-name="Product" value-field="product"/>
</actions>
<widgets>
<decorator-screen name="ImageManagementDecorator" location="${parameters.mainDecoratorLocation}">
@@ -826,7 +826,7 @@
<actions>
<set field="userTabButtonImage" value="ImageResize"/>
<set field="productId" from-field="parameters.productId"/>
- <entity-one value-field="product" entity-name="Product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<entity-condition entity-name="ProductContentAndInfo" list="productContentAndInfos">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="parameters.productId"/>
diff --git a/applications/product/widget/catalog/PriceForms.xml b/applications/product/widget/catalog/PriceForms.xml
index bb8111f..4e5e807 100644
--- a/applications/product/widget/catalog/PriceForms.xml
+++ b/applications/product/widget/catalog/PriceForms.xml
@@ -34,7 +34,7 @@
</service>
</actions>
<field name="productPriceRuleId" title="${uiLabelMap.ProductPriceRuleNameId}" widget-style="buttontext">
- <hyperlink target="EditProductPriceRules" description="${ruleName}[${productPriceRuleId}]" >
+ <hyperlink description="${ruleName}[${productPriceRuleId}]" target="EditProductPriceRules" >
<parameter param-name="productPriceRuleId"/>
</hyperlink>
</field>
@@ -42,7 +42,7 @@
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
<field name="editLink" title=" " widget-style="buttontext">
- <hyperlink target="EditProductPriceRules" description="${uiLabelMap.CommonEdit}">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditProductPriceRules">
<parameter param-name="productPriceRuleId"/>
</hyperlink>
</field>
@@ -69,7 +69,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field>
<field use-when="org.apache.ofbiz.base.util.UtilValidate.isEmpty(productPriceConds) && org.apache.ofbiz.base.util.UtilValidate.isEmpty(productPriceActions)"
name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductPriceRule" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteProductPriceRule">
<parameter param-name="productPriceRuleId"/>
</hyperlink>
</field>
@@ -100,7 +100,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field>
<field name="deleteLink" title=" " widget-style="buttontext" widget-area-style="align-text">
- <hyperlink target="deleteProductPriceCond" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteProductPriceCond">
<parameter param-name="productPriceRuleId" from-field="productPriceCond.productPriceRuleId"/>
<parameter param-name="productPriceCondSeqId" from-field="productPriceCond.productPriceCondSeqId"/>
</hyperlink>
@@ -144,7 +144,7 @@
<field name="amount" title="${uiLabelMap.ProductValue}"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field>
<field name="deleteLink" title=" " widget-style="buttontext" widget-area-style="align-text">
- <hyperlink target="deleteProductPriceAction" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteProductPriceAction">
<parameter param-name="productPriceRuleId" from-field="productPriceAction.productPriceRuleId"/>
<parameter param-name="productPriceActionSeqId" from-field="productPriceAction.productPriceActionSeqId"/>
</hyperlink>
diff --git a/applications/product/widget/catalog/ProdCatalogForms.xml b/applications/product/widget/catalog/ProdCatalogForms.xml
index 4eaa9bb..dfa2b32 100644
--- a/applications/product/widget/catalog/ProdCatalogForms.xml
+++ b/applications/product/widget/catalog/ProdCatalogForms.xml
@@ -44,13 +44,13 @@
</service>
</actions>
<field name="prodCatalogId" sort-field="true">
- <hyperlink also-hidden="false" description="${prodCatalogId}" target="EditCatalog">
+ <hyperlink description="${prodCatalogId}" target="EditCatalog" also-hidden="false">
<parameter param-name="prodCatalogId"/>
</hyperlink>
</field>
<field name="prodCatalogId" sort-field="true">
- <hyperlink target="EditProdCatalog?prodCatalogId=${prodCatalogId}" description="${prodCatalogId}"></hyperlink>
+ <hyperlink description="${prodCatalogId}" target="EditProdCatalog?prodCatalogId=${prodCatalogId}"></hyperlink>
</field>
<field name="catalogName" sort-field="true"><display/></field>
<field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}" sort-field="true"><display/></field>
@@ -118,7 +118,7 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeProdCatalogFromParty" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeProdCatalogFromParty" also-hidden="false">
<parameter param-name="prodCatalogId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
@@ -154,7 +154,7 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProdCatalogStore" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProdCatalogStore" also-hidden="false">
<parameter param-name="prodCatalogId"/>
<parameter param-name="productStoreId"/>
<parameter param-name="fromDate"/>
@@ -177,7 +177,7 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
<field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeProductCategoryFromProdCatalog" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeProductCategoryFromProdCatalog" also-hidden="false">
<parameter param-name="prodCatalogId"/>
<parameter param-name="productCategoryId"/>
<parameter param-name="partyId"/>
@@ -186,7 +186,7 @@
</hyperlink>
</field>
<field name="makeTopLink" title=" " widget-style="buttontext">
- <hyperlink target="EditCategory" description="${uiLabelMap.ProductMakeTop}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.ProductMakeTop}" target="EditCategory" also-hidden="false">
<parameter param-name="CATALOG_TOP_CATEGORY" from-field="productCategoryId"/>
<parameter param-name="productCategoryId"/>
</hyperlink>
diff --git a/applications/product/widget/catalog/ProductForms.xml b/applications/product/widget/catalog/ProductForms.xml
index 0951734..a5e1345 100644
--- a/applications/product/widget/catalog/ProductForms.xml
+++ b/applications/product/widget/catalog/ProductForms.xml
@@ -43,7 +43,7 @@
</service>
</actions>
<field name="productId" sort-field="true">
- <hyperlink also-hidden="false" description="${productId}" target="EditProduct">
+ <hyperlink description="${productId}" target="EditProduct" also-hidden="false">
<parameter param-name="productId"/>
</hyperlink>
</field>
@@ -504,7 +504,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="viewHistoryLink" title=" " widget-style="buttontext">
- <hyperlink target="ProductPriceHistory" description="${uiLabelMap.ProductHistory}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.ProductHistory}" target="ProductPriceHistory" also-hidden="false">
<parameter param-name="productId"/>
<parameter param-name="productPriceTypeId"/>
<parameter param-name="fromDate"/>
@@ -512,7 +512,7 @@
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductPrice" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductPrice" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="productPriceTypeId"/><parameter param-name="productPricePurposeId"/>
<parameter param-name="currencyUomId"/><parameter param-name="productStoreGroupId"/><parameter param-name="fromDate"/>
</hyperlink>
@@ -551,7 +551,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductPaymentMethodType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductPaymentMethodType" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="productPricePurposeId"/><parameter param-name="paymentMethodTypeId"/><parameter param-name="fromDate"/>
</hyperlink>
</field>
@@ -586,7 +586,7 @@
<field name="comments" title="${uiLabelMap.ProductComments}" ><textarea/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeProductFromCategory" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeProductFromCategory" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="productCategoryId"/><parameter param-name="fromDate"/>
</hyperlink>
</field>
@@ -596,7 +596,7 @@
<form name="ListProductContentInfos" type="list" title="" list-name="productContent"
odd-row-style="alternate-row" default-table-style="basic-table">
<field name="editProductContentInfo" title="${uiLabelMap.ProductContent}" widget-style="buttontext">
- <hyperlink target="EditProductContentContent" description="${description} [${contentId}]" also-hidden="false">
+ <hyperlink description="${description} [${contentId}]" target="EditProductContentContent" also-hidden="false">
<parameter param-name="productId"/>
<parameter param-name="contentId"/>
<parameter param-name="productContentTypeId"/>
@@ -616,12 +616,12 @@
<field name="useRoleTypeId"><display/></field>
<field name="sequenceNum"><display/></field>
<field name="editContent" title="${uiLabelMap.ProductEditContent}" widget-style="buttontext">
- <hyperlink target="/content/control/EditContent" target-type="inter-app" description="${contentId}" also-hidden="false">
+ <hyperlink description="${contentId}" target="/content/control/EditContent" target-type="inter-app" also-hidden="false">
<parameter param-name="contentId"/>
</hyperlink>
</field>
<field name="removeContent" title=" " widget-style="buttontext">
- <hyperlink target="removeContentFromProduct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentFromProduct" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="contentId"/><parameter param-name="productContentTypeId"/><parameter param-name="fromDate"/>
</hyperlink>
</field>
@@ -681,7 +681,7 @@
<auto-fields-service service-name="updateProductContent" map-name="productContent"/>
<field name="productId"><hidden/></field>
<field name="contentId" title="${uiLabelMap.ProductContent_Id}" widget-style="buttontext">
- <hyperlink target="EditProductContentContent" description="${content.description} [${productContent.contentId}]">
+ <hyperlink description="${content.description} [${productContent.contentId}]" target="EditProductContentContent">
<parameter param-name="productId" from-field="productContent.productId"/>
<parameter param-name="contentId" from-field="productContent.contentId"/>
</hyperlink>
@@ -695,7 +695,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeContentFromProduct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentFromProduct" also-hidden="false">
<parameter param-name="productId" from-field="productContent.productId"/>
<parameter param-name="contentId" from-field="productContent.contentId"/>
<parameter param-name="productContentTypeId" from-field="productContent.productContentTypeId"/>
@@ -721,12 +721,12 @@
<display-entity entity-name="DataResourceType" key-field-name="dataResourceTypeId" also-hidden="false"/>
</field>
<field name="editDataResource" widget-style="buttontext">
- <hyperlink target="/content/control/EditDataResource" target-type="inter-app" description="${dataResourceId}" also-hidden="false">
+ <hyperlink description="${dataResourceId}" target="/content/control/EditDataResource" target-type="inter-app" also-hidden="false">
<parameter param-name="dataResourceId"/>
</hyperlink>
</field>
<field name="editContent" widget-style="buttontext">
- <hyperlink target="/content/control/EditContent" target-type="inter-app" description="${contentId}" also-hidden="false">
+ <hyperlink description="${contentId}" target="/content/control/EditContent" target-type="inter-app" also-hidden="false">
<parameter param-name="contentId"/>
</hyperlink>
</field>
@@ -979,7 +979,7 @@
<display type="currency" currency="${currencyUomId}"/>
</field>
<field name="editLink" title=" " widget-style="buttontext">
- <hyperlink target="EditProductSuppliers" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditProductSuppliers" also-hidden="false">
<parameter param-name="productId"/>
<parameter param-name="partyId"/>
<parameter param-name="currencyUomId"/>
@@ -988,7 +988,7 @@
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeSupplierProduct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeSupplierProduct" also-hidden="false">
<parameter param-name="productId"/>
<parameter param-name="partyId"/>
<parameter param-name="currencyUomId"/>
@@ -1041,7 +1041,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductConfig" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductConfig" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="configItemId"/><parameter param-name="sequenceNum"/><parameter param-name="fromDate"/>
</hyperlink>
</field>
@@ -1204,7 +1204,7 @@
<set field="sectionTitle" from-field="assocSection.sectionTitle"/>
</actions>
<row-actions>
- <entity-one value-field="product" entity-name="Product">
+ <entity-one entity-name="Product" value-field="product">
<field-map field-name="productId" value="${parameters.productId}"/>
</entity-one>
</row-actions>
@@ -1232,7 +1232,7 @@
<field name="instruction"><display/></field>
<field name="quantity"><display/></field>
<field name="editLink" widget-style="buttontext">
- <hyperlink target="EditProductAssoc" description="${uiLabelMap.CommonEdit}">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditProductAssoc">
<parameter param-name="productId"/>
<parameter param-name="productIdTo"/>
<parameter param-name="productAssocTypeId"/>
@@ -1240,7 +1240,7 @@
</hyperlink>
</field>
<field name="deleteButton" widget-style="buttontext">
- <hyperlink target="deleteProductAssoc" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductAssoc">
<parameter param-name="productId"/>
<parameter param-name="productIdTo"/>
<parameter param-name="productAssocTypeId"/>
@@ -1259,7 +1259,7 @@
<field name="instruction"><hidden/></field>
<field name="routingWorkEffortId"><hidden/></field>
<field name="productIdTo" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${productIdTo}" target="ViewProductManufacturing">
+ <hyperlink description="${productIdTo}" target="ViewProductManufacturing" also-hidden="false">
<parameter param-name="productId" from-field="productIdTo"/>
</hyperlink>
</field>
@@ -1279,7 +1279,7 @@
<field name="productAssocTypeId"><hidden/></field>
<field name="scrapFactor"><hidden/></field>
<field name="productId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${productId}" target="ViewProductManufacturing">
+ <hyperlink description="${productId}" target="ViewProductManufacturing" also-hidden="false">
<parameter param-name="productId"/>
</hyperlink>
</field>
@@ -1297,7 +1297,7 @@
<display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/>
</field>
<field name="workEffortId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${workEffortId}" target="/manufacturing/control/EditRoutingProductLink" target-type="inter-app">
+ <hyperlink description="${workEffortId}" target="/manufacturing/control/EditRoutingProductLink" also-hidden="false" target-type="inter-app">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
@@ -1338,7 +1338,7 @@
<display/>
</field>
<field name="costComponentId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${costComponentId}" target="EditProductCosts">
+ <hyperlink description="${costComponentId}" target="EditProductCosts" also-hidden="false">
<parameter param-name="productId"/>
<parameter param-name="productCostComponentId" from-field="costComponentId"/>
</hyperlink>
@@ -1348,7 +1348,7 @@
<display-entity entity-name="CostComponentType"/>
</field>
<field name="deleteCostComponent" entry-name="costComponentId" widget-style="buttontext">
- <hyperlink target="deleteCostComponent" also-hidden="false" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteCostComponent" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="costComponentId"/>
</hyperlink>
</field>
@@ -1360,7 +1360,7 @@
<display-entity entity-name="CostComponentType"/>
</field>
<field name="costComponentCalcId" widget-style="buttontext">
- <hyperlink target="/manufacturing/control/EditCostCalcs" also-hidden="false" target-type="inter-app" description="${costComponentCalcId}">
+ <hyperlink description="${costComponentCalcId}" target="/manufacturing/control/EditCostCalcs" also-hidden="false" target-type="inter-app">
<parameter param-name="costComponentCalcId"/>
</hyperlink>
</field>
@@ -1370,7 +1370,7 @@
<field name="fromDate"><display/></field>
<field name="thruDate"><display/></field>
<field name="deleteProductCostComponentCalc" entry-name="productId" widget-style="buttontext">
- <hyperlink target="deleteProductCostComponentCalc" also-hidden="false" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductCostComponentCalc" also-hidden="false">
<parameter param-name="productId"/>
<parameter param-name="costComponentTypeId"/>
<parameter param-name="fromDate"/>
@@ -1454,7 +1454,7 @@
odd-row-style="alternate-row" default-table-style="basic-table">
<field name="orderDate"><display/></field>
<field name="orderId">
- <hyperlink also-hidden="false" description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app">
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview" also-hidden="false" target-type="inter-app">
<parameter param-name="orderId"/>
</hyperlink>
</field>
@@ -1533,7 +1533,7 @@
</drop-down>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductMaint" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductMaint" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="productMaintSeqId"/>
</hyperlink>
</field>
@@ -1583,7 +1583,7 @@
</field>
<field name="meterName"><text size="20"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductMeter" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductMeter" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="productMeterTypeId"/>
</hyperlink>
</field>
@@ -1634,7 +1634,7 @@
</field>
<field name="description"><text size="20"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductGeo" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductGeo" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="geoId"/>
</hyperlink>
</field>
@@ -1660,7 +1660,7 @@
<field name="productFeatureIactnTypeId"><display-entity entity-name="ProductFeatureIactnType"/></field>
<field name="removeFeatureInterAction" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="removeFeatureIactn" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeFeatureIactn">
<parameter param-name="productFeatureId"/><parameter param-name="productFeatureIdTo"/><parameter param-name="productId"/>
</hyperlink>
</field>
@@ -1701,7 +1701,7 @@
<field name="productId"><hidden/></field>
<field name="productFeatureId">
<drop-down allow-empty="false">
- <entity-options entity-name="ProductFeatureAndAppl" description="${description} [${productFeatureId}]" key-field-name="productFeatureId">
+ <entity-options entity-name="ProductFeatureAndAppl" key-field-name="productFeatureId" description="${description} [${productFeatureId}]">
<entity-constraint name="productId" env-name="productId"/>
<entity-order-by field-name="sequenceNum"/>
<entity-order-by field-name="defaultSequenceNum"/>
@@ -1724,7 +1724,7 @@
<display-entity entity-name="ProductFeature" description="${description} [${productFeatureId}]"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductFeatureApplAttr" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductFeatureApplAttr" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="productFeatureId"/><parameter param-name="attrName"/><parameter param-name="fromDate"/>
</hyperlink>
</field>
@@ -1753,7 +1753,7 @@
<field name="useTimeUomId">
<drop-down allow-empty="false">
- <entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId">
+ <entity-options entity-name="Uom" key-field-name="uomId" description="${description} (${abbreviation})">
<entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -1768,7 +1768,7 @@
</field>
<field name="canclAutmExtTimeUomId">
<drop-down allow-empty="false">
- <entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId">
+ <entity-options entity-name="Uom" key-field-name="uomId" description="${description} (${abbreviation})">
<entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -1777,7 +1777,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" widget-style="buttontext">
- <hyperlink target="deleteProductSubscriptionResource" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductSubscriptionResource" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="subscriptionResourceId"/><parameter param-name="fromDate"/>
</hyperlink>
</field>
@@ -1797,7 +1797,7 @@
<field name="useTimeUomId">
<drop-down allow-empty="false">
- <entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId">
+ <entity-options entity-name="Uom" key-field-name="uomId" description="${description} (${abbreviation})">
<entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -1812,7 +1812,7 @@
</field>
<field name="canclAutmExtTimeUomId">
<drop-down allow-empty="false">
- <entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId">
+ <entity-options entity-name="Uom" key-field-name="uomId" description="${description} (${abbreviation})">
<entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -1856,7 +1856,7 @@
<entity-one entity-name="Agreement" value-field="agreement"/>
</row-actions>
<field name="agreementId" widget-style="buttontext">
- <hyperlink target="/accounting/control/EditAgreement" target-type="inter-app" description="${agreementId}" also-hidden="false">
+ <hyperlink description="${agreementId}" target="/accounting/control/EditAgreement" target-type="inter-app" also-hidden="false">
<parameter param-name="agreementId"/>
</hyperlink>
</field>
@@ -1871,7 +1871,7 @@
<form name="ListSalesAgreements" type="list" list-name="salesAgreements"
odd-row-style="alternate-row" default-table-style="basic-table">
<field name="agreementId" widget-style="buttontext">
- <hyperlink target="/accounting/control/EditAgreementItemProduct" target-type="inter-app" description="${agreementId}/${agreementItemSeqId}" also-hidden="false">
+ <hyperlink description="${agreementId}/${agreementItemSeqId}" target="/accounting/control/EditAgreementItemProduct" target-type="inter-app" also-hidden="false">
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
<parameter param-name="productId"/>
@@ -1888,7 +1888,7 @@
<form name="ListProductAgreements" type="list" list-name="productAgreements"
odd-row-style="alternate-row" default-table-style="basic-table">
<field name="agreementId" widget-style="buttontext">
- <hyperlink target="/accounting/control/EditAgreementItemProduct" target-type="inter-app" description="${agreementId}/${agreementItemSeqId}" also-hidden="false">
+ <hyperlink description="${agreementId}/${agreementItemSeqId}" target="/accounting/control/EditAgreementItemProduct" target-type="inter-app" also-hidden="false">
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
<parameter param-name="productId"/>
@@ -1905,7 +1905,7 @@
<form name="ListCommissionAgreements" type="list" list-name="commissionAgreements"
odd-row-style="alternate-row" default-table-style="basic-table">
<field name="agreementId" widget-style="buttontext">
- <hyperlink target="/accounting/control/EditAgreementItemProduct" target-type="inter-app" description="${agreementId}/${agreementItemSeqId}" also-hidden="false">
+ <hyperlink description="${agreementId}/${agreementItemSeqId}" target="/accounting/control/EditAgreementItemProduct" target-type="inter-app" also-hidden="false">
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
<parameter param-name="productId"/>
@@ -1974,7 +1974,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeWorkEffortGoodStandard">
+ <hyperlink description="[${uiLabelMap.CommonDelete}]" target="removeWorkEffortGoodStandard" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="workEffortId"/><parameter param-name="workEffortGoodStdTypeId"/><parameter param-name="fromDate"/>
</hyperlink>
</field>
@@ -1990,7 +1990,7 @@
<field name="lastInventoryCount"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductFacility" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductFacility" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="facilityId"/>
</hyperlink>
</field>
@@ -2033,7 +2033,7 @@
</field>
<field name="submitButton" position="2" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" position="2" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductFacilityLocation" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductFacilityLocation" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="facilityId"/><parameter param-name="locationSeqId"/>
</hyperlink>
</field>
@@ -2076,7 +2076,7 @@
<field name="idValue"></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteGoodIdentification" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteGoodIdentification" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="goodIdentificationTypeId"/>
</hyperlink>
</field>
@@ -2134,7 +2134,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductKeyword" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductKeyword" also-hidden="false">
<parameter param-name="productId"/>
<parameter param-name="keyword"/>
<parameter param-name="keywordTypeId"/>
@@ -2158,7 +2158,7 @@
<field name="attrValue"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductAttribute" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductAttribute" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="attrName"/>
</hyperlink>
</field>
@@ -2186,7 +2186,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title="" widget-style="buttontext">
- <hyperlink target="deleteProductGlAccount" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductGlAccount" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="organizationPartyId"/><parameter param-name="glAccountTypeId"/>
</hyperlink>
</field>
@@ -2286,7 +2286,7 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDateTime}" red-when="before-now"></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removePartyFromProduct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removePartyFromProduct" also-hidden="false">
<parameter param-name="productId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
@@ -2334,13 +2334,13 @@
<field name="thruDate" title="${uiLabelMap.ProductDealEndDate}"><display/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="editLink" use-when="${groovy: return reqOrderQty.compareTo(soldOrderQty)!= 0;}&&${groovy: return thruDate.compareTo(org.apache.ofbiz.base.util.UtilDateTime.nowTimestamp()) == 1}" title=" " widget-style="buttontext">
- <hyperlink target="EditProductGroupOrder" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditProductGroupOrder" also-hidden="false">
<parameter param-name="productId"/>
<parameter param-name="groupOrderId"/>
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductGroupOrder" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductGroupOrder" also-hidden="false">
<parameter param-name="productId"/>
<parameter param-name="groupOrderId"/>
</hyperlink>
@@ -2383,7 +2383,7 @@
</actions>
<field name="keywordTypeId"><hidden/></field>
<field name="productId">
- <hyperlink target="EditProduct" description="${productId}">
+ <hyperlink description="${productId}" target="EditProduct">
<parameter param-name="productId"/>
</hyperlink>
</field>
diff --git a/applications/product/widget/catalog/PromoForms.xml b/applications/product/widget/catalog/PromoForms.xml
index 7e0c970..9308d91 100644
--- a/applications/product/widget/catalog/PromoForms.xml
+++ b/applications/product/widget/catalog/PromoForms.xml
@@ -23,7 +23,7 @@
<form name="ListProductPromos" type="list" title="" list-name="productPromos"
paginate-target="FindProductPromo" odd-row-style="alternate-row" default-table-style="basic-table">
<field name="productPromoId" widget-style="buttontext">
- <hyperlink target="EditProductPromo" description="${productPromoId}" also-hidden="false">
+ <hyperlink description="${productPromoId}" target="EditProductPromo" also-hidden="false">
<parameter param-name="productPromoId"/>
</hyperlink>
</field>
@@ -107,12 +107,12 @@
<auto-fields-entity entity-name="ProductPromoCode" default-field-type="display"/>
<field name="productPromoId"><hidden/></field>
<field name="productPromoCodeId" widget-style="buttontext">
- <hyperlink target="EditProductPromoCode" description="${productPromoCodeId}" also-hidden="false">
+ <hyperlink description="${productPromoCodeId}" target="EditProductPromoCode" also-hidden="false">
<parameter param-name="productPromoCodeId"/>
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductPromoCode" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductPromoCode" also-hidden="false">
<parameter param-name="productPromoCodeId"/>
<parameter param-name="productPromoId"/>
</hyperlink>
@@ -134,7 +134,7 @@
<form name="ListProductPromoContent" type="list" list-name="productPromoContents"
odd-row-style="alternate-row" default-table-style="basic-table">
<field name="editProductPromoContent" title="${uiLabelMap.ProductContent}" widget-style="buttontext">
- <hyperlink target="EditProductPromoContent" description="${description} [${contentId}]" also-hidden="false">
+ <hyperlink description="${description} [${contentId}]" target="EditProductPromoContent" also-hidden="false">
<parameter param-name="productPromoId"/>
<parameter param-name="contentId"/>
<parameter param-name="productPromoContentTypeId"/>
@@ -147,12 +147,12 @@
<field name="fromDate"><display/></field>
<field name="thruDate"><display/></field>
<field name="editContent" title="${uiLabelMap.ProductEditContent}" widget-style="buttontext">
- <hyperlink target="/content/control/EditContent" target-type="inter-app" description="${contentId}" also-hidden="false">
+ <hyperlink description="${contentId}" target="/content/control/EditContent" target-type="inter-app" also-hidden="false">
<parameter param-name="contentId"/>
</hyperlink>
</field>
<field name="removeContent" title=" " widget-style="buttontext">
- <hyperlink target="removeContentFromProductPromo" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentFromProductPromo" also-hidden="false">
<parameter param-name="productPromoId"/>
<parameter param-name="contentId"/>
<parameter param-name="productPromoContentTypeId"/>
diff --git a/applications/product/widget/catalog/ReviewForms.xml b/applications/product/widget/catalog/ReviewForms.xml
index ec635a0..bfb5542 100644
--- a/applications/product/widget/catalog/ReviewForms.xml
+++ b/applications/product/widget/catalog/ReviewForms.xml
@@ -57,7 +57,7 @@
</row-actions>
<field name="productReviewId"><hidden/></field>
<field name="productId">
- <hyperlink also-hidden="false" description="${productId}" target="EditProduct">
+ <hyperlink description="${productId}" target="EditProduct" also-hidden="false">
<parameter param-name="productId"/>
</hyperlink>
</field>
@@ -69,13 +69,13 @@
<field name="productReview" use-when="${statusId == 'PRR_DELETED'}"><textarea read-only="true"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" use-when="${statusId != 'PRR_DELETED'}"><submit button-type="button"/></field>
<field name="approve" widget-style="buttontext" use-when="${statusId == 'PRR_PENDING'}">
- <hyperlink target="updateProductReviewStatus" description="${uiLabelMap.FormFieldTitle_approve}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.FormFieldTitle_approve}" target="updateProductReviewStatus" also-hidden="false">
<parameter param-name="statusId" value="PRR_APPROVED"/>
<parameter param-name="productReviewId" from-field="productReviewId"/>
</hyperlink>
</field>
<field name="rejectButton" widget-style="buttontext" use-when="${statusId != 'PRR_DELETED'}">
- <hyperlink target="updateProductReviewStatus" description="${uiLabelMap.FormFieldTitle_rejectButton}" also-hidden="false" confirmation-message="Do you want to reject this review?">
+ <hyperlink description="${uiLabelMap.FormFieldTitle_rejectButton}" target="updateProductReviewStatus" also-hidden="false" confirmation-message="Do you want to reject this review?">
<parameter param-name="statusId" value="PRR_DELETED"/>
<parameter param-name="productReviewId" from-field="productReviewId"/>
</hyperlink>
diff --git a/applications/product/widget/catalog/ShippingForms.xml b/applications/product/widget/catalog/ShippingForms.xml
index 9f240d6..85caff4 100644
--- a/applications/product/widget/catalog/ShippingForms.xml
+++ b/applications/product/widget/catalog/ShippingForms.xml
@@ -25,13 +25,13 @@
paginate-target="ListQuantityBreaks" odd-row-style="alternate-row" default-table-style="basic-table">
<auto-fields-entity entity-name="QuantityBreak" default-field-type="display"/>
<field name="quantityBreakId" widget-style="buttontext">
- <hyperlink target="ListQuantityBreaks" description="${quantityBreakId}" also-hidden="false">
+ <hyperlink description="${quantityBreakId}" target="ListQuantityBreaks" also-hidden="false">
<parameter param-name="quantityBreakId"/>
</hyperlink>
</field>
<field name="quantityBreakTypeId" title="${uiLabelMap.CommonType}"><display-entity also-hidden="false" entity-name="QuantityBreakType"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteQuantityBreak" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteQuantityBreak" also-hidden="false">
<parameter param-name="quantityBreakId"/>
</hyperlink>
</field>
@@ -54,12 +54,12 @@
paginate-target="ListShipmentMethodTypes" odd-row-style="alternate-row" default-table-style="basic-table">
<auto-fields-entity entity-name="ShipmentMethodType" default-field-type="display"/>
<field name="shipmentMethodTypeId" widget-style="buttontext">
- <hyperlink target="ListShipmentMethodTypes" description="${shipmentMethodTypeId}" also-hidden="false">
+ <hyperlink description="${shipmentMethodTypeId}" target="ListShipmentMethodTypes" also-hidden="false">
<parameter param-name="shipmentMethodTypeId"/>
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteShipmentMethodType" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteShipmentMethodType" also-hidden="false">
<parameter param-name="shipmentMethodTypeId"/>
</hyperlink>
</field>
@@ -77,14 +77,14 @@
<field name="shipmentMethodTypeId"><display-entity also-hidden="false" entity-name="ShipmentMethodType"/></field>
<field name="roleTypeId"><display-entity also-hidden="false" entity-name="RoleType"/></field>
<field name="editLink" title=" " widget-style="buttontext">
- <hyperlink target="ListCarrierShipmentMethods" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="ListCarrierShipmentMethods" also-hidden="false">
<parameter param-name="shipmentMethodTypeId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteCarrierShipmentMethod" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteCarrierShipmentMethod" also-hidden="false">
<parameter param-name="shipmentMethodTypeId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
diff --git a/applications/product/widget/catalog/StoreForms.xml b/applications/product/widget/catalog/StoreForms.xml
index 30fc86d..241cc98 100644
--- a/applications/product/widget/catalog/StoreForms.xml
+++ b/applications/product/widget/catalog/StoreForms.xml
@@ -30,7 +30,7 @@
</entity-condition>
</actions>
<field name="productStoreId" title="${uiLabelMap.ProductStoreId}" widget-style="buttontext" sort-field="true">
- <hyperlink target="EditProductStore" description="${productStoreId}">
+ <hyperlink description="${productStoreId}" target="EditProductStore">
<parameter param-name="productStoreId"/>
</hyperlink>
</field>
@@ -68,7 +68,7 @@
</drop-down>
</field>
<field use-when="productStore!=null&&productStore.getString("inventoryFacilityId")!=null" name="inventoryFacilityLink" title=" " widget-style="buttontext">
- <hyperlink target="/facility/control/EditFacility" target-type="inter-app" description="${uiLabelMap.CommonEdit} ${uiLabelMap.ProductFacility} ${productStore.inventoryFacilityId}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonEdit} ${uiLabelMap.ProductFacility} ${productStore.inventoryFacilityId}" target="/facility/control/EditFacility" target-type="inter-app" also-hidden="false">
<parameter param-name="facilityId" from-field="productStore.inventoryFacilityId"/>
</hyperlink>
</field>
@@ -448,7 +448,7 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductStoreCatalog" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductStoreCatalog" also-hidden="false">
<parameter param-name="prodCatalogId"/>
<parameter param-name="productStoreId"/>
<parameter param-name="fromDate"/>
@@ -459,7 +459,7 @@
odd-row-style="alternate-row" default-table-style="basic-table" separate-columns="true">
<field name="productStoreId"><hidden/></field>
<field name="productPromoId" widget-style="buttontext">
- <hyperlink target="EditProductPromo" description="${productPromoId}" also-hidden="true">
+ <hyperlink description="${productPromoId}" target="EditProductPromo" also-hidden="true">
<parameter param-name="productPromoId"/>
</hyperlink>
</field>
@@ -532,7 +532,7 @@
<field name="thruDate"><display/></field>
<field name="sequenceNum"><display/></field>
<field name="editLink" widget-style="buttontext" title="${uiLabelMap.CommonEdit}">
- <hyperlink target="FindProductStoreRoles" description="${uiLabelMap.CommonEdit}">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="FindProductStoreRoles">
<parameter param-name="partyId"/>
<parameter param-name="productStoreId"/>
<parameter param-name="roleTypeId"/>
@@ -540,7 +540,7 @@
</hyperlink>
</field>
<field name="deleteLink" widget-style="buttontext" title="${uiLabelMap.CommonDelete}">
- <hyperlink target="storeRemoveRole" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="storeRemoveRole">
<parameter param-name="partyId"/>
<parameter param-name="productStoreId"/>
<parameter param-name="roleTypeId"/>
@@ -638,7 +638,7 @@
</actions>
<field name="productStoreGroupId"><hidden/></field>
<field name="productStoreGroupName">
- <hyperlink target="EditProductStoreGroupAndAssoc" description="${productStoreGroupName} [${productStoreGroupId}]">
+ <hyperlink description="${productStoreGroupName} [${productStoreGroupId}]" target="EditProductStoreGroupAndAssoc">
<parameter param-name="productStoreGroupId"/>
</hyperlink>
</field>
@@ -682,7 +682,7 @@
<field name="fromDate"><display type="date"/></field>
<field name="thruDate"><display type="date"/></field>
<field name="submitButton" title=" ">
- <hyperlink target="updateProductStoreGroupRollup" request-confirmation="true" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="updateProductStoreGroupRollup" request-confirmation="true">
<parameter param-name="productStoreGroupId"/>
<parameter param-name="parentGroupId"/>
<parameter param-name="fromDate"/>
@@ -698,7 +698,7 @@
</entity-and>
</actions>
<field name="productStoreId">
- <hyperlink target="EditProductStore" description="${productStoreId}">
+ <hyperlink description="${productStoreId}" target="EditProductStore">
<parameter param-name="productStoreId"/>
</hyperlink>
</field>
@@ -732,13 +732,13 @@
<display-entity entity-name="Enumeration" key-field-name="enumId"/>
</field>
<field name="remove" title=" " widget-style="buttontext">
- <hyperlink target="RemoveProductStoreFinAccountSettings" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="RemoveProductStoreFinAccountSettings">
<parameter param-name="productStoreId"/>
<parameter param-name="finAccountTypeId"/>
</hyperlink>
</field>
<field name="edit" title=" " widget-style="buttontext">
- <hyperlink target="EditProductStoreFinAccountSettings" description="${uiLabelMap.CommonEdit}">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditProductStoreFinAccountSettings">
<parameter param-name="productStoreId"/>
<parameter param-name="finAccountTypeId"/>
</hyperlink>
@@ -802,7 +802,7 @@
<field name="fromAddress" title="${uiLabelMap.CommonFromAddress}"></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="removeProductStoreEmail" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeProductStoreEmail" also-hidden="false">
<parameter param-name="productStoreId"/>
<parameter param-name="emailType"/>
</hyperlink>
@@ -880,7 +880,7 @@
<field name="paymentPropertiesPath" title="${uiLabelMap.ProductPaymentProps}"><display/></field>
<field name="applyToAllProducts" title="${uiLabelMap.ProductApplyToAll}"><display/></field>
<field name="editLink" title=" " use-when="${groovy:security.hasEntityPermission("CATALOG", "_UPDATE", session);}" widget-style="buttontext">
- <hyperlink target="EditProductStorePaySetup" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditProductStorePaySetup" also-hidden="false">
<parameter param-name="productStoreId"/>
<parameter param-name="paymentMethodTypeId"/>
<parameter param-name="paymentServiceTypeEnumId"/>
@@ -890,7 +890,7 @@
<display/>
</field>
<field name="deleteLink" title=" " use-when="${groovy:security.hasEntityPermission("CATALOG", "_DELETE", session);}" widget-style="buttontext">
- <hyperlink target="storeRemovePaySetting" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="storeRemovePaySetting" also-hidden="false">
<parameter param-name="productStoreId"/>
<parameter param-name="paymentMethodTypeId"/>
<parameter param-name="paymentServiceTypeEnumId"/>
@@ -908,14 +908,14 @@
</entity-and>
</actions>
<field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.ProductSegmentGroupId}">
- <hyperlink also-hidden="false" target-type="inter-app" description="${segmentGroupId}" target="/marketing/control/viewSegmentGroup">
+ <hyperlink description="${segmentGroupId}" target="/marketing/control/viewSegmentGroup" also-hidden="false" target-type="inter-app">
<parameter param-name="segmentGroupId"/>
</hyperlink>
</field>
<field name="segmentGroupTypeId" title="${uiLabelMap.ProductSegmentGroupTypeId}"><display-entity entity-name="SegmentGroupType"/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="/marketing/control/deleteSegmentGroup" description="${uiLabelMap.CommonDelete}" also-hidden="false" target-type="inter-app">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="/marketing/control/deleteSegmentGroup" also-hidden="false" target-type="inter-app">
<parameter param-name="segmentGroupId"/>
</hyperlink>
</field>
@@ -950,7 +950,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductStoreKeywordOvrd" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductStoreKeywordOvrd" also-hidden="false">
<parameter param-name="productStoreId"/>
<parameter param-name="keyword"/>
<parameter param-name="fromDate"/>
@@ -1015,7 +1015,7 @@
<field name="productStoreId"><hidden/></field>
<field name="carrierRoleTypeId"><hidden/></field>
<field name="shipmentCostEstimateId" title=" " widget-style="buttontext">
- <hyperlink target="EditProductStoreShipmentCostEstimates" description="${shipmentCostEstimateId}" also-hidden="false">
+ <hyperlink description="${shipmentCostEstimateId}" target="EditProductStoreShipmentCostEstimates" also-hidden="false">
<parameter param-name="productStoreId"/>
<parameter param-name="shipmentCostEstimateId"/>
</hyperlink>
@@ -1048,7 +1048,7 @@
<display-entity entity-name="Uom" key-field-name="uomId"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="storeRemoveShipRate" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="storeRemoveShipRate" also-hidden="false">
<parameter param-name="productStoreId"/>
<parameter param-name="shipmentCostEstimateId"/>
</hyperlink>
@@ -1207,7 +1207,7 @@
<auto-fields-entity entity-name="ProductStoreShipmentMeth" default-field-type="display"/>
<field name="productStoreId"><hidden/></field>
<field name="productStoreShipMethId" title=" " widget-style="buttontext">
- <hyperlink target="EditProductStoreShipSetup" description="${productStoreShipMethId}" also-hidden="false">
+ <hyperlink description="${productStoreShipMethId}" target="EditProductStoreShipSetup" also-hidden="false">
<parameter param-name="productStoreId"/>
<parameter param-name="productStoreShipMethId"/>
</hyperlink>
@@ -1235,7 +1235,7 @@
<display-entity entity-name="ShipmentGatewayConfig" key-field-name="shipmentGatewayConfigId" />
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="storeRemoveShipMeth" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="storeRemoveShipMeth" also-hidden="false">
<parameter param-name="productStoreId"/>
<parameter param-name="productStoreShipMethId"/>
</hyperlink>
diff --git a/applications/product/widget/catalog/SubscriptionForms.xml b/applications/product/widget/catalog/SubscriptionForms.xml
index 3879a5e..081def2 100644
--- a/applications/product/widget/catalog/SubscriptionForms.xml
+++ b/applications/product/widget/catalog/SubscriptionForms.xml
@@ -136,7 +136,7 @@
<field name="roleTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
<field name="orderId" widget-style="buttontext">
- <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}">
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app">
<parameter param-name="orderId"/>
</hyperlink>
</field>
@@ -337,7 +337,7 @@
</field>
<field name="subscriptionResourceId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${subscriptionResourceId}" target="EditSubscriptionResource">
+ <hyperlink description="${subscriptionResourceId}" target="EditSubscriptionResource" also-hidden="false">
<parameter param-name="subscriptionResourceId"/>
</hyperlink>
</field>
@@ -382,7 +382,7 @@
<field name="productId"><display/></field>
<field name="useTimeUomId">
<drop-down>
- <entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId">
+ <entity-options entity-name="Uom" key-field-name="uomId" description="${description} (${abbreviation})">
<entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -410,7 +410,7 @@
</drop-down>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteProductSubscriptionResourceSr" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductSubscriptionResourceSr" also-hidden="false">
<parameter param-name="subscriptionResourceId"/>
<parameter param-name="productId"/>
<parameter param-name="fromDate"/>
@@ -426,7 +426,7 @@
<field name="productId"><lookup target-form-name="LookupProduct"/></field>
<field name="useTimeUomId">
<drop-down allow-empty="false">
- <entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId">
+ <entity-options entity-name="Uom" key-field-name="uomId" description="${description} (${abbreviation})">
<entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -480,7 +480,7 @@
</actions>
<field name="subscriptionId"><hidden/></field>
<field name="communicationEventId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent" target-type="inter-app">
+ <hyperlink description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent" also-hidden="false" target-type="inter-app">
<parameter param-name="communicationEventId"/>
</hyperlink>
</field>
@@ -498,7 +498,7 @@
<field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
<field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="removeSubscriptionCommEvent" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeSubscriptionCommEvent" also-hidden="false">
<parameter param-name="subscriptionId"/>
<parameter param-name="communicationEventId"/>
</hyperlink>
diff --git a/applications/product/widget/facility/FacilityForms.xml b/applications/product/widget/facility/FacilityForms.xml
index e5cf094..ac76611 100644
--- a/applications/product/widget/facility/FacilityForms.xml
+++ b/applications/product/widget/facility/FacilityForms.xml
@@ -31,7 +31,7 @@
</service>
</actions>
<field name="facilityId">
- <hyperlink target="EditFacility" description="${facilityId}">
+ <hyperlink description="${facilityId}" target="EditFacility">
<parameter param-name="facilityId"/>
</hyperlink>
</field>
@@ -106,7 +106,7 @@
</service>
</actions>
<field name="inventoryItemId" widget-style="buttontext">
- <hyperlink target="EditInventoryItem" description="${inventoryItemId}">
+ <hyperlink description="${inventoryItemId}" target="EditInventoryItem">
<parameter param-name="inventoryItemId"/>
<parameter param-name="facilityId"/>
</hyperlink>
@@ -118,14 +118,14 @@
<field name="datetimeReceived"><display/></field>
<field name="expireDate" title="${uiLabelMap.ProductExpireDate}"><display/></field>
<field name="productId">
- <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}">
+ <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
<parameter param-name="productId"/>
</hyperlink>
</field>
<field name="internalName"><display/></field>
<field name="partyId"><display/></field>
<field name="locationSeqId" widget-style="buttontext">
- <hyperlink target="EditFacilityLocation" description="${areaId}:${aisleId}:${sectionId}:${levelId}:${positionId} [${locationSeqId}]">
+ <hyperlink description="${areaId}:${aisleId}:${sectionId}:${levelId}:${positionId} [${locationSeqId}]" target="EditFacilityLocation">
<parameter param-name="facilityId"/>
<parameter param-name="locationSeqId"/>
</hyperlink>
@@ -139,7 +139,7 @@
<field name="softIdentifier"><display/></field>
<field name="quantityOnHandTotal"><display description="${availableToPromiseTotal} / ${quantityOnHandTotal}"/></field>
<field name="transfer" title="${uiLabelMap.ProductTransfer}" entry-name="inventoryItemId" widget-style="buttontext">
- <hyperlink target="TransferInventoryItem" description="${uiLabelMap.ProductTransfer}">
+ <hyperlink description="${uiLabelMap.ProductTransfer}" target="TransferInventoryItem">
<parameter param-name="facilityId"/>
<parameter param-name="inventoryItemId"/>
</hyperlink>
@@ -149,7 +149,7 @@
override-list-size="${inventoryItemsSize}" paginate-target="SearchInventoryItemsByLabels"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="inventoryItemId" widget-style="buttontext">
- <hyperlink target="EditInventoryItem" description="${inventoryItemId}">
+ <hyperlink description="${inventoryItemId}" target="EditInventoryItem">
<parameter param-name="inventoryItemId"/>
<parameter param-name="facilityId"/>
</hyperlink>
@@ -161,7 +161,7 @@
<field name="datetimeReceived"><display/></field>
<field name="expireDate" title="${uiLabelMap.ProductExpireDate}"><display/></field>
<field name="productId">
- <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}">
+ <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
<parameter param-name="productId"/>
</hyperlink>
</field>
@@ -233,13 +233,13 @@
</row-actions>
<field name="inventoryItemId" widget-style="buttontext" position="1" use-when="showPosition1">
- <hyperlink target="EditInventoryItem" description="${inventoryItemId}">
+ <hyperlink description="${inventoryItemId}" target="EditInventoryItem">
<parameter param-name="inventoryItemId"/>
<parameter param-name="facilityId"/>
</hyperlink>
</field>
<field name="productId" position="1" use-when="showPosition1" widget-style="buttontext">
- <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}">
+ <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
<parameter param-name="productId"/>
</hyperlink>
</field>
@@ -262,19 +262,19 @@
</field>
<field name="description" position="2"><display/></field>
<field name="orderId" widget-style="buttontext" position="2">
- <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" >
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" >
<parameter param-name="orderId"/>
</hyperlink>
</field>
<field name="orderItemSeqId" position="2"><display/></field>
<field name="shipmentId" widget-style="buttontext" position="2">
- <hyperlink target="ViewShipment" description="${shipmentId}" >
+ <hyperlink description="${shipmentId}" target="ViewShipment" >
<parameter param-name="shipmentId"/>
</hyperlink>
</field>
<field name="shipmentItemSeqId" position="2"><display/></field>
<field name="workEffortId" widget-style="buttontext" position="2">
- <hyperlink target="/workeffort/control/WorkEffortSummary" target-type="inter-app" description="${workEffortId}" >
+ <hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary" target-type="inter-app" >
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
@@ -297,14 +297,14 @@
</row-actions>
<field name="productId" position="1" use-when="showPosition1" widget-style="buttontext">
- <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}">
+ <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
<parameter param-name="productId"/>
</hyperlink>
</field>
<field name="effectiveDate" position="2"><display/></field>
<field name="inventoryItemId" widget-style="buttontext" position="2">
- <hyperlink target="EditInventoryItem" description="${inventoryItemId}">
+ <hyperlink description="${inventoryItemId}" target="EditInventoryItem">
<parameter param-name="inventoryItemId"/>
<parameter param-name="facilityId"/>
</hyperlink>
@@ -318,19 +318,19 @@
</field>
<field name="description" position="2"><display/></field>
<field name="orderId" widget-style="buttontext" position="2">
- <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" >
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" >
<parameter param-name="orderId"/>
</hyperlink>
</field>
<field name="orderItemSeqId" position="2"><display/></field>
<field name="shipmentId" widget-style="buttontext" position="2">
- <hyperlink target="ViewShipment" description="${shipmentId}" >
+ <hyperlink description="${shipmentId}" target="ViewShipment" >
<parameter param-name="shipmentId"/>
</hyperlink>
</field>
<field name="shipmentItemSeqId" position="2"><display/></field>
<field name="workEffortId" widget-style="buttontext" position="2">
- <hyperlink target="/workeffort/control/WorkEffortSummary" target-type="inter-app" description="${workEffortId}" >
+ <hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary" target-type="inter-app" >
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
@@ -351,12 +351,12 @@
<field name="effectiveDate"><display/></field>
<field name="productId" widget-style="buttontext">
- <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}">
+ <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
<parameter param-name="productId"/>
</hyperlink>
</field>
<field name="inventoryItemId" widget-style="buttontext">
- <hyperlink target="EditInventoryItem" description="${inventoryItemId}">
+ <hyperlink description="${inventoryItemId}" target="EditInventoryItem">
<parameter param-name="inventoryItemId"/>
<parameter param-name="facilityId"/>
</hyperlink>
@@ -370,19 +370,19 @@
</field>
<field name="description"><display/></field>
<field name="orderId" widget-style="buttontext">
- <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" >
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" >
<parameter param-name="orderId"/>
</hyperlink>
</field>
<field name="orderItemSeqId"><display/></field>
<field name="shipmentId" widget-style="buttontext">
- <hyperlink target="ViewShipment" description="${shipmentId}" >
+ <hyperlink description="${shipmentId}" target="ViewShipment" >
<parameter param-name="shipmentId"/>
</hyperlink>
</field>
<field name="shipmentItemSeqId"><display/></field>
<field name="workEffortId" widget-style="buttontext">
- <hyperlink target="/workeffort/control/WorkEffortSummary" target-type="inter-app" description="${workEffortId}" >
+ <hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary" target-type="inter-app" >
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
@@ -413,7 +413,7 @@
<field name="productSupplierId" title="${uiLabelMap.ProductSupplier}">
<drop-down allow-empty="true">
<entity-options entity-name="PartyRoleAndPartyDetail" key-field-name="partyId" description="${groupName} [${partyId}]">
- <entity-constraint name="roleTypeId" value="SUPPLIER" operator="equals"/>
+ <entity-constraint name="roleTypeId" operator="equals" value="SUPPLIER"/>
<entity-order-by field-name="partyId"/>
</entity-options>
</drop-down>
@@ -448,7 +448,7 @@
<script location="component://product/groovyScripts/facility/facility/ComputeProductSellThroughData.groovy"/>
</row-actions>
<field name="items" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
- <hyperlink target="EditFacilityInventoryItems" description="${productId}">
+ <hyperlink description="${productId}" target="EditFacilityInventoryItems">
<parameter param-name="productId"/>
<parameter param-name="facilityId"/>
</hyperlink>
@@ -485,17 +485,17 @@
<form name="SchedulingList" type="multi" use-row-submit="true" list-name="shipmentRouteSegments" title="${uiLabelMap.PageTitlePackageShipmentScheduling}" target="BatchScheduleShipmentRouteSegments?facilityId=${facilityId}"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true">
<field name="shipmentId" title="${uiLabelMap.ProductShipmentId}">
- <hyperlink target="ViewShipment" description="${shipmentId}">
+ <hyperlink description="${shipmentId}" target="ViewShipment">
<parameter param-name="shipmentId"/>
</hyperlink>
</field>
<field name="primaryOrderId" title="${uiLabelMap.ProductOrderId}">
- <hyperlink target="/ordermgr/control/orderview" description="${primaryOrderId}" target-type="inter-app">
+ <hyperlink description="${primaryOrderId}" target="/ordermgr/control/orderview" target-type="inter-app">
<parameter param-name="orderId" from-field="primaryOrderId"/>
</hyperlink>
</field>
<field name="shipmentRouteSegmentId">
- <hyperlink target="EditShipmentRouteSegments" description="${shipmentRouteSegmentId}">
+ <hyperlink description="${shipmentRouteSegmentId}" target="EditShipmentRouteSegments">
<parameter param-name="shipmentId"/>
</hyperlink>
</field>
@@ -527,12 +527,12 @@
<form name="Labels" type="multi" use-row-submit="true" list-name="shipmentPackageRouteSegments" title="" target="BatchPrintShippingLabels" separate-columns="true"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="shipmentId" title="${uiLabelMap.ProductShipmentId}">
- <hyperlink target="ViewShipment" description="${shipmentId}">
+ <hyperlink description="${shipmentId}" target="ViewShipment">
<parameter param-name="shipmentId"/>
</hyperlink>
</field>
<field name="primaryOrderId" title="${uiLabelMap.ProductOrderId}">
- <hyperlink target="/ordermgr/control/orderview" description="${primaryOrderId}" target-type="inter-app">
+ <hyperlink description="${primaryOrderId}" target="/ordermgr/control/orderview" target-type="inter-app">
<parameter param-name="orderId" from-field="primaryOrderId"/>
</hyperlink>
</field>
@@ -545,7 +545,7 @@
<display-entity entity-name="ShipmentMethodType"/>
</field>
<field name="label" title="${uiLabelMap.ProductLabel}">
- <hyperlink target="viewShipmentPackageRouteSegLabelImage" description="${uiLabelMap.ProductLabel}">
+ <hyperlink description="${uiLabelMap.ProductLabel}" target="viewShipmentPackageRouteSegLabelImage">
<parameter param-name="shipmentId"/>
<parameter param-name="shipmentRouteSegmentId"/>
<parameter param-name="shipmentPackageSeqId"/>
@@ -614,7 +614,7 @@
<field name="fromDate"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeGroupFromFacility" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeGroupFromFacility" also-hidden="false">
<parameter param-name="facilityId"/>
<parameter param-name="facilityGroupId"/>
<parameter param-name="fromDate"/>
@@ -647,7 +647,7 @@
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removePartyFromFacility" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removePartyFromFacility" also-hidden="false">
<parameter param-name="facilityId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
@@ -687,7 +687,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
paginate-target="InventoryAverageCosts" override-list-size="${overrideListSize}">
<field name="productId2" title="${uiLabelMap.ProductProductId}" entry-name="productId" widget-style="buttontext">
- <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}">
+ <hyperlink description="${productId}" target="/catalog/control/EditProduct" target-type="inter-app">
<parameter param-name="productId"/>
</hyperlink>
</field>
@@ -734,17 +734,17 @@
</row-actions>
<field name="inventoryTransferId" title="${uiLabelMap.ProductInventoryTransfer}" widget-style="buttontext">
- <hyperlink target="TransferInventoryItem" description="${inventoryTransferId}">
+ <hyperlink description="${inventoryTransferId}" target="TransferInventoryItem">
<parameter param-name="inventoryTransferId"/>
</hyperlink>
</field>
<field name="inventoryItemId" widget-style="buttontext">
- <hyperlink target="EditInventoryItem" description="${inventoryItemId}">
+ <hyperlink description="${inventoryItemId}" target="EditInventoryItem">
<parameter param-name="inventoryItemId"/>
</hyperlink>
</field>
<field name="facilityId" widget-style="buttontext">
- <hyperlink target="EditFacility" description="${facilityId}">
+ <hyperlink description="${facilityId}" target="EditFacility">
<parameter param-name="facilityId"/>
</hyperlink>
</field>
@@ -753,7 +753,7 @@
</field>
<field name="locationSeqId"><display/></field>
<field name="productId" entry-name="product.productId" widget-style="buttontext">
- <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${product.productId}">
+ <hyperlink description="${product.productId}" target="/catalog/control/EditProduct" target-type="inter-app">
<parameter param-name="productId" from-field="product.productId"/>
</hyperlink>
</field>
@@ -778,17 +778,17 @@
</entity-one>
</row-actions>
<field name="inventoryTransferId" title="${uiLabelMap.ProductInventoryTransfer}" widget-style="buttontext">
- <hyperlink target="TransferInventoryItem" description="${inventoryTransferId}">
+ <hyperlink description="${inventoryTransferId}" target="TransferInventoryItem">
<parameter param-name="inventoryTransferId"/>
</hyperlink>
</field>
<field name="inventoryItemId" widget-style="buttontext">
- <hyperlink target="EditInventoryItem" description="${inventoryItemId}">
+ <hyperlink description="${inventoryItemId}" target="EditInventoryItem">
<parameter param-name="inventoryItemId"/>
</hyperlink>
</field>
<field name="facilityIdTo" widget-style="buttontext">
- <hyperlink target="EditFacility" description="${facilityIdTo}">
+ <hyperlink description="${facilityIdTo}" target="EditFacility">
<parameter param-name="facilityId" from-field="facilityIdTo"/>
</hyperlink>
</field>
@@ -797,7 +797,7 @@
</field>
<field name="locationSeqIdTo"><display/></field>
<field name="productId" entry-name="product.productId" widget-style="buttontext">
- <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${product.productId}">
+ <hyperlink description="${product.productId}" target="/catalog/control/EditProduct" target-type="inter-app">
<parameter param-name="productId" from-field="product.productId"/>
</hyperlink>
</field>
@@ -823,17 +823,17 @@
</entity-one>
</row-actions>
<field name="inventoryTransferId" title="${uiLabelMap.ProductInventoryTransfer}" widget-style="buttontext">
- <hyperlink target="TransferInventoryItem" description="${inventoryTransferId}">
+ <hyperlink description="${inventoryTransferId}" target="TransferInventoryItem">
<parameter param-name="inventoryTransferId"/>
</hyperlink>
</field>
<field name="inventoryItemId" widget-style="buttontext">
- <hyperlink target="EditInventoryItem" description="${inventoryItemId}">
+ <hyperlink description="${inventoryItemId}" target="EditInventoryItem">
<parameter param-name="inventoryItemId"/>
</hyperlink>
</field>
<field name="facilityIdTo" widget-style="buttontext">
- <hyperlink target="EditFacility" description="${facilityIdTo}" also-hidden="false">
+ <hyperlink description="${facilityIdTo}" target="EditFacility" also-hidden="false">
<parameter param-name="facilityId" from-field="facilityIdTo"/>
</hyperlink>
</field>
@@ -842,7 +842,7 @@
</field>
<field name="locationSeqIdTo"><display also-hidden="false"/></field>
<field name="productId" entry-name="product.productId" widget-style="buttontext">
- <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${product.productId}" also-hidden="false">
+ <hyperlink description="${product.productId}" target="/catalog/control/EditProduct" target-type="inter-app" also-hidden="false">
<parameter param-name="productId" from-field="product.productId"/>
</hyperlink>
</field>
@@ -890,7 +890,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="facilityId"><hidden/></field>
<field name="contentId" title="${uiLabelMap.CommonView}">
- <hyperlink target="/content/control/ViewSimpleContent" description="[${contentId}]" target-type="inter-app">
+ <hyperlink description="[${contentId}]" target="/content/control/ViewSimpleContent" target-type="inter-app">
<parameter param-name="contentId"/>
</hyperlink>
</field>
@@ -899,7 +899,7 @@
<field name="contentTypeId" title="${uiLabelMap.FormFieldTitle_contentTypeId}"><display-entity entity-name="ContentType" also-hidden="false"/></field>
<field name="fromDate"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteFacilityContent">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteFacilityContent" also-hidden="false">
<parameter param-name="facilityId"/>
<parameter param-name="contentId"/>
<parameter param-name="fromDate"/>
@@ -937,7 +937,7 @@
<form name="ListFacilityAgreements" type="list" list-name="facilityAgreements"
odd-row-style="alternate-row" default-table-style="basic-table">
<field name="agreementId" widget-style="buttontext">
- <hyperlink target="/accounting/control/EditAgreementItemFacility" target-type="inter-app" description="${agreementId}/${agreementItemSeqId}" also-hidden="false">
+ <hyperlink description="${agreementId}/${agreementItemSeqId}" target="/accounting/control/EditAgreementItemFacility" target-type="inter-app" also-hidden="false">
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
<parameter param-name="faclityId"/>
@@ -972,13 +972,13 @@
<alt-target use-when="${groovy: inventoryItem==null}" target="createInventoryTransfersForProduct"/>
<alt-target use-when="${groovy: inventoryTransferId!=null}" target="UpdateInventoryTransfer"/>
<field name="inventoryItemId" widget-style="buttontext" use-when="${groovy: inventoryItem != null}">
- <hyperlink target="/catalog/control/EditInventoryItem" target-type="inter-app" description="${inventoryItemId}">
+ <hyperlink description="${inventoryItemId}" target="/catalog/control/EditInventoryItem" target-type="inter-app">
<parameter param-name="inventoryItemId"/>
</hyperlink>
</field>
<field name="inventoryItemTypeId" use-when="${groovy: inventoryItem != null}"><display description="${inventoryItemType.description}"/></field>
<field name="productId" widget-style="buttontext">
- <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${groovy: if(inventoryItem) inventoryItem.productId else parameters.productId}">
+ <hyperlink description="${groovy: if(inventoryItem) inventoryItem.productId else parameters.productId}" target="/catalog/control/EditProduct" target-type="inter-app">
<parameter param-name="productId"/>
</hyperlink>
</field>
@@ -1003,7 +1003,7 @@
</drop-down>
</field>
<field name="facilityIdTo" use-when="${groovy: inventoryTransfer!=null}" widget-style="buttontext">
- <hyperlink target="EditFacility" description="${inventoryTransfer.facilityIdTo}" also-hidden="false">
+ <hyperlink description="${inventoryTransfer.facilityIdTo}" target="EditFacility" also-hidden="false">
<parameter param-name="facilityIdTo" value="${inventoryTransfer.facilityIdTo}"/>
</hyperlink>
</field>
diff --git a/applications/product/widget/facility/FacilityGroupForms.xml b/applications/product/widget/facility/FacilityGroupForms.xml
index 4a8b717..d07bd3c 100644
--- a/applications/product/widget/facility/FacilityGroupForms.xml
+++ b/applications/product/widget/facility/FacilityGroupForms.xml
@@ -67,7 +67,7 @@
<field name="fromDate"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeFacilityGroupFromGroup" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeFacilityGroupFromGroup" also-hidden="false">
<parameter param-name="showFacilityGroupId" from-field="facilityGroupId"/>
<parameter param-name="facilityGroupId"/>
<parameter param-name="parentFacilityGroupId"/>
@@ -104,7 +104,7 @@
<field name="fromDate"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeFacilityGroupFromGroup" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeFacilityGroupFromGroup" also-hidden="false">
<parameter param-name="showFacilityGroupId" from-field="parentFacilityGroupId"/>
<parameter param-name="facilityGroupId"/>
<parameter param-name="parentFacilityGroupId"/>
@@ -141,7 +141,7 @@
<field name="fromDate"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeFacilityFromGroup" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeFacilityFromGroup" also-hidden="false">
<parameter param-name="facilityGroupId"/>
<parameter param-name="facilityId"/>
<parameter param-name="fromDate"/>
@@ -177,7 +177,7 @@
<display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removePartyFromFacilityGroup" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removePartyFromFacilityGroup" also-hidden="false">
<parameter param-name="facilityGroupId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
diff --git a/applications/product/widget/facility/FacilityScreens.xml b/applications/product/widget/facility/FacilityScreens.xml
index 9a1a089..4fcaf3d 100644
--- a/applications/product/widget/facility/FacilityScreens.xml
+++ b/applications/product/widget/facility/FacilityScreens.xml
@@ -1073,15 +1073,15 @@
<property-map resource="ProductUiLabels" map-name="uiLabelMap"/>
<set field="title" value="${uiLabelMap.PageTitleTransferInventoryItem}"/>
- <entity-one value-field="inventoryItem" entity-name="InventoryItem"/>
- <entity-one value-field="inventoryItemType" entity-name="InventoryItemType">
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem"/>
+ <entity-one entity-name="InventoryItemType" value-field="inventoryItemType">
<field-map field-name="inventoryItemTypeId" value="${inventoryItem.inventoryItemTypeId}"/>
</entity-one>
- <entity-one value-field="statusItem" entity-name="StatusItem">
+ <entity-one entity-name="StatusItem" value-field="statusItem">
<field-map field-name="statusId" value="${inventoryItem.statusId}"/>
</entity-one>
- <entity-one value-field="inventoryTransfer" entity-name="InventoryTransfer"/>
- <entity-one value-field="product" entity-name="Product"/>
+ <entity-one entity-name="InventoryTransfer" value-field="inventoryTransfer"/>
+ <entity-one entity-name="Product" value-field="product"/>
</actions>
<widgets>
<decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
diff --git a/applications/product/widget/facility/FieldLookupForms.xml b/applications/product/widget/facility/FieldLookupForms.xml
index eba277e..57a5d6d 100644
--- a/applications/product/widget/facility/FieldLookupForms.xml
+++ b/applications/product/widget/facility/FieldLookupForms.xml
@@ -48,7 +48,7 @@
</service>
</actions>
<field name="facilityId" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${facilityId}" target="javascript:set_values('${facilityId}', '${facilityName}')"/>
+ <hyperlink description="${facilityId}" target="javascript:set_values('${facilityId}', '${facilityName}')" also-hidden="false" target-type="plain"/>
</field>
<field name="facilityName"><display/></field>
<field name="facilityTypeId"><display/></field>
@@ -59,7 +59,7 @@
<field name="facilityId" use-when="facilityId != null"><hidden/></field>
<field name="facilityId" use-when="facilityId == null">
<drop-down allow-empty="false">
- <entity-options entity-name="Facility" description="${facilityName}" key-field-name="facilityId">
+ <entity-options entity-name="Facility" key-field-name="facilityId" description="${facilityName}">
<entity-order-by field-name="facilityName"/>
</entity-options>
</drop-down>
@@ -88,7 +88,7 @@
</actions>
<auto-fields-entity entity-name="FacilityLocation" default-field-type="display"/>
<field name="locationSeqId" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${locationSeqId}" target="javascript:set_value('${locationSeqId}')"/>
+ <hyperlink description="${locationSeqId}" target="javascript:set_value('${locationSeqId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="facilityId"><hidden/></field>
<field name="locationTypeEnumId">
@@ -129,7 +129,7 @@
</service>
</actions>
<field name="shipmentId" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${shipmentId}" target="javascript:set_value('${shipmentId}')"/>
+ <hyperlink description="${shipmentId}" target="javascript:set_value('${shipmentId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="shipmentTypeId"><display-entity entity-name="ShipmentType"/></field>
<field name="statusId"><display-entity entity-name="StatusItem"/></field>
@@ -140,7 +140,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" view-size="20">
<field name="inventoryItemId"><display/></field>
<field name="locationSeqId" title=" " widget-style="buttontext" >
- <hyperlink also-hidden="false" target-type="plain" description="${locationSeqId}" target="javascript:set_value('${locationSeqId}')"/>
+ <hyperlink description="${locationSeqId}" target="javascript:set_value('${locationSeqId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="locationTypeEnumId">
<display-entity entity-name="Enumeration" key-field-name="enumId"/>
diff --git a/applications/product/widget/facility/InventoryForms.xml b/applications/product/widget/facility/InventoryForms.xml
index 64cd163..61d4eb6 100644
--- a/applications/product/widget/facility/InventoryForms.xml
+++ b/applications/product/widget/facility/InventoryForms.xml
@@ -81,7 +81,7 @@
<field name="expireDate" title="${uiLabelMap.ProductExpireDate}"/>
<field name="facilityId">
<drop-down allow-empty="true">
- <entity-options entity-name="Facility" description="${facilityName}" key-field-name="facilityId">
+ <entity-options entity-name="Facility" key-field-name="facilityId" description="${facilityName}">
<entity-order-by field-name="facilityName"/>
</entity-options>
<sub-hyperlink use-when="facilityId!=null" target="EditFacility" description="${uiLabelMap.ProductEditFacility} [${facilityId}]">
@@ -191,12 +191,12 @@
<auto-fields-entity entity-name="InventoryItemDetail" map-name="inventoryItemDetail" default-field-type="display"/>
<field name="inventoryItemId"><hidden/></field> <!-- this field is redundant -->
<field name="orderId" widget-style="buttontext">
- <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" >
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" >
<parameter param-name="orderId"/>
</hyperlink>
</field>
<field name="shipmentId" widget-style="buttontext">
- <hyperlink target="ViewShipment" description="${shipmentId}" >
+ <hyperlink description="${shipmentId}" target="ViewShipment" >
<parameter param-name="shipmentId"/>
</hyperlink>
</field>
@@ -211,7 +211,7 @@
<auto-fields-entity entity-name="OrderItemShipGrpInvRes" default-field-type="display"/>
<field name="inventoryItemId"><hidden/></field>
<field name="orderId" widget-style="buttontext">
- <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" >
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app" >
<parameter param-name="orderId"/>
</hyperlink>
</field>
@@ -221,7 +221,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<auto-fields-service service-name="updateInventoryItemLabelAppl"/>
<field name="inventoryItemLabelId" title=" " widget-style="buttontext">
- <hyperlink target="EditInventoryItemLabel" description="${inventoryItemLabelId}" also-hidden="true">
+ <hyperlink description="${inventoryItemLabelId}" target="EditInventoryItemLabel" also-hidden="true">
<parameter param-name="inventoryItemLabelId"/>
</hyperlink>
</field>
@@ -232,7 +232,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteInventoryItemLabelApplFromItem" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteInventoryItemLabelApplFromItem" also-hidden="false">
<parameter param-name="inventoryItemId"/>
<parameter param-name="inventoryItemLabelTypeId"/>
<parameter param-name="inventoryItemLabelId"/>
diff --git a/applications/product/widget/facility/InventoryItemLabelForms.xml b/applications/product/widget/facility/InventoryItemLabelForms.xml
index ba575ad..1397e91 100644
--- a/applications/product/widget/facility/InventoryItemLabelForms.xml
+++ b/applications/product/widget/facility/InventoryItemLabelForms.xml
@@ -48,7 +48,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteInventoryItemLabelType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteInventoryItemLabelType" also-hidden="false">
<parameter param-name="inventoryItemLabelTypeId"/>
</hyperlink>
</field>
@@ -57,7 +57,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="InventoryItemLabel" default-field-type="display"/>
<field name="inventoryItemLabelId" widget-style="buttontext">
- <hyperlink target="EditInventoryItemLabel" description="${inventoryItemLabelId}" also-hidden="true">
+ <hyperlink description="${inventoryItemLabelId}" target="EditInventoryItemLabel" also-hidden="true">
<parameter param-name="inventoryItemLabelId"/>
</hyperlink>
</field>
@@ -65,7 +65,7 @@
<display-entity entity-name="InventoryItemLabelType" description="${description} [${inventoryItemLabelTypeId}]" also-hidden="true"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteInventoryItemLabel" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteInventoryItemLabel" also-hidden="false">
<parameter param-name="inventoryItemLabelId"/>
</hyperlink>
</field>
@@ -101,7 +101,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteInventoryItemLabelAppl" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteInventoryItemLabelAppl" also-hidden="false">
<parameter param-name="inventoryItemId"/>
<parameter param-name="inventoryItemLabelTypeId"/>
<parameter param-name="inventoryItemLabelId"/>
diff --git a/applications/product/widget/facility/ShipmentForms.xml b/applications/product/widget/facility/ShipmentForms.xml
index 8e617a8..7d7b726 100644
--- a/applications/product/widget/facility/ShipmentForms.xml
+++ b/applications/product/widget/facility/ShipmentForms.xml
@@ -71,7 +71,7 @@
</service>
</actions>
<field name="shipmentId" title="${uiLabelMap.ProductShipmentId}" widget-style="buttontext">
- <hyperlink target="EditShipment" description="${shipmentId}">
+ <hyperlink description="${shipmentId}" target="EditShipment">
<parameter param-name="shipmentId" from-field="shipmentId"/>
</hyperlink>
</field>
@@ -144,13 +144,13 @@
</field>
<field name="estimatedShipWorkEffId" title="${uiLabelMap.ProductEstimatedShipWorkEffId}" widget-style="buttontext">
- <hyperlink target="/workeffort/control/WorkEffortSummary" also-hidden="false" description="${shipment.estimatedShipWorkEffId}" target-type="inter-app">
+ <hyperlink description="${shipment.estimatedShipWorkEffId}" target="/workeffort/control/WorkEffortSummary" also-hidden="false" target-type="inter-app">
<parameter param-name="workEffortId" from-field="shipment.estimatedShipWorkEffId"/>
</hyperlink>
</field>
<field name="estimatedArrivalDate" title="${uiLabelMap.ProductEstimatedArrivalDate}"><date-time/></field>
<field name="estimatedArrivalWorkEffId" title="${uiLabelMap.ProductEstimatedArrivalWorkEffId}" widget-style="buttontext">
- <hyperlink target="/workeffort/control/WorkEffortSummary" also-hidden="false" description="${shipment.estimatedArrivalWorkEffId}" target-type="inter-app">
+ <hyperlink description="${shipment.estimatedArrivalWorkEffId}" target="/workeffort/control/WorkEffortSummary" also-hidden="false" target-type="inter-app">
<parameter param-name="workEffortId" from-field="shipment.estimatedArrivalWorkEffId"/>
</hyperlink>
</field>
@@ -221,7 +221,7 @@
<field name="volume" title="${uiLabelMap.CommonVolume}"><display/></field>
<field name="volumeUom" title="${uiLabelMap.CommonUom}"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeOrderShipmentFromShipment" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeOrderShipmentFromShipment" also-hidden="false">
<parameter param-name="shipmentId"/>
<parameter param-name="shipmentItemSeqId"/>
<parameter param-name="orderId"/>
@@ -282,12 +282,12 @@
<field name="shipmentId"><hidden/></field>
<field name="orderItemSeqId"><hidden/></field>
<field name="orderId" widget-style="buttontext">
- <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId} - ${orderItemSeqId}" >
+ <hyperlink description="${orderId} - ${orderItemSeqId}" target="/ordermgr/control/orderview" target-type="inter-app" >
<parameter param-name="orderId"/>
</hyperlink>
</field>
<field name="inventoryItemId" widget-style="buttontext">
- <hyperlink target="EditInventoryItem" description="${inventoryItemId}">
+ <hyperlink description="${inventoryItemId}" target="EditInventoryItem">
<parameter param-name="inventoryItemId"/>
</hyperlink>
</field>
diff --git a/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml b/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml
index 3015d2a..b411c6f 100644
--- a/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml
+++ b/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml
@@ -319,9 +319,9 @@
<then>
<set field="hasPermission" value="false" type="Boolean"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
- <entity-one value-field="workEffort" entity-name="WorkEffort"/>
+ <entity-one entity-name="WorkEffort" value-field="workEffort"/>
<if-not-empty field="workEffort">
- <entity-condition list="partyAssignments" entity-name="WorkEffortPartyAssignment" filter-by-date="true">
+ <entity-condition entity-name="WorkEffortPartyAssignment" list="partyAssignments" filter-by-date="true">
<condition-list combine="and">
<condition-expr field-name="workEffortId" from-field="workEffortId"/>
<condition-expr field-name="partyId" from-field="userLogin.partyId"/>
diff --git a/applications/workeffort/minilang/timesheet/TimesheetServices.xml b/applications/workeffort/minilang/timesheet/TimesheetServices.xml
index 777fb9a..faa7f4b 100644
--- a/applications/workeffort/minilang/timesheet/TimesheetServices.xml
+++ b/applications/workeffort/minilang/timesheet/TimesheetServices.xml
@@ -79,7 +79,7 @@
<simple-method method-name="createTimesheets" short-description="Creates Timesheet multiple parties at a time">
<iterate list="parameters.partyIdList" entry="partyId">
<set field="parameters.partyId" from-field="partyId"/>
- <set-service-fields to-map="createParams" service-name="createTimesheet" map="parameters"/>
+ <set-service-fields service-name="createTimesheet" map="parameters" to-map="createParams"/>
<call-service service-name="createTimesheet" in-map-name="createParams"/>
</iterate>
</simple-method>
@@ -160,7 +160,7 @@
<set field="invoiceItemMap.description" value="${workEffort.workEffortName} [Task:${workEffort.workEffortId}]"/>
<get-related value-field="workEffort" relation-name="CustRequestWorkEffort" list="custRequestWorkEfforts"/>
<if-not-empty field="custRequestWorkEfforts">
- <first-from-list entry="custRequestWorkEffort" list="custRequestWorkEfforts"/>
+ <first-from-list list="custRequestWorkEfforts" entry="custRequestWorkEffort"/>
<get-related-one value-field="custRequestWorkEffort" relation-name="CustRequest" to-value-field="custRequest"/>
<if-not-empty field="custRequest">
<set field="invoiceItemDescription" value="${custRequest.custRequestName} [CRQ:${custRequest.custRequestId}] ${custRequest.description}"/>
@@ -199,7 +199,7 @@
<field-map field-name="partyId" from-field="timeEntry.partyId"/>
</entity-and>
<if-not-empty field="partyRates">
- <first-from-list entry="partyRate" list="partyRates"/>
+ <first-from-list list="partyRates" entry="partyRate"/>
<if-not-empty field="partyRate.percentageUsed">
<calculate field="timeEntry.hours" type="Double">
<calcop operator="multiply" field="timeEntry.hours">
diff --git a/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml b/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
index ae718bb..dbb697b 100644
--- a/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
+++ b/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
@@ -231,7 +231,7 @@
<if-empty field="targetWorkEffortId">
<sequenced-id sequence-name="WorkEffort" field="targetWorkEffortId" />
</if-empty>
- <set-service-fields service-name="createWorkEffort" to-map="createWorkEffortCtx" map="sourceWorkEffort" />
+ <set-service-fields service-name="createWorkEffort" map="sourceWorkEffort" to-map="createWorkEffortCtx"/> />
<set field="createWorkEffortCtx.workEffortId" from-field="targetWorkEffortId" />
<set field="createWorkEffortCtx.userLogin" from-field="parameters.userLogin" />
<call-service service-name="createWorkEffort" in-map-name="createWorkEffortCtx" />
@@ -241,7 +241,7 @@
</entity-one>
<set field="copyWorkEffortAssocs" from-field="parameters.copyWorkEffortAssocs" default-value="N" />
<if-compare field="copyWorkEffortAssocs" operator="equals" value="Y">
- <set-service-fields service-name="copyWorkEffortAssocs" to-map="copyWorkEffortAssocsCtx" map="parameters" />
+ <set-service-fields service-name="copyWorkEffortAssocs" map="parameters" to-map="copyWorkEffortAssocsCtx"/> />
<set field="copyWorkEffortAssocsCtx.targetWorkEffortId" from-field="targetWorkEffortId" />
<call-service service-name="copyWorkEffortAssocs" in-map-name="copyWorkEffortAssocsCtx" />
<check-errors />
@@ -339,7 +339,7 @@
<field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/>
</entity-and>
<if-not-empty field="currentAssignments">
- <first-from-list entry="firstAssignment" list="currentAssignments"/>
+ <first-from-list list="currentAssignments" entry="firstAssignment"/>
<add-error>
<fail-property resource="WorkEffortUiLabels" property="WorkEffortPartyAssignmentError"/>
</add-error>
@@ -728,7 +728,7 @@
<set field="workEffortIdTo" from-field="workEffortAssoc.workEffortIdTo" />
<if-compare field="deepCopy" operator="equals" value="Y">
<clear-field field="copyWorkEffortCtx" />
- <set-service-fields service-name="copyWorkEffort" to-map="copyWorkEffortCtx" map="parameters" />
+ <set-service-fields service-name="copyWorkEffort" map="parameters" to-map="copyWorkEffortCtx"/> />
<clear-field field="copyWorkEffortCtx.targetWorkEffortId"/>
<set field="copyWorkEffortCtx.sourceWorkEffortId" from-field="workEffortIdTo" />
<set field="copyWorkEffortCtx.copyWorkEffortAssocs" value="Y" />
@@ -750,8 +750,8 @@
<entity-one entity-name="WorkEffortInventoryAssign" value-field="foundEntity"/>
<if-not-empty field="foundEntity">
<calculate field="foundEntity.quantity" type="Double">
- <calcop field="foundEntity.quantity" operator="get"/>
- <calcop field="parameters.quantity" operator="get"/>
+ <calcop operator="get" field="foundEntity.quantity"/>
+ <calcop operator="get" field="parameters.quantity"/>
</calculate>
<store-value value-field="foundEntity"/>
<else>
@@ -1009,7 +1009,7 @@
</if-empty>
<!-- Create the new WorkEffort from the old one and the status -->
- <set-service-fields service-name="createWorkEffort" to-map="createWorkEffortCtx" map="oldWorkEffort"/>
+ <set-service-fields service-name="createWorkEffort" map="oldWorkEffort" to-map="createWorkEffortCtx"/>/>
<set field="createWorkEffortCtx.workEffortId" from-field="workEffortId"/>
<set field="createWorkEffortCtx.userLogin" from-field="parameters.userLogin"/>
<call-service service-name="createWorkEffort" in-map-name="createWorkEffortCtx"/>
@@ -1222,7 +1222,7 @@
</condition-list>
</entity-condition>
<if-not-empty field="partyRates">
- <first-from-list entry="partyRate" list="partyRates"/>
+ <first-from-list list="partyRates" entry="partyRate"/>
<if-not-empty field="partyRate.percentageUsed">
<calculate field="actual.hours" type="Double">
<calcop operator="multiply" field="actual.hours">
@@ -1314,7 +1314,7 @@
<simple-method method-name="getICalWorkEfforts" short-description="Get All Work Efforts Related To An iCalendar Publish Point" login-required="false">
<!-- Servlet already confirmed workEffortId is a valid publish point -->
<set field="workEffortId" from-field="parameters.workEffortId"/>
- <entity-condition list="assignedParties" entity-name="WorkEffortPartyAssignment" filter-by-date="true">
+ <entity-condition entity-name="WorkEffortPartyAssignment" list="assignedParties" filter-by-date="true">
<condition-list combine="and">
<condition-expr field-name="workEffortId" from-field="workEffortId"/>
<condition-expr field-name="roleTypeId" value="ICAL_MEMBER"/>
@@ -1345,7 +1345,7 @@
</entity-condition>
<list-to-list list="resultList" to-list="workEfforts"/>
</iterate>
- <entity-condition list="resultList" entity-name="WorkEffortAssocToView" filter-by-date="true">
+ <entity-condition entity-name="WorkEffortAssocToView" list="resultList" filter-by-date="true">
<condition-list combine="and">
<condition-expr field-name="workEffortIdFrom" operator="equals" from-field="workEffortId"/>
<condition-expr field-name="workEffortTypeId" operator="equals" from-field="parameters.workEffortTypeId" ignore-if-empty="true"/>
@@ -1359,7 +1359,7 @@
<simple-method method-name="getPartyICalUrl" short-description="Get The Party iCalendar URL" login-required="false">
<!-- RFC 2445 4.8.4.1 and 4.8.4.3 Value must be a URI (4.3.3) -->
<set field="partyId" from-field="parameters.partyId"/>
- <entity-condition list="contactMechs" entity-name="PartyContactWithPurpose">
+ <entity-condition entity-name="PartyContactWithPurpose" list="contactMechs">
<condition-list combine="and">
<condition-list combine="or">
<condition-expr field-name="contactMechPurposeTypeId" value="ICAL_URL"/>
diff --git a/applications/workeffort/widget/LookupForms.xml b/applications/workeffort/widget/LookupForms.xml
index 0430722..56b2975 100644
--- a/applications/workeffort/widget/LookupForms.xml
+++ b/applications/workeffort/widget/LookupForms.xml
@@ -144,7 +144,7 @@
</service>
</actions>
<field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${workEffortId}" target="javascript:set_value('${workEffortId}')"/>
+ <hyperlink description="${workEffortId}" target="javascript:set_value('${workEffortId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="workEffortName"><display/></field>
<field name="workEffortTypeId"><display-entity entity-name="WorkEffortType"/></field>
@@ -175,7 +175,7 @@
</service>
</actions>
<field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${timesheetId}" target="javascript:set_value('${timesheetId}')"/>
+ <hyperlink description="${timesheetId}" target="javascript:set_value('${timesheetId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="partyId"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field>
<field name="clientPartyId"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field>
diff --git a/applications/workeffort/widget/TimesheetForms.xml b/applications/workeffort/widget/TimesheetForms.xml
index 57e9d46..23e8217 100644
--- a/applications/workeffort/widget/TimesheetForms.xml
+++ b/applications/workeffort/widget/TimesheetForms.xml
@@ -140,7 +140,7 @@
</display-entity>
</field>
<field name="invoiceId" widget-style="buttontext">
- <hyperlink target="/accounting/control/invoiceOverview" target-type="inter-app" description="${invoiceId}">
+ <hyperlink description="${invoiceId}" target="/accounting/control/invoiceOverview" target-type="inter-app">
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
@@ -174,7 +174,7 @@
<field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteTimesheetRole" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTimesheetRole" also-hidden="false">
<parameter param-name="timesheetId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
@@ -238,7 +238,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteTimesheetEntry" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTimesheetEntry" also-hidden="false">
<parameter param-name="timesheetId"/>
<parameter param-name="timeEntryId"/>
</hyperlink>
diff --git a/applications/workeffort/widget/WorkEffortCommEventForms.xml b/applications/workeffort/widget/WorkEffortCommEventForms.xml
index b7f07d0..2177480 100644
--- a/applications/workeffort/widget/WorkEffortCommEventForms.xml
+++ b/applications/workeffort/widget/WorkEffortCommEventForms.xml
@@ -31,7 +31,7 @@
</actions>
<field name="workEffortId"><hidden/></field>
<field name="communicationEventId" widget-style="buttontext">
- <hyperlink target="/partymgr/control/EditCommunicationEvent" target-type="inter-app" description="${communicationEventId}">
+ <hyperlink description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent" target-type="inter-app">
<parameter param-name="communicationEventId"/>
</hyperlink>
</field>
@@ -40,7 +40,7 @@
<field name="description"><text size="40"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteCommunicationEventWorkEff" also-hidden="false" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteCommunicationEventWorkEff" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="communicationEventId"/>
</hyperlink>
diff --git a/applications/workeffort/widget/WorkEffortForms.xml b/applications/workeffort/widget/WorkEffortForms.xml
index 2665852..55fa690 100644
--- a/applications/workeffort/widget/WorkEffortForms.xml
+++ b/applications/workeffort/widget/WorkEffortForms.xml
@@ -277,7 +277,7 @@
</service>
</actions>
<field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${workEffortName}[${workEffortId}]" target="javascript:set_value('${workEffortId}')" target-type="plain"/>
+ <hyperlink description="${workEffortName}[${workEffortId}]" target="javascript:set_value('${workEffortId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="workEffortTypeId"><display-entity entity-name="WorkEffortType"/></field>
<field name="contactMechTypeId"><display-entity entity-name="ContactMechType"/></field>
@@ -331,7 +331,7 @@
<field name="fromDate"><date-time default-value="${nowTimestamp}"/></field>
<field name="thruDate"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit/></field>
- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+ <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false"/></field>
</form>
<form name="EditWorkEffortAssoc" target="updateWorkEffortAssoc" title="" type="single"
@@ -357,7 +357,7 @@
<field name="fromDate" field-name="fromDate" map-name="workEffortAssoc"><display/></field>
<field name="thruDate" field-name="thruDate" map-name="workEffortAssoc"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit/></field>
- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+ <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false"/></field>
</form>
<form name="EditWorkEffortAndAssoc" extends="EditWorkEffort" default-map-name="workEffort" target="updateWorkEffortAndAssoc" title="" type="single"
@@ -411,7 +411,7 @@
</service>
</actions>
<field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${workEffortName} [${workEffortId}]" target="EditWorkEffort">
+ <hyperlink description="${workEffortName} [${workEffortId}]" target="EditWorkEffort" also-hidden="false">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
@@ -426,26 +426,26 @@
<field name="actualCompletionDate"><display type="date"/></field>
<!-- These links have been commented because they are (partially or totally) broken
<field name="editLink" title=" " widget-style="linktext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditWorkEffort">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditWorkEffort" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="DONE_PAGE" value="ListWorkEfforts?${queryStringEncoded"/>
</hyperlink>
</field>
<field name="childLink" title=" " widget-style="linktext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEntityChildren}" target="ChildWorkEfforts">
+ <hyperlink description="${uiLabelMap.CommonEntityChildren}" target="ChildWorkEfforts" also-hidden="false">
<parameter param-name="trail" from-field="workEffortId"/>
<parameter param-name="DONE_PAGE" value="ListWorkEfforts?${queryStringEncoded"/>
</hyperlink>
</field>
<field name="editChildLink" title=" " widget-style="linktext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDetail} + ${uiLabelMap.CommonEntityChildren}" target="EditListWorkEfforts">
+ <hyperlink description="${uiLabelMap.CommonDetail} + ${uiLabelMap.CommonEntityChildren}" target="EditListWorkEfforts" also-hidden="false">
<parameter param-name="trail" from-field="workEffortId"/>
<parameter param-name="DONE_PAGE" value="ListWorkEfforts?${queryStringEncoded"/>
</hyperlink>
</field>
-->
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffort">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffort" also-hidden="false">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
@@ -456,19 +456,19 @@
<form name="WorkEffortTreeLine" hide-header="true" target="ListWorkEfforts" title="" type="list" list-name="listIt"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${workEffortName} [${workEffortId}]" target="EditWorkEffort">
+ <hyperlink description="${workEffortName} [${workEffortId}]" target="EditWorkEffort" also-hidden="false">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
<field name="workEffortTypeId"><display-entity entity-name="WorkEffortType"/></field>
<field name="workEffortPurposeTypeId"><display-entity entity-name="WorkEffortPurposeType"/></field>
<field name="detailLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDetail}" target="ListChildWorkEffort">
+ <hyperlink description="${uiLabelMap.CommonDetail}" target="ListChildWorkEffort" also-hidden="false">
<parameter param-name="trail" from-field="workEffortId"/>
</hyperlink>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeWorkEffort">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeWorkEffort" also-hidden="false">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
@@ -524,7 +524,7 @@
<field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="preferredContactMechId"><display/></field>
<field name="editLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditWorkEffortParty">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditWorkEffortParty" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="partyId"/>
<parameter param-name="fromDate"/>
@@ -635,7 +635,7 @@
<field name="note" title="${uiLabelMap.CommonNote}"><textarea cols="60" rows="3"/></field>
<field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="60" rows="10"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+ <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false"/></field>
</form>
<form name="FindWorkEffortCommEvents" default-map-name="workEffortCommEvent" target="ListWorkEffortCommEvents" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
@@ -693,7 +693,7 @@
</entity-and>
</actions>
<field name="contactMechId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${contactMechId}" target="javascript:set_value('${contactMechId}')" target-type="plain"/>
+ <hyperlink description="${contactMechId}" target="javascript:set_value('${contactMechId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="contactMechTypeId"><display-entity entity-name="ContactMechType"/></field>
</form>
@@ -740,7 +740,7 @@
</service>
</actions>
<field name="communicationEventId" title="${uiLabelMap.WorkEffortCommEventId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" target-type="plain"/>
+ <hyperlink description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="partyIdFrom" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonFrom}">
<display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/>
@@ -860,7 +860,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteWorkEffortTimeEntry" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortTimeEntry" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="timeEntryId"/>
</hyperlink>
@@ -919,7 +919,7 @@
<field name="attrValue"><text/></field>
<field name="updateButton"><submit/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteWorkEffortAttribute" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortAttribute" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="attrName"/>
</hyperlink>
@@ -943,27 +943,27 @@
</entity-condition>
</actions>
<field name="noteId">
- <hyperlink target="EditWorkEffortNotes" also-hidden="false" description="${noteId}">
+ <hyperlink description="${noteId}" target="EditWorkEffortNotes" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="noteId"/>
</hyperlink>
</field>
<field name="workEffortId" entity-name="WorkEffort" widget-style="buttontext">
- <hyperlink target="EditWorkEffort" also-hidden="false" description="${workEffortId}">
+ <hyperlink description="${workEffortId}" target="EditWorkEffort" also-hidden="false">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
<field name="noteInfo" title="${uiLabelMap.CommonNote}"><display/></field>
<field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${groovy:org.apache.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${noteDateTime}"/></field>
<field name="internalNote" title="${uiLabelMap.WorkEffortPrivatePublic}" widget-style="buttontext" use-when=""N".equals(internalNote)">
- <hyperlink target="updateWorkEffortNote" description="${uiLabelMap.OrderNotesPrivate}">
+ <hyperlink description="${uiLabelMap.OrderNotesPrivate}" target="updateWorkEffortNote">
<parameter param-name="workEffortId"/>
<parameter param-name="noteId"/>
<parameter param-name="internalNote" value="Y"/>
</hyperlink>
</field>
<field name="internalNote" title="${uiLabelMap.WorkEffortPrivatePublic}" widget-style="buttontext" use-when=""Y".equals(internalNote)">
- <hyperlink target="updateWorkEffortNote" description="${uiLabelMap.OrderNotesPublic}">
+ <hyperlink description="${uiLabelMap.OrderNotesPublic}" target="updateWorkEffortNote">
<parameter param-name="workEffortId"/>
<parameter param-name="noteId"/>
<parameter param-name="internalNote" value="N"/>
@@ -1028,7 +1028,7 @@
<field name="fromDate"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContent">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContent" also-hidden="false">
<parameter param-name="workEffortContentTypeId"/>
<parameter param-name="fromDate"/>
<parameter param-name="workEffortId"/>
@@ -1091,7 +1091,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeWorkEffortGoodStandard">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeWorkEffortGoodStandard" also-hidden="false">
<parameter param-name="workEffortGoodStdTypeId"/>
<parameter param-name="productId"/>
<parameter param-name="fromDate"/>
@@ -1147,7 +1147,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortReview">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortReview" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="userLoginId"/>
<parameter param-name="reviewDate"/>
@@ -1174,7 +1174,7 @@
<field name="keyword" title="${uiLabelMap.WorkEffortKeywords}" ><display/></field>
<field name="relevancyWeight"><display/></field>
<field name="deleteLink" title="${uiLabelMap.ProductDeleteAllKeywords}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortKeyword">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortKeyword" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="keyword"/>
</hyperlink>
@@ -1208,7 +1208,7 @@
<field name="contactMechId" use-when="postalAddress != null" title="${uiLabelMap.CommonDescription}"><display description="${postalAddress.address1} ${postalAddress.address2} ${postalAddress.city} ${postalAddress.stateProvinceGeoId} ${postalAddress.postalCode} ${postalAddress.countryGeoId} "/></field>
<field name="contactMechId" use-when="telecomNumber == null && postalAddress == null" title="${uiLabelMap.CommonDescription}"><display description="${contactMech.infoString}"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContactMech">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContactMech" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="contactMechId"/>
<parameter param-name="fromDate"/>
@@ -1244,7 +1244,7 @@
<field name="agreementItemSeqId"><display/></field>
<field name="workEffortId"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteAgreementWorkEffortApplic">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteAgreementWorkEffortApplic" also-hidden="false">
<parameter param-name="agreementId"/>
<parameter param-name="agreementItemSeqId"/>
<parameter param-name="workEffortId"/>
@@ -1290,7 +1290,7 @@
<field name="comments"><text size="60" maxlength="255"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortFixedAssetAssign">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortFixedAssetAssign" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="fixedAssetId"/>
<parameter param-name="fromDate"/>
@@ -1361,7 +1361,7 @@
<field name="reminderOffset"><lookup target-form-name="LookupTimeDuration" presentation="window"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortEventReminder">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortEventReminder" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="contactMechId"/>
<parameter param-name="sequenceId"/>
@@ -1421,7 +1421,7 @@
<set field="parameters.fromDate" value=""/>
<set field="parameters.thruDate" value=""/>
<set field="parameters.comments" value=""/>
- <entity-condition list="roleList" entity-name="RoleType">
+ <entity-condition entity-name="RoleType" list="roleList">
<condition-list combine="or">
<condition-expr field-name="roleTypeId" operator="equals" value="CAL_DELEGATE"/>
<condition-expr field-name="roleTypeId" operator="equals" value="ICAL_MEMBER"/>
@@ -1463,12 +1463,12 @@
<set field="serverRootUrl" value="${groovy: org.apache.ofbiz.base.util.UtilHttp.getServerRootUrl(request)}"/>
</actions>
<field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}">
- <hyperlink also-hidden="false" description="${workEffortId}" target="EditICalendar" target-type="plain">
+ <hyperlink description="${workEffortId}" target="EditICalendar" also-hidden="false" target-type="plain">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
<field name="iCalendarUrl" title="${uiLabelMap.WorkEffortICalendarUrl}">
- <hyperlink also-hidden="false" description="${serverRootUrl}/iCalendar/${workEffortId}/" target="${serverRootUrl}/iCalendar/${workEffortId}/" target-type="plain"/>
+ <hyperlink description="${serverRootUrl}/iCalendar/${workEffortId}/" target="${serverRootUrl}/iCalendar/${workEffortId}/" also-hidden="false" target-type="plain"/>
</field>
<field name="workEffortName" title="${uiLabelMap.WorkEffortICalendarName}"><display/></field>
</form>
diff --git a/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml b/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml
index 5bccf09..1c6835a 100644
--- a/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml
+++ b/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml
@@ -40,7 +40,7 @@
<field name="orderDate"><display/></field>
<field name="grandTotal"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteWorkEffortOrderHeader" also-hidden="false" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortOrderHeader" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="orderId"/>
</hyperlink>
diff --git a/applications/workeffort/widget/WorkEffortQuoteForms.xml b/applications/workeffort/widget/WorkEffortQuoteForms.xml
index 342f7c4..0caa646 100644
--- a/applications/workeffort/widget/WorkEffortQuoteForms.xml
+++ b/applications/workeffort/widget/WorkEffortQuoteForms.xml
@@ -38,7 +38,7 @@
<field name="statusItemDescription"><display/></field>
<field name="issueDate"><display/></field>
<field name="deleteLink" title=" " widget-style="linktext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortQuote">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortQuote" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="quoteId"/>
</hyperlink>
@@ -77,7 +77,7 @@
<field name="estimatedDeliveryDate"><display/></field>
<field name="comments"><display/></field>
<field name="deleteLink" title=" " widget-style="linktext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortQuoteItem">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortQuoteItem" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="quoteId"/>
<parameter param-name="quoteItemSeqId"/>
diff --git a/applications/workeffort/widget/WorkEffortRequestForms.xml b/applications/workeffort/widget/WorkEffortRequestForms.xml
index 0d01062..9f50b0e 100644
--- a/applications/workeffort/widget/WorkEffortRequestForms.xml
+++ b/applications/workeffort/widget/WorkEffortRequestForms.xml
@@ -37,7 +37,7 @@
<field name="custRequestTypeDescription"><display/></field>
<field name="statusItemDescription"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortRequest">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortRequest" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="custRequestId"/>
</hyperlink>
@@ -71,7 +71,7 @@
<field name="productId"><display/></field>
<field name="description"><display/></field>
<field name="deleteLink" title=" " widget-style="linktext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortRequestItem">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortRequestItem" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="custRequestId"/>
<parameter param-name="custRequestItemSeqId"/>
diff --git a/applications/workeffort/widget/WorkEffortRequirementForms.xml b/applications/workeffort/widget/WorkEffortRequirementForms.xml
index 7121815..7c6b584 100644
--- a/applications/workeffort/widget/WorkEffortRequirementForms.xml
+++ b/applications/workeffort/widget/WorkEffortRequirementForms.xml
@@ -30,7 +30,7 @@
</actions>
<field name="workEffortId"><hidden/></field>
<field name="requirementId" widget-style="linktext">
- <hyperlink target="/ordermgr/control/EditRequirement" target-type="inter-app" description="${requirementId}">
+ <hyperlink description="${requirementId}" target="/ordermgr/control/EditRequirement" target-type="inter-app">
<parameter param-name="requirementId"/>
</hyperlink>
</field>
@@ -38,7 +38,7 @@
<field name="statusItemDescription"><display/></field>
<field name="requirementDescription"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteWorkEffortRequirement" also-hidden="false" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortRequirement" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="requirementId"/>
</hyperlink>
diff --git a/applications/workeffort/widget/WorkEffortShopListForms.xml b/applications/workeffort/widget/WorkEffortShopListForms.xml
index 047a8f1..69c845c 100644
--- a/applications/workeffort/widget/WorkEffortShopListForms.xml
+++ b/applications/workeffort/widget/WorkEffortShopListForms.xml
@@ -29,7 +29,7 @@
</actions>
<field name="workEffortId"><hidden/></field>
<field name="shoppingListId" title="${uiLabelMap.WorkEffortShopListId}" widget-style="buttontext">
- <hyperlink target="/partymgr/control/editShoppingList" target-type="inter-app" description="${shoppingListId}">
+ <hyperlink description="${shoppingListId}" target="/partymgr/control/editShoppingList" target-type="inter-app">
<parameter param-name="shoppingListId"/>
</hyperlink>
</field>
@@ -38,7 +38,7 @@
<field name="description"><display/></field>
<field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${lastName} ${groupName} [${partyId}]"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteShoppingListWorkEffort" also-hidden="false" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteShoppingListWorkEffort" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="shoppingListId"/>
</hyperlink>
diff --git a/framework/common/minilang/CdyneServices.xml b/framework/common/minilang/CdyneServices.xml
index 7acef98..33898ab 100644
--- a/framework/common/minilang/CdyneServices.xml
+++ b/framework/common/minilang/CdyneServices.xml
@@ -53,7 +53,7 @@
</condition-list>
</condition-list>
</entity-condition>
- <first-from-list entry="countyGeo" list="geoList"/>
+ <first-from-list list="geoList" entry="countyGeo"/>
<if-not-empty field="countyGeo">
<!-- We found a county, now just save off the ID -->
<set field="postalAddress.countyGeoId" from-field="countyGeo.geoId"/>
diff --git a/framework/common/minilang/CommonServices.xml b/framework/common/minilang/CommonServices.xml
index b2354b8..78e99ea 100644
--- a/framework/common/minilang/CommonServices.xml
+++ b/framework/common/minilang/CommonServices.xml
@@ -130,7 +130,7 @@
<!-- Do custom conversion, if we have customMethodId -->
<if-not-empty field="uomConversion.customMethodId"> <!-- custom conversion? -->
<log level="verbose" message="using custom conversion customMethodId=${uomConversion.customMethodId}"/>
- <set-service-fields service-name="convertUomCustom" to-map="customParms" map="parameters"/>
+ <set-service-fields service-name="convertUomCustom" map="parameters" to-map="customParms"/>/>
<set field="customParms.uomConversion" from-field="uomConversion"/>
<call-service service-name="convertUomCustom" in-map-name="customParms">
<result-to-field result-name="convertedValue"/>
@@ -206,7 +206,7 @@
<simple-method method-name="getVisualThemeResources" short-description="Get visual theme resources" login-required="false">
<set field="visualThemeId" from-field="parameters.visualThemeId"/>
<set field="themeResources" from-field="parameters.themeResources"/>
- <entity-condition list="resourceList" entity-name="VisualThemeResource" use-cache="true">
+ <entity-condition entity-name="VisualThemeResource" list="resourceList" use-cache="true">
<condition-expr field-name="visualThemeId" from-field="visualThemeId"/>
<order-by field-name="resourceTypeEnumId"/>
<order-by field-name="sequenceId"/>
@@ -214,7 +214,7 @@
<if-empty field="resourceList">
<!-- if not found use the good old initial ofbiz theme so the system will at least start up and will be usable -->
<log level="error" message="Could not find the '${visualThemeId}' theme, reverting back to the good old OFBiz theme..."></log>
- <entity-condition list="resourceList" entity-name="VisualThemeResource" use-cache="true">
+ <entity-condition entity-name="VisualThemeResource" list="resourceList" use-cache="true">
<condition-expr field-name="visualThemeId" value="FLAT_GREY"/>
<order-by field-name="resourceTypeEnumId"/>
<order-by field-name="sequenceId"/>
diff --git a/framework/common/minilang/PortalPageServices.xml b/framework/common/minilang/PortalPageServices.xml
index 9af594c..beac96e 100644
--- a/framework/common/minilang/PortalPageServices.xml
+++ b/framework/common/minilang/PortalPageServices.xml
@@ -57,7 +57,7 @@
<field-map field-name="columnSeqId" from-field="column.columnSeqId"/>
</entity-and>
<iterate list="portalPortletList" entry="portalPortlet">
- <set-service-fields service-name="deletePortalPagePortlet" to-map="deletePortalPagePortletInMap" map="portalPortlet"/>
+ <set-service-fields service-name="deletePortalPagePortlet" map="portalPortlet" to-map="deletePortalPagePortletInMap"/>/>
<call-service service-name="deletePortalPagePortlet" in-map-name="deletePortalPagePortletInMap"/>
</iterate>
<remove-value value-field="column"/>
@@ -70,13 +70,13 @@
<make-value entity-name="PortalPagePortlet" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <entity-condition list="portlets" entity-name="PortalPagePortlet">
+ <entity-condition entity-name="PortalPagePortlet" list="portlets">
<condition-expr field-name="portalPageId" operator="equals" from-field="parameters.portalPageId"/>
<select-field field-name="sequenceNum"/>
<order-by field-name="-sequenceNum"/>
<limit-range size="1" start="0"/>
</entity-condition>
- <first-from-list entry="portalPagePortlet" list="portlets"/>
+ <first-from-list list="portlets" entry="portalPagePortlet"/>
<if-empty field="portalPagePortlet.sequenceNum">
<calculate field="newEntity.sequenceNum" type="Long"><number value="1"/></calculate>
@@ -122,7 +122,7 @@
<field-map field-name="ownerUserLoginId" from-field="parameters.ownerUserLoginId"/>
<field-map field-name="portalPortletId" from-field="parameters.portalPortletId"/>
</entity-and>
- <first-from-list entry="portalPage" list="ppList"/>
+ <first-from-list list="ppList" entry="portalPage"/>
<set field="parameters.portalPageId" from-field="portalPage.portalPageId"/>
</if-not-empty>
<entity-condition entity-name="PortletAttribute" list="attributeList">
@@ -170,7 +170,7 @@
<condition-expr field-name="parentPortalPageId" operator="equals" from-field="parameters.parentPortalPageId"/>
</condition-list>
</entity-condition>
- <first-from-list entry="checkSequenceNum" list="checkSequenceNums"/>
+ <first-from-list list="checkSequenceNums" entry="checkSequenceNum"/>
<if-not-empty field="checkSequenceNum.portalPageId">
<set field="first.portalPageId" from-field="checkSequenceNum.portalPageId"/>
<set field="first.sequenceNum" from-field="getPortalPage.sequenceNum" type="Long"/>
@@ -265,7 +265,7 @@
<order-by field-name="-sequenceNum"/>
</entity-condition>
</if-compare>
- <first-from-list entry="getData" list="getDatas"/>
+ <first-from-list list="getDatas" entry="getData"/>
<set field="portalPage.sequenceNum" from-field="getData.sequenceNum" type="Long"/>
<store-value value-field="portalPage"/>
<set field="first.portalPageId" from-field="getData.portalPageId"/>
@@ -279,7 +279,7 @@
<call-simple-method method-name="checkOwnerShip"/>
<!-- origin Portlet -->
- <entity-one value-field="originPp" entity-name="PortalPagePortlet">
+ <entity-one entity-name="PortalPagePortlet" value-field="originPp">
<field-map field-name="portalPageId" from-field="parameters.o_portalPageId"/>
<field-map field-name="portalPortletId" from-field="parameters.o_portalPortletId"/>
<field-map field-name="portletSeqId" from-field="parameters.o_portletSeqId"/>
@@ -297,7 +297,7 @@
<field-map field-name="portletSeqId" from-field="parameters.d_portletSeqId"/>
</entity-one>
- <entity-condition list="modifyPpList" entity-name="PortalPagePortlet">
+ <entity-condition entity-name="PortalPagePortlet" list="modifyPpList">
<condition-list combine="and">
<condition-expr field-name="portalPageId" operator="equals" from-field="parameters.portalPageId"/>
<condition-expr field-name="columnSeqId" operator="equals" from-field="columnSeqId"/>
@@ -317,7 +317,7 @@
<field-map field-name="portletSeqId" from-field="parameters.d_portletSeqId"/>
</entity-one>
- <entity-condition list="modifyPpList" entity-name="PortalPagePortlet">
+ <entity-condition entity-name="PortalPagePortlet" list="modifyPpList">
<condition-list combine="and">
<condition-expr field-name="portalPageId" operator="equals" from-field="parameters.portalPageId"/>
<condition-expr field-name="columnSeqId" operator="equals" from-field="columnSeqId"/>
diff --git a/framework/common/widget/HelpScreens.xml b/framework/common/widget/HelpScreens.xml
index 0605008..9aaf327 100644
--- a/framework/common/widget/HelpScreens.xml
+++ b/framework/common/widget/HelpScreens.xml
@@ -123,9 +123,9 @@
<actions>
<!-- Read portalPage to retrieve helpContentId,
if portalPage.originalPortalPageId is not null retrieve originalPortalPage-->
- <entity-one value-field="portalPageTmp" entity-name="PortalPage" use-cache="true"/>
+ <entity-one entity-name="PortalPage" value-field="portalPageTmp" use-cache="true"/>
<set field="originalPortalPageId" from-field="portalPageTmp.originalPortalPageId" default-value="${parameters.portalPageId}"/>
- <entity-one value-field="portalPage" entity-name="PortalPage" use-cache="true">
+ <entity-one entity-name="PortalPage" value-field="portalPage" use-cache="true">
<field-map field-name="portalPageId" from-field="originalPortalPageId"/>
</entity-one>
</actions>
diff --git a/framework/common/widget/LookupForms.xml b/framework/common/widget/LookupForms.xml
index c647355..81be5b9 100644
--- a/framework/common/widget/LookupForms.xml
+++ b/framework/common/widget/LookupForms.xml
@@ -85,7 +85,7 @@
</service>
</actions>
<field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')"/>
+ <hyperlink description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')" also-hidden="false" target-type="plain"/>
</field>
<field name="enabled"><display/></field>
<field name="hasLoggedOut"><display/></field>
@@ -111,7 +111,7 @@
</actions>
<auto-fields-entity entity-name="PortalPage" default-field-type="display"/>
<field name="portalPageId" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${portalPageId}" target="javascript:set_value('${portalPageId}')"/>
+ <hyperlink description="${portalPageId}" target="javascript:set_value('${portalPageId}')" also-hidden="false" target-type="plain"/>
</field>
</form>
@@ -124,7 +124,7 @@
<form name="ListLocales" type="list" list-name="locales" paginate-target="LookupLocale"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="localeString" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${localeString}" target="javascript:set_value('${localeString}', '${localeName}')"/>
+ <hyperlink description="${localeString}" target="javascript:set_value('${localeString}', '${localeName}')" also-hidden="false" target-type="plain"/>
</field>
<field name="localeName" title="${uiLabelMap.CommonLanguageTitle}"><display/></field>
</form>
diff --git a/framework/common/widget/PortalPageForms.xml b/framework/common/widget/PortalPageForms.xml
index 2ab8a13..a09faa1 100644
--- a/framework/common/widget/PortalPageForms.xml
+++ b/framework/common/widget/PortalPageForms.xml
@@ -81,13 +81,13 @@
</field>
<field name="originalPortalPageId"><display-entity entity-name="PortalPage" description="${portalPageName} [${portalPageId}]" key-field-name="portalPageId"/></field>
<field name="deleteLink" use-when="!ownerUserLoginId.equals("_NA_")" title=" " widget-style="buttontext" >
- <hyperlink target="deletePortalPage" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePortalPage">
<parameter param-name="portalPageId"/>
<parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/>
</hyperlink>
</field>
<field name="deleteLink" use-when="!ownerUserLoginId.equals("_NA_")&&originalPortalPageId!=null" title=" " widget-style="buttontext" >
- <hyperlink target="deletePortalPage" description="${uiLabelMap.CommonRevertPortalPage}">
+ <hyperlink description="${uiLabelMap.CommonRevertPortalPage}" target="deletePortalPage">
<parameter param-name="portalPageId"/>
<parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/>
</hyperlink>
diff --git a/framework/common/widget/SecurityForms.xml b/framework/common/widget/SecurityForms.xml
index 5b18021..6f62be7 100644
--- a/framework/common/widget/SecurityForms.xml
+++ b/framework/common/widget/SecurityForms.xml
@@ -85,7 +85,7 @@
<field name="securityAnswer" title="${uiLabelMap.SecurityAnswer}"><text /></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${cancelPage}" also-hidden="false">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -121,7 +121,7 @@
<field name="description" title="${uiLabelMap.CommonDescription}"><text size="60" maxlength="250"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${cancelPage}" also-hidden="false">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -144,7 +144,7 @@
<field name="groupId"><hidden/></field>
<field name="permissionId" title="${uiLabelMap.PermissionId}"><display-entity entity-name="SecurityPermission" description="${permissionId} ${description}"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeSecurityPermissionFromSecurityGroup" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeSecurityPermissionFromSecurityGroup">
<parameter param-name="permissionId"/>
<parameter param-name="groupId"/>
</hyperlink>
@@ -181,7 +181,7 @@
</entity-condition>
</actions>
<field name="groupId" title="${uiLabelMap.CommonSecurityGroupId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${groupId}" target="EditSecurityGroup">
+ <hyperlink description="${groupId}" target="EditSecurityGroup" also-hidden="false">
<parameter param-name="groupId"/>
</hyperlink>
</field>
@@ -199,7 +199,7 @@
</actions>
<field name="groupId"><hidden/></field>
<field name="userLoginId" sort-field="true">
- <hyperlink also-hidden="false" description="${userLoginId}" target="editlogin">
+ <hyperlink description="${userLoginId}" target="editlogin" also-hidden="false">
<parameter param-name="userLoginId"/>
</hyperlink>
</field>
@@ -225,7 +225,7 @@
</entity-condition>
</actions>
<field name="userLoginId" widget-style="buttontext" sort-field="true">
- <hyperlink also-hidden="false" description="${userLoginId}" target="editlogin">
+ <hyperlink description="${userLoginId}" target="editlogin" also-hidden="false">
<parameter param-name="userLoginId"/>
</hyperlink>
</field>
@@ -285,7 +285,7 @@
</service>
</actions>
<field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')"/>
+ <hyperlink description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')" also-hidden="false" target-type="plain"/>
</field>
<field name="enabled"><display/></field>
<field name="hasLoggedOut"><display/></field>
@@ -305,7 +305,7 @@
<field name="newPasswordVerify"><password/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${cancelPage}" also-hidden="false">
<parameter param-name="userLoginId"/>
<parameter param-name="partyId"/>
</hyperlink>
@@ -324,7 +324,7 @@
<field name="userLdapDn" use-when="!"true".equals(ldapEnabled)"><ignored/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${cancelPage}" also-hidden="false">
<parameter param-name="userLoginId"/>
<parameter param-name="partyId"/>
</hyperlink>
diff --git a/framework/webapp/config/url.properties b/framework/webapp/config/url.properties
index 4689899..6868e08 100644
--- a/framework/webapp/config/url.properties
+++ b/framework/webapp/config/url.properties
@@ -22,11 +22,11 @@
# HTTPS Port (Secure port)
port.https.enabled=Y
-port.https=8443
+port.https=443
force.https.host=
# HTTP Port (Not Secure port)
-port.http=8080
+port.http=80
force.http.host=
# If you want to use HTTP then set no.http=N. Else all requests will use HTTPS except if put in the http.request-map.list
diff --git a/framework/webtools/widget/ArtifactInfoForms.xml b/framework/webtools/widget/ArtifactInfoForms.xml
index 28e47d2..97179a4 100644
--- a/framework/webtools/widget/ArtifactInfoForms.xml
+++ b/framework/webtools/widget/ArtifactInfoForms.xml
@@ -23,7 +23,7 @@
<form name="ComponentList" type="list" separate-columns="true" title="Component List" list-name="componentList" target=""
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="compName">
- <hyperlink target="TestSuiteInfo?compName=${compName}" description="${compName}" ></hyperlink>
+ <hyperlink description="${compName}" target="TestSuiteInfo?compName=${compName}" ></hyperlink>
</field>
<field name="rootLocation"><display/></field>
<field name="enabled"><display/></field>
@@ -37,11 +37,11 @@
<field name="compName"><hidden value="${parameters.compName}"/></field>
<field name="suiteName"><display/></field>
<field name="runSuite" use-when="suiteName!=void">
- <hyperlink target="RunTest?compName=${parameters.compName}&suiteName=${suiteNameSave}" description="run suite"/>
+ <hyperlink description="run suite" target="RunTest?compName=${parameters.compName}&suiteName=${suiteNameSave}"/>
</field>
<field name="caseName"><display/></field>
<field name="runCase">
- <hyperlink target="RunTest?compName=${parameters.compName}&suiteName=${suiteNameSave}&caseName=${caseName}" description="run case"/>
+ <hyperlink description="run case" target="RunTest?compName=${parameters.compName}&suiteName=${suiteNameSave}&caseName=${caseName}"/>
</field>
</form>
</forms>
diff --git a/framework/webtools/widget/EntitySyncForms.xml b/framework/webtools/widget/EntitySyncForms.xml
index bede51b..6dcca48 100644
--- a/framework/webtools/widget/EntitySyncForms.xml
+++ b/framework/webtools/widget/EntitySyncForms.xml
@@ -36,23 +36,23 @@
</field>
<field use-when=""ESR_RUNNING".equals(runStatusId)" name="resetStatus" title=" " widget-style="smallSubmit">
- <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsSyncResetRunStatus}" target="resetEntitySyncStatusToNotStarted">
+ <hyperlink description="${uiLabelMap.WebtoolsSyncResetRunStatus}" target="resetEntitySyncStatusToNotStarted" also-hidden="false">
<parameter param-name="entitySyncId"/>
</hyperlink>
</field>
<field use-when=""ESR_NOT_STARTED".equals(runStatusId) || "ESR_COMPLETE".equals(runStatusId)" name="runOfflineSync" title=" " widget-style="smallSubmit">
- <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsSyncRunOffline}" target="runOfflineEntitySync">
+ <hyperlink description="${uiLabelMap.WebtoolsSyncRunOffline}" target="runOfflineEntitySync" also-hidden="false">
<parameter param-name="entitySyncId"/>
</hyperlink>
</field>
<field use-when=""ESR_PENDING".equals(runStatusId)" name="acceptOffline" title=" " widget-style="smallSubmit">
- <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsSyncAcceptOffline}" target="updateOfflineEntitySync">
+ <hyperlink description="${uiLabelMap.WebtoolsSyncAcceptOffline}" target="updateOfflineEntitySync" also-hidden="false">
<parameter param-name="entitySyncId"/>
<parameter param-name="updateType" value="ACCEPT"/>
</hyperlink>
</field>
<field use-when=""ESR_PENDING".equals(runStatusId)" name="rejectOffline" title=" " widget-style="smallSubmit">
- <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsSyncRejectOffline}" target="updateOfflineEntitySync">
+ <hyperlink description="${uiLabelMap.WebtoolsSyncRejectOffline}" target="updateOfflineEntitySync" also-hidden="false">
<parameter param-name="entitySyncId"/>
<parameter param-name="updateType" value="REJECT"/>
</hyperlink>
diff --git a/framework/webtools/widget/GeoManagementForms.xml b/framework/webtools/widget/GeoManagementForms.xml
index f8c1e7a..1078a31 100644
--- a/framework/webtools/widget/GeoManagementForms.xml
+++ b/framework/webtools/widget/GeoManagementForms.xml
@@ -60,7 +60,7 @@
</field>
<field name="wellKnownText" title="${uiLabelMap.CommonGeoWellKnownText}"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteGeo" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteGeo">
<parameter param-name="geoId"/>
<parameter param-name="noConditionFind" value="Y"/>
</hyperlink>
@@ -113,7 +113,7 @@
</form>
<form name="ListLookupGeo" extends="ListGeos">
<field name="geoId" title="${uiLabelMap.CommonGeoId}" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${geoId}" target="javascript:set_value('${geoId}')"/>
+ <hyperlink description="${geoId}" target="javascript:set_value('${geoId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="deleteLink"><ignored/></field>
</form>
diff --git a/framework/webtools/widget/GeoManagementScreens.xml b/framework/webtools/widget/GeoManagementScreens.xml
index e60a91e..529f9ce 100644
--- a/framework/webtools/widget/GeoManagementScreens.xml
+++ b/framework/webtools/widget/GeoManagementScreens.xml
@@ -53,7 +53,7 @@
<set field="currentUrl" value="geoPoints"/>
<set field="headerItem" value="Geos"/>
<set field="tabButtonItem" value="GeoPoints"/>
- <entity-one value-field="geoPoint" entity-name="GeoPoint"/>
+ <entity-one entity-name="GeoPoint" value-field="geoPoint"/>
<script location="component://webtools/groovyScripts/geo/GetGeoLocation.groovy"/>
</actions>
<widgets>
diff --git a/framework/webtools/widget/MiscForms.xml b/framework/webtools/widget/MiscForms.xml
index 13bf03c..2924710 100644
--- a/framework/webtools/widget/MiscForms.xml
+++ b/framework/webtools/widget/MiscForms.xml
@@ -49,7 +49,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
<field name="cancelButton" title=" " widget-style="smallSubmit">
- <hyperlink target="${demoTargetUrl}" description="${uiLabelMap.CommonCancel}"></hyperlink>
+ <hyperlink description="${uiLabelMap.CommonCancel}" target="${demoTargetUrl}"></hyperlink>
</field>
</form>
diff --git a/framework/webtools/widget/ServiceForms.xml b/framework/webtools/widget/ServiceForms.xml
index 55142f1..f9bf6ca 100644
--- a/framework/webtools/widget/ServiceForms.xml
+++ b/framework/webtools/widget/ServiceForms.xml
@@ -86,7 +86,7 @@
</actions>
<field name="jobName" title="${uiLabelMap.WebtoolsJob}" sort-field="true"><display/></field>
<field name="jobId" title="${uiLabelMap.CommonId}" sort-field="true">
- <hyperlink also-hidden="false" description="${jobId}" target="JobDetails">
+ <hyperlink description="${jobId}" target="JobDetails" also-hidden="false">
<parameter param-name="jobId" from-field="jobId"/>
</hyperlink>
</field>
@@ -94,14 +94,14 @@
<field name="runTime" title="${uiLabelMap.WebtoolsRunTime}" sort-field="true"><display/></field>
<field name="startDateTime" title="${uiLabelMap.CommonStartDateTime}" sort-field="true"><display/></field>
<field name="serviceName" title="${uiLabelMap.WebtoolsService}" sort-field="true">
- <hyperlink also-hidden="false" description="${serviceName}" target="ServiceList">
+ <hyperlink description="${serviceName}" target="ServiceList" also-hidden="false">
<parameter param-name="sel_service_name" from-field="serviceName"/>
</hyperlink>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}" sort-field="true"><display-entity entity-name="StatusItem"/></field>
<field name="finishDateTime" title="${uiLabelMap.CommonEndDateTime}" sort-field="true"><display/></field>
<field name="cancelButton" title=" " use-when="startDateTime==null&&finishDateTime==null&&cancelDateTime==null" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsCancelJob}" target="cancelJob">
+ <hyperlink description="${uiLabelMap.WebtoolsCancelJob}" target="cancelJob" also-hidden="false">
<parameter param-name="jobId"/>
</hyperlink>
</field>
@@ -179,7 +179,7 @@
<field name="reasonEnumId" sort-field="true" title="${uiLabelMap.CommonReason}"><display-entity entity-name="Enumeration" key-field-name="enumId" description="[${enumCode}] ${description}"/></field>
<field name="comments"><display/></field>
<field name="cancelButton" title=" " use-when="editable && cancelable" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonCancel}" target="updateJobManagerLock">
+ <hyperlink description="${uiLabelMap.CommonCancel}" target="updateJobManagerLock" also-hidden="false">
<parameter param-name="instanceId"/>
<parameter param-name="fromDate"/>
<parameter param-name="thruDate" value="${nowTimestamp}"/>
@@ -219,7 +219,7 @@
<field name="createdByUserLogin" title="${uiLabelMap.CommonBy}"><display/></field>
<field name="reasonEnumId" title="${uiLabelMap.CommonReason}"><display-entity entity-name="Enumeration" key-field-name="enumId" description="[${enumCode}] ${description}"/></field>
<field name="cancelButton" title=" " use-when="editable && cancelable" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonCancel}" target="updateJobManagerLock">
+ <hyperlink description="${uiLabelMap.CommonCancel}" target="updateJobManagerLock" also-hidden="false">
<parameter param-name="instanceId"/>
<parameter param-name="fromDate"/>
<parameter param-name="thruDate" value="${nowTimestamp}"/>
diff --git a/framework/webtools/widget/ServiceScreens.xml b/framework/webtools/widget/ServiceScreens.xml
index f417e6e..23a3c37 100644
--- a/framework/webtools/widget/ServiceScreens.xml
+++ b/framework/webtools/widget/ServiceScreens.xml
@@ -271,10 +271,10 @@
<screen name="JobManagerLockEnable">
<section>
<actions>
- <entity-condition list="currentJobManagerLocks" entity-name="JobManagerLock" filter-by-date="true">
+ <entity-condition entity-name="JobManagerLock" list="currentJobManagerLocks" filter-by-date="true">
<order-by field-name="fromDate"/>
</entity-condition>
- <entity-condition list="nextJobManagerLocks" entity-name="JobManagerLock" filter-by-date="false">
+ <entity-condition entity-name="JobManagerLock" list="nextJobManagerLocks" filter-by-date="false">
<condition-list>
<condition-expr field-name="fromDate" operator="greater" from-field="nowTimestamp"/>
<condition-list combine="or">
diff --git a/framework/webtools/widget/TempExprScreens.xml b/framework/webtools/widget/TempExprScreens.xml
index 4d0fb88..a527f97 100644
--- a/framework/webtools/widget/TempExprScreens.xml
+++ b/framework/webtools/widget/TempExprScreens.xml
@@ -88,9 +88,9 @@
<actions>
<set field="tabMenuItem" value="editExpression"/>
<set field="titleProperty" value="${titleProperty}" default-value="TemporalExpressionMaintenance"/>
- <entity-one value-field="temporalExpression" entity-name="TemporalExpression"/>
+ <entity-one entity-name="TemporalExpression" value-field="temporalExpression"/>
<set field="fromTempExprId" from-field="parameters.tempExprId"/>
- <entity-condition list="childExpressionList" entity-name="TemporalExpressionChild">
+ <entity-condition entity-name="TemporalExpressionChild" list="childExpressionList">
<condition-expr field-name="fromTempExprId" from-field="fromTempExprId"/>
</entity-condition>
</actions>
diff --git a/framework/webtools/widget/tempExprForms.xml b/framework/webtools/widget/tempExprForms.xml
index 3ca694f..a81cbfb 100644
--- a/framework/webtools/widget/tempExprForms.xml
+++ b/framework/webtools/widget/tempExprForms.xml
@@ -40,7 +40,7 @@
<form name="BasicExpressionList" type="list"
default-table-style="basic-table hover-bar" odd-row-style="alternate-row" header-row-style="header-row-2">
<field name="tempExprId" title="${uiLabelMap.TemporalExpressionId}" sort-field="true">
- <hyperlink also-hidden="false" target-type="plain" description="${tempExprId}" target="editTemporalExpression">
+ <hyperlink description="${tempExprId}" target="editTemporalExpression" also-hidden="false" target-type="plain">
<parameter param-name="tempExprId"/>
</hyperlink>
</field>
@@ -70,7 +70,7 @@
<form name="ListChildExpressions" extends="BasicExpressionList" list-name="childExpressionList" paginate-target="editTemporalExpression?tempExprId=${tempExprId}">
<field name="exprAssocType"><display/></field>
<field name="deleteButton" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteTemporalExpressionAssoc">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTemporalExpressionAssoc" also-hidden="false">
<parameter param-name="tempExprId" from-field="parameters.tempExprId"/>
<parameter param-name="fromTempExprId"/>
<parameter param-name="toTempExprId" from-field="tempExprId"/>
diff --git a/specialpurpose/assetmaint/minilang/FixedAssetMaintServices.xml b/specialpurpose/assetmaint/minilang/FixedAssetMaintServices.xml
index c20e894..43b05a1 100644
--- a/specialpurpose/assetmaint/minilang/FixedAssetMaintServices.xml
+++ b/specialpurpose/assetmaint/minilang/FixedAssetMaintServices.xml
@@ -48,7 +48,7 @@
<set-service-fields map="parameters" service-name="updateWorkEffort" to-map="updateWorkEffortCtx"/>
<set from-field="parameters.scheduleWorkEffortId" field="updateWorkEffortCtx.workEffortId"/>
<set from-field="parameters.scheduleWorkEffortId" field="workEffortId"/>
- <entity-one value-field="workEffort" entity-name="WorkEffort"/>
+ <entity-one entity-name="WorkEffort" value-field="workEffort"/>
<set field="updateWorkEffortCtx.actualCompletionDate" from-field="parameters.actualCompletionDate" default-value="${workEffort.actualCompletionDate}"/>
<call-service service-name="updateWorkEffort" in-map-name="updateWorkEffortCtx"/>
</simple-method>
diff --git a/specialpurpose/assetmaint/widget/AssetmaintScreens.xml b/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
index 6a95d90..9ce50d8 100644
--- a/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
+++ b/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
@@ -288,7 +288,7 @@
<set field="maintHistSeqId" from-field="parameters.maintHistSeqId"/>
<entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
<entity-one entity-name="FixedAssetMaint" value-field="fixedAssetMaint"/>
- <entity-condition list="itemIssuanceList" entity-name="ProductInventoryItemAndItemIssuance">
+ <entity-condition entity-name="ProductInventoryItemAndItemIssuance" list="itemIssuanceList">
<condition-expr field-name="quantity" operator="greater" value="0"/>
</entity-condition>
</actions>
@@ -321,11 +321,11 @@
<entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
<set field="layoutSettings.documentTitle" from-field="uiLabelMap.AccountingFixedAssetMaintWorkEffortName"/>
<entity-one entity-name="FixedAssetMaint" value-field="fixedAssetMaint"/>
- <entity-condition list="itemIssuanceList" entity-name="ProductInventoryItemAndItemIssuance">
+ <entity-condition entity-name="ProductInventoryItemAndItemIssuance" list="itemIssuanceList">
<condition-expr field-name="quantity" operator="greater" value="0"/>
</entity-condition>
<set field="workEffortId" from-field="fixedAssetMaint.scheduleWorkEffortId"/>
- <entity-condition list="notes" entity-name="WorkEffortNoteAndData">
+ <entity-condition entity-name="WorkEffortNoteAndData" list="notes">
<condition-expr field-name="workEffortId" from-field="workEffortId"/>
<order-by field-name="noteId"/>
</entity-condition>
diff --git a/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml b/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
index 23b3c8d..80bcb05 100644
--- a/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
+++ b/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
@@ -75,7 +75,7 @@
</service>
</actions>
<field name="maintHistSeqId" widget-style="linktext">
- <hyperlink also-hidden="false" description="${maintHistSeqId}" target="EditFixedAssetMaint">
+ <hyperlink description="${maintHistSeqId}" target="EditFixedAssetMaint" also-hidden="false">
<parameter param-name="fixedAssetId"/>
<parameter param-name="maintHistSeqId"/>
</hyperlink>
diff --git a/specialpurpose/assetmaint/widget/forms/ProductForms.xml b/specialpurpose/assetmaint/widget/forms/ProductForms.xml
index ee8d04e..7f96395 100644
--- a/specialpurpose/assetmaint/widget/forms/ProductForms.xml
+++ b/specialpurpose/assetmaint/widget/forms/ProductForms.xml
@@ -68,14 +68,14 @@
</service>
</actions>
<field name="productId" title="${uiLabelMap.CommonId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${productId}" target="EditProduct">
+ <hyperlink description="${productId}" target="EditProduct" also-hidden="false">
<parameter param-name="productId"/>
</hyperlink>
</field>
<field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field>
<field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
<field name="searchVariants" title="" widget-style="buttontext" use-when="isVirtual!=null&&"${isVirtual}".equals("Y")">
- <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct">
+ <hyperlink description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct" also-hidden="false" target-type="plain">
<parameter param-name="productId"/>
</hyperlink>
</field>
@@ -102,13 +102,13 @@
</service>
</actions>
<field name="productId" title="${uiLabelMap.CommonId}" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_values('${productId}', '${internalName}')"/>
+ <hyperlink description="${productId}" target="javascript:set_values('${productId}', '${internalName}')" also-hidden="false" target-type="plain"/>
</field>
<field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field>
<field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
<field name="primaryProductCategoryId" title="${uiLabelMap.ProductPrimaryCategory}"><display/></field>
<field name="searchVariants" title="" widget-style="buttontext" use-when="isVirtual!=null&&"${isVirtual}".equals("Y")">
- <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct">
+ <hyperlink description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct" also-hidden="false" target-type="plain">
<parameter param-name="productId"/>
</hyperlink>
</field>
@@ -143,7 +143,7 @@
<field name="maintTemplateWorkEffortId"><lookup target-form-name="LookupWorkEffort"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteProductMaint" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProductMaint" also-hidden="false">
<parameter param-name="fixedAssetId" from-field="parameters.fixedAssetId"/>
<parameter param-name="productId"/>
<parameter param-name="productMaintSeqId"/>
diff --git a/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml b/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
index 9a8949f..916c357 100644
--- a/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
+++ b/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
@@ -163,7 +163,7 @@
</entity-condition>
</actions>
<field name="workEffortName" entry-name="workEffortToName" title="${uiLabelMap.CommonName}">
- <hyperlink also-hidden="false" description="${workEffortToName}" target="EditWorkEfforts">
+ <hyperlink description="${workEffortToName}" target="EditWorkEfforts" also-hidden="false">
<parameter param-name="workEffortId" from-field="workEffortIdTo"/>
<parameter param-name="workEffortIdFrom" from-field="workEffortId"/>
<parameter param-name="fromDate"/>
diff --git a/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml b/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml
index 40bf038..899219d 100644
--- a/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml
+++ b/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml
@@ -50,7 +50,7 @@
</service>
</actions>
<field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')"/>
+ <hyperlink description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="fixedAssetName" title="${uiLabelMap.CommonName}"><display/></field>
<field name="classEnumId"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
@@ -85,7 +85,7 @@
</service>
</actions>
<field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" widget-style="buttontext">
- <hyperlink also-hidden="false" target-type="plain" description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')"/>
+ <hyperlink description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="fixedAssetName" title="${uiLabelMap.CommonName}"><display/></field>
<field name="classEnumId"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
diff --git a/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml b/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml
index 66d7cd5..612f3df 100644
--- a/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml
+++ b/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml
@@ -119,7 +119,7 @@
</service>
</actions>
<field name="fixedAssetId" widget-style="linktext">
- <hyperlink also-hidden="false" description="${fixedAssetName} ${fixedAssetId}" target="EditComputerHardware">
+ <hyperlink description="${fixedAssetName} ${fixedAssetId}" target="EditComputerHardware" also-hidden="false">
<parameter param-name="fixedAssetId"/>
</hyperlink>
</field>
@@ -151,7 +151,7 @@
</service>
</actions>
<field name="fixedAssetId" widget-style="linktext">
- <hyperlink also-hidden="false" description="${fixedAssetName} ${fixedAssetId}" target="EditComputerSoftware">
+ <hyperlink description="${fixedAssetName} ${fixedAssetId}" target="EditComputerSoftware" also-hidden="false">
<parameter param-name="fixedAssetId"/>
</hyperlink>
</field>
@@ -180,7 +180,7 @@
</entity-condition>
</actions>
<field name="fixedAssetId" widget-style="linktext">
- <hyperlink also-hidden="false" description="${fixedAssetName} ${fixedAssetId}" target="EditComputerHardware">
+ <hyperlink description="${fixedAssetName} ${fixedAssetId}" target="EditComputerHardware" also-hidden="false">
<parameter param-name="fixedAssetId"/>
</hyperlink>
</field>
diff --git a/specialpurpose/bi/minilang/FactServices.xml b/specialpurpose/bi/minilang/FactServices.xml
index ca65b84..a3589cf 100644
--- a/specialpurpose/bi/minilang/FactServices.xml
+++ b/specialpurpose/bi/minilang/FactServices.xml
@@ -288,7 +288,7 @@
</condition-list>
<order-by field-name="-statusDatetime"/>
</entity-condition>
- <first-from-list entry="orderStatus" list="orderStatusList"/>
+ <first-from-list list="orderStatusList" entry="orderStatus"/>
<if-not-empty field="orderStatus.statusDatetime">
<clear-field field="inMap"/>
<set field="inMap.dimensionEntityName" value="DateDimension"/>
@@ -403,7 +403,7 @@
</condition-list>
</entity-condition>
<if-not-empty field="costs">
- <first-from-list entry="cost" list="costs"/>
+ <first-from-list list="costs" entry="cost"/>
<set field="convertUomCurrencyMap.uomId" from-field="cost.currencyUomId"/>
<set field="convertUomCurrencyMap.uomIdTo" value="USD"/>
@@ -461,7 +461,7 @@
<entity-and entity-name="ProductPromoCode" list="productPromo">
<field-map field-name="productPromoId" from-field="discount.productPromoId"/>
</entity-and>
- <first-from-list entry="productPromoCode" list="productPromo"/>
+ <first-from-list list="productPromo" entry="productPromoCode"/>
<if-not-empty field="productPromoCode">
<set field="fact.productPromoCode" from-field="productPromoCode.productPromoCodeId"/>
<else>
@@ -627,7 +627,7 @@
<call-service service-name="loadDateDimension" in-map-name="inMap"/>
<check-errors/>
- <entity-condition list="orderStatusList" entity-name="OrderStatus">
+ <entity-condition entity-name="OrderStatus" list="orderStatusList">
<condition-list combine="and">
<condition-expr field-name="statusId" value="ORDER_APPROVED"/>
<condition-expr field-name="statusDatetime" operator="greater-equals" from-field="parameters.fromDate"/>
@@ -657,7 +657,7 @@
<order-by field-name="-fromDate"/>
</entity-condition>
<if-not-empty field="UomConversionDatedList">
- <first-from-list entry="UomConversion" list="UomConversionDatedList"/>
+ <first-from-list list="UomConversionDatedList" entry="UomConversion"/>
<field-to-result field="UomConversion.conversionFactor" result-name="conversionFactor"/>
<else>
<entity-condition entity-name="UomConversionDated" list="UomConversionDatedLastestList">
@@ -668,7 +668,7 @@
</condition-list>
</entity-condition>
<if-not-empty field="UomConversionDatedLastestList">
- <first-from-list entry="UomConversionLastest" list="UomConversionDatedLastestList"/>
+ <first-from-list list="UomConversionDatedLastestList" entry="UomConversionLastest"/>
<field-to-result field="UomConversionLastest.conversionFactor" result-name="conversionFactor"/>
</if-not-empty>
</else>
diff --git a/specialpurpose/birt/widget/facility/FacilityForms.xml b/specialpurpose/birt/widget/facility/FacilityForms.xml
index 29d62c8..303e902 100644
--- a/specialpurpose/birt/widget/facility/FacilityForms.xml
+++ b/specialpurpose/birt/widget/facility/FacilityForms.xml
@@ -44,7 +44,7 @@
<field name="productSupplierId" title="${uiLabelMap.ProductSupplier}">
<drop-down allow-empty="true">
<entity-options entity-name="PartyRoleAndPartyDetail" key-field-name="partyId" description="${groupName} [${partyId}]">
- <entity-constraint name="roleTypeId" value="SUPPLIER" operator="equals"/>
+ <entity-constraint name="roleTypeId" operator="equals" value="SUPPLIER"/>
<entity-order-by field-name="partyId"/>
</entity-options>
</drop-down>
diff --git a/specialpurpose/ebay/widget/EbayForms.xml b/specialpurpose/ebay/widget/EbayForms.xml
index ccb0d70..23d11d1 100644
--- a/specialpurpose/ebay/widget/EbayForms.xml
+++ b/specialpurpose/ebay/widget/EbayForms.xml
@@ -24,7 +24,7 @@
header-row-style="header-row" default-table-style="basic-table">
<field name="productStoreId">
<drop-down>
- <entity-options entity-name="ProductStore" description="${storeName}" key-field-name="productStoreId">
+ <entity-options entity-name="ProductStore" key-field-name="productStoreId" description="${storeName}">
<entity-order-by field-name="storeName"/>
</entity-options>
</drop-down>
@@ -43,7 +43,7 @@
<field name="externalId" title="${uiLabelMap.EbayImportEbayItem}"><display/></field>
<field name="transactionId"><display/></field>
<field name="orderId">
- <hyperlink target="orderview" description="${orderId}">
+ <hyperlink description="${orderId}" target="orderview">
<parameter param-name="orderId"/>
</hyperlink>
</field>
@@ -92,7 +92,7 @@
header-row-style="header-row" default-table-style="basic-table">
<field name="productStoreId">
<drop-down>
- <entity-options entity-name="ProductStore" description="${storeName}" key-field-name="productStoreId">
+ <entity-options entity-name="ProductStore" key-field-name="productStoreId" description="${storeName}">
<entity-order-by field-name="storeName"/>
</entity-options>
</drop-down>
@@ -113,7 +113,7 @@
<field name="externalId" title="${uiLabelMap.EbayEbayOrderIdOrTransactionId}" use-when="${isEbayOrder}" tooltip="eBay Order"><display/></field>
<field name="externalId" title="${uiLabelMap.EbayEbayOrderIdOrTransactionId}" use-when="${isEbayTransaction}" tooltip="eBay Transaction"><display/></field>
<field name="orderId">
- <hyperlink target="/ordermgr/control/orderview" also-hidden="false" description="${orderId}" target-type="inter-app">
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview" also-hidden="false" target-type="inter-app">
<parameter param-name="orderId"/>
</hyperlink>
</field>
@@ -146,12 +146,12 @@
<field name="compatibilityLevel"><display/></field>
<field name="webSiteId" title="${uiLabelMap.ProductWebSite}"><display-entity entity-name="WebSite" description="${siteName} [${webSiteId}]"/></field>
<field name="editEbayConfiguration" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
- <hyperlink target="EditEbayConfiguration" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditEbayConfiguration" also-hidden="false">
<parameter param-name="productStoreId"/>
</hyperlink>
</field>
<field name="deleteEbayConfiguration" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteEbayConfiguration" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEbayConfiguration" also-hidden="false">
<parameter param-name="productStoreId"/>
</hyperlink>
</field>
@@ -213,7 +213,7 @@
</drop-down>
</field>
<field name="deleteEbayShippingMethod" title="" widget-style="buttontext">
- <hyperlink target="deleteEbayShippingMethod" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEbayShippingMethod" also-hidden="false">
<parameter param-name="shipmentMethodName"/>
<parameter param-name="productStoreId"/>
</hyperlink>
@@ -257,7 +257,7 @@
</field>
<field name="websiteId" field-name="webSiteId" parameter-name="webSiteId" title="${uiLabelMap.ProductWebSite}">
<drop-down no-current-selected-key="${parameters.webSiteId}" allow-empty="true">
- <entity-options entity-name="WebSite" description="${siteName} [${webSiteId}]" key-field-name="webSiteId">
+ <entity-options entity-name="WebSite" key-field-name="webSiteId" description="${siteName} [${webSiteId}]">
<entity-order-by field-name="siteName"/>
</entity-options>
</drop-down>
diff --git a/specialpurpose/ebaystore/minilang/EbayServices.xml b/specialpurpose/ebaystore/minilang/EbayServices.xml
index 222624e..258ad7d 100644
--- a/specialpurpose/ebaystore/minilang/EbayServices.xml
+++ b/specialpurpose/ebaystore/minilang/EbayServices.xml
@@ -22,26 +22,26 @@
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="createEbayAccount" short-description="Create Ebay Account">
- <set-service-fields service-name="createPersonAndUserLogin" to-map="newPerson" map="parameters"/>
+ <set-service-fields service-name="createPersonAndUserLogin" map="parameters" to-map="newPerson"/>/>
<call-service service-name="createPersonAndUserLogin" in-map-name="newPerson">
<result-to-field result-name="partyId" field="parameters.partyId"/>
</call-service>
<set field="parameters.roleTypeId" value="VENDOR" />
- <set-service-fields service-name="createPartyRole" to-map="newPartyRole" map="parameters"/>
+ <set-service-fields service-name="createPartyRole" map="parameters" to-map="newPartyRole"/>/>
<call-service service-name="createPartyRole" in-map-name="newPartyRole"/>
<set field="parameters.storeName" value="${parameters.userLoginId}_store"/>
- <set-service-fields service-name="createProductStore" to-map="newProductStore" map="parameters"/>
+ <set-service-fields service-name="createProductStore" map="parameters" to-map="newProductStore"/>/>
<call-service service-name="createProductStore" in-map-name="newProductStore">
<result-to-field result-name="productStoreId" field="parameters.productStoreId"/>
</call-service>
<set field="parameters.roleTypeId" value="EBAY_ACCOUNT"/>
- <set-service-fields service-name="createPartyRole" to-map="newPartyRole" map="parameters"/>
+ <set-service-fields service-name="createPartyRole" map="parameters" to-map="newPartyRole"/>/>
<call-service service-name="createPartyRole" in-map-name="newPartyRole"/>
- <set-service-fields service-name="createProductStoreRole" to-map="newProductStoreRole" map="parameters"/>
+ <set-service-fields service-name="createProductStoreRole" map="parameters" to-map="newProductStoreRole"/>/>
<call-service service-name="createProductStoreRole" in-map-name="newProductStoreRole"/>
<field-to-result field="parameters.productStoreId" result-name="productStoreId"/>
@@ -105,7 +105,7 @@
<check-errors/>
</if-empty>
- <set-service-fields map="parameters" to-map="callServiceMap" service-name="reserveEbayProductInventoryByStoreFacility"/>
+ <set-service-fields service-name="reserveEbayProductInventoryByStoreFacility" map="parameters" to-map="callServiceMap"/>/>
<set from-field="facilityId" field="callServiceMap.facilityId"/>
<set from-field="requireInventory" field="callServiceMap.requireInventory"/>
<set from-field="productStore.reserveOrderEnumId" field="callServiceMap.reserveOrderEnumId"/>
diff --git a/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml b/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml
index faf21e7..0875b32 100644
--- a/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml
+++ b/specialpurpose/ebaystore/minilang/EbayStoreEvents.xml
@@ -251,7 +251,7 @@
<simple-method method-name="createEmailTemplate" short-description="Create Email Template">
<!-- create content -->
<set field="parameters.dataTemplateTypeId" value="FTL"/>
- <set-service-fields service-name="createElectronicText" to-map="newElectronicText" map="parameters"/>
+ <set-service-fields service-name="createElectronicText" map="parameters" to-map="newElectronicText"/>/>
<call-service service-name="createElectronicText" in-map-name="newElectronicText">
<result-to-field result-name="dataResourceId" field="parameters.dataResourceId"/>
</call-service>
@@ -259,7 +259,7 @@
<set field="parameters.roleTypeId" value="OWNER"/>
<set field="parameters.contentTypeId" value="DOCUMENT"/>
<set field="parameters.ownerContentId" from-field="parameters.emailType"/>
- <set-service-fields service-name="createContent" to-map="newContent" map="parameters"/>
+ <set-service-fields service-name="createContent" map="parameters" to-map="newContent"/>/>
<call-service service-name="createContent" in-map-name="newContent" >
<result-to-field result-name="contentId"/>
</call-service>
@@ -271,7 +271,7 @@
<if-not-empty field="parameters.includeCrossPromotions">
<set field="parameters.subject" value="${parameters.includeCrossPromotions} INCLUDE_CROSS_PROMOTIONS"/>
</if-not-empty>
- <set-service-fields service-name="createProductStoreEmailSetting" to-map="newEmailSetting" map="parameters"/>
+ <set-service-fields service-name="createProductStoreEmailSetting" map="parameters" to-map="newEmailSetting"/>/>
<call-service service-name="createProductStoreEmailSetting" in-map-name="newEmailSetting" >
<result-to-field result-name="contentId"/>
</call-service>
@@ -279,7 +279,7 @@
<simple-method method-name="updateEmailTemplate" short-description="Create Email Template">
<!-- update content -->
- <set-service-fields service-name="updateElectronicText" to-map="updateElectronicText" map="parameters"/>
+ <set-service-fields service-name="updateElectronicText" map="parameters" to-map="updateElectronicText"/>/>
<call-service service-name="updateElectronicText" in-map-name="updateElectronicText">
<result-to-field result-name="dataResourceId" field="parameters.dataResourceId"/>
</call-service>
@@ -291,7 +291,7 @@
<if-not-empty field="parameters.includeCrossPromotions">
<set field="parameters.subject" value="${parameters.subject} INCLUDE_CROSS_PROMOTIONS"/>
</if-not-empty-->
- <set-service-fields service-name="updateProductStoreEmailSetting" to-map="updateEmailSetting" map="parameters"/>
+ <set-service-fields service-name="updateProductStoreEmailSetting" map="parameters" to-map="updateEmailSetting"/>/>
<call-service service-name="updateProductStoreEmailSetting" in-map-name="updateEmailSetting" >
<result-to-field result-name="contentId"/>
</call-service>
diff --git a/specialpurpose/ebaystore/widget/CommonScreens.xml b/specialpurpose/ebaystore/widget/CommonScreens.xml
index 5e26c75..99e155a 100644
--- a/specialpurpose/ebaystore/widget/CommonScreens.xml
+++ b/specialpurpose/ebaystore/widget/CommonScreens.xml
@@ -61,11 +61,11 @@
<field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
</service>
<set field="userLoginId" from-field="result.userLoginId"/>
- <entity-one value-field="ebayUser" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="ebayUser">
<field-map field-name="userLoginId" from-field="result.userLoginId"/>
</entity-one>
<set field="parameters.partyId" from-field="ebayUser.partyId" global="true"/>
- <entity-one value-field="person" entity-name="Person">
+ <entity-one entity-name="Person" value-field="person">
<field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-one>
</actions>
diff --git a/specialpurpose/ebaystore/widget/EbayAccountForms.xml b/specialpurpose/ebaystore/widget/EbayAccountForms.xml
index 205cea8..e354378 100644
--- a/specialpurpose/ebaystore/widget/EbayAccountForms.xml
+++ b/specialpurpose/ebaystore/widget/EbayAccountForms.xml
@@ -42,7 +42,7 @@
<field name="itemID"><display description="${itemID} - ${title}"/></field>
<field name="userID"><display description="${userID}"/></field>
<field name="actions" use-when=""${commentType}" == """>
- <hyperlink target="LeaveFeedback" description="Leave Feedback">
+ <hyperlink description="Leave Feedback" target="LeaveFeedback">
<parameter param-name="itemId" value="${itemID}"/>
<parameter param-name="transactionId" value="${transactionID}"/>
<parameter param-name="productStoreId" value="${parameters.productStoreId}"/>
diff --git a/specialpurpose/ebaystore/widget/EbayEmailScreens.xml b/specialpurpose/ebaystore/widget/EbayEmailScreens.xml
index aaa9a17..e8cbc42 100644
--- a/specialpurpose/ebaystore/widget/EbayEmailScreens.xml
+++ b/specialpurpose/ebaystore/widget/EbayEmailScreens.xml
@@ -30,19 +30,19 @@
</service>
<set field="userLoginId" from-field="result.userLoginId"/>
<set field="emailType" from-field="parameters.emailType"/>
- <entity-one value-field="emailSetting" entity-name="ProductStoreEmailSetting">
+ <entity-one entity-name="ProductStoreEmailSetting" value-field="emailSetting">
<field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
<field-map field-name="emailType" from-field="emailType"/>
</entity-one>
<set field="subject" from-field="emailSetting.subject"/>
<set field="bodyScreenLocation" value="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate"/>
<set field="fromAddress" from-field="ebayUser.email"/>
- <entity-one value-field="userLoginCheck" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLoginCheck">
<field-map field-name="userLoginId" from-field="userLoginId"/>
</entity-one>
<set field="partyId" from-field="userLoginCheck.partyId"/>
<script location="component://ebaystore/groovyScripts/email/GetProductStoreEmailTemplate.groovy"/>
- <entity-one value-field="templateContent" entity-name="Content"/>
+ <entity-one entity-name="Content" value-field="templateContent"/>
<get-related-one value-field="templateContent" relation-name="DataResource" to-value-field="templateDataResource"/>
<get-related-one value-field="templateDataResource" relation-name="ElectronicText" to-value-field="templateData"/>
<set field="textData" from-field="templateData.textData"/>
diff --git a/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml b/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
index 44a89b0..e8d3df3 100644
--- a/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
+++ b/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
@@ -126,7 +126,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" position="1"><submit/></field>
<field name="cancelButton" title=" " widget-style="smallSubmit" position="2">
- <hyperlink target="soldListing" description="${uiLabelMap.CommonCancel}">
+ <hyperlink description="${uiLabelMap.CommonCancel}" target="soldListing">
<parameter param-name="productStoreId" from-field="parameters.productStoreId"/>
</hyperlink>
</field>
@@ -302,7 +302,7 @@
<field name="afterDays" title="${uiLabelMap.EbayAfter}" position="1" tooltip="${uiLabelMap.CommonDays} ${uiLabelMap.EbayIsSendCopyEmailTooltip}" ><text default-value="5" size="5" maxlength="2"></text></field>
<field name="isSendCopyEmailToSeller" position="1" title="${uiLabelMap.EbayIsSendCopyEmailToSeller}"><check></check></field>
<field name="emailTemplate" title="Email" tooltip="Edit Feedback Reminder email template">
- <hyperlink target="editEmailTemplate" description="Edit Email Template">
+ <hyperlink description="Edit Email Template" target="editEmailTemplate">
<parameter param-name="productStoreId" from-field="parameters.productStoreId"/>
<parameter param-name="emailType" value="EBAY_WIN_BUYER_NOTI"/>
</hyperlink>
@@ -324,7 +324,7 @@
<field name="isAutoSendPayReceivedEmail" tooltip="${uiLabelMap.EbayAutoPaymentReceviedEmail}" position="1" title="${uiLabelMap.EbayIsAutoSendEmail}"><check></check></field>
<field name="isSendCopyEmailToSeller" position="1" title="${uiLabelMap.EbayIsSendCopyEmailToSeller}"><check></check></field>
<field name="emailTemplate" title="Email" tooltip="Edit Payment received email template">
- <hyperlink target="editEmailTemplate" description="${uiLabelMap.EbayEditEmailTemplate}">
+ <hyperlink description="${uiLabelMap.EbayEditEmailTemplate}" target="editEmailTemplate">
<parameter param-name="productStoreId" from-field="parameters.productStoreId"/>
<parameter param-name="emailType" value="EBAY_PAY_RECIEVED"/>
</hyperlink>
@@ -473,7 +473,7 @@
<field name="itemId"><display/></field>
<field name="SKU" title="Product ID"><display/></field>
<field name="title">
- <hyperlink target="${viewItemURL}" description="${title}" target-type="plain" target-window="_BLANK"/>
+ <hyperlink description="${title}" target="${viewItemURL}" target-type="plain" target-window="_BLANK"/>
</field>
<field name="buyItNowPrice"><display/></field>
<field name="reservePrice"><display/></field>
@@ -483,7 +483,7 @@
<field name="quantity"><display/></field>
<field name="listingType"><display/></field>
<field name="EditItem">
- <hyperlink target="getItemProduct?productStoreId=${parameters.productStoreId}&itemId=${itemId}" description="Edit" target-type="plain" target-window="_BLANK"/>
+ <hyperlink description="Edit" target="getItemProduct?productStoreId=${parameters.productStoreId}&itemId=${itemId}" target-type="plain" target-window="_BLANK"/>
</field>
</grid>
<!-- Unsold Listing -->
@@ -647,7 +647,7 @@
<field name="offerStatus" title="Offer Status"><display description="${inMap.offerStatus}"/></field>
<field name="contactStatus" title="Contact Status"><display description="${contactStatus}"/></field>
<field name="viewCustomerDataButton" widget-style="buttontext" title="View Customer Offer Data">
- <hyperlink target="customerOfferData" description="View Data" also-hidden="false">
+ <hyperlink description="View Data" target="customerOfferData" also-hidden="false">
<parameter param-name="productStoreId" from-field="productStoreId"/>
<parameter param-name="itemId" from-field="itemId"/>
<parameter param-name="userId" from-field="userId"/>
@@ -661,7 +661,7 @@
</hyperlink>
</field>
<field name="deleteOfferButton" title="Delete Offer Alert Data" widget-style="buttontext">
- <hyperlink target="deleteContactAlert" description="Delete Data" also-hidden="false">
+ <hyperlink description="Delete Data" target="deleteContactAlert" also-hidden="false">
<parameter param-name="itemId" from-field="itemId"/>
<parameter param-name="userId" from-field="userId"/>
<parameter param-name="productStoreId" from-field="productStoreId"/>
@@ -704,7 +704,7 @@
<field name="itemId" title="Item ID" sort-field="true"><display description="${itemId}"/></field>
<field name="SKU" title="Product ID"><display description="${SKU}"/></field>
<field name="title">
- <hyperlink target="${viewItemURL}" description="${title}" target-type="plain" target-window="_BLANK"/>
+ <hyperlink description="${title}" target="${viewItemURL}" target-type="plain" target-window="_BLANK"/>
</field>
<field name="sellingStatus" title="Status"><display description="${sellingStatus}"/></field>
<field name="endTime" title="Closing Time"><display description="${endTime}"/></field>
@@ -721,7 +721,7 @@
<field name="_rowSubmit" position="1" title="${uiLabelMap.CommonSelect}"><check/></field>
<field name="productStoreId"><hidden value="${productStoreId}"/></field>
<field name="orderId" title="Order ID">
- <hyperlink target="https://localhost:8443/ordermgr/control/orderview?orderId=${orderId}" description="${orderId}" target-type="plain" target-window="_BLANK"/>
+ <hyperlink description="${orderId}" target="https://localhost:8443/ordermgr/control/orderview?orderId=${orderId}" target-type="plain" target-window="_BLANK"/>
</field>
<field name="externalId" title="Transaction ID"><display description="${externalId}"/></field>
<field name="ebayUserIdBuyer" title="Winner Bidder"><display description="${ebayUserIdBuyer}"/></field>
@@ -762,7 +762,7 @@
<field name="productStoreId"><hidden value="${productStoreId}"/></field>
<field name="_rowSubmit" position="1" title="${uiLabelMap.CommonSelect}" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><check/></field>
<field name="orderId" position="1" title="Order ID" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}">
- <hyperlink target="https://localhost:8443/ordermgr/control/orderview?orderId=${orderId}" description="${orderId}" target-type="plain" target-window="_BLANK"/>
+ <hyperlink description="${orderId}" target="https://localhost:8443/ordermgr/control/orderview?orderId=${orderId}" target-type="plain" target-window="_BLANK"/>
</field>
<field name="externalId" title="External ID" position="1" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${externalId}"></display></field>
<field name="ebayUserIdBuyer" title="Winning Bidder" position="1" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${ebayUserIdBuyer}"></display></field>
diff --git a/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml b/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml
index 32d4e97..790d205 100644
--- a/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml
+++ b/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml
@@ -283,7 +283,7 @@
<set field="headerItem" value="ebayStore"/>
<set field="autoPrefEnumId" value="EBAY_AUTO_RELISTING"/>
<set field="serviceName" value="autoRelistingItems"/>
- <entity-one value-field="ebayPrefRelisting" entity-name="EbayProductStorePref">
+ <entity-one entity-name="EbayProductStorePref" value-field="ebayPrefRelisting">
<field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
<field-map field-name="autoPrefEnumId" from-field="autoPrefEnumId"/>
</entity-one>
@@ -308,11 +308,11 @@
<set field="autoPrefEnumId2" value="EBAY_AUTO_DISPUTE2"/>
<set field="serviceName1" value="automaticEbayDisputeNotComplete"/>
<set field="serviceName2" value="automaticEbayDisputeNotPay"/>
- <entity-one value-field="ebayPrefDispute1" entity-name="EbayProductStorePref">
+ <entity-one entity-name="EbayProductStorePref" value-field="ebayPrefDispute1">
<field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
<field-map field-name="autoPrefEnumId" from-field="autoPrefEnumId1"/>
</entity-one>
- <entity-one value-field="ebayPrefDispute2" entity-name="EbayProductStorePref">
+ <entity-one entity-name="EbayProductStorePref" value-field="ebayPrefDispute2">
<field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
<field-map field-name="autoPrefEnumId" from-field="autoPrefEnumId2"/>
</entity-one>
@@ -407,19 +407,19 @@
</service>
<set field="userLoginId" from-field="result.userLoginId"/>
<set field="emailType" from-field="parameters.emailType"/>
- <entity-one value-field="emailSetting" entity-name="ProductStoreEmailSetting">
+ <entity-one entity-name="ProductStoreEmailSetting" value-field="emailSetting">
<field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
<field-map field-name="emailType" from-field="emailType"/>
</entity-one>
<set field="subject" from-field="emailSetting.subject"/>
<set field="bodyScreenLocation" value="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate"/>
<set field="fromAddress" from-field="ebayUser.email"/>
- <entity-one value-field="userLoginCheck" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLoginCheck">
<field-map field-name="userLoginId" from-field="userLoginId"/>
</entity-one>
<set field="partyId" from-field="userLoginCheck.partyId"/>
<script location="component://ebaystore/groovyScripts/email/GetProductStoreEmailTemplate.groovy"/>
- <entity-one value-field="templateContent" entity-name="Content"/>
+ <entity-one entity-name="Content" value-field="templateContent"/>
<get-related-one value-field="templateContent" relation-name="DataResource" to-value-field="templateDataResource"/>
<get-related-one value-field="templateDataResource" relation-name="ElectronicText" to-value-field="templateData"/>
<set field="textData" from-field="templateData.textData"/>
diff --git a/specialpurpose/ebaystore/widget/EbayStoreForms.xml b/specialpurpose/ebaystore/widget/EbayStoreForms.xml
index acdcaf3..fa1845a 100644
--- a/specialpurpose/ebaystore/widget/EbayStoreForms.xml
+++ b/specialpurpose/ebaystore/widget/EbayStoreForms.xml
@@ -96,7 +96,7 @@
<field name="prodCatalogId"><hidden/></field>
<field name="productCategoryId"><display></display></field>
<field name="categoryName">
- <hyperlink target="getChildCategory" description="${prodCategory.categoryName}">
+ <hyperlink description="${prodCategory.categoryName}" target="getChildCategory">
<parameter param-name="productStoreId"/>
<parameter from-field="parameters.prodCatalogId" param-name="prodCatalogId"/>
<parameter param-name="productCategoryId"/>
@@ -134,7 +134,7 @@
<display-entity entity-name="ProdCatalog" description="${catalogName}" key-field-name="prodCatalogId"/>
</field>
<field name="delete" widget-style="buttontext">
- <hyperlink target="removeCatalogFromStore" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeCatalogFromStore">
<parameter param-name="productStoreId"/>
<parameter param-name="prodCatalogId"/>
<parameter param-name="fromDate"/>
diff --git a/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml b/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml
index c29e22a..9e6d511 100644
--- a/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml
+++ b/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml
@@ -290,7 +290,7 @@
<!-- the above copy is okay since we checked already that they are the same -->
<call-service service-name="createPersonAndUserLogin" in-map-name="personUserLoginContext">
<result-to-field result-name="partyId" field="tempMap.partyId"/>
- <result-to-field field="createdUserLogin" result-name="newUserLogin"/>
+ <result-to-field result-name="newUserLogin" field="createdUserLogin"/>
</call-service>
<set-current-user-login value-field="createdUserLogin"/>
@@ -1267,7 +1267,7 @@
</if-compare-field>
</simple-method>
<simple-method method-name="createAnonContact" short-description="Create a non Contact" login-required="false">
- <entity-one value-field="systemUserLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="parameters.userLogin" from-field="systemUserLogin"/>
@@ -1295,11 +1295,11 @@
</if-compare-field>
<check-errors/>
<if-empty field="parameters.partyId">
- <set-service-fields service-name="createPerson" to-map="newPerson" map="parameters"/>
+ <set-service-fields service-name="createPerson" map="parameters" to-map="newPerson"/>/>
<call-service service-name="createPerson" in-map-name="newPerson">
<result-to-field result-name="partyId" field="parameters.partyId"/>
</call-service>
- <set-service-fields service-name="createPartyContactMech" to-map="newContact" map="parameters"/>
+ <set-service-fields service-name="createPartyContactMech" map="parameters" to-map="newContact"/>/>
<set field="newContact.infoString" from-field="parameters.emailAddress"/>
<set field="newContact.contactMechTypeId" value="EMAIL_ADDRESS"/>
<set field="newContact.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
@@ -1310,7 +1310,7 @@
<set field="parameters.contactMechIdFrom" from-field="contact.contactMechId"/>
</else>
</if-empty>
- <set-service-fields service-name="sendContactUsEmailToCompany" to-map="newComm" map="parameters"/>
+ <set-service-fields service-name="sendContactUsEmailToCompany" map="parameters" to-map="newComm"/>/>
<set field="newComm.emailType" value="CONT_NOTI_EMAIL"/>
<call-service service-name="sendContactUsEmailToCompany" in-map-name="newComm">
<default-message property="ThankYouForContactingUs" resource="EcommerceUiLabels"></default-message>
diff --git a/specialpurpose/ecommerce/widget/ContentForms.xml b/specialpurpose/ecommerce/widget/ContentForms.xml
index f479aef..6e7472f 100644
--- a/specialpurpose/ecommerce/widget/ContentForms.xml
+++ b/specialpurpose/ecommerce/widget/ContentForms.xml
@@ -30,7 +30,7 @@
default-title-style="tableheadtext" default-widget-style="inputBox"
paginate-target="/AdminSearch">
<field name="editContent" title=" ">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="CMSContentEdit" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="drDataResourceId"/>
<parameter param-name="contentIdTo"/>
diff --git a/specialpurpose/ecommerce/widget/ForumForms.xml b/specialpurpose/ecommerce/widget/ForumForms.xml
index 6ba39fb..b06bf94 100644
--- a/specialpurpose/ecommerce/widget/ForumForms.xml
+++ b/specialpurpose/ecommerce/widget/ForumForms.xml
@@ -194,12 +194,12 @@
default-title-style="tableheadtext" default-widget-style="inputBox"
paginate-target="/FindContent">
<field name="editContent" title=" ">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContent">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditContent" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="drDataResourceId"/>
</hyperlink>
<!--
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContent">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditContent" also-hidden="false">
<parameter param-name="caContentIdTo"/>
<parameter param-name="caFromDate"/>
<parameter param-name="contentId"/>
@@ -645,7 +645,7 @@
</field>
<!--
<field name="submitContentEdit" title=" ">
- <hyperlink also-hidden="false" description="Submit" target="javascript:document.EditAddContent.action='${persistAction}'; document.EditAddContent.submit()" target-type="plain"/>
+ <hyperlink description="Submit" target="javascript:document.EditAddContent.action='${persistAction}'; document.EditAddContent.submit()" also-hidden="false" target-type="plain"/>
</field>
-->
<field name="deactivateExisting" >
diff --git a/specialpurpose/ecommerce/widget/ForumScreens.xml b/specialpurpose/ecommerce/widget/ForumScreens.xml
index c547149..de72023 100644
--- a/specialpurpose/ecommerce/widget/ForumScreens.xml
+++ b/specialpurpose/ecommerce/widget/ForumScreens.xml
@@ -65,7 +65,7 @@
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
- <entity-condition list="forumMessages" entity-name="ContentAssocViewTo" >
+ <entity-condition entity-name="ContentAssocViewTo" list="forumMessages" >
<condition-list combine="and">
<condition-expr field-name="contentIdStart" from-field="parameters.forumId"/>
<condition-list combine="or">
diff --git a/specialpurpose/ecommerce/widget/blog/BlogForms.xml b/specialpurpose/ecommerce/widget/blog/BlogForms.xml
index d0d9276..4ea0a59 100644
--- a/specialpurpose/ecommerce/widget/blog/BlogForms.xml
+++ b/specialpurpose/ecommerce/widget/blog/BlogForms.xml
@@ -49,10 +49,10 @@
<submit button-type="button"/>
</field>
<field name="createBlog" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonNew} ${uiLabelMap.ContentForum}" target="EditBlogArticle"/>
+ <hyperlink description="${uiLabelMap.CommonNew} ${uiLabelMap.ContentForum}" target="EditBlogArticle" also-hidden="false"/>
</field>
<field name="createForum" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonNew} ${uiLabelMap.ContentForum}" target="EditForumArticle"/>
+ <hyperlink description="${uiLabelMap.CommonNew} ${uiLabelMap.ContentForum}" target="EditForumArticle" also-hidden="false"/>
</field>
</form>
@@ -69,7 +69,7 @@
</actions>
<field name="editContent" title=" ">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="CMSContentEdit" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="drDataResourceId"/>
<parameter param-name="contentIdTo"/>
diff --git a/specialpurpose/example/minilang/example/ExampleServices.xml b/specialpurpose/example/minilang/example/ExampleServices.xml
index 82e7aa1..dfc7274 100644
--- a/specialpurpose/example/minilang/example/ExampleServices.xml
+++ b/specialpurpose/example/minilang/example/ExampleServices.xml
@@ -29,7 +29,7 @@
<field-map field-name="exampleId" from-field="parameters.exampleId"/>
<order-by field-name="-statusDate"/>
</entity-and>
- <first-from-list entry="oldExampleStatus" list="oldExampleStatusList"/>
+ <first-from-list list="oldExampleStatusList" entry="oldExampleStatus"/>
<if-not-empty field="oldExampleStatus">
<set field="oldExampleStatus.statusEndDate" from-field="nowTimestamp"/>
<store-value value-field="oldExampleStatus"/>
diff --git a/specialpurpose/example/widget/example/ExampleFeatureForms.xml b/specialpurpose/example/widget/example/ExampleFeatureForms.xml
index a8978c3..0c997d1 100644
--- a/specialpurpose/example/widget/example/ExampleFeatureForms.xml
+++ b/specialpurpose/example/widget/example/ExampleFeatureForms.xml
@@ -40,7 +40,7 @@
</service>
</actions>
<field name="exampleFeatureId" title="${uiLabelMap.ExampleExampleFeatureId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${exampleFeatureId}" target="EditExampleFeature">
+ <hyperlink description="${exampleFeatureId}" target="EditExampleFeature" also-hidden="false">
<parameter param-name="exampleFeatureId"/>
</hyperlink>
</field>
@@ -98,7 +98,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title="" widget-style="buttontext">
- <hyperlink target="feature_deleteExampleFeatureAppl" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="feature_deleteExampleFeatureAppl" also-hidden="false">
<parameter param-name="exampleId"/>
<parameter param-name="exampleFeatureId"/>
<parameter param-name="fromDate"/>
@@ -162,7 +162,7 @@
</actions>
<!--<auto-fields-entity entity-name="ExampleFeature" default-field-type="display"/>-->
<field name="exampleFeatureId" title="${uiLabelMap.ExampleExampleFeatureId}" widget-style="buttontext">
- <hyperlink description="${exampleFeatureId}" also-hidden="false" target-type="plain" target="javascript:set_value('${exampleFeatureId}')"/>
+ <hyperlink description="${exampleFeatureId}" target="javascript:set_value('${exampleFeatureId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="featureSourceEnumId" title="${uiLabelMap.ExampleFeatureSource}">
<display-entity entity-name="Enumeration" key-field-name="enumId" description="${description} [${enumCode}]" also-hidden="false"/>
diff --git a/specialpurpose/example/widget/example/ExampleForms.xml b/specialpurpose/example/widget/example/ExampleForms.xml
index 8153b5a..d911820 100644
--- a/specialpurpose/example/widget/example/ExampleForms.xml
+++ b/specialpurpose/example/widget/example/ExampleForms.xml
@@ -66,7 +66,7 @@
<alt-row-style use-when="'EXST_APPROVED'.equals(statusId)" style="Validate"/>
<alt-row-style use-when="'EXST_CANCELLED'.equals(statusId)" style="Warn"/>
<field name="exampleId" title="${uiLabelMap.ExampleExampleId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${exampleId}" target="EditExample">
+ <hyperlink description="${exampleId}" target="EditExample" also-hidden="false">
<parameter param-name="exampleId"/>
</hyperlink>
</field>
@@ -144,7 +144,7 @@
<entity-condition entity-name="Example"><order-by field-name="exampleName"/></entity-condition>
</actions>
<field name="exampleId" title="${uiLabelMap.ExampleExampleId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${exampleId}" target="EditExampleLayer" link-type="layered-modal">
+ <hyperlink description="${exampleId}" target="EditExampleLayer" also-hidden="false" link-type="layered-modal">
<parameter param-name="exampleId"/>
</hyperlink>
</field>
@@ -253,7 +253,7 @@
</drop-down>
</field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteExampleItem" description="${uiLabelMap.CommonDelete}" also-hidden="false" confirmation-message="${uiLabelMap.CommonConfirmDelete}" image-location="${iconsLocation}/delete.png">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteExampleItem" also-hidden="false" confirmation-message="${uiLabelMap.CommonConfirmDelete}" image-location="${iconsLocation}/delete.png">
<parameter param-name="exampleId"/>
<parameter param-name="exampleItemSeqId"/>
</hyperlink>
@@ -303,7 +303,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="example_deleteExampleFeatureAppl" description="${uiLabelMap.CommonDelete}" also-hidden="false" image-location="${iconsLocation}/delete.png">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="example_deleteExampleFeatureAppl" also-hidden="false" image-location="${iconsLocation}/delete.png">
<parameter param-name="exampleId"/>
<parameter param-name="exampleFeatureId"/>
<parameter param-name="fromDate"/>
diff --git a/specialpurpose/example/widget/example/FormWidgetExampleForms.xml b/specialpurpose/example/widget/example/FormWidgetExampleForms.xml
index bb2dad5..fb45953 100644
--- a/specialpurpose/example/widget/example/FormWidgetExampleForms.xml
+++ b/specialpurpose/example/widget/example/FormWidgetExampleForms.xml
@@ -400,7 +400,7 @@
<!-- ************************ -->
<field name="emptyField0" title=" "><display/></field>
<field name="newExample" title=" " widget-area-style="smallSubmit" position="1">
- <hyperlink also-hidden="false" description="${uiLabelMap.ExampleNewExample} (Layered-modal)" target="EditExampleLayer" link-type="layered-modal"/>
+ <hyperlink description="${uiLabelMap.ExampleNewExample} (Layered-modal)" target="EditExampleLayer" also-hidden="false" link-type="layered-modal"/>
</field>
</form>
</forms>
diff --git a/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml b/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml
index 896a102..27aa0a5 100644
--- a/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml
+++ b/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml
@@ -24,7 +24,7 @@
<form name="ListFacilities" type="list" list-name="facilities" paginate-target="main"
default-title-style="tableheadtext">
<field name="facilityId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${facilityId}" target="menu">
+ <hyperlink description="${facilityId}" target="menu" also-hidden="false">
<parameter param-name="facilityId"/>
</hyperlink>
</field>
@@ -89,7 +89,7 @@
<field name="quantity" required-field="true" entry-name="totalQuantityOnHand"><text size="6" default-value=""/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeProductFromCategory" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeProductFromCategory" also-hidden="false">
<parameter param-name="productId"/>
<parameter param-name="productCategoryId"/>
<parameter param-name="fromDate"/>
diff --git a/specialpurpose/lucene/widget/LuceneForms.xml b/specialpurpose/lucene/widget/LuceneForms.xml
index c9df7f7..9040819 100644
--- a/specialpurpose/lucene/widget/LuceneForms.xml
+++ b/specialpurpose/lucene/widget/LuceneForms.xml
@@ -32,7 +32,7 @@
<form name="SearchList" type="list" target="" list-name="queryResults" paginate-target="/AdminSearch"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="editContent" title=" ">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="CMSContentEdit" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="drDataResourceId" from-field="dataResourceId"/>
<parameter param-name="contentIdTo"/>
diff --git a/specialpurpose/myportal/minilang/Events.xml b/specialpurpose/myportal/minilang/Events.xml
index 14be065..b76e367 100644
--- a/specialpurpose/myportal/minilang/Events.xml
+++ b/specialpurpose/myportal/minilang/Events.xml
@@ -57,7 +57,7 @@
<set-service-fields map="userLoginContext" service-name="createPersonAndUserLogin" to-map="personUserLoginContext"/>
<call-service service-name="createPersonAndUserLogin" in-map-name="personUserLoginContext">
<result-to-field result-name="partyId" field="partyId"/>
- <result-to-field field="createdUserLogin" result-name="newUserLogin"/>
+ <result-to-field result-name="newUserLogin" field="createdUserLogin"/>
</call-service>
<set-current-user-login value-field="createdUserLogin"/>
<else>
diff --git a/specialpurpose/myportal/widget/PortalAdmForms.xml b/specialpurpose/myportal/widget/PortalAdmForms.xml
index f07d8e0..b7a61b5 100644
--- a/specialpurpose/myportal/widget/PortalAdmForms.xml
+++ b/specialpurpose/myportal/widget/PortalAdmForms.xml
@@ -72,7 +72,7 @@
<field name="ownerUserLoginId" sort-field="true"><display/></field>
<field name="securityGroupId" title="${uiLabelMap.CommonSecurityGroupId}" sort-field="true"><display/></field>
<field name="deleteLink" use-when="originalPortalPageId!=null" title=" " widget-style="buttontext" >
- <hyperlink target="deletePortalPage" description="${uiLabelMap.CommonRevertPortalPage}">
+ <hyperlink description="${uiLabelMap.CommonRevertPortalPage}" target="deletePortalPage">
<parameter param-name="portalPageId"/>
<parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/>
</hyperlink>
diff --git a/specialpurpose/projectmgr/minilang/ProjectServices.xml b/specialpurpose/projectmgr/minilang/ProjectServices.xml
index 4b4bcfe..9a74739 100644
--- a/specialpurpose/projectmgr/minilang/ProjectServices.xml
+++ b/specialpurpose/projectmgr/minilang/ProjectServices.xml
@@ -81,7 +81,7 @@
<check-errors/>
<!-- find exist e-mail address. if have not exist then create new-->
- <entity-condition list="existEmailAddresses" entity-name="WorkEffortContactMechView">
+ <entity-condition entity-name="WorkEffortContactMechView" list="existEmailAddresses">
<condition-list combine="and">
<condition-expr field-name="workEffortId" from-field="parameters.workEffortId"/>
<condition-expr field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
@@ -101,7 +101,7 @@
<field-map field-name="workEffortId" from-field="oldEmailAddress.workEffortId"/>
<field-map field-name="contactMechId" from-field="oldEmailAddress.contactMechId"/>
</entity-and>
- <first-from-list entry="oldWorkEffortContactMech" list="oldWorkEffortContactMechs"/>
+ <first-from-list list="oldWorkEffortContactMechs" entry="oldWorkEffortContactMech"/>
<now-timestamp field="oldWorkEffortContactMech.thruDate"/>
<store-value value-field="oldWorkEffortContactMech"/>
</iterate>
@@ -130,7 +130,7 @@
</entity-and>
<!-- end current record if required -->
<if-not-empty field="workEffortPartyAssignments">
- <first-from-list entry="workEffortPartyAssignment" list="workEffortPartyAssignments"/>
+ <first-from-list list="workEffortPartyAssignments" entry="workEffortPartyAssignment"/>
<if-compare-field field="updProjectRole.newPartyId" operator="not-equals" to-field="workEffortPartyAssignment.partyId">
<now-timestamp field="workEffortPartyAssignment.thruDate"/>
<store-value value-field="workEffortPartyAssignment"/>
@@ -180,23 +180,23 @@
</simple-method>
<simple-method method-name="updateTaskAndRelatedInfo" short-description="Update the task and when info is provided update the related information too">
- <set-service-fields service-name="updateWorkEffort" to-map="updateWorkeffort" map="parameters"/>
+ <set-service-fields service-name="updateWorkEffort" map="parameters" to-map="updateWorkeffort"/>/>
<call-service service-name="updateWorkEffort" in-map-name="updateWorkeffort"/>
<if-not-empty field="parameters.estimatedDuration">
- <set-service-fields service-name="updateWorkEffortSkillStandard" to-map="updateWorkEffortSkillStandard" map="parameters"/>
+ <set-service-fields service-name="updateWorkEffortSkillStandard" map="parameters" to-map="updateWorkEffortSkillStandard"/>/>
<if-empty field="parameters.skillTypeId">
<entity-and entity-name="WorkEffortSkillStandard" list="workEffortSkillStandards">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
<if-not-empty field="workEffortSkillStandards">
- <first-from-list entry="workEffortSkillStandard" list="workEffortSkillStandards"/>
+ <first-from-list list="workEffortSkillStandards" entry="workEffortSkillStandard"/>
<set field="updateWorkEffortSkillStandard.skillTypeId" from-field="workEffortSkillStandard.skillTypeId"/>
<else>
<set field="updateWorkEffortSkillStandard.skillTypeId" value="_NA_"/>
</else>
</if-not-empty>
</if-empty>
- <entity-one value-field="workEffortSkillStandard" entity-name="WorkEffortSkillStandard">
+ <entity-one entity-name="WorkEffortSkillStandard" value-field="workEffortSkillStandard">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
<field-map field-name="skillTypeId" from-field="updateWorkEffortSkillStandard.skillTypeId"/>
</entity-one>
@@ -344,7 +344,7 @@
<clear-field field="task.estimatedCompletionDate"/>
</iterate>
- <first-from-list entry="task" list="tasks"/>
+ <first-from-list list="tasks" entry="task"/>
<set field="startDate" from-field="task.actualStartDate"/>
<set field="taskId" from-field="task.workEffortId"/>
<else>
@@ -483,7 +483,7 @@
<field-map field-name="workEffortId" from-field="projectId"/>
<field-map field-name="partyId" from-field="timesheet.partyId"/>
</entity-and>
- <first-from-list entry="projectAssign" list="projectAssigns"/>
+ <first-from-list list="projectAssigns" entry="projectAssign"/>
<set field="parameters.partyId" from-field="timesheet.partyId"/>
<set field="parameters.roleTypeId" from-field="projectAssign.roleTypeId"/>
<set field="parameters.statusId" value="PAS_ASSIGNED"/>
@@ -550,7 +550,7 @@
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
<field-map field-name="partyId" from-field="timesheet.partyId"/>
</entity-and>
- <first-from-list entry="alreadyAssign" list="assigns"/>
+ <first-from-list list="assigns" entry="alreadyAssign"/>
<if-compare field="alreadyAssign.statusId" value="PAS_COMPLETED" operator="not-equals">
<set field="upStat.partyId" from-field="timesheet.partyId"/>
<set field="upStat.statusId" value="PAS_COMPLETED"/>
@@ -718,7 +718,7 @@
</entity-and>
<filter-list-by-date list="emailAddresses"/>
<if-not-empty field="emailAddresses">
- <first-from-list entry="emailAddress" list="emailAddresses"/>
+ <first-from-list list="emailAddresses" entry="emailAddress"/>
<set field="highInfo.emailAddress" from-field="emailAddress.infoString"/>
</if-not-empty>
@@ -1050,7 +1050,7 @@
</entity-condition>
<!-- Now used TimeEntries to update (or not) actual start and end Date -->
- <first-from-list entry="summaryInfo" list="summaryInfos"/>
+ <first-from-list list="summaryInfos" entry="summaryInfo"/>
<set field="highInfo.estimatedStartDate" from-field="summaryInfo.estimatedStartDate"/>
<set field="highInfo.estimatedCompletionDate" from-field="summaryInfo.estimatedCompletionDate"/>
<set field="highInfo.actualStartDate" from-field="summaryInfo.actualStartDate"/>
@@ -1068,7 +1068,7 @@
</condition-list>
<select-field field-name="actualEntryStartDate"/>
</entity-condition>
- <first-from-list entry="timeEntriesInfo" list="summaryEntriesInfos"/>
+ <first-from-list list="summaryEntriesInfos" entry="timeEntriesInfo"/>
<if-not-empty field="timeEntriesInfo">
<if-not-empty field="timeEntriesInfo.actualEntryStartDate">
<if>
@@ -1104,7 +1104,7 @@
<clear-field field="originalActualHours"/>
<!-- I- get timeEntries for which there is no rate (originalHours)-->
- <entity-condition list="notRatedValues" entity-name="ProjectPhaseTaskActualNotRatedHoursView">
+ <entity-condition entity-name="ProjectPhaseTaskActualNotRatedHoursView" list="notRatedValues">
<condition-list>
<condition-expr field-name="projectId" from-field="highInfo.projectId" ignore-if-empty="true"/>
<condition-expr field-name="phaseId" from-field="highInfo.phaseId" ignore-if-empty="true"/>
@@ -1113,13 +1113,13 @@
</condition-list>
<select-field field-name="totalOriginalHours"/>
</entity-condition>
- <first-from-list entry="notRatedValue" list="notRatedValues"/>
+ <first-from-list list="notRatedValues" entry="notRatedValue"/>
<set field="originalHours" from-field="notRatedValue.totalOriginalHours" type="Double"/>
<!-- II- get total for timeEntries having a partyRate that should be applied
before applying rate (totalOriginalHours)
after applying rate (totalRatedHours)-->
- <entity-condition list="ratedValues" entity-name="ProjectPhaseTaskActualRatedHoursView">
+ <entity-condition entity-name="ProjectPhaseTaskActualRatedHoursView" list="ratedValues">
<condition-list>
<condition-expr field-name="projectId" from-field="highInfo.projectId" ignore-if-empty="true"/>
<condition-expr field-name="phaseId" from-field="highInfo.phaseId" ignore-if-empty="true"/>
@@ -1161,7 +1161,7 @@
<set field="highInfo.actualHours" from-field="actualHours"/>
<!-- do the same but for non-billed hours -->
<!-- first get not rated hours -->
- <entity-condition list="notRatedValues" entity-name="ProjectPhaseTaskActualNotRatedHoursView">
+ <entity-condition entity-name="ProjectPhaseTaskActualNotRatedHoursView" list="notRatedValues">
<condition-list>
<condition-expr field-name="projectId" from-field="highInfo.projectId" ignore-if-empty="true"/>
<condition-expr field-name="phaseId" from-field="highInfo.phaseId" ignore-if-empty="true"/>
@@ -1171,10 +1171,10 @@
</condition-list>
<select-field field-name="totalOriginalHours"/>
</entity-condition>
- <first-from-list entry="notRatedValue" list="notRatedValues"/>
+ <first-from-list list="notRatedValues" entry="notRatedValue"/>
<set field="actualNonBilledHours" from-field="notRatedValue.totalOriginalHours" type="Double"/>
<!-- second get non billed for entries having an invoiceId -->
- <entity-condition list="ratedValues" entity-name="ProjectPhaseTaskActualRatedHoursView">
+ <entity-condition entity-name="ProjectPhaseTaskActualRatedHoursView" list="ratedValues">
<condition-list>
<condition-expr field-name="projectId" from-field="highInfo.projectId" ignore-if-empty="true"/>
<condition-expr field-name="phaseId" from-field="highInfo.phaseId" ignore-if-empty="true"/>
@@ -1358,7 +1358,7 @@
</entity-condition>
<if-not-empty field="timesheets">
<!-- use existing timesheet -->
- <first-from-list entry="timesheet" list="timesheets"/>
+ <first-from-list list="timesheets" entry="timesheet"/>
<if-compare field="timesheet.statusId" value="TIMESHEET_IN_PROCESS" operator="equals">
<set field="parameters.timesheetId" from-field="timesheet.timesheetId"/>
<else>
@@ -1383,7 +1383,7 @@
<field-map field-name="partyId" from-field="parameters.partyId"/>
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
- <first-from-list entry="taskRole" list="taskRoles"/>
+ <first-from-list list="taskRoles" entry="taskRole"/>
<set field="parameters.roleTypeId" from-field="taskRole.roleTypeId"/>
<set field="parameters.statusId" value="PAS_ASSIGNED"/>
<call-simple-method method-name="assignPartyToWorkEffort" xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"/>
diff --git a/specialpurpose/projectmgr/widget/ProjectScreens.xml b/specialpurpose/projectmgr/widget/ProjectScreens.xml
index 28738df..e7e8c20 100644
--- a/specialpurpose/projectmgr/widget/ProjectScreens.xml
+++ b/specialpurpose/projectmgr/widget/ProjectScreens.xml
@@ -975,7 +975,7 @@
<property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/images/jsgantt.js" global="true"/>
<set field="layoutSettings.styleSheets[]" value="/images/jsgantt.css" global="true"/>
- <entity-condition list="projects" entity-name="WorkEffortPartyAssignByGroup" filter-by-date="true">
+ <entity-condition entity-name="WorkEffortPartyAssignByGroup" list="projects" filter-by-date="true">
<condition-list combine="and">
<condition-expr field-name="partyId" from-field="userLogin.partyId"/>
<condition-list combine="or">
diff --git a/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml b/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml
index fcffaa9..a2a73f8 100644
--- a/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml
+++ b/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml
@@ -101,13 +101,13 @@
<field name="custRequestName"><display/></field>
<field name="description"><display/></field>
<field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}">
- <hyperlink also-hidden="false" description="${projectName}" target="projectView">
+ <hyperlink description="${projectName}" target="projectView" also-hidden="false">
<parameter param-name="projectId"/>
</hyperlink>
</field>
<field name="phaseName"><display description="${result.phaseName}"/></field>
<field name="taskName">
- <hyperlink target="taskView" description="${workEffort.workEffortName}">
+ <hyperlink description="${workEffort.workEffortName}" target="taskView">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
@@ -134,12 +134,12 @@
</service>
</row-actions>
<field name="custRequestId">
- <hyperlink target="ViewRequest" description="${custRequestName} [${custRequestId}]">
+ <hyperlink description="${custRequestName} [${custRequestId}]" target="ViewRequest">
<parameter param-name="custRequestId"/>
</hyperlink>
</field>
<field name="workEffortParentId" title="${uiLabelMap.ProjectMgrProjectId}" map-name="sResult" sort-field="true">
- <hyperlink target="projectView" description="${sResult.projectName} [${sResult.projectId}]">
+ <hyperlink description="${sResult.projectName} [${sResult.projectId}]" target="projectView">
<parameter param-name="projectId" from-field="sResult.projectId"/>
</hyperlink>
</field>
@@ -147,7 +147,7 @@
<display description="${sResult.phaseName} [${sResult.phaseId}]"/>
</field>
<field name="workEffortId">
- <hyperlink target="taskView" description="${workEffortName} [${workEffortId}]">
+ <hyperlink description="${workEffortName} [${workEffortId}]" target="taskView">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
@@ -166,7 +166,7 @@
</form>
<form name="ViewRequestWorkEfforts" extends="ViewRequestWorkEfforts" extends-resource="component://order/widget/ordermgr/CustRequestForms.xml">
<field name="workEffortId">
- <hyperlink target="taskView" description="${workEffortName} [${workEffortId}]">
+ <hyperlink description="${workEffortName} [${workEffortId}]" target="taskView">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
diff --git a/specialpurpose/projectmgr/widget/forms/ProjectForms.xml b/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
index 5e92f05..ea41568 100644
--- a/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
+++ b/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
@@ -42,7 +42,7 @@
<field name="projectId"><hidden/></field>
<field name="templateId" use-when="projectId==null">
<drop-down allow-empty="true">
- <entity-options entity-name="WorkEffort" description="${workEffortName}" key-field-name="workEffortId">
+ <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}">
<entity-constraint name="workEffortTypeId" value="PROJECT_TEMPLATE"/>
</entity-options>
</drop-down>
@@ -60,7 +60,7 @@
</field>
<field name="organizationPartyId">
<drop-down no-current-selected-key="defaultOrganizationPartyId">
- <entity-options entity-name="PartyAcctgPrefAndGroup" description="${groupName}" key-field-name="partyId"/>
+ <entity-options entity-name="PartyAcctgPrefAndGroup" key-field-name="partyId" description="${groupName}"/>
</drop-down>
</field>
<field name="priority" title="${uiLabelMap.CommonPriority}">
@@ -86,7 +86,7 @@
</field>
<field name="parentProjectName" entry-name="parentProjectId" parameter-name="workEffortParentId">
<drop-down allow-empty="true">
- <entity-options entity-name="WorkEffort" description="${workEffortName}" key-field-name="workEffortId">
+ <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}">
<entity-constraint name="workEffortTypeId" value="PROJECT"/>
<entity-constraint name="workEffortId" operator="not-equals" env-name="projectId"/>
</entity-options>
@@ -140,7 +140,7 @@
</row-actions>
<field name="workEffortId"><hidden/></field>
<field name="phaseName" position="1" use-when="showPosition1"><display description="${phaseName}[${phaseId}]"/></field>
- <field name="workEffortName" title="${uiLabelMap.FormFieldTitle_taskName}" position="1" use-when="showPosition1"><hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffortName}[${workEffortId}]"/></field>
+ <field name="workEffortName" title="${uiLabelMap.FormFieldTitle_taskName}" position="1" use-when="showPosition1"><hyperlink description="${workEffortName}[${workEffortId}]" target="taskView?workEffortId=${workEffortId}"/></field>
<field name="timesheetId" position="2">
<hyperlink description="${timesheetId}" target="Timesheet">
<parameter param-name="timesheetId"/>
@@ -221,7 +221,7 @@
<field name="workEffortParentId"><hidden value=""/></field>
<field name="workEffortId"><hidden value="${projectId}"/></field>
<field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${workEffortName}" target="projectView">
+ <hyperlink description="${workEffortName}" target="projectView" also-hidden="false">
<parameter param-name="projectId" from-field="workEffortId"/>
</hyperlink>
</field>
@@ -352,7 +352,7 @@
<field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><date-time type="date"/></field>
<field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><date-time type="date"/></field>
<field name="edit" title=" ">
- <hyperlink target="EditTask?workEffortId=${workEffortId}" description="${uiLabelMap.CommonEdit}"/>
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditTask?workEffortId=${workEffortId}"/>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>
@@ -415,7 +415,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="wbsId"><display description="${projectId}.${phaseSeqNum}"/></field>
<field name="phase">
- <hyperlink target="FindPhase" description="${phaseName}">
+ <hyperlink description="${phaseName}" target="FindPhase">
<parameter param-name="projectId"/>
</hyperlink>
</field>
@@ -435,7 +435,7 @@
</row-actions>
<field name="wbsId"><display description="${projectId}.${phaseSeqNum}.${sequenceNum}"/></field>
<field name="task">
- <hyperlink target="taskView" description="${workEffortName}">
+ <hyperlink description="${workEffortName}" target="taskView">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
@@ -457,7 +457,7 @@
</form>
<form name="ListOrderInfo" target="EditProjectOrders?projectId=${projectId}" type="list" list-name="listOrderAssoProject" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="orderId">
- <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}">
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app">
<parameter param-name="orderId"/>
</hyperlink>
</field>
@@ -467,7 +467,7 @@
<field name="orderDate"><display/></field>
<field name="entryDate"><display/></field>
<field name="linkProjectOrder" title=" " widget-style="buttontext" use-when="headerItem.equals("editProjectOrders")">
- <hyperlink target="unLinkProjectOrder" description="${uiLabelMap.ProjectMgrRemoveLinkFromProject}">
+ <hyperlink description="${uiLabelMap.ProjectMgrRemoveLinkFromProject}" target="unLinkProjectOrder">
<parameter param-name="workEffortId" from-field="projectId"/>
<parameter param-name="orderId"/>
<parameter param-name="projectId"/>
@@ -548,7 +548,7 @@
</row-actions>
<field name="projectId"><hidden/></field>
<field name="partyName" title="${uiLabelMap.CommonName}">
- <hyperlink target="viewprofile" description="${groupName} [${partyId}]">
+ <hyperlink description="${groupName} [${partyId}]" target="viewprofile">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -691,13 +691,13 @@
<set field="statusId" from-field="result.statusId"/>
</row-actions>
<field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${workEffortName}" target="taskView">
+ <hyperlink description="${workEffortName}" target="taskView" also-hidden="false">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
<field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display description="${resultProject.phaseName}"/></field>
<field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}">
- <hyperlink target="projectView" description="${resultProject.projectName}">
+ <hyperlink description="${resultProject.projectName}" target="projectView">
<parameter param-name="projectId" from-field="resultProject.projectId"/>
</hyperlink>
</field>
@@ -723,7 +723,7 @@
</hyperlink>
</field>
<field name="toComplete" title="${uiLabelMap.CommonStatustoComplete}">
- <hyperlink target="updateResourcesTaskAssigment" description="${uiLabelMap.CommonStatustoComplete}">
+ <hyperlink description="${uiLabelMap.CommonStatustoComplete}" target="updateResourcesTaskAssigment">
<parameter param-name="workEffortId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
@@ -749,7 +749,7 @@
<set field="ActualCompletionDate" from-field="result.projectInfo.actualCompletionDate"/>
</row-actions>
<field entry-name="workEffortName" name="projectName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}" widget-style="buttontext">
- <hyperlink target="projectView" description="${workEffortName}[${workEffortId}]">
+ <hyperlink description="${workEffortName}[${workEffortId}]" target="projectView">
<parameter param-name="projectId" from-field="workEffortId"/>
</hyperlink>
</field>
@@ -773,7 +773,7 @@
<field name="partyId"><hidden/></field>
<field use-when="workEffortId==projectId" name="workEffortId" entry-name="test" title="${uiLabelMap.ProjectMgrProjectName}"><!-- project level -->
<drop-down allow-empty="false">
- <entity-options entity-name="WorkEffort" description="${workEffortName}" key-field-name="workEffortId">
+ <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}">
<entity-constraint name="workEffortTypeId" value="PROJECT"/>
<entity-constraint name="workEffortId" operator="not-equals" env-name="projectId"/>
<entity-constraint name="currentStatusId" operator="not-equals" value="PRJ_CLOSED"/>
@@ -888,7 +888,7 @@
<field name="thruDate"><ignored/></field>
<field name="submitButton"><ignored/></field>
<field name="deleteLink" title=" " widget-style="buttontext" use-when="headerItem.equals("EditProjectContents")">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteProjectContent">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProjectContent" also-hidden="false">
<auto-parameters-entity/>
</hyperlink>
</field>
@@ -896,7 +896,7 @@
<hyperlink description="${uiLabelMap.ContentDownload}" target="ViewSimpleContent?contentId=${contentId}"/>
</field>
<field name="deleteLink" title=" " widget-style="buttontext" use-when="headerItem.equals("EditTaskContents")">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteTaskContent">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTaskContent" also-hidden="false">
<auto-parameters-entity/>
</hyperlink>
</field>
diff --git a/specialpurpose/projectmgr/widget/forms/ResourceForms.xml b/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
index 5c45d69..1bce5a8 100644
--- a/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
+++ b/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
@@ -31,13 +31,13 @@
<service service-name="getPartyTelephone" result-map="telResult"/>
</row-actions>
<field name="resourceName" parameter-name="partyId" title="${uiLabelMap.ProjectMgrResourceName}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${lastName}, ${firstName} ${middleName} ${groupName}" target="viewprofile">
+ <hyperlink description="${lastName}, ${firstName} ${middleName} ${groupName}" target="viewprofile" also-hidden="false">
<parameter param-name="partyId"/>
</hyperlink>
</field>
<field name="roleTypeId"><hidden/></field>
<field name="emailAddress" title="${uiLabelMap.PartyEmailAddress}">
- <hyperlink target="/partymgr/control/EditCommunicationEvent" description="${emailResult.emailAddress}" target-type="inter-app">
+ <hyperlink description="${emailResult.emailAddress}" target="/partymgr/control/EditCommunicationEvent" target-type="inter-app">
<parameter param-name="partyIdFrom" from-field="userLogin.partyId"/>
<parameter param-name="partyIdTo" from-field="partyId"/>
<parameter param-name="communicationEventTypeId" value="EMAIL_COMMUNICATION"/>
@@ -48,7 +48,7 @@
<field name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber}${groovy:telResult.get("extension")!=null?" Ext:":" "}${telResult.extension}"/></field>
<field name="contactMechPurposeTypeId" entry-name="telResult.contactMechPurposeTypeId" title="${uiLabelMap.CommonPurpose}"><display-entity entity-name="ContactMechPurposeType"/></field>
<field name="remove" title="${uiLabelMap.CommonRemove}">
- <hyperlink target="removeResource" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeResource">
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
</hyperlink>
@@ -57,7 +57,7 @@
<form name="ListBillingHours" type="list" list-name="billingList" paginate-target="ListResourcesBillingHours"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="projectName">
- <hyperlink target="projectView" description="${projectName} [${projectId}]">
+ <hyperlink description="${projectName} [${projectId}]" target="projectView">
<parameter param-name="projectId"/>
</hyperlink>
</field>
diff --git a/specialpurpose/projectmgr/widget/forms/TaskForms.xml b/specialpurpose/projectmgr/widget/forms/TaskForms.xml
index 0708081..9d947c7 100644
--- a/specialpurpose/projectmgr/widget/forms/TaskForms.xml
+++ b/specialpurpose/projectmgr/widget/forms/TaskForms.xml
@@ -204,13 +204,13 @@
<set field="currentStatusId" from-field="result.taskInfo.currentStatusId"/>
</row-actions>
<field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${workEffortName}" target="taskView">
+ <hyperlink description="${workEffortName}" target="taskView" also-hidden="false">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
<field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display/></field>
<field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}" widget-style="buttontext" sort-field="true">
- <hyperlink also-hidden="false" description="${projectName}" target="projectView">
+ <hyperlink description="${projectName}" target="projectView" also-hidden="false">
<parameter param-name="projectId"/>
</hyperlink>
</field>
@@ -239,14 +239,14 @@
<field name="oldRoleTypeId" parameter-name="roleTypeId"><hidden value="${roleTypeId}"/></field>
<field name="oldPartyId" parameter-name="partyId"><hidden value="${partyId}"/></field>
<field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${workEffortName}" target="taskView">
+ <hyperlink description="${workEffortName}" target="taskView" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="my"/>
</hyperlink>
</field>
<field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display description="${resultProject.phaseName}"/></field>
<field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}">
- <hyperlink target="projectView" description="${resultProject.projectName}">
+ <hyperlink description="${resultProject.projectName}" target="projectView">
<parameter param-name="projectId" from-field="resultProject.projectId"/>
</hyperlink>
</field>
@@ -279,7 +279,7 @@
<field name="fromDate"><hidden/></field>
<field name="updateButton"><submit/></field>
<field name="remove" title="${uiLabelMap.CommonRemove}">
- <hyperlink target="updateTaskAssigment" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="updateTaskAssigment">
<parameter param-name="workEffortId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
@@ -288,7 +288,7 @@
</hyperlink>
</field>
<field name="toComplete" title="${uiLabelMap.CommonStatustoComplete}">
- <hyperlink target="updateTaskAssigment" description="${uiLabelMap.CommonStatustoComplete}">
+ <hyperlink description="${uiLabelMap.CommonStatustoComplete}" target="updateTaskAssigment">
<parameter param-name="workEffortId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
@@ -307,7 +307,7 @@
</display-entity></field>
<field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}" event="onchange" action="javascript:document.assignTaskToMe.submit();" use-when="parameters.get("workEffortId")==null">
<drop-down allow-empty="true">
- <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${projectName} -- ${phaseName} -- ${workEffortName}" key-field-name="workEffortId" filter-by-date="true">
+ <entity-options entity-name="ProjectPartyAndPhaseAndTask" key-field-name="workEffortId" description="${projectName} -- ${phaseName} -- ${workEffortName}" filter-by-date="true">
<entity-constraint name="projectStatusId" operator="not-equals" value="PRJ_CLOSED"/>
<entity-constraint name="partyId" operator="equals" value="${parameters.userLogin.partyId}"/>
<entity-constraint name="currentStatusId" operator="equals" value="PTS_CREATED"/>
@@ -340,7 +340,7 @@
<field name="fromDate"><hidden/></field>
<field name="workEffortId"><hidden/></field>
<field name="workEffortIdFrom" title="${uiLabelMap.CommonName}">
- <hyperlink target="taskView" description="${r.taskInfo.taskName}">
+ <hyperlink description="${r.taskInfo.taskName}" target="taskView">
<parameter param-name="workEffortId" from-field="workEffortIdFrom"/>
</hyperlink>
</field>
@@ -365,7 +365,7 @@
<field name="fromDate"><hidden/></field>
<field name="workEffortId"><hidden/></field>
<field name="workEffortIdTo" title="${uiLabelMap.CommonName}">
- <hyperlink target="taskView" description="${r.taskInfo.taskName}">
+ <hyperlink description="${r.taskInfo.taskName}" target="taskView">
<parameter param-name="workEffortId" from-field="workEffortIdTo"/>
</hyperlink>
</field>
@@ -452,7 +452,7 @@
<field name="timeEntryId"><hidden/></field>
<field name="workEffortId"><hidden/></field>
<field name="timesheetId">
- <hyperlink target="Timesheet" description="${timesheetId}">
+ <hyperlink description="${timesheetId}" target="Timesheet">
<parameter param-name="timesheetId"/>
</hyperlink>
</field>
@@ -478,7 +478,7 @@
<field name="comments"><text size="60"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteTimeEntry" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTimeEntry" also-hidden="false">
<parameter param-name="workEffortId"/>
<parameter param-name="timeEntryId"/>
</hyperlink>
@@ -526,14 +526,14 @@
<field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${groovy:org.apache.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${groovy: org.apache.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, "dd-MM-yyyy HH:mm", TimeZone.getDefault(), context.get("locale"))}"/></field>
<field name="internalNote" widget-style="buttontext" title="${uiLabelMap.ProjectMgrPrivateOrPublic}" use-when="internalNote.equals("N")">
- <hyperlink target="updateTaskNote" description="${uiLabelMap.OrderNotesPrivate}">
+ <hyperlink description="${uiLabelMap.OrderNotesPrivate}" target="updateTaskNote">
<parameter param-name="workEffortId"/>
<parameter param-name="noteId"/>
<parameter param-name="internalNote" value="Y"/>
</hyperlink>
</field>
<field name="internalNote" widget-style="buttontext" title="${uiLabelMap.ProjectMgrPrivateOrPublic}" use-when="internalNote.equals("Y")">
- <hyperlink target="updateTaskNote" description="${uiLabelMap.OrderNotesPublic}">
+ <hyperlink description="${uiLabelMap.OrderNotesPublic}" target="updateTaskNote">
<parameter param-name="workEffortId"/>
<parameter param-name="noteId"/>
<parameter param-name="internalNote" value="N"/>
@@ -545,7 +545,7 @@
<field name="taskName" title="${uiLabelMap.ProjectMgrTaskName}"><display description="${task.taskName} [${task.taskId}]"/></field>
<field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display description="${projectResult.phaseName} [${projectResult.phaseId}]"/></field>
<field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}">
- <hyperlink target="projectView" description="${projectResult.projectName} [${projectResult.projectId}]">
+ <hyperlink description="${projectResult.projectName} [${projectResult.projectId}]" target="projectView">
<parameter param-name="projectId" from-field="projectResult.projectId"/>
</hyperlink>
</field>
@@ -598,7 +598,7 @@
<form name="ListTaskParties" type="list" list-name="taskParties"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="partyId" title="${uiLabelMap.CommonName}">
- <hyperlink target="viewprofile" description="${partyName}">
+ <hyperlink description="${partyName}" target="viewprofile">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -615,7 +615,7 @@
</entity-and>
</actions>
<field name="contentName" widget-style="smallSubmit">
- <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="ViewSimpleContent">
+ <hyperlink description="${contentName} [${contentId}]" target="ViewSimpleContent" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="dataResourceId"/>
<parameter param-name="communicationEventId"/>
@@ -660,7 +660,7 @@
<field name="fromDate"><hidden/></field>
<field name="workEffortId"><hidden/></field>
<field name="workEffortIdFrom" title="${uiLabelMap.CommonName}">
- <hyperlink target="Dependencies" description="${result.taskInfo.taskName}">
+ <hyperlink description="${result.taskInfo.taskName}" target="Dependencies">
<parameter param-name="workEffortId" from-field="workEffortIdFrom"/>
</hyperlink>
</field>
@@ -687,7 +687,7 @@
<field name="fromDate"><hidden/></field>
<field name="workEffortId"><hidden/></field>
<field name="workEffortIdTo" title="${uiLabelMap.CommonName}">
- <hyperlink target="Dependencies" description="${result.taskInfo.taskName}">
+ <hyperlink description="${result.taskInfo.taskName}" target="Dependencies">
<parameter param-name="workEffortId" from-field="workEffortIdFrom"/>
</hyperlink>
</field>
diff --git a/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml b/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
index 1153817..aa51e9a 100644
--- a/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
+++ b/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
@@ -74,7 +74,7 @@
<set field="complete" value="${uiLabelMap.ProjectMgrToComplete}"/>
</actions>
<field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${timesheetId}" target="${my}Timesheet">
+ <hyperlink description="${timesheetId}" target="${my}Timesheet" also-hidden="false">
<parameter param-name="timesheetId"/>
</hyperlink>
</field>
@@ -85,7 +85,7 @@
<field name="hours"><display/></field>
<field name="comments" title="${uiLabelMap.CommonComments}"><display/></field>
<field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
- <hyperlink target="TimeSheetStatusToComplete" description="${groovy:statusId.equals("TIMESHEET_IN_PROCESS")?complete:""}" also-hidden="false">
+ <hyperlink description="${groovy:statusId.equals("TIMESHEET_IN_PROCESS")?complete:""}" target="TimeSheetStatusToComplete" also-hidden="false">
<parameter param-name="timesheetId"/>
<parameter param-name="statusId" value="TIMESHEET_COMPLETED"/>
</hyperlink>
@@ -134,7 +134,7 @@
<set field="completeLink" value="${groovy:"TIMESHEET_IN_PROCESS".equals(statusId)?complete:""}"/>
</row-actions>
<field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${timesheetId}" target="Timesheet">
+ <hyperlink description="${timesheetId}" target="Timesheet" also-hidden="false">
<parameter param-name="timesheetId"/>
</hyperlink>
</field>
@@ -145,7 +145,7 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
<!--field name="comments" title="${uiLabelMap.CommonComments}"><display/></field-->
<field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
- <hyperlink target="TimeSheetStatusToComplete" description="${groovy:statusId.equals("TIMESHEET_IN_PROCESS")?complete:""}">
+ <hyperlink description="${groovy:statusId.equals("TIMESHEET_IN_PROCESS")?complete:""}" target="TimeSheetStatusToComplete">
<parameter param-name="timesheetId"/>
<parameter param-name="statusId" value="TIMESHEET_COMPLETED"/>
</hyperlink>
@@ -272,7 +272,7 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deleteTimesheetEntry" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTimesheetEntry" also-hidden="false">
<parameter param-name="timesheetId"/>
<parameter param-name="timeEntryId"/>
</hyperlink>
@@ -283,7 +283,7 @@
<field name="timesheetId"><hidden/></field>
<field name="taskWbsId"><display/></field>
<field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}">
- <hyperlink target="taskView" description="${workEffortName}">
+ <hyperlink description="${workEffortName}" target="taskView">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
diff --git a/specialpurpose/scrum/minilang/ScrumEvents.xml b/specialpurpose/scrum/minilang/ScrumEvents.xml
index f7b696b..8bfcccb 100644
--- a/specialpurpose/scrum/minilang/ScrumEvents.xml
+++ b/specialpurpose/scrum/minilang/ScrumEvents.xml
@@ -93,7 +93,7 @@
<!-- Add default backlog and task to sprint -->
<call-simple-method method-name="createBacklogMeeting"/>
- <entity-one value-field="workEffort" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="workEffort">
<field-map field-name="workEffortId" from-field="parameters.projectId"/>
</entity-one>
</then>
@@ -116,7 +116,7 @@
<entity-and entity-name="WorkEffortAndProduct" list="workEffortList">
<field-map field-name="workEffortId" from-field="parameters.projectId"/>
</entity-and>
- <first-from-list entry="workEffortMap" list="workEffortList"/>
+ <first-from-list list="workEffortList" entry="workEffortMap"/>
<make-value value-field="backlogMeeting" entity-name="CustRequest"/>
<sequenced-id sequence-name="CustRequest" field="custRequestId"/>
<set field="backlogMeeting.custRequestId" from-field="custRequestId"/>
@@ -148,7 +148,7 @@
</call-service>
<set field="parameters.custRequestId" from-field="custRequestId"/>
<set field="parameters.workEffortId" from-field="workEffortId"/>
- <set-service-fields service-name="createWorkEffortRequest" to-map="createWorkEffortRequest" map="parameters"/>
+ <set-service-fields service-name="createWorkEffortRequest" map="parameters" to-map="createWorkEffortRequest"/>/>
<call-service service-name="createWorkEffortRequest" in-map-name="createWorkEffortRequest">
<result-to-field result-name="workEffortId" field="workEffort"/>
</call-service>
@@ -163,7 +163,7 @@
</call-service>
<set field="parameters.custRequestId" from-field="custRequestId"/>
<set field="parameters.workEffortId" from-field="workEffortId"/>
- <set-service-fields service-name="createWorkEffortRequest" to-map="createWorkEffortRequest" map="parameters"/>
+ <set-service-fields service-name="createWorkEffortRequest" map="parameters" to-map="createWorkEffortRequest"/>/>
<call-service service-name="createWorkEffortRequest" in-map-name="createWorkEffortRequest">
<result-to-field result-name="workEffortId" field="workEffortId"/>
</call-service>
@@ -178,7 +178,7 @@
</call-service>
<set field="parameters.custRequestId" from-field="custRequestId"/>
<set field="parameters.workEffortId" from-field="workEffortId"/>
- <set-service-fields service-name="createWorkEffortRequest" to-map="createWorkEffortRequest" map="parameters"/>
+ <set-service-fields service-name="createWorkEffortRequest" map="parameters" to-map="createWorkEffortRequest"/>/>
<call-service service-name="createWorkEffortRequest" in-map-name="createWorkEffortRequest">
<result-to-field result-name="workEffortId" field="workEffortId"/>
</call-service>
@@ -264,7 +264,7 @@
</condition>
<then>
<call-simple-method method-name="getWebSiteId"/>
- <entity-condition list="taskInSprintBacklogs" entity-name="CustRequestAndWorkEffort">
+ <entity-condition entity-name="CustRequestAndWorkEffort" list="taskInSprintBacklogs">
<condition-list combine="and">
<condition-expr field-name="custRequestId" from-field="parameters.custRequestId"/>
<condition-expr field-name="workEffortTypeId" value="SCRUM_SPRINT" operator="not-equals"/>
@@ -277,7 +277,7 @@
<call-service service-name="deleteWorkEffortRequest" in-map-name="input"/>
</if-not-empty>
<!-- Change CustRequest status back to Accepted an d reorder backlog Item-->
- <entity-one value-field="sprintMap" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="sprintMap">
<field-map field-name="workEffortId" from-field="parameters.sprintId"/>
</entity-one>
<entity-and entity-name="WorkEffortAndProduct" list="projectList">
@@ -287,7 +287,7 @@
<if-empty field="productId">
<set field="productId" from-field="parameters.productId"/>
</if-empty>
- <entity-one value-field="custRequest" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest"/>
<if-compare field="custRequest.custRequestTypeId" operator="equals" value="RF_UNPLAN_BACKLOG">
<entity-count count-field="getNum" entity-name="CustRequestAndCustRequestItem">
<condition-list combine="and">
@@ -313,7 +313,7 @@
<set field="custRequestResultMap.custSequenceNum" from-field="sequenceNumIn"/>
<else>
<if-compare field="custRequest.custRequestTypeId" operator="equals" value="RF_UNPLAN_BACKLOG">
- <entity-condition list="custRequestList" entity-name="CustRequestAndCustRequestItem">
+ <entity-condition entity-name="CustRequestAndCustRequestItem" list="custRequestList">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="productId"/>
<condition-expr field-name="custRequestTypeId" operator="equals" value="RF_UNPLAN_BACKLOG"/>
@@ -322,7 +322,7 @@
<order-by field-name="custSequenceNum"/>
</entity-condition>
<else>
- <entity-condition list="custRequestList" entity-name="CustRequestAndCustRequestItem">
+ <entity-condition entity-name="CustRequestAndCustRequestItem" list="custRequestList">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="productId"/>
<condition-expr field-name="custRequestTypeId" operator="not-equals" value="RF_UNPLAN_BACKLOG"/>
@@ -341,7 +341,7 @@
<set field="ready" value="${groovy:internalSeq>=externalSeq}" type="Boolean"/>
<if-compare field="ready" operator="equals" value="true" type="Boolean">
<set field="custRequestIdIn" from-field="custRequestList[i].custRequestId"/>
- <entity-one value-field="custRequestMap" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequestMap">
<field-map field-name="custRequestId" from-field="custRequestIdIn"/>
</entity-one>
<set field="custSequenceNum" from-field="custRequestMap.custSequenceNum"/>
@@ -450,7 +450,7 @@
<entity-one entity-name="UserLogin" value-field="sysUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
- <set-service-fields service-name="createWorkEffort" to-map="createProject" map="parameters"/>
+ <set-service-fields service-name="createWorkEffort" map="parameters" to-map="createProject"/>/>
<set field="createProject.workEffortTypeId" value="SCRUM_PROJECT"/>
<set field="createProject.currentStatusId" value="SPJ_ACTIVE"/>
<set field="createProject.userLogin" from-field="sysUserLogin"/>
@@ -519,7 +519,7 @@
</condition>
<then>
<now-timestamp field="now"/>
- <set-service-fields service-name="updateWorkEffort" to-map="updateProject" map="parameters"/>
+ <set-service-fields service-name="updateWorkEffort" map="parameters" to-map="updateProject"/>/>
<call-service service-name="updateWorkEffort" in-map-name="updateProject"/>
<!-- remove old workeffort associate with product -->
<entity-and entity-name="WorkEffortGoodStandard" list="workEffGSDList">
@@ -538,7 +538,7 @@
<set field="goodStandardMap.statusId" value="WEGS_CREATED"/>
<create-value value-field="goodStandardMap"/>
<!-- update project billed options -->
- <entity-one value-field="workEffortAttMap" entity-name="WorkEffortAttribute">
+ <entity-one entity-name="WorkEffortAttribute" value-field="workEffortAttMap">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
<field-map field-name="attrName" value="PROJECT_BILLED"/>
</entity-one>
@@ -566,7 +566,7 @@
<if-not-empty field="sprintList"></if-not-empty>
<iterate list="sprintList" entry="sprint">
<!-- Check current status -->
- <entity-one value-field="sprintEntry" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="sprintEntry">
<field-map field-name="workEffortId" from-field="sprint.sprintId"/>
</entity-one>
<if-not-empty field="sprintEntry">
@@ -613,7 +613,7 @@
</or>
</condition>
<then>
- <entity-one value-field="custRequest" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest"/>
<!-- set default custRequestName -->
<if-empty field="custRequest.custRequestName">
<set field="custRequest.custRequestName" value="product backlog[${custRequest.custRequestId}]"/>
@@ -716,7 +716,7 @@
<then>
<set field="sequenceNumIndex" value="${custRequestList[m].custSequenceNum + count}" type="Integer"/>
<set field="custRequestList[m].custSequenceNum" from-field="sequenceNumIndex" type="String"/>
- <entity-one value-field="newCustRequestMap" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="newCustRequestMap">
<field-map field-name="custRequestId" from-field="custRequestList[m].custRequestId"/>
</entity-one>
<set field="nextSeqNum" value="${custRequestList[m].custSequenceNum}" type="Long"/>
@@ -728,7 +728,7 @@
<if-compare-field field="custRequestList[m].custSequenceNum" operator="greater" to-field="custRequestIndexMap" type="Integer">
<set field="sequenceNumIndex" value="${custRequestIndexMap + count}" type="Integer"/>
<set field="custRequestList[m].custSequenceNum" from-field="sequenceNumIndex" type="String"/>
- <entity-one value-field="newCustRequestMaps" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="newCustRequestMaps">
<field-map field-name="custRequestId" from-field="custRequestList[m].custRequestId"/>
</entity-one>
<set field="nextSeqNum" value="${custRequestList[m].custSequenceNum}" type="Long"/>
@@ -750,7 +750,7 @@
<set field="newSeq" from-field="custRequestListWithNewSeq[l].custSequenceNum" type="Integer"/>
<set field="oldSeq" from-field="custRequestList[newSeq-1].custSequenceNum" type="Long"/>
<set field="custRequestId" from-field="custRequestListWithNewSeq[l].custRequestId"/>
- <entity-one value-field="newCustRequestMap" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="newCustRequestMap">
<field-map field-name="custRequestId" from-field="custRequestId"/>
</entity-one>
<set field="newCustRequestMap.custSequenceNum" from-field="oldSeq"/>
@@ -769,7 +769,7 @@
<!-- start sort transaction -->
<loop count="${newCustCount}" field="l">
<set field="custRequestId" from-field="custRequestListWithNewSeq[l].custRequestId"/>
- <entity-one value-field="newCustRequestMap" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="newCustRequestMap">
<field-map field-name="custRequestId" from-field="custRequestId"/>
</entity-one>
<if-compare field="newCustRequestMap.custRequestTypeId" operator="equals" value="RF_PROD_BACKLOG" >
@@ -801,7 +801,7 @@
<set field="oldSeq" from-field="custRequestList[newSeq-1].custSequenceNum" type="Long" />
<loop count="${custCount}" field="m">
<set field="newcustRequestId" from-field="custRequestList[m].custRequestId"/>
- <entity-one value-field="custRequestMap" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequestMap">
<field-map field-name="custRequestId" from-field="newcustRequestId"/>
</entity-one>
<set field="custSequenceNum" from-field="custRequestMap.custSequenceNum" type="Long"/>
@@ -931,7 +931,7 @@
<if-compare operator="equals" value="0" field="getNum">
<set field="createCustRequestInMap.custSequenceNum" from-field="sequenceNumIn"/>
<else>
- <entity-condition list="custRequestList" entity-name="CustRequestAndCustRequestItem">
+ <entity-condition entity-name="CustRequestAndCustRequestItem" list="custRequestList">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="parameters.productId"/>
<condition-expr field-name="statusId" operator="equals" value="CRQ_ACCEPTED"/>
@@ -956,7 +956,7 @@
<if-compare field="getNum" operator="equals" value="0">
<set field="createCustRequestInMap.custSequenceNum" from-field="parameters.custSequenceNum"/>
<else>
- <entity-condition list="custRequestList" entity-name="CustRequestAndCustRequestItem">
+ <entity-condition entity-name="CustRequestAndCustRequestItem" list="custRequestList">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="parameters.productId"/>
<condition-expr field-name="statusId" operator="equals" value="CRQ_ACCEPTED"/>
@@ -972,7 +972,7 @@
<set field="ready" value="${groovy:internalSeq>=externalSeq}" type="Boolean"/>
<if-compare field="ready" operator="equals" value="true" type="Boolean">
<set field="custRequestId" from-field="custRequestList[j].custRequestId"/>
- <entity-one value-field="custRequestMap" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequestMap">
<field-map field-name="custRequestId" from-field="custRequestId"/>
</entity-one>
<set field="custSequenceNum" from-field="custRequestMap.custSequenceNum"/>
@@ -1041,7 +1041,7 @@
<number value="3600000"/>
</calcop>
</calculate>
- <set-service-fields service-name="updateCustRequest" to-map="inMap" map="parameters"/>
+ <set-service-fields service-name="updateCustRequest" map="parameters" to-map="inMap"/>/>
<call-service service-name="updateCustRequest" in-map-name="inMap"/>
</simple-method>
@@ -1060,11 +1060,11 @@
<field-map field-name="workEffortId" from-field="parameters.projectId"/>
</entity-and>
<first-from-list entry="project" list="projectList"/>
- <entity-one value-field="workEffortAttMap" entity-name="WorkEffortAttribute">
+ <entity-one entity-name="WorkEffortAttribute" value-field="workEffortAttMap">
<field-map field-name="workEffortId" from-field="parameters.projectId"/>
<field-map field-name="attrName" value="PROJECT_BILLED"/>
</entity-one>
- <entity-condition list="custRequestList" entity-name="CustRequestAndCustRequestItem">
+ <entity-condition entity-name="CustRequestAndCustRequestItem" list="custRequestList">
<condition-list combine="and">
<condition-expr field-name="custRequestTypeId" value="RF_PROD_BACKLOG" />
<condition-expr field-name="statusId" value="CRQ_ACCEPTED" />
@@ -1128,7 +1128,7 @@
</condition-list>
</entity-condition>
<if-not-empty field="assigneds">
- <first-from-list entry="assignedMap" list="assigneds"/>
+ <first-from-list list="assigneds" entry="assignedMap"/>
<set field="newInput.partyId" from-field="assignedMap.partyId"></set>
<set field="newInput.workEffortId" from-field="workEffortId"></set>
<set field="newInput.roleTypeId" from-field="assignedMap.roleTypeId"></set>
@@ -1180,7 +1180,7 @@
</condition-list>
</entity-condition>
<if-not-empty field="assigneds">
- <first-from-list entry="assignedMap" list="assigneds"/>
+ <first-from-list list="assigneds" entry="assignedMap"/>
<set field="newInput.partyId" from-field="assignedMap.partyId"></set>
<set field="newInput.workEffortId" from-field="workEffortId"></set>
<set field="newInput.roleTypeId" from-field="assignedMap.roleTypeId"></set>
@@ -1233,7 +1233,7 @@
<entity-and entity-name="UserLogin" list="userLogins">
<field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-and>
- <entity-one value-field="partyNameView" entity-name="PartyNameView"/>
+ <entity-one entity-name="PartyNameView" value-field="partyNameView"/>
<if-empty field="userLogins">
<set field="_error_message_" value="${partyNameView.lastName}, ${partyNameView.firstName} [${parameters.partyId}] does not have UserLogin."/>
<return response-code="error"/>
@@ -1252,7 +1252,7 @@
<set field="parameters.roleTypeId" value="STAKEHOLDER"/>
</if-compare>
- <set-service-fields service-name="ensurePartyRole" to-map="ensurePartyRole" map="parameters"/>
+ <set-service-fields service-name="ensurePartyRole" map="parameters" to-map="ensurePartyRole"/>/>
<set field="ensurePartyRole.userLogin" from-field="sysUserLogin"/>
<call-service service-name="ensurePartyRole" in-map-name="ensurePartyRole"/>
<entity-one entity-name="UserLogin" value-field="sysUserLogin">
@@ -1265,11 +1265,11 @@
</entity-and>
<if-empty field="listGroupId">
<set field="parameters.userLoginId" from-field="userLoginId"/>
- <set-service-fields service-name="addUserLoginToSecurityGroup" to-map="inMap" map="parameters"/>
+ <set-service-fields service-name="addUserLoginToSecurityGroup" map="parameters" to-map="inMap"/>/>
<set field="inMap.userLogin" from-field="sysUserLogin"/>
<call-service service-name="addUserLoginToSecurityGroup" in-map-name="inMap"/>
<else>
- <entity-one value-field="roleTypeMap" entity-name="RoleType">
+ <entity-one entity-name="RoleType" value-field="roleTypeMap">
<field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/>
</entity-one>
<add-error>
@@ -1291,10 +1291,10 @@
<field field="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="uploadedFile"/>
</call-class-method>
- <entity-one value-field="systemUser" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="systemUser">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
- <entity-one value-field="custRequestMap" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequestMap">
<field-map field-name="custRequestId" from-field="formInput.formInput.custRequestId"/>
</entity-one>
<if-empty field="formInput.formInput.sprintId">
@@ -1303,7 +1303,7 @@
<field-map field-name="currentStatusId" value="SPRINT_ACTIVE"/>
</entity-and>
<if-not-empty field="custRequestWorkEfforts">
- <first-from-list entry="custRequestWorkEffort" list="custRequestWorkEfforts"/>
+ <first-from-list list="custRequestWorkEfforts" entry="custRequestWorkEffort"/>
<set field="formInput.formInput.sprintId" from-field="custRequestWorkEffort.workEffortId"/>
</if-not-empty>
</if-empty>
@@ -1312,7 +1312,7 @@
<not><if-empty field="formInput.formInput.actualStartDate"/></not>
</condition>
<then>
- <entity-one value-field="sprint" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="sprint">
<field-map field-name="workEffortId" from-field="formInput.formInput.sprintId"/>
</entity-one>
<set field="formInput.formInput.actualStartDate" from-field="sprint.actualStartDate"/>
@@ -1370,7 +1370,7 @@
<if-compare field="formInput.formInput.workEffortTypeId" operator="equals" value="SCRUM_TASK_INST">
<set field="formInput.formInput.priority" value="4"/>
</if-compare>
- <set-service-fields service-name="createWorkEffort" to-map="createWorkEffort" map="formInput.formInput"/>
+ <set-service-fields service-name="createWorkEffort" map="formInput.formInput" to-map="createWorkEffort"/>/>
<entity-one entity-name="UserLogin" value-field="sysUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
@@ -1381,7 +1381,7 @@
<result-to-field result-name="workEffortId" field="formInput.formInput.workEffortId"/>
</call-service>
<set field="formInput.formInput.custRequestId" from-field="custRequestId"/>
- <set-service-fields service-name="createWorkEffortRequest" to-map="createWorkEffortRequest" map="formInput.formInput"/>
+ <set-service-fields service-name="createWorkEffortRequest" map="formInput.formInput" to-map="createWorkEffortRequest"/>/>
<call-service service-name="createWorkEffortRequest" in-map-name="createWorkEffortRequest"/>
<!--if plan hours(from task) more than first plan hours -->
@@ -1394,7 +1394,7 @@
<result-to-field result-name="initPlanHours"/>
</call-service>
<if-compare-field field="planHours" operator="greater" to-field="initPlanHours" type="Double">
- <entity-one value-field="custRequestMap" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequestMap">
<field-map field-name="custRequestId" from-field="formInput.formInput.custRequestId"/>
</entity-one>
<set field="planHoursIn" from-field="planHours" type="Double"/>
@@ -1402,7 +1402,7 @@
<store-value value-field="custRequestMap"/>
<else>
<if-compare-field field="initPlanHours" operator="greater" to-field="planHours" type="Double">
- <entity-one value-field="custRequestMap" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequestMap">
<field-map field-name="custRequestId" from-field="formInput.formInput.custRequestId"/>
</entity-one>
<set field="planHoursIn" from-field="planHours" type="Double"/>
@@ -1504,7 +1504,7 @@
<entity-and entity-name="UserLogin" list="userLogins">
<field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-and>
- <entity-one value-field="partyNameView" entity-name="PartyNameView"/>
+ <entity-one entity-name="PartyNameView" value-field="partyNameView"/>
<if-not-empty field="project">
<if-compare operator="equals" value="PRODUCT_OWNER" field="roleTypeId">
<set field="_error_message_" value="The system can add only one product owner!"/>
@@ -1527,11 +1527,11 @@
<field-map field-name="userLoginId" value="system"/>
</entity-one>
- <set-service-fields service-name="ensurePartyRole" to-map="ensurePartyRole" map="parameters"/>
+ <set-service-fields service-name="ensurePartyRole" map="parameters" to-map="ensurePartyRole"/>/>
<set field="ensurePartyRole.userLogin" from-field="sysUserLogin"/>
<set field="ensurePartyRole.roleTypeId" from-field="parameters.roleTypeId"/>
<call-service service-name="ensurePartyRole" in-map-name="ensurePartyRole"/>
- <set-service-fields service-name="assignPartyToWorkEffort" to-map="assignPartyToWorkEffort" map="parameters"/>
+ <set-service-fields service-name="assignPartyToWorkEffort" map="parameters" to-map="assignPartyToWorkEffort"/>/>
<set field="assignPartyToWorkEffort.userLogin" from-field="sysUserLogin"/>
<call-service service-name="assignPartyToWorkEffort" in-map-name="assignPartyToWorkEffort"/>
</simple-method>
@@ -1604,7 +1604,7 @@
</or>
</condition>
<then>
- <entity-one value-field="product" entity-name="Product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<make-value value-field="product" entity-name="Product"/>
<set field="product.productId" from-field="parameters.productId"/>
<set field="product.productTypeId" value="SCRUM_ITEM"/>
@@ -1632,7 +1632,7 @@
</condition>
<then>
<call-simple-method method-name="getWebSiteId"/>
- <entity-one value-field="custRequest" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequest">
<field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
</entity-one>
<set field="update.custRequestId" from-field="parameters.custRequestId"/>
@@ -1654,7 +1654,7 @@
<entity-and entity-name="CustRequestItem" list="custRequestItemList">
<field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
</entity-and>
- <first-from-list entry="custRequestItemMap" list="custRequestItemList"/>
+ <first-from-list list="custRequestItemList" entry="custRequestItemMap"/>
<if-compare-field field="custRequestItemMap.productId" operator="not-equals" to-field="parameters.productId" type="String">
<set field="nullField" type="String"/>
<set field="custRequest.parentCustRequestId" from-field="nullField"/>
@@ -1744,7 +1744,7 @@
<set field="partyCompany" from-field="parameters.partyCompany"/>
<set field="companyId" value="${groovy:partyCompany.substring(partyCompany.indexOf('[')+1,partyCompany.indexOf(']'))}"/>
<!-- Create partyPreson -->
- <entity-one value-field="partyRoles" entity-name="PartyRole">
+ <entity-one entity-name="PartyRole" value-field="partyRoles">
<field-map field-name="partyId" value="${parameters.partyId}"/>
<field-map field-name="roleTypeId" value="PRODUCT_OWNER"/>
</entity-one>
@@ -1761,7 +1761,7 @@
<set field="productRole.fromDate" from-field="nowTimestamp" />
<create-value value-field="productRole"/>
<!-- Create partyCompany -->
- <entity-one value-field="partyRoles" entity-name="PartyRole">
+ <entity-one entity-name="PartyRole" value-field="partyRoles">
<field-map field-name="partyId" value="${companyId}"/>
<field-map field-name="roleTypeId" value="PRODUCT_OWNER_COMP"/>
</entity-one>
@@ -1850,7 +1850,7 @@
<field-map field-name="roleTypeId" value="PRODUCT_OWNER"/>
</entity-and>
<if-not-empty field="ownerProductRoles">
- <first-from-list entry="ownerProductRole" list="ownerProductRoles"/>
+ <first-from-list list="ownerProductRoles" entry="ownerProductRole"/>
<set-service-fields service-name="removePartyFromProduct" to-map="removeProductOwnerRole" map="ownerProductRole"/>
<set field="removeProductOwnerRole.userLogin" from-field="systemUserLogin"/>
<call-service service-name="removePartyFromProduct" in-map-name="removeProductOwnerRole"/>
@@ -1861,7 +1861,7 @@
<field-map field-name="partyId" from-field="productRoleList[0].partyId"/>
</entity-and>
<if-not-empty field="companyRoles">
- <first-from-list entry="companyRole" list="companyRoles"/>
+ <first-from-list list="companyRoles" entry="companyRole"/>
<set-service-fields service-name="removePartyFromProduct" to-map="removeCompanyRole" map="companyRole"/>
<set field="removeCompanyRole.userLogin" from-field="systemUserLogin"/>
<call-service service-name="removePartyFromProduct" in-map-name="removeCompanyRole"/>
@@ -2058,7 +2058,7 @@
<field-map field-name="custRequestTypeId" value="RF_SCRUM_MEETINGS"/>
</entity-and>
<if-empty field="meetingTasks">
- <first-from-list entry="lastTimeEntry" list="lastTimeEntrys"/>
+ <first-from-list list="lastTimeEntrys" entry="lastTimeEntry"/>
<if-not-empty field="lastTimeEntry">
<set field="lastTimeEntry.planHours" from-field="parameters.planHours" type="Double"/>
<set field="parameters.timeEntryId" from-field="lastTimeEntry.timeEntryId"/>
@@ -2068,7 +2068,7 @@
</if-not-empty>
</if-empty>
- <set-service-fields service-name="updateWorkEffort" to-map="inMap" map="parameters"/>
+ <set-service-fields service-name="updateWorkEffort" map="parameters" to-map="inMap"/>/>
<call-service service-name="updateWorkEffort" in-map-name="inMap"/>
<if-not-empty field="parameters.partyId">
<!-- Assigned -->
@@ -2088,7 +2088,7 @@
<condition-expr field-name="taskId" from-field="parameters.workEffortId"/>
</condition-list>
</entity-condition>
- <first-from-list entry="sprint" list="sprintList"/>
+ <first-from-list list="sprintList" entry="sprint"/>
<entity-condition entity-name="WorkEffortPartyAssignment" list="sprintRoles">
<condition-list combine="and">
<condition-expr field-name="partyId" from-field="parameters.partyId"/>
@@ -2127,7 +2127,7 @@
<entity-and entity-name="CustRequestWorkEffort" list="custRequestWorkEffortList">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
- <first-from-list entry="custRequestWorkEffortMap" list="custRequestWorkEffortList"/>
+ <first-from-list list="custRequestWorkEffortList" entry="custRequestWorkEffortMap"/>
<set field="backlogPlanMap.custRequestId" from-field="custRequestWorkEffortMap.custRequestId" />
<set field="taskPlanMap.custRequestId" from-field="custRequestWorkEffortMap.custRequestId" />
<call-service service-name="getScrumPlanHour" in-map-name="backlogPlanMap">
@@ -2137,7 +2137,7 @@
<result-to-field result-name="initPlanHours"/>
</call-service>
<if-compare-field field="planHours" operator="greater" to-field="initPlanHours" type="Double">
- <entity-one value-field="custRequestMap" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequestMap">
<field-map field-name="custRequestId" from-field="custRequestWorkEffortMap.custRequestId"/>
</entity-one>
<set field="planHoursIn" from-field="planHours" type="Double"/>
@@ -2145,7 +2145,7 @@
<store-value value-field="custRequestMap"/>
<else>
<if-compare-field field="initPlanHours" operator="greater" to-field="planHours" type="Double">
- <entity-one value-field="custRequestMap" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequestMap">
<field-map field-name="custRequestId" from-field="custRequestWorkEffortMap.custRequestId"/>
</entity-one>
<set field="planHoursIn" from-field="planHours" type="Double"/>
@@ -2184,12 +2184,12 @@
</if-not-empty>
</simple-method>
<simple-method method-name="deleteTaskNote" short-description="Delete Task Note">
- <entity-one value-field="workNoteMap" entity-name="WorkEffortNote" auto-field-map="true"/>
+ <entity-one entity-name="WorkEffortNote" value-field="workNoteMap" auto-field-map="true"/>
<remove-value value-field="workNoteMap"/>
<remove-related relation-name="NoteData" value-field="workNoteMap"/>
</simple-method>
<simple-method method-name="DeleteTaskFromSprintOverview" short-description="Delete Task From Sprint Overview Screen">
- <entity-one value-field="taskWorkEffort" entity-name="CustRequestWorkEffort">
+ <entity-one entity-name="CustRequestWorkEffort" value-field="taskWorkEffort">
<field-map field-name="workEffortId" from-field="parameters.workEffort"/>
<field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
</entity-one>
@@ -2218,7 +2218,7 @@
<field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/>
</entity-and>
<if-not-empty field="partyRoles">
- <set-service-fields service-name="deletePartyRole" to-map="deletePartyRoleMap" map="parameters"/>
+ <set-service-fields service-name="deletePartyRole" map="parameters" to-map="deletePartyRoleMap"/>/>
<set field="deletePartyRoleMap.userLogin" from-field="sysUserLogin"/>
<call-service service-name="deletePartyRole" in-map-name="deletePartyRoleMap"/>
</if-not-empty>
@@ -2240,7 +2240,7 @@
</entity-one>
<set-service-fields service-name="assignPartyToWorkEffort" map="parameters" to-map="assignPartyToWorkEffortCtx"/>
<set field="assignPartyToWorkEffortCtx.userLogin" from-field="sysUserLogin"/>
- <entity-condition list="partyRoleList" entity-name="PartyRole">
+ <entity-condition entity-name="PartyRole" list="partyRoleList">
<condition-expr field-name="partyId" from-field="assignPartyToWorkEffortCtx.partyId"/>
<select-field field-name="roleTypeId"/>
</entity-condition>
@@ -2273,7 +2273,7 @@
<field field="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="uploadedFile"/>
</call-class-method>
- <entity-one value-field="systemUser" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="systemUser">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<!--<log level="info" message="=========================parameters:${formInput.formInput}"></log>-->
@@ -2285,12 +2285,12 @@
</call-service>
<field-to-request field="workEffortId"/>
<set field="formInput.formInput.workEffortId" from-field="workEffortId"/>
- <set-service-fields service-name="createWorkEffortRequest" to-map="workEffortRequestCtx" map="formInput.formInput"/>
+ <set-service-fields service-name="createWorkEffortRequest" map="formInput.formInput" to-map="workEffortRequestCtx"/>/>
<call-service service-name="createWorkEffortRequest" in-map-name="workEffortRequestCtx"/>
<!-- createWorkEffortRequest not provide to add the workEffortParentId into WorkEffort entity. -->
<!-- So, we have to add to the entity manualy -->
- <entity-one value-field="taskInfo" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="taskInfo">
<field-map field-name="workEffortId"/>
</entity-one>
<if-not-empty field="formInput.formInput.sprintId">
@@ -2366,14 +2366,14 @@
<field-to-request field="custRequestId"/>
</if-not-empty>
<!-- Re-opened the backlog for status CRQ_COMPLETED -->
- <entity-condition list="custCompletedList" entity-name="CustRequest">
+ <entity-condition entity-name="CustRequest" list="custCompletedList">
<condition-list combine="and">
<condition-expr field-name="custRequestId" from-field="formInput.formInput.custRequestId"/>
<condition-expr field-name="statusId" operator="equals" value="CRQ_COMPLETED"/>
</condition-list>
</entity-condition>
<if-not-empty field="custCompletedList">
- <first-from-list entry="custRequestMap" list="custCompletedList"/>
+ <first-from-list list="custCompletedList" entry="custRequestMap"/>
<if>
<condition>
<and>
@@ -2418,7 +2418,7 @@
<select-field field-name="productId"/>
</entity-and>
<if-not-empty field="projectAndTaskList">
- <first-from-list entry="projectAndTaskMap" list="projectAndTaskList"/>
+ <first-from-list list="projectAndTaskList" entry="projectAndTaskMap"/>
<entity-and entity-name="WorkEffortAndProduct" list="productList">
<field-map field-name="workEffortId" from-field="projectAndTaskMap.projectId"/>
<select-field field-name="productId"/>
@@ -2428,7 +2428,7 @@
<field-map field-name="productId" from-field="productList[0].productId"/>
</entity-and>
<else>
- <first-from-list entry="unPlannedTaskMap" list="unPlannedTasks"/>
+ <first-from-list list="unPlannedTasks" entry="unPlannedTaskMap"/>
<entity-and entity-name="WorkEffortAndProduct" list="defaultTaskList">
<field-map field-name="workEffortPurposeTypeId" value="SCRUM_DEFAULT_TASK"/>
<field-map field-name="productId" from-field="unPlannedTaskMap.productId"/>
@@ -2494,7 +2494,7 @@
<call-simple-method method-name="getWebSiteId"/>
<set field="SprintId" from-field="parameters.sprintId"/>
<set field="ProjectId" from-field="parameters.projectId"/>
- <entity-one value-field="sprint" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="sprint">
<field-map field-name="workEffortId" from-field="SprintId"/>
</entity-one>
<now-timestamp field="curDate"/>
@@ -2519,7 +2519,7 @@
</else>
</if-compare>
<set field="backlog" value="${backlog} ${tempBacklog}"/>
- <entity-condition list="taskInSprintBacklogs" entity-name="CustRequestAndWorkEffort">
+ <entity-condition entity-name="CustRequestAndWorkEffort" list="taskInSprintBacklogs">
<condition-list combine="and">
<condition-expr field-name="custRequestId" from-field="listBackNotComplete[i].custRequestId"/>
<condition-expr field-name="workEffortTypeId" value="SCRUM_SPRINT" operator="not-equals"/>
@@ -2647,7 +2647,7 @@
<now-timestamp field="now"/>
<!-- calculate estimatedMilliSeconds from initail planned hours -->
<set field="plannedHours" from-field="parameters.plannedHours" default-value="0" type="Integer"/>
- <set-service-fields service-name="createWorkEffort" to-map="workEffortMap" map="parameters"/>
+ <set-service-fields service-name="createWorkEffort" map="parameters" to-map="workEffortMap"/>/>
<set field="parameters.estimatedMilliSeconds" value="${groovy:plannedHours*60*60*1000}"/>
<call-service service-name="createWorkEffort" in-map-name="workEffortMap">
<result-to-field result-name="workEffortId"/>
@@ -2978,7 +2978,7 @@
</if-not-empty>
</simple-method>
<simple-method method-name="deleteProdBacklogNote" short-description="Delete Product Backlog Item Note">
- <entity-one value-field="custNoteMap" entity-name="CustRequestNote" auto-field-map="true"/>
+ <entity-one entity-name="CustRequestNote" value-field="custNoteMap" auto-field-map="true"/>
<remove-value value-field="custNoteMap"/>
<remove-related relation-name="NoteData" value-field="custNoteMap"/>
</simple-method>
@@ -3116,7 +3116,7 @@
</condition-list>
<order-by field-name="-fromDate" />
</entity-condition>
- <first-from-list entry="lastTimeEntry" list="lastTimeEntrys" />
+ <first-from-list list="lastTimeEntrys" entry="lastTimeEntry" />
<if-not-empty field="lastTimeEntry">
<set field="lastTimeEntry.planHours" from-field="planHours" />
<store-value value-field="lastTimeEntry" />
@@ -3169,14 +3169,14 @@
<then>
<call-simple-method method-name="getWebSiteId"/>
<!-- Re-opened the backlog for status CRQ_CANCELLED -->
- <entity-condition list="custCancelledList" entity-name="CustRequest">
+ <entity-condition entity-name="CustRequest" list="custCancelledList">
<condition-list combine="and">
<condition-expr field-name="custRequestId" from-field="parameters.custRequestId"/>
<condition-expr field-name="statusId" operator="equals" value="CRQ_CANCELLED"/>
</condition-list>
</entity-condition>
<if-not-empty field="custCancelledList">
- <first-from-list entry="custRequest" list="custCancelledList"/>
+ <first-from-list list="custCancelledList" entry="custRequest"/>
<get-related relation-name="CustRequestWorkEffort" list="custRequestWorkEffortList" value-field="custRequest"/>
<!-- Remove the backlog from sprint -->
<if-not-empty field="custRequestWorkEffortList">
@@ -3225,7 +3225,7 @@
<condition-expr field-name="taskId" from-field="parameters.workEffortId"/>
</condition-list>
</entity-condition>
- <first-from-list entry="sprint" list="sprintList"/>
+ <first-from-list list="sprintList" entry="sprint"/>
<entity-condition entity-name="WorkEffortPartyAssignment" list="sprintRoles">
<condition-list combine="and">
<condition-expr field-name="partyId" from-field="parameters.partyId"/>
@@ -3263,12 +3263,12 @@
<entity-and entity-name="CustRequestWorkEffort" list="custRequestList">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
- <entity-one value-field="custRequest" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequest">
<field-map field-name="custRequestId" from-field="custRequestList[0].custRequestId"/>
</entity-one>
<set field="custRequestTypeId" from-field="custRequest.custRequestTypeId"/>
<if-compare field="custRequestTypeId" operator="equals" value="RF_UNPLAN_BACKLOG">
- <entity-one value-field="party" entity-name="PartyRole">
+ <entity-one entity-name="PartyRole" value-field="party">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="roleTypeId" value="SCRUM_TEAM"/>
</entity-one>
@@ -3291,7 +3291,7 @@
<condition-expr field-name="taskId" from-field="parameters.workEffortId"/>
</condition-list>
</entity-condition>
- <first-from-list entry="sprint" list="sprintList"/>
+ <first-from-list list="sprintList" entry="sprint"/>
<entity-condition entity-name="WorkEffortPartyAssignment" list="sprintRoles">
<condition-list combine="and">
<condition-expr field-name="partyId" from-field="parameters.partyId"/>
@@ -3341,7 +3341,7 @@
<loop count="${size}" field="i">
<if-compare operator="equals" value="${sprintId}" field="sprintList[i].workEffortId" >
<set field="previousSprintId" from-field="sprintList[i+1].workEffortId"/>
- <entity-condition list="memberPrevSprint" entity-name="WorkEffortPartyAssignment">
+ <entity-condition entity-name="WorkEffortPartyAssignment" list="memberPrevSprint">
<condition-list combine="and">
<condition-expr field-name="workEffortId" from-field="previousSprintId"/>
<condition-list combine="or">
@@ -3483,7 +3483,7 @@
<if-not-empty field="workEffGSDList">
<remove-list list="workEffGSDList"/>
</if-not-empty>
- <set-service-fields service-name="deleteWorkEffort" to-map="serviceMap" map="workEffortMap"/>
+ <set-service-fields service-name="deleteWorkEffort" map="workEffortMap" to-map="serviceMap"/>/>
<call-service service-name="deleteWorkEffort" in-map-name="serviceMap">
<default-message>The Default Task record successfully deleted.</default-message>
</call-service>
@@ -3540,7 +3540,7 @@
<if-compare field="getNum" operator="equals" value="0">
<set field="createCustRequestInMap.custSequenceNum" from-field="parameters.custSequenceNum"/>
<else>
- <entity-condition list="custRequestList" entity-name="CustRequestAndCustRequestItem">
+ <entity-condition entity-name="CustRequestAndCustRequestItem" list="custRequestList">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="parameters.productId"/>
<condition-expr field-name="statusId" operator="equals" value="CRQ_ACCEPTED"/>
@@ -3556,7 +3556,7 @@
<set field="ready" value="${groovy:internalSeq>=externalSeq}" type="Boolean"/>
<if-compare field="ready" operator="equals" value="true" type="Boolean">
<set field="custRequestIdIn" from-field="custRequestList[j].custRequestId"/>
- <entity-one value-field="custRequestMap" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequestMap">
<field-map field-name="custRequestId" from-field="custRequestIdIn"/>
</entity-one>
<set field="custSequenceNum" from-field="custRequestMap.custSequenceNum"/>
@@ -3668,7 +3668,7 @@
</condition-list>
</entity-condition>
<if-not-empty field="assigneds">
- <first-from-list entry="assignedMap" list="assigneds"/>
+ <first-from-list list="assigneds" entry="assignedMap"/>
<set field="newInput.partyId" from-field="assignedMap.partyId"></set>
<set field="newInput.workEffortId" from-field="workEffortId"></set>
<set field="newInput.roleTypeId" from-field="assignedMap.roleTypeId"></set>
@@ -3724,7 +3724,7 @@
</condition-list>
</entity-condition>
<if-not-empty field="assigneds">
- <first-from-list entry="assignedMap" list="assigneds"/>
+ <first-from-list list="assigneds" entry="assignedMap"/>
<set field="newInput.partyId" from-field="assignedMap.partyId"></set>
<set field="newInput.workEffortId" from-field="workEffortId"></set>
<set field="newInput.roleTypeId" from-field="assignedMap.roleTypeId"></set>
@@ -3827,7 +3827,7 @@
</condition-list>
</entity-condition>
<if-not-empty field="assigneds">
- <first-from-list entry="assignedMap" list="assigneds"/>
+ <first-from-list list="assigneds" entry="assignedMap"/>
<set field="newInput.partyId" from-field="assignedMap.partyId"></set>
<set field="newInput.workEffortId" from-field="workEffortId"></set>
<set field="newInput.roleTypeId" from-field="assignedMap.roleTypeId"></set>
@@ -3862,7 +3862,7 @@
</condition-list>
</entity-condition>
<if-not-empty field="assigneds">
- <first-from-list entry="assignedMap" list="assigneds"/>
+ <first-from-list list="assigneds" entry="assignedMap"/>
<set field="newInput.partyId" from-field="assignedMap.partyId"></set>
<set field="newInput.workEffortId" from-field="workEffortId"></set>
<set field="newInput.roleTypeId" from-field="assignedMap.roleTypeId"></set>
@@ -3891,7 +3891,7 @@
</condition>
<then>
<!-- update status task -->
- <entity-one value-field="workEffortMap" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="workEffortMap">
<field-map field-name="workEffortId" from-field="parameters.taskId"/>
</entity-one>
<set field="update.workEffortId" from-field="parameters.taskId"/>
@@ -3946,7 +3946,7 @@
<select-field field-name="productId"/>
</entity-and>
<if-not-empty field="projectAndTaskList">
- <first-from-list entry="projectAndTaskMap" list="projectAndTaskList"/>
+ <first-from-list list="projectAndTaskList" entry="projectAndTaskMap"/>
<entity-and entity-name="WorkEffortAndProduct" list="productList">
<field-map field-name="workEffortId" from-field="projectAndTaskMap.projectId"/>
<select-field field-name="productId"/>
@@ -3956,7 +3956,7 @@
<field-map field-name="productId" from-field="productList[0].productId"/>
</entity-and>
<else>
- <first-from-list entry="unPlannedTaskMap" list="unPlannedTasks"/>
+ <first-from-list list="unPlannedTasks" entry="unPlannedTaskMap"/>
<entity-and entity-name="WorkEffortAndProduct" list="defaultTaskList">
<field-map field-name="workEffortPurposeTypeId" value="SCRUM_DEFAULT_TASK"/>
<field-map field-name="productId" from-field="unPlannedTaskMap.productId"/>
@@ -4043,7 +4043,7 @@
</if-compare>
<!-- re-open completed sprint -->
<if-not-empty field="backlogTask[0].sprintId">
- <entity-one value-field="sprintMap" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="sprintMap">
<field-map field-name="workEffortId" from-field="backlogTask[0].sprintId"/>
</entity-one>
<if-compare operator="equals" value="SPRINT_CLOSED" field="sprintMap.currentStatusId">
@@ -4081,7 +4081,7 @@
</condition-list>
</entity-condition>
<if-not-empty field="assigneds">
- <first-from-list entry="assignedMap" list="assigneds"/>
+ <first-from-list list="assigneds" entry="assignedMap"/>
<set field="newInput.partyId" from-field="assignedMap.partyId"></set>
<set field="newInput.workEffortId" from-field="workEffortId"></set>
<set field="newInput.roleTypeId" from-field="assignedMap.roleTypeId"></set>
@@ -4133,7 +4133,7 @@
<entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
- <set-service-fields service-name="updatePartyRate" to-map="partyRateMap" map="parameters"/>
+ <set-service-fields service-name="updatePartyRate" map="parameters" to-map="partyRateMap"/>/>
<set field="partyRateMap.userLogin" from-field="systemUserLogin"/>
<call-service service-name="updatePartyRate" in-map-name="partyRateMap"/>
<field-to-request field="parameters.partyId" request-name="partyId"/>
@@ -4143,7 +4143,7 @@
<entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
- <set-service-fields service-name="deletePartyRate" to-map="partyRateMap" map="parameters"/>
+ <set-service-fields service-name="deletePartyRate" map="parameters" to-map="partyRateMap"/>/>
<set field="partyRateMap.userLogin" from-field="systemUserLogin"/>
<call-service service-name="deletePartyRate" in-map-name="partyRateMap"/>
<field-to-request field="parameters.partyId" request-name="partyId"/>
@@ -4153,7 +4153,7 @@
<entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
- <set-service-fields service-name="createPartyRelationshipContactAccount" to-map="partyRelationshipMap" map="parameters"/>
+ <set-service-fields service-name="createPartyRelationshipContactAccount" map="parameters" to-map="partyRelationshipMap"/>/>
<set field="partyRelationshipMap.userLogin" from-field="systemUserLogin"/>
<call-service service-name="createPartyRelationshipContactAccount" in-map-name="partyRelationshipMap">
<default-message>Successfully created party relationship.</default-message>
@@ -4343,7 +4343,7 @@
</simple-method>
<simple-method method-name="removeProductMember" short-description="Remove Product Member">
<set field="parameters.fromDate" from-field="parameters.fromDate" type="Timestamp"/>
- <entity-one value-field="productRoleMap" entity-name="ProductRole"/>
+ <entity-one entity-name="ProductRole" value-field="productRoleMap"/>
<remove-value value-field="productRoleMap"/>
</simple-method>
<simple-method method-name="updateNotBilledBacklog" short-description="Update Not Billed Backlog">
@@ -4356,7 +4356,7 @@
<loop count="${rowCount}" field="i">
<set field="billed" from-field="paramMap["billed_o_${i}"]"/>
<set field="custRequestId" from-field="paramMap["custRequestId_o_${i}"]"/>
- <entity-one value-field="custRequestMap" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequestMap"/>
<set field="custRequestMap.billed" from-field="billed"/>
<store-value value-field="custRequestMap"/>
</loop>
diff --git a/specialpurpose/scrum/minilang/ScrumPermissionServices.xml b/specialpurpose/scrum/minilang/ScrumPermissionServices.xml
index 61b0dd5..f29949b 100644
--- a/specialpurpose/scrum/minilang/ScrumPermissionServices.xml
+++ b/specialpurpose/scrum/minilang/ScrumPermissionServices.xml
@@ -58,14 +58,14 @@
<!-- Scrum CommonDecorator Only-->
<if-compare operator="equals" value="SCRUM" field="sec_object">
- <entity-condition list="securityGroupList" entity-name="ScrumMemberUserLoginAndSecurityGroup">
+ <entity-condition entity-name="ScrumMemberUserLoginAndSecurityGroup" list="securityGroupList">
<condition-list combine="and">
<condition-expr field-name="partyId" operator="equals" from-field="partyId"/>
<condition-expr field-name="partyStatusId" operator="not-equals" value="PARTY_DISABLED"/>
<condition-expr field-name="thruDate" operator="equals" value=""/>
</condition-list>
</entity-condition>
- <first-from-list entry="securityGroupMap" list="securityGroupList"/>
+ <first-from-list list="securityGroupList" entry="securityGroupMap"/>
<if>
<condition>
<or>
@@ -474,7 +474,7 @@
<simple-method method-name="projectUpdateMemberPermission" short-description="Check Project update Member Permission">
<set field="hasPermission" value="false" type="Boolean"/>
<if-has-permission permission="PROJECT" action="_UPDATE">
- <entity-condition list="workEffortPartyAssignments" entity-name="WorkEffortPartyAssignment">
+ <entity-condition entity-name="WorkEffortPartyAssignment" list="workEffortPartyAssignments">
<condition-list combine="and">
<condition-expr field-name="partyId" from-field="userLogin.partyId"/>
<condition-expr field-name="workEffortId" from-field="parameters.projectId"/>
@@ -489,7 +489,7 @@
<simple-method method-name="taskUpdateMemberPermission" short-description="Check Project update Member Permission">
<set field="hasPermission" value="false" type="Boolean"/>
<if-has-permission permission="TASK" action="_UPDATE">
- <entity-condition list="workEffortPartyAssignments" entity-name="WorkEffortPartyAssignment">
+ <entity-condition entity-name="WorkEffortPartyAssignment" list="workEffortPartyAssignments">
<condition-list combine="and">
<condition-expr field-name="partyId" from-field="userLogin.partyId"/>
<condition-expr field-name="roleTypeId" value="SCRUM_MASTER"/>
@@ -558,7 +558,7 @@
<simple-method method-name="projectTaskCreatePermission" short-description="Check Project Create Task Permission">
<set field="hasPermission" value="false" type="Boolean"/>
<if-has-permission permission="TASK" action="_CREATE">
- <entity-condition list="workEffortPartyAssignments" entity-name="WorkEffortPartyAssignment">
+ <entity-condition entity-name="WorkEffortPartyAssignment" list="workEffortPartyAssignments">
<condition-list combine="and">
<condition-expr field-name="partyId" from-field="userLogin.partyId"/>
<condition-expr field-name="workEffortId" from-field="parameters.projectId"/>
@@ -573,7 +573,7 @@
<simple-method method-name="projectTaskDeletePermission" short-description="Check Project Delete Task Permission">
<set field="hasPermission" value="false" type="Boolean"/>
<if-has-permission permission="TASK" action="_DELETE">
- <entity-condition list="workEffortPartyAssignments" entity-name="WorkEffortPartyAssignment">
+ <entity-condition entity-name="WorkEffortPartyAssignment" list="workEffortPartyAssignments">
<condition-list combine="and">
<condition-expr field-name="partyId" from-field="userLogin.partyId"/>
<condition-expr field-name="workEffortId" from-field="parameters.projectId"/>
diff --git a/specialpurpose/scrum/minilang/ScrumServices.xml b/specialpurpose/scrum/minilang/ScrumServices.xml
index 12df52f..a5a3ab0 100644
--- a/specialpurpose/scrum/minilang/ScrumServices.xml
+++ b/specialpurpose/scrum/minilang/ScrumServices.xml
@@ -27,7 +27,7 @@
</if-compare>
<if-compare field="parameters.mode" value="UP" operator="equals">
<!-- check custRequestTypeId -->
- <entity-one value-field="custRequest" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest"/>
<if-compare field="custRequest.custRequestTypeId" operator="equals" value="RF_UNPLAN_BACKLOG">
<entity-count count-field="getNum" entity-name="CustRequestAndCustRequestItem">
<condition-list combine="and">
@@ -39,7 +39,7 @@
</condition-list>
</condition-list>
</entity-count>
- <entity-condition list="custReq" entity-name="CustRequestAndCustRequestItem">
+ <entity-condition entity-name="CustRequestAndCustRequestItem" list="custReq">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="parameters.productId" />
<condition-expr field-name="custRequestTypeId" operator="equals" value="RF_UNPLAN_BACKLOG"/>
@@ -61,7 +61,7 @@
<condition-expr field-name="statusId" operator="equals" value="CRQ_ACCEPTED"/>
</condition-list>
</entity-count>
- <entity-condition list="custReq" entity-name="CustRequestAndCustRequestItem">
+ <entity-condition entity-name="CustRequestAndCustRequestItem" list="custReq">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="parameters.productId" />
<condition-expr field-name="custRequestTypeId" operator="equals" value="RF_PROD_BACKLOG"/>
@@ -79,7 +79,7 @@
<set field="custReq[i].custSequenceNum" from-field="custReq[i-1].custSequenceNum" />
<set field="custReq[i-1].custSequenceNum" from-field="temp" />
- <entity-one value-field="firstup" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="firstup">
<field-map field-name="custRequestId" from-field="custReq[i].custRequestId" />
</entity-one><!--<log level="always" message="666666666666666666666 firstup : ${firstup}"></log>-->
<set field="firstup.custSequenceNum" from-field="custReq[i].custSequenceNum" />
@@ -91,7 +91,7 @@
</else>
</if-empty>
- <entity-one value-field="lastup" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="lastup">
<field-map field-name="custRequestId" from-field="custReq[i-1].custRequestId" />
</entity-one>
<set field="lastup.custSequenceNum" from-field="custReq[i-1].custSequenceNum" />
@@ -108,7 +108,7 @@
</if-compare>
<!-- DOWN -->
<if-compare field="parameters.mode" value="DWN" operator="equals">
- <entity-one value-field="custRequest" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest"/>
<if-compare field="custRequest.custRequestTypeId" operator="equals" value="RF_UNPLAN_BACKLOG">
<entity-count count-field="getNum" entity-name="CustRequestAndCustRequestItem">
<condition-list combine="and">
@@ -120,7 +120,7 @@
</condition-list>
</condition-list>
</entity-count>
- <entity-condition list="custReq" entity-name="CustRequestAndCustRequestItem">
+ <entity-condition entity-name="CustRequestAndCustRequestItem" list="custReq">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="parameters.productId" />
<condition-expr field-name="custRequestTypeId" operator="equals" value="RF_UNPLAN_BACKLOG"/>
@@ -142,7 +142,7 @@
<condition-expr field-name="statusId" operator="equals" value="CRQ_ACCEPTED"/>
</condition-list>
</entity-count>
- <entity-condition list="custReq" entity-name="CustRequestAndCustRequestItem">
+ <entity-condition entity-name="CustRequestAndCustRequestItem" list="custReq">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="parameters.productId" />
<condition-expr field-name="custRequestTypeId" operator="equals" value="RF_PROD_BACKLOG"/>
@@ -161,7 +161,7 @@
<set field="custReq[i].custSequenceNum" from-field="custReq[i+1].custSequenceNum" />
<set field="custReq[i+1].custSequenceNum" from-field="temp" />
- <entity-one value-field="first" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="first">
<field-map field-name="custRequestId" from-field="custReq[i].custRequestId" />
</entity-one>
<set field="first.custSequenceNum" from-field="custReq[i].custSequenceNum" />
@@ -173,7 +173,7 @@
</else>
</if-empty>
- <entity-one value-field="last" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="last">
<field-map field-name="custRequestId" from-field="custReq[i+1].custRequestId" />
</entity-one>
<set field="last.custSequenceNum" from-field="custReq[i+1].custSequenceNum" />
@@ -190,7 +190,7 @@
</if-compare>
<!-- TOP -->
<if-compare field="parameters.mode" value="TOP" operator="equals">
- <entity-one value-field="custRequest" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest"/>
<if-compare field="custRequest.custRequestTypeId" operator="equals" value="RF_UNPLAN_BACKLOG">
<entity-count count-field="getNum" entity-name="CustRequestAndCustRequestItem">
<condition-list combine="and">
@@ -202,7 +202,7 @@
</condition-list>
</condition-list>
</entity-count>
- <entity-condition list="custReq" entity-name="CustRequestAndCustRequestItem">
+ <entity-condition entity-name="CustRequestAndCustRequestItem" list="custReq">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="parameters.productId" />
<condition-expr field-name="custRequestTypeId" operator="equals" value="RF_UNPLAN_BACKLOG"/>
@@ -224,7 +224,7 @@
<condition-expr field-name="statusId" operator="equals" value="CRQ_ACCEPTED"/>
</condition-list>
</entity-count>
- <entity-condition list="custReq" entity-name="CustRequestAndCustRequestItem">
+ <entity-condition entity-name="CustRequestAndCustRequestItem" list="custReq">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="parameters.productId" />
<condition-expr field-name="custRequestTypeId" operator="equals" value="RF_PROD_BACKLOG"/>
@@ -246,7 +246,7 @@
</if-compare>
</loop>
<loop count="${selectedIndex}" field="j">
- <entity-one value-field="custReqBottom" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custReqBottom">
<field-map field-name="custRequestId" from-field="custReq[j].custRequestId" />
</entity-one>
<set field="custReqBottom.custSequenceNum" from-field="custReq[j+1].custSequenceNum"
@@ -260,7 +260,7 @@
</if-empty>
</loop>
- <entity-one value-field="updatetop" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="updatetop">
<field-map field-name="custRequestId" from-field="selectedCustReq.custRequestId" />
</entity-one>
<set field="updatetop.custSequenceNum" from-field="topCustReq.custSequenceNum"
@@ -275,7 +275,7 @@
</if-compare>
<!-- buttom -->
<if-compare field="parameters.mode" value="BOT" operator="equals">
- <entity-one value-field="custRequest" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest"/>
<if-compare field="custRequest.custRequestTypeId" operator="equals" value="RF_UNPLAN_BACKLOG">
<entity-count count-field="getNum" entity-name="CustRequestAndCustRequestItem">
<condition-list combine="and">
@@ -287,7 +287,7 @@
</condition-list>
</condition-list>
</entity-count>
- <entity-condition list="custReq" entity-name="CustRequestAndCustRequestItem">
+ <entity-condition entity-name="CustRequestAndCustRequestItem" list="custReq">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="parameters.productId" />
<condition-expr field-name="custRequestTypeId" operator="equals" value="RF_UNPLAN_BACKLOG"/>
@@ -309,7 +309,7 @@
<condition-expr field-name="statusId" operator="equals" value="CRQ_ACCEPTED"/>
</condition-list>
</entity-count>
- <entity-condition list="custReq" entity-name="CustRequestAndCustRequestItem">
+ <entity-condition entity-name="CustRequestAndCustRequestItem" list="custReq">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="parameters.productId" />
<condition-expr field-name="custRequestTypeId" operator="equals" value="RF_PROD_BACKLOG"/>
@@ -333,7 +333,7 @@
<loop count="${diffIndex}" field="j"><!--<log level="always" message="////////// j : ${j}"></log>-->
<set field="lowerSeqNum" from-field="custReq[j+selectedIndex].custSequenceNum" />
- <entity-one value-field="update" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="update">
<field-map field-name="custRequestId"
from-field="custReq[j+selectedIndex+1].custRequestId" />
</entity-one>
@@ -348,7 +348,7 @@
</else>
</if-empty>
</loop>
- <entity-one value-field="update2" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="update2">
<field-map field-name="custRequestId" from-field="selectedCustReq.custRequestId" />
</entity-one>
<if-empty field="update2">
@@ -377,13 +377,13 @@
<field-map field-name="workEffortId" from-field="parameters.taskId" />
</entity-one>
<if-not-empty field="task">
- <entity-condition list="sprintList" entity-name="ProjectSprintBacklogAndTask">
+ <entity-condition entity-name="ProjectSprintBacklogAndTask" list="sprintList">
<condition-list combine="and">
<condition-expr field-name="taskId" from-field="parameters.taskId"/>
<condition-expr field-name="sprintTypeId" operator="equals" value="SCRUM_SPRINT"/>
</condition-list>
</entity-condition>
- <entity-one value-field="sprint" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="sprint">
<field-map field-name="workEffortId" from-field="sprintList[0].sprintId"/>
</entity-one>
<else>
@@ -400,14 +400,14 @@
<!-- get project info -->
<if-not-empty field="sprint">
<!-- get project from sprint -->
- <entity-condition list="projectList" entity-name="ProjectSprintBacklogAndTask">
+ <entity-condition entity-name="ProjectSprintBacklogAndTask" list="projectList">
<condition-list combine="and">
<condition-expr field-name="sprintId" from-field="sprint.workEffortId"/>
<condition-expr field-name="sprintTypeId" operator="equals" value="SCRUM_SPRINT"/>
<condition-expr field-name="taskId" from-field="parameters.taskId"/>
</condition-list>
</entity-condition>
- <first-from-list entry="project" list="projectList"/>
+ <first-from-list list="projectList" entry="project"/>
<field-to-result field="project.projectId"
result-name="projectId" />
<field-to-result field="project.projectName"
@@ -429,7 +429,7 @@
value="${project.projectId}.${sprint.sequenceNum}.${task.sequenceNum}" />
<field-to-result field="taskWbsId" />
<else>
- <entity-condition list="tasksDetail" entity-name="ProjectSprintBacklogTaskAndParty">
+ <entity-condition entity-name="ProjectSprintBacklogTaskAndParty" list="tasksDetail">
<condition-list combine="and">
<condition-expr field-name="taskId" from-field="task.workEffortId"/>
</condition-list>
@@ -455,7 +455,7 @@
</if-compare>
<!-- Check : if parameter of workEffortId is leaveTypeId in EmplLeaveType -->
- <entity-one value-field="emplLeaveTypeMap" entity-name="EmplLeaveType">
+ <entity-one entity-name="EmplLeaveType" value-field="emplLeaveTypeMap">
<field-map field-name="leaveTypeId" from-field="parameters.workEffortId"/>
</entity-one>
<if-not-empty field="emplLeaveTypeMap">
@@ -488,7 +488,7 @@
<set field="leaveThruDate" value="${groovy:import java.sql.Timestamp;
return new Timestamp(emplLeaveFromDate.getTime() + ((int) (60L*60L*1000L*hours)));}"/>
<set field="emplLeaveThruDate" from-field="leaveThruDate" type="Timestamp"/>
- <entity-one value-field="emplLeaveMap" entity-name="EmplLeave">
+ <entity-one entity-name="EmplLeave" value-field="emplLeaveMap">
<field-map field-name="partyId" from-field="timesheet.partyId"/>
<field-map field-name="leaveTypeId" from-field="parameters.workEffortId"/>
<field-map field-name="fromDate" from-field="emplLeaveFromDate"/>
@@ -533,7 +533,7 @@
<set field="leaveThruDate" value="${groovy:import java.sql.Timestamp;
return new Timestamp(emplLeaveFromDate.getTime() + ((int) (60L*60L*1000L*hours)));}"/>
<set field="emplLeaveThruDate" from-field="leaveThruDate" type="Timestamp"/>
- <entity-one value-field="emplLeave" entity-name="EmplLeave">
+ <entity-one entity-name="EmplLeave" value-field="emplLeave">
<field-map field-name="partyId" from-field="timesheet.partyId"/>
<field-map field-name="leaveTypeId" from-field="parameters.workEffortId"/>
<field-map field-name="fromDate" from-field="emplLeaveFromDate"/>
@@ -753,7 +753,7 @@
</condition-list>
<order-by field-name="-fromDate" />
</entity-condition>
- <first-from-list entry="lastTimeEntry" list="lastTimeEntrys" />
+ <first-from-list list="lastTimeEntrys" entry="lastTimeEntry" />
<if-not-empty field="lastTimeEntry">
<set field="lastTimeEntry.planHours" from-field="parameters.planHours" />
<set field="lastTimeEntry.rateTypeId" from-field="parameters.rateTypeId" />
@@ -794,7 +794,7 @@
<field-map field-name="partyId" from-field="timesheet.partyId" />
</entity-and>
<if-compare operator="not-equals" value="SCAS_COMPLETED" field="assigns[0].statusId">
- <first-from-list entry="alreadyAssign" list="assigns" />
+ <first-from-list list="assigns" entry="alreadyAssign" />
<if-compare field="alreadyAssign.statusId" value="SCAS_COMPLETED" operator="not-equals">
<set field="upStat.partyId" from-field="timesheet.partyId" />
<set field="upStat.statusId" value="SCAS_COMPLETED" />
@@ -829,7 +829,7 @@
<entity-and entity-name="CustRequestWorkEffort" list="custRequestWorkEffortList">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
- <first-from-list entry="custRequestWorkEffortMap" list="custRequestWorkEffortList"/>
+ <first-from-list list="custRequestWorkEffortList" entry="custRequestWorkEffortMap"/>
<set field="backlogPlanMap.custRequestId" from-field="custRequestWorkEffortMap.custRequestId" />
<set field="taskPlanMap.custRequestId" from-field="custRequestWorkEffortMap.custRequestId" />
<call-service service-name="getScrumPlanHour" in-map-name="backlogPlanMap">
@@ -839,7 +839,7 @@
<result-to-field result-name="initPlanHours"/>
</call-service>
<if-compare-field field="planHours" operator="greater" to-field="initPlanHours" type="Double">
- <entity-one value-field="custRequestMap" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequestMap">
<field-map field-name="custRequestId" from-field="custRequestWorkEffortMap.custRequestId"/>
</entity-one>
<set field="planHoursIn" from-field="planHours" type="Double"/>
@@ -847,7 +847,7 @@
<store-value value-field="custRequestMap"/>
<else>
<if-compare-field field="initPlanHours" operator="greater" to-field="planHours" type="Double">
- <entity-one value-field="custRequestMap" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequestMap">
<field-map field-name="custRequestId" from-field="custRequestWorkEffortMap.custRequestId"/>
</entity-one>
<set field="planHoursIn" from-field="planHours" type="Double"/>
@@ -938,7 +938,7 @@
</entity-and>
</if-not-empty>
<if-empty field="resultCustType">
- <entity-condition list="tasks" entity-name="ProjectSprintBacklogAndTask">
+ <entity-condition entity-name="ProjectSprintBacklogAndTask" list="tasks">
<condition-list combine="and">
<condition-expr field-name="projectId" operator="equals" from-field="parameters.projectId" ignore-if-empty="true" />
<condition-expr field-name="sprintId" operator="equals" from-field="parameters.sprintId" ignore-if-empty="true" />
@@ -956,13 +956,13 @@
<iterate list="tasks" entry="task">
<set field="taskIdCond[+0]" from-field="task.taskId" />
</iterate>
- <entity-condition list="timeEntries" entity-name="TimeEntry">
+ <entity-condition entity-name="TimeEntry" list="timeEntries">
<condition-expr field-name="workEffortId" operator="in" from-field="taskIdCond" />
<order-by field-name="workEffortId" />
</entity-condition>
</if-not-empty>
<else>
- <entity-condition list="tasks" entity-name="UnPlannedBacklogsAndTasks">
+ <entity-condition entity-name="UnPlannedBacklogsAndTasks" list="tasks">
<condition-list combine="and">
<condition-expr field-name="custRequestId" from-field="parameters.custRequestId"/>
<condition-expr field-name="custRequestTypeId" value="RF_UNPLAN_BACKLOG"/>
@@ -978,7 +978,7 @@
<iterate list="tasks" entry="task">
<set field="taskIdCond[+0]" from-field="task.workEffortId" />
</iterate>
- <entity-condition list="timeEntries" entity-name="TimeEntry">
+ <entity-condition entity-name="TimeEntry" list="timeEntries">
<condition-expr field-name="workEffortId" operator="in" from-field="taskIdCond" />
<order-by field-name="workEffortId" />
</entity-condition>
@@ -986,7 +986,7 @@
</else>
</if-empty>
<if-empty field="taskIdCond">
- <entity-condition list="tasks" entity-name="CustRequestAndWorkEffort">
+ <entity-condition entity-name="CustRequestAndWorkEffort" list="tasks">
<condition-list combine="and">
<condition-expr field-name="custRequestId" from-field="parameters.custRequestId"/>
<condition-list combine="or">
@@ -1001,7 +1001,7 @@
<iterate list="tasks" entry="task">
<set field="taskIdCond[+0]" from-field="task.workEffortId" />
</iterate>
- <entity-condition list="timeEntries" entity-name="TimeEntry">
+ <entity-condition entity-name="TimeEntry" list="timeEntries">
<condition-expr field-name="workEffortId" operator="in" from-field="taskIdCond" />
<order-by field-name="workEffortId" />
</entity-condition>
@@ -1012,7 +1012,7 @@
<!-- get time entry from task -->
<if-not-empty field="parameters.taskId">
- <entity-condition list="timeEntries" entity-name="TimeEntry">
+ <entity-condition entity-name="TimeEntry" list="timeEntries">
<condition-list combine="and">
<condition-expr field-name="workEffortId" from-field="parameters.taskId"/>
<condition-expr field-name="partyId" from-field="parameters.partyId" ignore-if-empty="true"/>
@@ -1020,12 +1020,12 @@
</entity-condition>
<else>
<if-not-empty field="taskIdCond">
- <entity-condition list="timeEntries" entity-name="TimeEntry">
+ <entity-condition entity-name="TimeEntry" list="timeEntries">
<condition-list combine="and">
<condition-expr field-name="workEffortId" operator="in" from-field="taskIdCond"/>
</condition-list>
</entity-condition>
- <entity-condition list="listTimeEntriesNotBill" entity-name="TimeEntry">
+ <entity-condition entity-name="TimeEntry" list="listTimeEntriesNotBill">
<condition-list combine="and">
<condition-expr field-name="workEffortId" operator="in" from-field="taskIdCond"/>
<condition-expr field-name="invoiceId" operator="equals" from-field="nullField"/>
@@ -1055,7 +1055,7 @@
<field-map field-name="partyId" from-field="timeEntryNotBill.partyId"/>
</entity-and>
<if-not-empty field="partyRates">
- <first-from-list entry="partyRate" list="partyRates"/>
+ <first-from-list list="partyRates" entry="partyRate"/>
<if-not-empty field="partyRate.percentageUsed">
<calculate field="timeEntryNotBill.hours" type="Double">
<calcop operator="multiply" field="timeEntryNotBill.hours">
@@ -1085,7 +1085,7 @@
<simple-method method-name="getScrumActualHourByTimesheet" short-description=" Get actual hour from (TimeSheet).">
<if-not-empty field="parameters.timesheetId">
- <entity-condition list="timeEntries" entity-name="TimeEntry">
+ <entity-condition entity-name="TimeEntry" list="timeEntries">
<condition-list combine="and">
<condition-expr field-name="timesheetId" from-field="parameters.timesheetId"/>
</condition-list>
@@ -1235,7 +1235,7 @@
<set field="notFirst" value="Y" /><!-- do not create, only add -->
</if-compare>
<!-- get partyId in Company -->
- <entity-condition list="listPartyIdInCompany" entity-name="PartyRelationship">
+ <entity-condition entity-name="PartyRelationship" list="listPartyIdInCompany">
<condition-list combine="and">
<condition-expr field-name="partyIdFrom" from-field="parameters.partyIdFrom"/>
<condition-expr field-name="roleTypeIdFrom" value="ACCOUNT" />
@@ -1273,7 +1273,7 @@
</condition-list>
</entity-condition>
<!-- get tasks from cancelled backlog item -->
- <entity-condition list="cancelledBacklogTasks" entity-name="CancelledBacklogsTaskAndTimeEntryTimeSheet">
+ <entity-condition entity-name="CancelledBacklogsTaskAndTimeEntryTimeSheet" list="cancelledBacklogTasks">
<condition-list combine="and">
<condition-expr field-name="productId" operator="equals" from-field="parameters.productId" />
<condition-expr field-name="invoiceId" operator="equals" from-field="nullField" />
@@ -1285,7 +1285,7 @@
</condition-list>
</entity-condition>
<!-- get unplanned task -->
- <entity-condition list="unplannedTasks" entity-name="UnPlannedBacklogsTaskAndTimeEntryTimeSheet">
+ <entity-condition entity-name="UnPlannedBacklogsTaskAndTimeEntryTimeSheet" list="unplannedTasks">
<condition-list combine="and">
<condition-expr field-name="productId" operator="equals" from-field="parameters.productId" />
<condition-expr field-name="invoiceId" operator="equals" from-field="nullField" />
@@ -1449,7 +1449,7 @@
<set field="invoiceItemMap.description" value="${workEffort.workEffortName} [Task:${workEffort.workEffortId}]"/>
<get-related value-field="workEffort" relation-name="CustRequestWorkEffort" list="custRequestWorkEfforts"/>
<if-not-empty field="custRequestWorkEfforts">
- <first-from-list entry="custRequestWorkEffort" list="custRequestWorkEfforts"/>
+ <first-from-list list="custRequestWorkEfforts" entry="custRequestWorkEffort"/>
<get-related-one value-field="custRequestWorkEffort" relation-name="CustRequest" to-value-field="custRequest"/>
<if-not-empty field="custRequest">
<if-compare field="custRequest.custRequestTypeId" operator="equals" value="RF_SCRUM_MEETINGS" >
@@ -1497,7 +1497,7 @@
<field-map field-name="partyId" from-field="timeEntry.partyId"/>
</entity-and>
<if-not-empty field="partyRates">
- <first-from-list entry="partyRate" list="partyRates"/>
+ <first-from-list list="partyRates" entry="partyRate"/>
<if-not-empty field="partyRate.percentageUsed">
<calculate field="timeEntry.hours" type="Double">
<calcop operator="multiply" field="timeEntry.hours">
@@ -1683,7 +1683,7 @@
</condition-list>
<order-by field-name="-fromDate" />
</entity-condition>
- <first-from-list entry="planTimeEntry" list="listPlanHoursByPartyId"/>
+ <first-from-list list="listPlanHoursByPartyId" entry="planTimeEntry"/>
<if-not-empty field="planTimeEntry">
<calculate field="taskPlanHours" type="Double">
<calcop operator="add" field="planTimeEntry.planHours">
@@ -1694,7 +1694,7 @@
</loop>
</if-not-empty>
<else>
- <first-from-list entry="timeEntry" list="timeEntries" />
+ <first-from-list list="timeEntries" entry="timeEntry" />
<!-- Check if have TimeEntry -->
<if-not-empty field="timeEntry">
<calculate field="taskPlanHours" type="Double">
@@ -1752,7 +1752,7 @@
</if-not-empty>
<else>
- <entity-condition list="tasks" entity-name="UnPlannedBacklogsAndTasks">
+ <entity-condition entity-name="UnPlannedBacklogsAndTasks" list="tasks">
<condition-list combine="and">
<condition-expr field-name="custRequestId" from-field="parameters.custRequestId"/>
<condition-expr field-name="custRequestTypeId" value="RF_UNPLAN_BACKLOG"/>
@@ -1778,7 +1778,7 @@
</if-not-empty>
</else>
</if-empty>
- <entity-one value-field="custRequestMap" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequestMap"/>
<if-compare field="custRequestMap.statusId" operator="equals" value="CRQ_ACCEPTED">
<get-related relation-name="CustRequestWorkEffort" list="custWorkEffList" value-field="custRequestMap"/>
<if-not-empty field="custWorkEffList">
@@ -1988,7 +1988,7 @@
</condition-list>
<order-by field-name="-fromDate" />
</entity-condition>
- <first-from-list entry="lastTimeEntry" list="lastTimeEntrys" />
+ <first-from-list list="lastTimeEntrys" entry="lastTimeEntry" />
<if-not-empty field="lastTimeEntry">
<set field="planHours" from-field="lastTimeEntry.planHours" />
</if-not-empty>
@@ -2013,7 +2013,7 @@
<set field="status" value="SRPINT_ACTIVE" />
<set field="curDate" type="Timestamp" />
<set field="projectId" from-field="sprint.workEffortParentId" />
- <entity-one value-field="project" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="project">
<field-map field-name="workEffortId" from-field="projectId" />
</entity-one>
<if-not-empty field="project">
@@ -2092,7 +2092,7 @@
</if-not-empty>
<if-not-empty field="custRequest">
<calculate field="defaultBacklogPlanHours" type="Double">
- <calcop field="custRequest.custEstimatedMilliSeconds" operator="divide">
+ <calcop operator="divide" field="custRequest.custEstimatedMilliSeconds">
<number value="3600000" />
</calcop>
</calculate>
@@ -2115,8 +2115,8 @@
<if-compare field="taskPlanHours" operator="greater"
value="0" type="Double">
<calculate field="planHours" type="Double">
- <calcop field="planHours" operator="subtract">
- <calcop field="taskPlanHours" operator="get" />
+ <calcop operator="subtract" field="planHours">
+ <calcop operator="get" field="taskPlanHours" />
</calcop>
</calculate>
</if-compare>
@@ -2145,8 +2145,8 @@
<result-to-field result-name="planHours" field="taskPlanChack" />
</call-service>
<calculate field="totalTaskPlanHours" type="Double">
- <calcop field="taskPlanChack" operator="add">
- <calcop field="totalTaskPlanHours" operator="get" />
+ <calcop operator="add" field="taskPlanChack">
+ <calcop operator="get" field="totalTaskPlanHours" />
</calcop>
</calculate>
</iterate>
@@ -2166,8 +2166,8 @@
</then>
<else>
<calculate field="newPlanHours" type="Double">
- <calcop field="planHours" operator="add">
- <calcop field="parameters.planHours" operator="get" />
+ <calcop operator="add" field="planHours">
+ <calcop operator="get" field="parameters.planHours" />
</calcop>
</calculate>
</else>
@@ -2199,7 +2199,7 @@
<set field="sequenceNumStep" value="1" type="Long" />
<iterate list="custRequestAndCustRequestItems" entry="custRequestAndCustRequestItem">
<!-- update custSequenceNum field of cust request -->
- <entity-one value-field="custRequest" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequest">
<field-map field-name="custRequestId"
from-field="custRequestAndCustRequestItem.custRequestId" />
</entity-one>
@@ -2220,9 +2220,9 @@
<entity-and entity-name="CustRequestWorkEffort" list="sprintBacklogs">
<field-map field-name="workEffortId" from-field="parameters.workEffortId" />
</entity-and>
- <first-from-list entry="sprintBacklog" list="sprintBacklogs" />
+ <first-from-list list="sprintBacklogs" entry="sprintBacklog" />
<set field="custRequestId" from-field="sprintBacklog.custRequestId" />
- <entity-one value-field="custRequestMap" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequestMap"/>
<set field="custRequestTypeId" from-field="custRequestMap.custRequestTypeId" />
<if-not-empty field="custRequestId">
<if-compare field="custRequestTypeId" operator="equals" value="RF_UNPLAN_BACKLOG">
@@ -2290,11 +2290,11 @@
</and>
</condition>
<then>
- <entity-one value-field="custRequest" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequest">
<field-map field-name="custRequestId" from-field="custRequestId"/>
</entity-one>
<if-compare operator="not-equals" value="CRQ_COMPLETED" field="custRequest.statusId">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<if-empty field="custRequest.custRequestName">
@@ -2313,7 +2313,7 @@
<set field="custRequest.fromPartyId" from-field="productRole[0].partyId"/>
</if-compare>
</if-empty>
- <set-service-fields service-name="updateCustRequest" to-map="updateCustRequest" map="custRequest"/>
+ <set-service-fields service-name="updateCustRequest" map="custRequest" to-map="updateCustRequest"/>/>
<set field="updateCustRequest.webSiteId" from-field="parameters.webSiteId"/>
<call-service service-name="updateCustRequest" in-map-name="updateCustRequest"/>
<log level="info" message="Completed Sprint Backlog # ${custRequestId}"/>
@@ -2326,7 +2326,7 @@
<entity-one entity-name="WorkEffort" value-field="resultWorkEffort">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-one>
- <entity-condition list="listCustInSprint" entity-name="CustRequestAndWorkEffort" distinct="true">
+ <entity-condition entity-name="CustRequestAndWorkEffort" list="listCustInSprint" distinct="true">
<condition-list combine="and">
<condition-expr field-name="workEffortId" from-field="resultWorkEffort.workEffortParentId"/>
</condition-list>
@@ -2448,15 +2448,15 @@
</simple-method>
<simple-method method-name="checkProductOwnerOfSprint" short-description="Check Product Owner Of Sprint">
<set field="isProductOwner" type="Boolean" value="false"/>
- <entity-one value-field="projectMap" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="projectMap">
<field-map field-name="workEffortId" from-field="parameters.sprintId"/>
</entity-one>
<entity-and entity-name="WorkEffortAndProduct" list="productList">
<field-map field-name="workEffortId" from-field="projectMap.workEffortParentId"/>
</entity-and>
- <first-from-list entry="productMap" list="productList"/>
+ <first-from-list list="productList" entry="productMap"/>
<if-not-empty field="productMap.productId">
- <entity-condition list="productRoles" entity-name="ProductRole">
+ <entity-condition entity-name="ProductRole" list="productRoles">
<condition-list combine="and">
<condition-expr field-name="roleTypeId" value="PRODUCT_OWNER"/>
<condition-expr field-name="productId" from-field="productMap.productId"/>
@@ -2468,12 +2468,12 @@
</if-not-empty>
</simple-method>
<simple-method method-name="checkProductOwnerOfBacklog" short-description="Check Product Owner Of Backlog">
- <entity-condition list="custRequestItems" entity-name="CustRequestItem">
+ <entity-condition entity-name="CustRequestItem" list="custRequestItems">
<condition-expr field-name="custRequestId" from-field="parameters.custRequestId"/>
</entity-condition>
- <first-from-list entry="custRequestItem" list="custRequestItems"/>
+ <first-from-list list="custRequestItems" entry="custRequestItem"/>
<if-not-empty field="custRequestItem.productId">
- <entity-condition list="productRoles" entity-name="ProductRole">
+ <entity-condition entity-name="ProductRole" list="productRoles">
<condition-list combine="and">
<condition-expr field-name="roleTypeId" value="PRODUCT_OWNER"/>
<condition-expr field-name="productId" from-field="custRequestItem.productId"/>
@@ -2513,7 +2513,7 @@
<if-not-empty field="committer">
<set field="committer" value="${groovy: committer.toString().trim();}"/>
</if-not-empty>
- <entity-one value-field="user" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="user">
<field-map field-name="userLoginId" from-field="committer"/>
</entity-one>
<if-empty field="user">
@@ -2524,7 +2524,7 @@
</entity-and>
<if-not-empty field="partyIdenList">
<first-from-list entry="partyIdenMap" list="partyIdenList"/>
- <entity-one value-field="user" entity-name="Party">
+ <entity-one entity-name="Party" value-field="user">
<field-map field-name="partyId" from-field="partyIdenMap.partyId"/>
</entity-one>
<else>
@@ -2535,7 +2535,7 @@
</else>
</if-not-empty>
</if-empty>
- <entity-one value-field="task" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="task">
<field-map field-name="workEffortId" from-field="parameters.taskId"/>
</entity-one>
<if-not-empty field="task">
@@ -2544,7 +2544,7 @@
<field-map field-name="roleTypeId" value="OWNER"/>
</entity-and>
<set field="contentIds" type="List" value="${groovy:return org.apache.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(contentRoles, "contentId", true)}"/>
- <entity-condition list="listIt" entity-name="WorkEffortAndContentDataResource">
+ <entity-condition entity-name="WorkEffortAndContentDataResource" list="listIt">
<condition-list combine="and">
<condition-expr field-name="workEffortId" from-field="parameters.taskId"/>
<condition-expr field-name="contentId" from-field="contentIds" operator="in"/>
@@ -2562,7 +2562,7 @@
<set field="parameters.objectInfo" from-field="parameters.revisionLink"/>
<set field="parameters.mimeTypeId" value="text/plain"/>
- <set-service-fields service-name="createDataResource" to-map="newDataResource" map="parameters"/>
+ <set-service-fields service-name="createDataResource" map="parameters" to-map="newDataResource"/>/>
<call-service service-name="createDataResource" in-map-name="newDataResource">
<result-to-field result-name="dataResourceId" field="parameters.dataResourceId"/>
</call-service>
@@ -2571,14 +2571,14 @@
<set field="parameters.partyId" from-field="user.partyId"/>
<set field="parameters.contentName" value="R${parameters.revisionNumber}"/>
<set field="parameters.description" from-field="parameters.revisionDescription"/>
- <set-service-fields service-name="createContent" to-map="newContent" map="parameters"/>
+ <set-service-fields service-name="createContent" map="parameters" to-map="newContent"/>/>
<call-service service-name="createContent" in-map-name="newContent">
<result-to-field result-name="contentId" field="parameters.contentId"/>
</call-service>
<set field="parameters.workEffortContentTypeId" value="TASK_SUB_INFO"/>
<set field="parameters.workEffortId" from-field="task.workEffortId"/>
- <set-service-fields service-name="createWorkEffortContent" to-map="newWorkEffortContent" map="parameters"/>
+ <set-service-fields service-name="createWorkEffortContent" map="parameters" to-map="newWorkEffortContent"/>/>
<call-service service-name="createWorkEffortContent" in-map-name="newWorkEffortContent"/>
<!-- check if party assigned to task-->
@@ -2588,7 +2588,7 @@
</entity-and>
<!-- create link from partyId to svn name -->
<if-not-empty field="assignList">
- <entity-one value-field="partyIdenMap" entity-name="PartyIdentification">
+ <entity-one entity-name="PartyIdentification" value-field="partyIdenMap">
<field-map field-name="partyId" from-field="user.partyId"/>
<field-map field-name="partyIdentificationTypeId" value="SVN_LOGIN"/>
</entity-one>
@@ -2641,7 +2641,7 @@
</and>
</condition>
<then>
- <first-from-list entry="timesheetMap" list="timesheetList"/>
+ <first-from-list list="timesheetList" entry="timesheetMap"/>
<set field="planHourMap.taskId" from-field="task.workEffortId"/>
<set field="planHourMap.userLogin" from-field="userLogin"/>
<call-service service-name="getScrumPlanHour" in-map-name="planHourMap">
@@ -2655,7 +2655,7 @@
<field-map field-name="workEffortId" from-field="task.workEffortId"/>
</entity-and>
<if-not-empty field="timeEntryList">
- <first-from-list entry="timeEntryMap" list="timeEntryList"/>
+ <first-from-list list="timeEntryList" entry="timeEntryMap"/>
<!-- remove old planned hour -->
<if-not-empty field="planHours">
<calculate field="planHours">
@@ -2698,7 +2698,7 @@
<entity-and entity-name="CustRequestWorkEffort" list="custRequestWorkEffortList">
<field-map field-name="workEffortId" from-field="task.workEffortId"/>
</entity-and>
- <first-from-list entry="custRequestWorkEffortMap" list="custRequestWorkEffortList"/>
+ <first-from-list list="custRequestWorkEffortList" entry="custRequestWorkEffortMap"/>
<set field="backlogPlanMap.custRequestId" from-field="custRequestWorkEffortMap.custRequestId" />
<set field="backlogPlanMap.userLogin" from-field="userLogin"/>
<set field="taskPlanMap.custRequestId" from-field="custRequestWorkEffortMap.custRequestId" />
@@ -2710,7 +2710,7 @@
<result-to-field result-name="initPlanHours"/>
</call-service>
<if-compare-field field="planHours" operator="greater" to-field="initPlanHours" type="Double">
- <entity-one value-field="custRequestMap" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequestMap">
<field-map field-name="custRequestId" from-field="custRequestWorkEffortMap.custRequestId"/>
</entity-one>
<set field="planHoursIn" from-field="planHours" type="Double"/>
@@ -2718,7 +2718,7 @@
<store-value value-field="custRequestMap"/>
<else>
<if-compare-field field="initPlanHours" operator="greater" to-field="planHours" type="Double">
- <entity-one value-field="custRequestMap" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custRequestMap">
<field-map field-name="custRequestId" from-field="custRequestWorkEffortMap.custRequestId"/>
</entity-one>
<set field="planHoursIn" from-field="planHours" type="Double"/>
@@ -2739,7 +2739,7 @@
</simple-method>
<simple-method method-name="getPartyLeaveHoursForDate" short-description="Get party leave hours for date.">
- <entity-one value-field="emplLeaveMap" entity-name="EmplLeave">
+ <entity-one entity-name="EmplLeave" value-field="emplLeaveMap">
<field-map field-name="partyId" from-field="parameters.partyId"/>
<field-map field-name="leaveTypeId" from-field="parameters.leaveTypeId"/>
<field-map field-name="fromDate" from-field="parameters.fromDate"/>
diff --git a/specialpurpose/scrum/minilang/test/DailyMeetingMinuteTests.xml b/specialpurpose/scrum/minilang/test/DailyMeetingMinuteTests.xml
index 2ecff5d..b7073f1 100644
--- a/specialpurpose/scrum/minilang/test/DailyMeetingMinuteTests.xml
+++ b/specialpurpose/scrum/minilang/test/DailyMeetingMinuteTests.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="testDailyMinute" short-description="Daily Meeting Minute Test" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
diff --git a/specialpurpose/scrum/minilang/test/MyWorkTests.xml b/specialpurpose/scrum/minilang/test/MyWorkTests.xml
index eff539b..03b60a2 100644
--- a/specialpurpose/scrum/minilang/test/MyWorkTests.xml
+++ b/specialpurpose/scrum/minilang/test/MyWorkTests.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="testUpdateTimesheetEntryByWorkeffortNotComplete" short-description="Test update timesheet entry by workeffort" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="scrumteam1"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -34,7 +34,7 @@
</simple-method>
<simple-method method-name="testUpdateTimesheetEntryByWorkeffortComplete" short-description="Test update timesheet entry by workeffort" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="scrumteam1"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -46,7 +46,7 @@
<call-service service-name="updateTimesheetEntryByWorkeffort" in-map-name="inMap"></call-service>
</simple-method>
<simple-method method-name="testUpdateTask" short-description="Test update tasks" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="scrumteam2"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -58,7 +58,7 @@
</simple-method>
<simple-method method-name="testRemoveTaskAssignToMe" short-description="Test remove task assign to me" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="scrumteam2"/>
</entity-one>
<entity-and entity-name="WorkEffortPartyAssignment" list="listWorkAssignment">
@@ -74,7 +74,7 @@
</simple-method>
<simple-method method-name="testAddNewTimesheet" short-description="Test add a new timesheet" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="scrumteam2"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -84,7 +84,7 @@
</call-service>
</simple-method>
<simple-method method-name="testSetTimeSheetStatusToComplete" short-description="Test set timesheet status to complete" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="scrumteam2"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
diff --git a/specialpurpose/scrum/minilang/test/ProductBacklogTest.xml b/specialpurpose/scrum/minilang/test/ProductBacklogTest.xml
index 461a0a6..c549df8 100644
--- a/specialpurpose/scrum/minilang/test/ProductBacklogTest.xml
+++ b/specialpurpose/scrum/minilang/test/ProductBacklogTest.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="testCreateProductBacklogByAdmin" short-description="Test Create Product Backlog" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -34,7 +34,7 @@
</simple-method>
<simple-method method-name="testCreateProductBacklogByProductOwner" short-description="Test Create Product Backlog" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="productowner"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -46,7 +46,7 @@
</simple-method>
<simple-method method-name="testCreateProductBacklogByScrumMaster" short-description="Test Create Product Backlog" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="scrummaster"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -58,7 +58,7 @@
</simple-method>
<simple-method method-name="testUpdateProductBacklogByAdmin" short-description="Test Update Product Backlog" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -71,7 +71,7 @@
</simple-method>
<simple-method method-name="testUpdateProductBacklogByProductOwner" short-description="Test Update Product Backlog" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="productowner"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -88,14 +88,14 @@
</simple-method>
<simple-method method-name="testDeleteProductBacklogByAdmin" short-description="Test Delete Product Backlog" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
<set field="parameters.userLogin" from-field="userLogin"/>
<set field="parameters.productId" value="DEMO-PRODUCT-1"/>
<set field="parameters.custRequestId" value="TEST5"/>
- <entity-one value-field="result" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="result">
<field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
</entity-one>
<if-compare operator="equals" value="CRQ_ACCEPTED" field="result.statusId">
@@ -104,14 +104,14 @@
</simple-method>
<simple-method method-name="testDeleteProductBacklogByProducOwner" short-description="Test Delete Product Backlog" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="productowner"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
<set field="parameters.userLogin" from-field="userLogin"/>
<set field="parameters.productId" value="DEMO-PRODUCT-1"/>
<set field="parameters.custRequestId" value="TEST6"/>
- <entity-one value-field="result" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="result">
<field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
</entity-one>
<if-compare operator="equals" value="CRQ_ACCEPTED" field="result.statusId">
@@ -120,7 +120,7 @@
</simple-method>
<simple-method method-name="testDeleteProductBacklogByScrumMaster" short-description="Test Delete Product Backlog" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="scrummaster"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -131,7 +131,7 @@
</simple-method>
<simple-method method-name="testCreateBacklogSetStatus" short-description=" Test Set Status Create Product Backlog" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="productowner"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -143,11 +143,11 @@
</simple-method>
<simple-method method-name="testCreateDefaultBacklogs" short-description="Test Create DefaultBacklogs" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
- <entity-one value-field="workEffort" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="workEffort">
<field-map field-name="workEffortId" value="DEMO-PROJECT-1"/>
</entity-one>
<set field="parameters.workEffortName" value="Test Default Task"/>
@@ -160,7 +160,7 @@
</simple-method>
<simple-method method-name="testCreateProductBacklogCategory" short-description="Test Create Product Backlog Category" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -171,7 +171,7 @@
</simple-method>
<simple-method method-name="testUpdateProductBacklogCategory" short-description="Test Update Product Backlog Category" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -182,7 +182,7 @@
</simple-method>
<simple-method method-name="testNewProductBacklogEmail" short-description="Test New Product Backlog Email" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="serviceCtx.userLogin" from-field="userLogin"/>
@@ -196,7 +196,7 @@
</simple-method>
<simple-method method-name="testUpdateProductBacklogEmail" short-description="Test Update Product Backlog Email" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="serviceCtx.userLogin" from-field="userLogin"/>
@@ -209,7 +209,7 @@
</simple-method>
<simple-method method-name="testUpdateSprintBacklogseqDown" short-description="Test Update Sprint Backlog Sequence on Down" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="serviceCtx.userLogin" from-field="userLogin"/>
@@ -222,7 +222,7 @@
<call-service service-name="updateSprintBacklogseq" in-map-name="serviceCtx"/>
</simple-method>
<simple-method method-name="testUpdateSprintBacklogseqUP" short-description="Test Update Sprint Backlog Sequence on UP" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="serviceCtx.userLogin" from-field="userLogin"/>
@@ -235,7 +235,7 @@
<call-service service-name="updateSprintBacklogseq" in-map-name="serviceCtx"/>
</simple-method>
<simple-method method-name="testUpdateSprintBacklogseqBotton" short-description="Test Update Sprint Backlog Sequence on Botton" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="serviceCtx.userLogin" from-field="userLogin"/>
@@ -248,7 +248,7 @@
<call-service service-name="updateSprintBacklogseq" in-map-name="serviceCtx"/>
</simple-method>
<simple-method method-name="testUpdateSprintBacklogseqTOP" short-description="Test Update Sprint Backlog Sequence on TOP" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="serviceCtx.userLogin" from-field="userLogin"/>
diff --git a/specialpurpose/scrum/minilang/test/ProductTest.xml b/specialpurpose/scrum/minilang/test/ProductTest.xml
index 3c850db..af878dc 100644
--- a/specialpurpose/scrum/minilang/test/ProductTest.xml
+++ b/specialpurpose/scrum/minilang/test/ProductTest.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="testCreateProductByAdmin" short-description="" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -37,7 +37,7 @@
</simple-method>
<simple-method method-name="testUpdateProductByAdmin" short-description="" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
diff --git a/specialpurpose/scrum/minilang/test/QATests.xml b/specialpurpose/scrum/minilang/test/QATests.xml
index 5a75b1d..8a14e19 100644
--- a/specialpurpose/scrum/minilang/test/QATests.xml
+++ b/specialpurpose/scrum/minilang/test/QATests.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="testCreateTestTask" short-description="" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="testadmin"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
diff --git a/specialpurpose/scrum/minilang/test/ScrumProjectTests.xml b/specialpurpose/scrum/minilang/test/ScrumProjectTests.xml
index 6967360..5054e94 100644
--- a/specialpurpose/scrum/minilang/test/ScrumProjectTests.xml
+++ b/specialpurpose/scrum/minilang/test/ScrumProjectTests.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="testCreateScrumProjectByProductOwner" short-description="Test Create Scrum Project" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="productowner"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -37,7 +37,7 @@
</simple-method>
<simple-method method-name="testUpdateScrumProjectByProductOwner" short-description="Test Create Scrum Project" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="productowner"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -52,7 +52,7 @@
</simple-method>
<simple-method method-name="testUpdateScrumProjectByScrumMaster" short-description="Test Create Scrum Project" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="productowner"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -67,7 +67,7 @@
</simple-method>
<simple-method method-name="testCloseScrumProject" short-description="Test Close Scrum Project " login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
diff --git a/specialpurpose/scrum/minilang/test/SprintBacklogTests.xml b/specialpurpose/scrum/minilang/test/SprintBacklogTests.xml
index a901823..630f520 100644
--- a/specialpurpose/scrum/minilang/test/SprintBacklogTests.xml
+++ b/specialpurpose/scrum/minilang/test/SprintBacklogTests.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="testcreateSprintBacklogByAdmin" short-description="" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -32,7 +32,7 @@
</simple-method>
<simple-method method-name="testcreateSprintBacklogByScrummaster" short-description="" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="scrummaster"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -43,7 +43,7 @@
</simple-method>
<simple-method method-name="testdeleteSprintBacklogByAdmin" short-description="" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -53,7 +53,7 @@
</simple-method>
<simple-method method-name="testdeleteSprintBacklogByScurmmaster" short-description="" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="scrummaster"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
diff --git a/specialpurpose/scrum/minilang/test/SprintTests.xml b/specialpurpose/scrum/minilang/test/SprintTests.xml
index 6dfd059..d48c0bd 100644
--- a/specialpurpose/scrum/minilang/test/SprintTests.xml
+++ b/specialpurpose/scrum/minilang/test/SprintTests.xml
@@ -22,18 +22,18 @@
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="testUpdateSprintBacklog" short-description="Update Sprint Backlog" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="parameters.custRequestId" value="TEST9"/>
<set field="parameters.estimatedMilliSeconds" value="36000000"/>
<set field="parameters.userLogin" from-field="userLogin"/>
- <set-service-fields service-name="updateCustRequest" to-map="inMap" map="parameters"/>
+ <set-service-fields service-name="updateCustRequest" map="parameters" to-map="inMap"/>/>
<call-service service-name="updateCustRequest" in-map-name="inMap"/>
</simple-method>
<simple-method method-name="testCreateSprintByScrummaster" short-description="Test Create Sprint By Scrummaster" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="scrummaster"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -62,7 +62,7 @@
</simple-method>
<simple-method method-name="testCreateSprintByAdmin" short-description="Test Create Sprint By Admin" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -91,7 +91,7 @@
</simple-method>
<simple-method method-name="testAddSprintMember" short-description="Test add Sprint member" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="scrummaster"/>
</entity-one>
<set field="parameters.workEffortId" value="DEMO-SPRINT-1"/>
@@ -104,7 +104,7 @@
</simple-method>
<simple-method method-name="testRemoveSprintMember" short-description="Test remove Sprint member" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="scrummaster"/>
</entity-one>
<set field="parameters.workEffortId" value="DEMO-SPRINT-1"/>
diff --git a/specialpurpose/scrum/minilang/test/TaskTests.xml b/specialpurpose/scrum/minilang/test/TaskTests.xml
index 878199c..e072331 100644
--- a/specialpurpose/scrum/minilang/test/TaskTests.xml
+++ b/specialpurpose/scrum/minilang/test/TaskTests.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="testViewScrumRevision" short-description="Test View Scrum Revision" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -41,7 +41,7 @@
<check-errors/>
</simple-method>
<simple-method method-name="testRetrieveMissingScrumRevision" short-description="Test Retrieve Missing Scrum Revision" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -59,7 +59,7 @@
<check-errors/>
</simple-method>
<simple-method method-name="testRemoveDuplicateScrumRevision" short-description="Test Remove Duplicate Scrum Revision" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
diff --git a/specialpurpose/scrum/minilang/test/TimesheetTests.xml b/specialpurpose/scrum/minilang/test/TimesheetTests.xml
index ae63fee..4a3cbbe 100644
--- a/specialpurpose/scrum/minilang/test/TimesheetTests.xml
+++ b/specialpurpose/scrum/minilang/test/TimesheetTests.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="testTimesheetToComplete" short-description="Test set timesheet status to complete" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="scrumteam2"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
@@ -31,7 +31,7 @@
<call-service service-name="updateTimesheet" in-map-name="inMap"></call-service>
</simple-method>
<simple-method method-name="testTimesheetToInProcess" short-description="Test set timesheet status to In Process" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="scrumteam2"/>
</entity-one>
<set-current-user-login value-field="userLogin"/>
diff --git a/specialpurpose/scrum/widget/CommonScreens.xml b/specialpurpose/scrum/widget/CommonScreens.xml
index c0f078e..1ac7613 100644
--- a/specialpurpose/scrum/widget/CommonScreens.xml
+++ b/specialpurpose/scrum/widget/CommonScreens.xml
@@ -512,7 +512,7 @@
<section>
<actions>
<set field="headerItem" value="Sprints"/>
- <entity-one value-field="sprint" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="sprint">
<field-map field-name="workEffortId" from-field="parameters.sprintId"/>
</entity-one>
<set field="parameters.projectId" from-field="sprint.workEffortParentId"/>
diff --git a/specialpurpose/scrum/widget/CommunicationEventForms.xml b/specialpurpose/scrum/widget/CommunicationEventForms.xml
index 500c7e9..a8b791a 100644
--- a/specialpurpose/scrum/widget/CommunicationEventForms.xml
+++ b/specialpurpose/scrum/widget/CommunicationEventForms.xml
@@ -130,7 +130,7 @@
<field name="fromDate"><hidden/></field>
<field name="my"><hidden/></field>
<field name="contentName">
- <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="ViewSimpleContent">
+ <hyperlink description="${contentName} [${contentId}]" target="ViewSimpleContent" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="dataResourceId"/>
<parameter param-name="communicationEventId"/>
@@ -181,7 +181,7 @@
<field name="subject" tooltip="Do not remove the "PD#${product.productId}" number"><text size="74" maxlength="255" default-value="PD#${product.productId} - ${product.internalName}"/></field>
<field name="send" title=" " position="1" widget-style="buttontext"
use-when=""${communicationEvent.statusId}"!="COM_COMPLETE"&&"${communicationEvent.statusId}"!="COM_IN_PROGRESS"">
- <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.CommonSend}" target="javascript:(document.EditEmailForProduct.form.value='list'),(document.EditEmailForProduct.statusId.value='COM_IN_PROGRESS'),(document.EditEmailForProduct.submit())"/>
+ <hyperlink description="${uiLabelMap.CommonSend}" target="javascript:(document.EditEmailForProduct.form.value='list'),(document.EditEmailForProduct.statusId.value='COM_IN_PROGRESS'),(document.EditEmailForProduct.submit())" also-hidden="false" target-type="plain"/>
</field>
</form>
<form name="ViewEmailForProduct" type="single" extends="EditEmail" target="${target}" default-map-name="communicationEvent" id="updateEmailForProduct">
@@ -192,7 +192,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="custRequestId"><ignored/> </field>
<field name="contentName">
- <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="ViewSimpleContent">
+ <hyperlink description="${contentName} [${contentId}]" target="ViewSimpleContent" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="dataResourceId"/>
<parameter param-name="communicationEventId"/>
diff --git a/specialpurpose/scrum/widget/FieldLookupForms.xml b/specialpurpose/scrum/widget/FieldLookupForms.xml
index 761017e..9039fa8 100644
--- a/specialpurpose/scrum/widget/FieldLookupForms.xml
+++ b/specialpurpose/scrum/widget/FieldLookupForms.xml
@@ -49,7 +49,7 @@
</service>
</actions>
<field name="custRequestId" widget-style="buttontext" title="Product Backlog Item Id">
- <hyperlink also-hidden="false" target-type="plain" description="${custRequestId}" target="javascript:set_value('${custRequestId}')"/>
+ <hyperlink description="${custRequestId}" target="javascript:set_value('${custRequestId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="description" title="Product Backlog Item"><display/></field>
<field name="parentCustRequestId" title="Parent Product Backlog Item"><display/></field>
diff --git a/specialpurpose/scrum/widget/MyWorkForms.xml b/specialpurpose/scrum/widget/MyWorkForms.xml
index d905764..2164bab 100644
--- a/specialpurpose/scrum/widget/MyWorkForms.xml
+++ b/specialpurpose/scrum/widget/MyWorkForms.xml
@@ -26,7 +26,7 @@
<set field="complete" value="${uiLabelMap.ScrumToComplete}"/>
</actions>
<field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${timesheetId}" target="MyWork">
+ <hyperlink description="${timesheetId}" target="MyWork" also-hidden="false">
<parameter param-name="timesheetId"/>
</hyperlink>
</field>
@@ -36,7 +36,7 @@
<field name="hours"><display/></field>
<field name="comments" title="${uiLabelMap.CommonComments}"><display/></field>
<field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
- <hyperlink target="${my}TimeSheetStatusToComplete" description="${groovy:statusId.equals("TIMESHEET_IN_PROCESS")?complete:""}" also-hidden="false">
+ <hyperlink description="${groovy:statusId.equals("TIMESHEET_IN_PROCESS")?complete:""}" target="${my}TimeSheetStatusToComplete" also-hidden="false">
<parameter param-name="timesheetId"/>
<parameter param-name="statusId" value="TIMESHEET_COMPLETED"/>
</hyperlink>
diff --git a/specialpurpose/scrum/widget/OpenTestForms.xml b/specialpurpose/scrum/widget/OpenTestForms.xml
index 7e9b804..2ab8ac9 100644
--- a/specialpurpose/scrum/widget/OpenTestForms.xml
+++ b/specialpurpose/scrum/widget/OpenTestForms.xml
@@ -33,7 +33,7 @@
<set field="partyId" from-field="partyAssignViewList[0].partyId"/>
</row-actions>
<field name="workEffortId" title="${uiLabelMap.ScrumTaskName}">
- <hyperlink target="editDefaultTask" description="${workEffortName}">
+ <hyperlink description="${workEffortName}" target="editDefaultTask">
<parameter param-name="workEffortId"/>
<parameter param-name="productId"/>
</hyperlink></field>
@@ -43,7 +43,7 @@
<display-entity entity-name="PartyNameView" description="${lastName} ${firstName} ${middleName}" key-field-name="partyId"/>
</field>
<field name="deleteButton" title="${uiLabelMap.CommonRemove}" widget-style="buttontext">
- <hyperlink target="deleteDefaultTask" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteDefaultTask">
<parameter param-name="workEffortId"/>
<parameter param-name="productId"/>
</hyperlink>
@@ -99,13 +99,13 @@
<entity-one entity-name="PartyNameView" value-field="party"/>
</row-actions>
<field name="workEffortId" title="Task Name">
- <hyperlink target="taskView" description="${workEffortName}">
+ <hyperlink description="${workEffortName}" target="taskView">
<parameter param-name="taskId" from-field="workEffortId"/>
</hyperlink>
</field>
<field name="description"><display/></field>
<field name="partyId">
- <hyperlink target="viewprofile" description="${party.firstName} ${party.lastName}">
+ <hyperlink description="${party.firstName} ${party.lastName}" target="viewprofile">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -135,7 +135,7 @@
}"/>
</row-actions>
<field name="backlogName" title="${uiLabelMap.ScrumBacklogItem}">
- <hyperlink target="ViewProdBacklogItem" description="${description}[${custRequestId}]" target-window="_blank">
+ <hyperlink description="${description}[${custRequestId}]" target="ViewProdBacklogItem" target-window="_blank">
<parameter param-name="custRequestId" from-field="custRequestId"/>
<parameter param-name="productId" from-field="parameters.productId"/>
</hyperlink>
@@ -242,7 +242,7 @@
<set field="partyId" from-field="partyAssignViewList[0].partyId"/>
</row-actions>
<field name="workEffortId" title="${uiLabelMap.ScrumTaskName}">
- <hyperlink target="editDefaultTaskScrum" description="${workEffortName}">
+ <hyperlink description="${workEffortName}" target="editDefaultTaskScrum">
<parameter param-name="workEffortId"/>
</hyperlink></field>
<field name="workEffortTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="WorkEffortType"/></field>
@@ -251,7 +251,7 @@
<display-entity entity-name="PartyNameView" description="${lastName} ${firstName} ${middleName}" key-field-name="partyId"/>
</field>
<field name="deleteButton" title="${uiLabelMap.CommonRemove}" widget-style="buttontext">
- <hyperlink target="deleteDefaultTaskScrum" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteDefaultTaskScrum">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
diff --git a/specialpurpose/scrum/widget/OpenTestScreens.xml b/specialpurpose/scrum/widget/OpenTestScreens.xml
index 375b0aa..7490f38 100644
--- a/specialpurpose/scrum/widget/OpenTestScreens.xml
+++ b/specialpurpose/scrum/widget/OpenTestScreens.xml
@@ -41,7 +41,7 @@
<actions>
<set field="titleProperty" value="PageTitleDefaultTasks"/>
<set field="tabButtonItem" value="defaultTasks"/>
- <entity-one value-field="product" entity-name="Product"/>
+ <entity-one entity-name="Product" value-field="product"/>
</actions>
<widgets>
<decorator-screen name="CommonScrumProductDecorator" location="${parameters.mainDecoratorLocation}">
@@ -64,7 +64,7 @@
<set field="titleProperty" value="PageTitleEditDefaultTasks"/>
<set field="tabButtonItem" value="defaultTasks"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
- <entity-one value-field="product" entity-name="Product"/>
+ <entity-one entity-name="Product" value-field="product"/>
</actions>
<widgets>
<decorator-screen name="CommonScrumProductDecorator" location="${parameters.mainDecoratorLocation}">
diff --git a/specialpurpose/scrum/widget/ProjectForms.xml b/specialpurpose/scrum/widget/ProjectForms.xml
index 43773f1..9a2df96 100644
--- a/specialpurpose/scrum/widget/ProjectForms.xml
+++ b/specialpurpose/scrum/widget/ProjectForms.xml
@@ -38,7 +38,7 @@
<field name="partyId"><hidden/></field>
<field use-when="workEffortId==projectId" name="workEffortId" entry-name="test" title="${uiLabelMap.ScrumProjectName}"><!-- project level -->
<drop-down allow-empty="false">
- <entity-options entity-name="WorkEffort" description="${workEffortName}" key-field-name="workEffortId">
+ <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}">
<entity-constraint name="workEffortTypeId" value="SCRUM_PROJECT"/>
<entity-constraint name="currentStatusId" operator="equals" value="SPJ_ACTIVE"/>
<entity-order-by field-name="workEffortName"/>
@@ -78,7 +78,7 @@
<field name="partyId"><hidden value="${parameters.partyId}"/></field>
<field name="fromDate"><hidden/></field>
<field entry-name="workEffortName" name="projectName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}" widget-style="buttontext">
- <hyperlink target="viewScrumProject" description="${workEffortName}[${workEffortId}]">
+ <hyperlink description="${workEffortName}[${workEffortId}]" target="viewScrumProject">
<parameter param-name="projectId" from-field="workEffortId"/>
</hyperlink>
</field>
diff --git a/specialpurpose/scrum/widget/ResourceForms.xml b/specialpurpose/scrum/widget/ResourceForms.xml
index 37b7693..c02058a 100644
--- a/specialpurpose/scrum/widget/ResourceForms.xml
+++ b/specialpurpose/scrum/widget/ResourceForms.xml
@@ -74,7 +74,7 @@
<set field="rateAmount" from-field="rateResult[0].rateAmount"/>
</row-actions>
<field name="lastName" parameter-name="partyId" title="${uiLabelMap.ScrumMember}" sort-field="true">
- <hyperlink also-hidden="false" description="${partyNameView.lastName}, ${partyNameView.firstName} ${partyNameView.middleName} - [${partyId}]" target="viewprofile" link-type="hidden-form">
+ <hyperlink description="${partyNameView.lastName}, ${partyNameView.firstName} ${partyNameView.middleName} - [${partyId}]" target="viewprofile" also-hidden="false" link-type="hidden-form">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -86,14 +86,14 @@
<field name="rateAmount" use-when="rateTypeId!=null"><display/></field>
<field name="percentageUsed" use-when="rateTypeId!=null"><display/></field>
<field name="update" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext" use-when="rateTypeId!=null">
- <hyperlink target="QuickAddPartyRate" description="${uiLabelMap.CommonUpdate}" link-type="hidden-form">
+ <hyperlink description="${uiLabelMap.CommonUpdate}" target="QuickAddPartyRate" link-type="hidden-form">
<parameter param-name="partyId"/>
<parameter param-name="rateTypeId"/>
<parameter param-name="fromDate"/>
</hyperlink>
</field>
<field name="remove" title="${uiLabelMap.CommonRemove}" widget-style="buttontext">
- <hyperlink target="removeResource" description="${uiLabelMap.CommonRemove}" link-type="hidden-form" confirmation-message="Are you sure to delete this person ?">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeResource" link-type="hidden-form" confirmation-message="Are you sure to delete this person ?">
<parameter param-name="partyId"/>
<parameter param-name="groupId"/>
<parameter param-name="userLoginId"/>
@@ -200,14 +200,14 @@
<set field="parameters.workEffortTypeId" value="PROJECT"/>
<set field="fieldList[]" value="workEffortId"/>
<set field="fieldList[]" value="lastStatusUpdate"/>
- <entity-condition list="contents" entity-name="ContentRole">
+ <entity-condition entity-name="ContentRole" list="contents">
<condition-list>
<condition-expr field-name="partyId" from-field="parameters.partyId"/>
<condition-expr field-name="roleTypeId" value="OWNER"/>
</condition-list>
</entity-condition>
<set field="contentIds" value="${groovy:return org.apache.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(contents, "contentId", true)}" type="List" />
- <entity-condition list="listIt" entity-name="WorkEffortAndContentDataResource">
+ <entity-condition entity-name="WorkEffortAndContentDataResource" list="listIt">
<condition-list>
<condition-expr field-name="contentName" operator="like" value="%${parameters.contentName}%" ignore-if-empty="true" ignore-case="true"/>
<condition-expr field-name="description" operator="like" value="%${parameters.description}%" ignore-if-empty="true" ignore-case="true"/>
@@ -366,7 +366,7 @@
<set field="compCheck" value="${groovy: if (roleTypeId=="PRODUCT_OWNER_COMP" || roleTypeId=="PRODUCT_OWNER") compCheck = true; else compCheck = false;}" type="Boolean"/>
</row-actions>
<field name="lastName" parameter-name="partyId" title="${uiLabelMap.ScrumMember}" sort-field="true">
- <hyperlink also-hidden="false" description="${partyNameView.lastName} ${partyNameView.middleName} ${partyNameView.firstName} ${partyNameView.groupName} - [${partyId}]" target="viewprofile" link-type="hidden-form">
+ <hyperlink description="${partyNameView.lastName} ${partyNameView.middleName} ${partyNameView.firstName} ${partyNameView.groupName} - [${partyId}]" target="viewprofile" also-hidden="false" link-type="hidden-form">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -377,7 +377,7 @@
<display type="date"/>
</field>
<field name="remove" title="${uiLabelMap.CommonRemove}" widget-style="buttontext" use-when="!compCheck">
- <hyperlink target="removeProductMember" description="${uiLabelMap.CommonRemove}" link-type="hidden-form">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removeProductMember" link-type="hidden-form">
<parameter param-name="productId" from-field="productId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
diff --git a/specialpurpose/scrum/widget/ResourceScreens.xml b/specialpurpose/scrum/widget/ResourceScreens.xml
index 38fa5e9..d46c253 100644
--- a/specialpurpose/scrum/widget/ResourceScreens.xml
+++ b/specialpurpose/scrum/widget/ResourceScreens.xml
@@ -272,14 +272,14 @@
<set field="title" value="${uiLabelMap.ScrumRevisions}"/>
<set field="parameters.custRequestId" from-field="custRequestWorkEffort[0].custRequestId"/>
<set field="parameters.noConditionFind" value="Y"/>
- <entity-condition list="contents" entity-name="ContentRole">
+ <entity-condition entity-name="ContentRole" list="contents">
<condition-list>
<condition-expr field-name="partyId" from-field="parameters.partyId"/>
<condition-expr field-name="roleTypeId" value="OWNER"/>
</condition-list>
</entity-condition>
<set field="contentIds" value="${groovy:return org.apache.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(contents, "contentId", true)}" type="List" />
- <entity-condition list="listIt" entity-name="WorkEffortAndContentDataResource">
+ <entity-condition entity-name="WorkEffortAndContentDataResource" list="listIt">
<condition-list>
<condition-expr field-name="workEffortContentTypeId" value="TASK_SUB_INFO"/>
<condition-expr field-name="contentId" operator="in" from-field="contentIds"/>
@@ -403,7 +403,7 @@
<set field="titleProperty" value="PageTitleScrumProductMembers"/>
<set field="productId" from-field="parameters.productId"/>
<set field="tabButtonItem" value="productMember"/>
- <entity-one value-field="product" entity-name="Product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<script location="component://scrum/groovyScripts/ListScrumRolesPersonAndCompany.groovy"/>
</actions>
<widgets>
diff --git a/specialpurpose/scrum/widget/TaskForms.xml b/specialpurpose/scrum/widget/TaskForms.xml
index f856714..56ed103 100644
--- a/specialpurpose/scrum/widget/TaskForms.xml
+++ b/specialpurpose/scrum/widget/TaskForms.xml
@@ -220,29 +220,29 @@
<field name="workEffortName" title="${uiLabelMap.ScrumTaskName}"><display description="${resultTask.workEffortName}"/></field>
<field name="workEffortTypeId" title="${uiLabelMap.ScrumTaskType}" ><display description="${workEffortType.description}"/></field>
<field name="custRequestId" title="${uiLabelMap.ScrumProductBacklog}">
- <hyperlink target="ViewProdBacklogItem" description="${custRequest.description} [${custRequest.custRequestId}]">
+ <hyperlink description="${custRequest.description} [${custRequest.custRequestId}]" target="ViewProdBacklogItem">
<parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
<parameter param-name="productId" from-field="productId"/>
</hyperlink>
</field>
<field name="sprintName" title="${uiLabelMap.ScrumSprint}" use-when="sprintId!=null">
- <hyperlink target="ViewSprint" description="${sprintName} [${sprintId}]">
+ <hyperlink description="${sprintName} [${sprintId}]" target="ViewSprint">
<parameter param-name="projectId" from-field="projectId"/>
<parameter param-name="sprintId" from-field="sprintId"/>
</hyperlink>
</field>
<field name="projectName" title="${uiLabelMap.ScrumProject}" use-when="projectId!=null">
- <hyperlink target="viewScrumProject" description="${projectName} [${projectId}]">
+ <hyperlink description="${projectName} [${projectId}]" target="viewScrumProject">
<parameter param-name="projectId"/>
</hyperlink>
</field>
<field name="productId" title="${uiLabelMap.PageTitleProduct}">
- <hyperlink target="ViewProduct" description="${product.internalName} [${productId}]">
+ <hyperlink description="${product.internalName} [${productId}]" target="ViewProduct">
<parameter param-name="productId" from-field="productId"/>
</hyperlink>
</field>
<field name="groupName" title="${uiLabelMap.ScrumCompany}">
- <hyperlink target="viewprofile" description="${companyList[0].groupName}">
+ <hyperlink description="${companyList[0].groupName}" target="viewprofile">
<parameter param-name="partyId" from-field="companyList[0].partyId"/>
</hyperlink>
</field>
@@ -592,7 +592,7 @@
</entity-condition>
</actions>
<field name="partyId" title="${uiLabelMap.CommonName}">
- <hyperlink target="viewprofile" description="${lastName} ${firstName}">
+ <hyperlink description="${lastName} ${firstName}" target="viewprofile">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -627,7 +627,7 @@
</row-actions>
<field name="workEffortId"><hidden/></field>
<field name="taskName" title="${uiLabelMap.ScrumTaskName}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${taskName} - [${taskId}] " target="taskView">
+ <hyperlink description="${taskName} - [${taskId}] " target="taskView" also-hidden="false">
<parameter param-name="taskId" from-field="workEffortId"/>
</hyperlink>
</field>
@@ -647,7 +647,7 @@
</field>
<field name="UpdateButton" title="${uiLabelMap.CommonUpdate}"><submit/></field>
<field name="RemoveButton" title="${uiLabelMap.CommonRemove}" widget-style="buttontext">
- <hyperlink target="unassignPartyFromWorkEffort" description="${uiLabelMap.CommonRemove}" confirmation-message="Are you sure to remove this task ?" link-type="hidden-form">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="unassignPartyFromWorkEffort" confirmation-message="Are you sure to remove this task ?" link-type="hidden-form">
<parameter param-name="workEffortId" from-field="taskId"/>
<parameter param-name="partyId" from-field="partyId"/>
<parameter param-name="roleTypeId" from-field="roleTypeId"/>
@@ -703,7 +703,7 @@
</display-entity>
</field>
<field name="sprintId" use-when="sprintId==null">
- <hyperlink target="unplanBacklog" description="${uiLabelMap.ScrumUnplanSprint}">
+ <hyperlink description="${uiLabelMap.ScrumUnplanSprint}" target="unplanBacklog">
<parameter param-name="productId" from-field="productId"/>
</hyperlink>
</field>
@@ -736,13 +736,13 @@
<field name="taskActualMilliSeconds" title="${uiLabelMap.ScrumActualHours}" parameter-name="actualHours"><display description="${result.actualHours}"/></field>
<field name="taskEstimatedStartDate" title="${uiLabelMap.CommonStartDate}" parameter-name="estimatedStartDate"><display type="date"/></field>
<field name="editButton" title=" " widget-style="buttontext">
- <hyperlink target="EditTask" description="${uiLabelMap.CommonEdit}" link-type="hidden-form">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditTask" link-type="hidden-form">
<parameter param-name="taskId"/>
<parameter param-name="sprintId"></parameter>
</hyperlink>
</field>
<field name="deleteButton" title=" " widget-style="buttontext">
- <hyperlink target="deleteTask" description="${uiLabelMap.CommonDelete}" link-type="hidden-form" confirmation-message="Are you sure to delete this task?">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTask" link-type="hidden-form" confirmation-message="Are you sure to delete this task?">
<parameter param-name="custRequestId"/>
<parameter param-name="workEffortId" from-field="taskId"/>
</hyperlink>
@@ -832,7 +832,7 @@
<property-to-field resource="revision" property="revision.url" field="url"/>
</row-actions>
<field name="contentName" title="${uiLabelMap.ScrumRevision}" widget-style="buttontext">
- <hyperlink target="RevisionInfo?repository=${url}${drObjectInfo}" description="${contentName}" link-type="anchor" target-window="_BLANK" target-type="plain"/>
+ <hyperlink description="${contentName}" target="RevisionInfo?repository=${url}${drObjectInfo}" link-type="anchor" target-window="_BLANK" target-type="plain"/>
</field>
<field name="description" title="${uiLabelMap.CommonMessage}"><display description="${groovy:description.toString().substring(0,Math.min(description.toString().length(),100))}"/></field>
<field name="partyId" title="${uiLabelMap.ScrumCommitter}">
@@ -946,7 +946,7 @@
<field name="sprintId"><hidden value="${parameters.sprintId}"/></field>
<field name="partyId"><hidden/></field>
<field name="memberName" title="${uiLabelMap.ScrumMembersName}">
- <hyperlink target="viewprofile" description="${lastName} ${firstName} ${middleName} [${partyId}]">
+ <hyperlink description="${lastName} ${firstName} ${middleName} [${partyId}]" target="viewprofile">
<parameter param-name="partyId"/>
</hyperlink>
</field>
diff --git a/specialpurpose/scrum/widget/TaskScreens.xml b/specialpurpose/scrum/widget/TaskScreens.xml
index 9957974..56b78b6 100644
--- a/specialpurpose/scrum/widget/TaskScreens.xml
+++ b/specialpurpose/scrum/widget/TaskScreens.xml
@@ -281,7 +281,7 @@
<field-map field-name="workEffortId" from-field="parameters.taskId"/>
</entity-and>
<set field="partyId" from-field="assignTo[0].partyId"/>
- <entity-one value-field="person" entity-name="Person"/>
+ <entity-one entity-name="Person" value-field="person"/>
<entity-condition list="SprintTasks" entity-name="ProjectSprintBacklogAndTask">
<condition-list combine="and">
<condition-expr field-name="projectId" from-field="parameters.projectId"/>
@@ -325,7 +325,7 @@
<field-map field-name="custRequestId" from-field="custRequestId"/>
</entity-and>
<set field="sprintId" from-field="parameters.sprintId"/>
- <entity-one value-field="sprint" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="sprint">
<field-map field-name="workEffortId" from-field="sprintId"/>
</entity-one>
</actions>
@@ -381,7 +381,7 @@
<actions>
<set field="workEffortId" from-field="parameters.taskId"/>
<set field="taskId" from-field="parameters.taskId"/>
- <entity-condition list="workNoteList" entity-name="WorkEffortNote" >
+ <entity-condition entity-name="WorkEffortNote" list="workNoteList" >
<condition-expr field-name="workEffortId" from-field="workEffortId"/>
<order-by field-name="-noteId"/>
<limit-range start="0" size="5"/>
@@ -410,7 +410,7 @@
<screen name="ViewTask">
<section>
<actions>
- <entity-one value-field="task" entity-name="WorkEffort"/>
+ <entity-one entity-name="WorkEffort" value-field="task"/>
</actions>
<widgets>
<include-screen name="taskInfo"/>
@@ -420,7 +420,7 @@
<screen name="InfoTestTaskNote">
<section>
<actions>
- <entity-one value-field="task" entity-name="WorkEffort"/>
+ <entity-one entity-name="WorkEffort" value-field="task"/>
<set field="taskId" from-field="task.workEffortId"/>
</actions>
<widgets>
diff --git a/specialpurpose/scrum/widget/TimeSheetForms.xml b/specialpurpose/scrum/widget/TimeSheetForms.xml
index 322d951..90a0ed1 100644
--- a/specialpurpose/scrum/widget/TimeSheetForms.xml
+++ b/specialpurpose/scrum/widget/TimeSheetForms.xml
@@ -64,7 +64,7 @@
<set field="completeLink" value="${groovy:"TIMESHEET_IN_PROCESS".equals(statusId)?complete:""}"/>
</row-actions>
<field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${timesheetId}" target="ViewTimeSheet">
+ <hyperlink description="${timesheetId}" target="ViewTimeSheet" also-hidden="false">
<parameter param-name="timesheetId"/>
</hyperlink>
</field>
@@ -75,13 +75,13 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
<!--field name="comments" title="${uiLabelMap.CommonComments}"><display/></field-->
<field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
- <hyperlink target="TimeSheetStatusToComplete" description="${groovy:statusId.equals("TIMESHEET_IN_PROCESS")?complete:""}">
+ <hyperlink description="${groovy:statusId.equals("TIMESHEET_IN_PROCESS")?complete:""}" target="TimeSheetStatusToComplete">
<parameter param-name="timesheetId"/>
<parameter param-name="statusId" value="TIMESHEET_COMPLETED"/>
</hyperlink>
</field>
<field name="inProcessLink" title="${uiLabelMap.StatusToInProcess}" widget-style="buttontext">
- <hyperlink target="updateTimesheetToInProcess" description="${groovy:statusId.equals("TIMESHEET_COMPLETED")?inProcess:""}" >
+ <hyperlink description="${groovy:statusId.equals("TIMESHEET_COMPLETED")?inProcess:""}" target="updateTimesheetToInProcess" >
<parameter param-name="timesheetId"/>
<parameter param-name="statusId" value="TIMESHEET_IN_PROCESS"/>
</hyperlink>
@@ -93,7 +93,7 @@
<set field="complete" value="${uiLabelMap.ScrumToComplete}"/>
</actions>
<field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${timesheetId}" target="${my}Timesheet">
+ <hyperlink description="${timesheetId}" target="${my}Timesheet" also-hidden="false">
<parameter param-name="timesheetId"/>
</hyperlink>
</field>
@@ -104,7 +104,7 @@
<field name="hours"><display/></field>
<field name="comments" title="${uiLabelMap.CommonComments}"><display/></field>
<field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
- <hyperlink target="TimeSheetStatusToComplete" description="${groovy:statusId.equals("TIMESHEET_IN_PROCESS")?complete:""}" also-hidden="false">
+ <hyperlink description="${groovy:statusId.equals("TIMESHEET_IN_PROCESS")?complete:""}" target="TimeSheetStatusToComplete" also-hidden="false">
<parameter param-name="timesheetId"/>
<parameter param-name="statusId" value="TIMESHEET_COMPLETED"/>
</hyperlink>
diff --git a/specialpurpose/scrum/widget/TimeSheetScreens.xml b/specialpurpose/scrum/widget/TimeSheetScreens.xml
index d45b742..69d752a 100644
--- a/specialpurpose/scrum/widget/TimeSheetScreens.xml
+++ b/specialpurpose/scrum/widget/TimeSheetScreens.xml
@@ -54,7 +54,7 @@
<set field="headerItem" value="timesheet"/>
<set field="tabButtonItem" value="timesheets"/>
<script location="component://scrum/groovyScripts/EditDailyHourReport.groovy"/>
- <entity-one value-field="partyNameViewMap" entity-name="PartyNameView">
+ <entity-one entity-name="PartyNameView" value-field="partyNameViewMap">
<field-map field-name="partyId" from-field="timesheet.partyId"/>
</entity-one>
</actions>
diff --git a/specialpurpose/scrum/widget/scrumForms.xml b/specialpurpose/scrum/widget/scrumForms.xml
index cf8e51f..492c998 100644
--- a/specialpurpose/scrum/widget/scrumForms.xml
+++ b/specialpurpose/scrum/widget/scrumForms.xml
@@ -41,7 +41,7 @@
<field name="projectId"><hidden value="${parameters.projectId}"/></field>
<field name="workEffortId"><hidden value="${workEffortId}"/></field>
<field name="workEffortName" title="Sprint Name">
- <hyperlink target="ViewSprint" description="${workEffortName}">
+ <hyperlink description="${workEffortName}" target="ViewSprint">
<parameter param-name="sprintId" from-field="workEffortId"/>
<parameter param-name="projectId" from-field="projectWorkEffort.workEffortId"/>
</hyperlink>
@@ -75,7 +75,7 @@
<field-map field-name="workEffortId" from-field="parameters.projectId"/>
</entity-and>
<set field="productId" from-field="projectList[0].productId"/>
- <entity-condition list="custRequestAndCustRequestItem" entity-name="CustRequestAndCustRequestItem">
+ <entity-condition entity-name="CustRequestAndCustRequestItem" list="custRequestAndCustRequestItem">
<condition-list combine="and">
<condition-expr field-name="custRequestTypeId" value="RF_PROD_BACKLOG" />
<condition-expr field-name="statusId" value="CRQ_ACCEPTED" />
@@ -86,7 +86,7 @@
</actions>
<field name="custRequestId"><hidden/></field>
<field name="description" title="${uiLabelMap.ScrumProductBacklogName}">
- <hyperlink target="ViewProdBacklogItem" description="${context.description} - [${custRequestId}]">
+ <hyperlink description="${context.description} - [${custRequestId}]" target="ViewProdBacklogItem">
<parameter param-name="custRequestId"/>
<parameter param-name="productId"/>
</hyperlink>
@@ -187,14 +187,14 @@
<field name="planHours" title="${uiLabelMap.ScrumPlannedHours}" position="2" use-when="!"SCRUM_SPRINT".equals(taskTypeId)"><display></display>
</field>
<field name="deleteButton" title=" " position="1" use-when="showPosition1&&!"CRQ_COMPLETED".equals("${custRequest.statusId}")" widget-style="buttontext">
- <hyperlink target="DeleteSprintBackLogs" description="Delete" confirmation-message="Are you sure to delete this sprint backlog ?" link-type="hidden-form">
+ <hyperlink description="Delete" target="DeleteSprintBackLogs" confirmation-message="Are you sure to delete this sprint backlog ?" link-type="hidden-form">
<parameter param-name="custRequestId"/>
<parameter param-name="sprintId"/>
<parameter param-name="projectId"/>
</hyperlink>
</field>
<field name="newTask" title=" " position="1" use-when="showPosition1&&!"CRQ_COMPLETED".equals("${custRequest.statusId}")" widget-style="buttontext">
- <hyperlink target="NewSprintBacklogTask" description="Add Task" link-type="hidden-form">
+ <hyperlink description="Add Task" target="NewSprintBacklogTask" link-type="hidden-form">
<parameter param-name="custRequestId"/>
<parameter param-name="sprintId"/>
<parameter param-name="projectId"/>
@@ -205,13 +205,13 @@
<display-entity entity-name="PartyNameView" description="${lastName}, ${firstName} ${middleName}" key-field-name="partyId"/>
</field>
<field name="editTaskParty" title=" " position="2" use-when="!"STS_COMPLETED".equals(taskCurrentStatusId)&&!"SCRUM_SPRINT".equals(taskTypeId)" widget-style="buttontext">
- <hyperlink target="EditTask" description="${uiLabelMap.CommonEdit}" link-type="hidden-form" target-window="_BLANK">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditTask" link-type="hidden-form" target-window="_BLANK">
<parameter param-name="taskId"/>
<parameter param-name="sprintId"></parameter>
</hyperlink>
</field>
<field name="deleteTaskButton" title=" " position="2" use-when="!"STS_COMPLETED".equals(taskCurrentStatusId)&&!"SCRUM_SPRINT".equals(taskTypeId)" widget-style="buttontext">
- <hyperlink target="DeleteTaskFromSprintOverview" description="Delete" confirmation-message="Are you sure to delete this task ?" link-type="hidden-form">
+ <hyperlink description="Delete" target="DeleteTaskFromSprintOverview" confirmation-message="Are you sure to delete this task ?" link-type="hidden-form">
<parameter param-name="workEffortId" from-field="taskId"/>
<parameter param-name="custRequestId"/>
<parameter param-name="sprintId"/>
@@ -220,7 +220,7 @@
</field>
<field name="setCompleteButton" title=" " widget-style="buttontext" use-when="!"STS_COMPLETED".equals(taskCurrentStatusId)&&!"SCRUM_SPRINT".equals(taskTypeId)"
position="2">
- <hyperlink target="setCompleteTask" description="${uiLabelMap.ScrumSetComplete}" link-type="hidden-form">
+ <hyperlink description="${uiLabelMap.ScrumSetComplete}" target="setCompleteTask" link-type="hidden-form">
<parameter param-name="workEffortId" from-field="taskId"/>
<parameter param-name="sprintId"></parameter>
</hyperlink>
@@ -280,12 +280,12 @@
<set field="actualCompletionDate" from-field="sprint.actualCompletionDate" type="Timestamp"/>
</actions>
<field name="productId" title="${uiLabelMap.ScrumProductName}">
- <hyperlink target="ViewProduct" description="${resultProduct.internalName} [${resultProduct.productId}]">
+ <hyperlink description="${resultProduct.internalName} [${resultProduct.productId}]" target="ViewProduct">
<parameter param-name="productId" from-field="resultProduct.productId"/>
</hyperlink>
</field>
<field name="projectId" title="${uiLabelMap.ScrumProjectName}">
- <hyperlink target="viewScrumProject" description="${project.workEffortName} [${project.workEffortId}]">
+ <hyperlink description="${project.workEffortName} [${project.workEffortId}]" target="viewScrumProject">
<parameter param-name="projectId" from-field="parameters.projectId"/>
</hyperlink>
</field>
@@ -337,7 +337,7 @@
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down>
<entity-options entity-name="StatusItem">
- <entity-constraint name="statusTypeId" value="SPRINT_STATUS" operator="equals"/>
+ <entity-constraint name="statusTypeId" operator="equals" value="SPRINT_STATUS"/>
</entity-options>
</drop-down>
</field>
@@ -442,7 +442,7 @@
<field name="sprintId"> <hidden value="${parameters.sprintId}"/></field>
<field name="partyId"><hidden/></field>
<field name="workEffortId"><hidden value="${parameters.sprintId}"/></field>
- <field name="memberName" title="${uiLabelMap.ScrumMembersName}"><hyperlink target="viewprofile" description="${lastName}, ${firstName} ${middleName} [${partyId}]"><parameter param-name="partyId"/></hyperlink></field>
+ <field name="memberName" title="${uiLabelMap.ScrumMembersName}"><hyperlink description="${lastName}, ${firstName} ${middleName} [${partyId}]" target="viewprofile"><parameter param-name="partyId"/></hyperlink></field>
<field name="roleTypeId">
<display-entity entity-name="RoleType"/>
</field>
@@ -463,7 +463,7 @@
<form name="EditScrumProject" default-map-name="workEffort" target="updateScrumProject" title="" type="single">
<actions>
- <entity-one value-field="workEffortAttMap" entity-name="WorkEffortAttribute">
+ <entity-one entity-name="WorkEffortAttribute" value-field="workEffortAttMap">
<field-map field-name="workEffortId" from-field="workEffortId"/>
<field-map field-name="attrName" value="PROJECT_BILLED"/>
</entity-one>
@@ -543,7 +543,7 @@
<field-map field-name="roleTypeId" value="PRODUCT_OWNER"/>
</entity-and>
<set field="partyMap.productOwnerId" from-field="productRoleList[0].partyId"/>
- <entity-one value-field="workEffortAttMap" entity-name="WorkEffortAttribute">
+ <entity-one entity-name="WorkEffortAttribute" value-field="workEffortAttMap">
<field-map field-name="workEffortId" from-field="parameters.projectId"/>
<field-map field-name="attrName" value="PROJECT_BILLED"/>
</entity-one>
@@ -597,7 +597,7 @@
<set field="sprintName" from-field="workEffort.workEffortName"/>
<set field="projectId" from-field="workEffort.workEffortParentId"/>
<set field="noteInfo" from-field="custRequestNotes[0].noteInfo"/>
- <entity-one value-field="workEffortAttMap" entity-name="WorkEffortAttribute">
+ <entity-one entity-name="WorkEffortAttribute" value-field="workEffortAttMap">
<field-map field-name="workEffortId" from-field="projectId"/>
<field-map field-name="attrName" value="PROJECT_BILLED"/>
</entity-one>
@@ -738,7 +738,7 @@
<display description="${request[0].lastName} ${request[0].firstName} ${request[0].middleName}"/>
</field>
<field name="Sprint" title="${uiLabelMap.ScrumSprintName}" use-when="sprintName!=null">
- <hyperlink target="ViewSprint" description="${sprintName} [${workEffortlist[0].workEffortId}]">
+ <hyperlink description="${sprintName} [${workEffortlist[0].workEffortId}]" target="ViewSprint">
<parameter param-name="prjectId" from-field="projectId"/>
<parameter param-name="sprintId" from-field="workEffortlist[0].workEffortId"/>
</hyperlink>
@@ -993,7 +993,7 @@
</field>
<field name="custSequenceNum" position="2" title="${uiLabelMap.ScrumSeq}"><display/></field>
<field name="custRequestId" position="2" title="${uiLabelMap.ScrumProductBacklogItem}">
- <hyperlink target="ViewProdBacklogItem" description="${description} [${custRequestId}]">
+ <hyperlink description="${description} [${custRequestId}]" target="ViewProdBacklogItem">
<parameter param-name="custRequestId"/>
<parameter param-name="productId"/>
</hyperlink>
@@ -1108,7 +1108,7 @@
<field name="realSequenceNum"><hidden/></field>
<field name="custRequestId"><hidden/></field>
<field name="backlogId" position="1" title="${uiLabelMap.ScrumBacklogId}">
- <hyperlink target="ViewProdBacklogItem" description="${custRequestId}">
+ <hyperlink description="${custRequestId}" target="ViewProdBacklogItem">
<parameter param-name="custRequestId"/>
<parameter param-name="productId"/>
</hyperlink>
@@ -1133,7 +1133,7 @@
</field>
<field name="setToReview" widget-style="buttontext" title="${uiLabelMap.ScrumMoveToUnplannedSprint}"><hidden/></field>
<field name="deleteFlag" position="1" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="DeleteProductBacklogItem" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="DeleteProductBacklogItem">
<parameter param-name="productId" from-field="parameters.productId"/>
<parameter param-name="custRequestId" from-field="custRequestId"/>
<parameter param-name="statusId" from-field="parameters.statusId"/>
@@ -1199,12 +1199,12 @@
</entity-one>
</row-actions>
<field name="companyId" title="${uiLabelMap.ScrumOwnerCompany}" position="1" use-when="!isCurrentCompany" widget-style="buttontext">
- <hyperlink target="viewprofile" description="${companyName} [${companyId}]">
+ <hyperlink description="${companyName} [${companyId}]" target="viewprofile">
<parameter param-name="partyId" from-field="companyId"/>
</hyperlink>
</field>
<field name="projectName" title="${uiLabelMap.ScrumProject}" position="1" use-when="!isCurrentProject" widget-style="buttontext">
- <hyperlink target="viewScrumProject" description="${projectName} [${projectId}]">
+ <hyperlink description="${projectName} [${projectId}]" target="viewScrumProject">
<parameter param-name="projectId"/>
</hyperlink>
</field>
@@ -1216,13 +1216,13 @@
</display-entity>
</field>
<field name="productOwnerName" title="${uiLabelMap.ScrumProductOwner}" position="1" use-when="!isCurrentProject">
- <hyperlink target="viewprofile" description="${productOwnerName} [${productOwnerId}]">
+ <hyperlink description="${productOwnerName} [${productOwnerId}]" target="viewprofile">
<parameter param-name="partyId" from-field="productOwnerId"/>
</hyperlink>
</field>
<field name="dummy" title=" " position="2" use-when=""${sprintId}"!="""><display description=" "/></field>
<field name="sprintName" title="${uiLabelMap.ScrumTab} ${uiLabelMap.ScrumSprint}" position="2" use-when=""${sprintId}"!=""">
- <hyperlink target="ViewSprint" description="${uiLabelMap.ScrumTab} ${sprintName} [${sprintId}]">
+ <hyperlink description="${uiLabelMap.ScrumTab} ${sprintName} [${sprintId}]" target="ViewSprint">
<parameter param-name="projectId"/>
<parameter param-name="sprintId"/>
</hyperlink>
@@ -1289,12 +1289,12 @@
</row-actions>
<field name="projectName" title="${uiLabelMap.ScrumProject}" position="1" use-when="!isCurrentProject">
- <hyperlink target="viewScrumProject" description="${projectName} [${projectId}]">
+ <hyperlink description="${projectName} [${projectId}]" target="viewScrumProject">
<parameter param-name="projectId" from-field="workEffortId"/>
</hyperlink>
</field>
<field name="sprintName" title="${uiLabelMap.ScrumTab} ${uiLabelMap.ScrumSprint}" position="2" use-when=""${sprintId}"!=""">
- <hyperlink target="ViewSprint" description="${uiLabelMap.ScrumTab} ${sprintName} [${sprintId}]">
+ <hyperlink description="${uiLabelMap.ScrumTab} ${sprintName} [${sprintId}]" target="ViewSprint">
<parameter param-name="projectId"/>
<parameter param-name="sprintId"/>
</hyperlink>
@@ -1324,7 +1324,7 @@
</actions>
<field name="projectId"><hidden value="${parameters.projectId}"/></field>
<field name="workEffortName" title="${uiLabelMap.ScrumSprintName}">
- <hyperlink target="ViewSprint" description="${workEffortName} [${workEffortId}]">
+ <hyperlink description="${workEffortName} [${workEffortId}]" target="ViewSprint">
<parameter param-name="sprintId" from-field="workEffortId"/>
<parameter param-name="projectId" from-field="project.workEffortId"/>
</hyperlink>
@@ -1424,7 +1424,7 @@
<field-map field-name="workEffortId" from-field="parameters.projectId"/>
</entity-and>
<set field="productId" from-field="projectList[0].productId"/>
- <entity-condition list="productBacklog" entity-name="CustRequestAndCustRequestItem">
+ <entity-condition entity-name="CustRequestAndCustRequestItem" list="productBacklog">
<condition-list combine="and">
<condition-expr field-name="custRequestTypeId" value="RF_PROD_BACKLOG" />
<condition-expr field-name="statusId" value="CRQ_ACCEPTED" />
@@ -1538,7 +1538,7 @@
<set field="statusMap.statusId" value="${groovy: if(supportDiscontinuationDate == null) return 'PRODUCT_ACTIVE' else return 'PRODUCT_CLOSED'}"/>
</actions>
<field name="productOwerId" title="${uiLabelMap.ScrumCompanyAndProductOwner}">
- <hyperlink target="viewprofile" description="${parties[0].groupName} -- ${parties[0].lastName} ${parties[0].firstName} ${parties[0].middleName}">
+ <hyperlink description="${parties[0].groupName} -- ${parties[0].lastName} ${parties[0].firstName} ${parties[0].middleName}" target="viewprofile">
<parameter param-name="partyId" from-field="productRole[0].partyId"/>
</hyperlink>
</field>
@@ -1791,12 +1791,12 @@
<set field="billed" from-field="backlogItem.billed"/>
</row-actions>
<field name="projectId" position="1" use-when="${groovy:showPosition1==true}" title="${uiLabelMap.ScrumProject}">
- <hyperlink target="viewScrumProject" description="${projectName}">
+ <hyperlink description="${projectName}" target="viewScrumProject">
<parameter param-name="projectId"/>
</hyperlink>
</field>
<field name="sprintId" position="1" use-when="${groovy:showPosition1==true}" title="${uiLabelMap.ScrumSprint}">
- <hyperlink target="ViewSprint" description="${sprintName}">
+ <hyperlink description="${sprintName}" target="ViewSprint">
<parameter param-name="projectId"/>
<parameter param-name="sprintId"/>
</hyperlink>
@@ -1960,7 +1960,7 @@
<display description="${categoryList[0].custRequestName} [${categoryList[0].custRequestId}]"/>
</field>
<field name="Sprint" title="${uiLabelMap.ScrumSprintName}" use-when="sprintName!=null">
- <hyperlink target="ViewSprint" description="${sprintName} [${productBacklogs[0].workEffortId}]">
+ <hyperlink description="${sprintName} [${productBacklogs[0].workEffortId}]" target="ViewSprint">
<parameter param-name="prjectId" from-field="projectId"/>
<parameter param-name="sprintId" from-field="workEffortlist[0].workEffortId"/>
</hyperlink>
@@ -1990,7 +1990,7 @@
</row-actions>
<field name="custSequenceNum" position="2" title="${uiLabelMap.ScrumSeq}"><display/></field>
<field name="custRequestId" position="2" title="${uiLabelMap.ScrumProductBacklogItem}">
- <hyperlink target="ViewProdBacklogItem" description="${description} [${custRequestId}]">
+ <hyperlink description="${description} [${custRequestId}]" target="ViewProdBacklogItem">
<parameter param-name="custRequestId"/>
<parameter param-name="productId"/>
</hyperlink>
@@ -2030,7 +2030,7 @@
</field>
<field name="custSequenceNum" position="2" title="${uiLabelMap.ScrumSeq}"><display/></field>
<field name="custRequestId" position="2" title="${uiLabelMap.ScrumProductBacklogItem}">
- <hyperlink target="ViewProdBacklogItem" description="${description} [${custRequestId}]">
+ <hyperlink description="${description} [${custRequestId}]" target="ViewProdBacklogItem">
<parameter param-name="custRequestId"/>
<parameter param-name="productId"/>
</hyperlink>
@@ -2111,7 +2111,7 @@
</row-actions>
<field name="sprintId"><hidden value="${parameters.sprintId}"/></field>
<field name="taskId" title="${uiLabelMap.ScrumTask}" parameter-name="workEffortId">
- <hyperlink target="SprintTaskView" description="${taskName} [${taskId}]">
+ <hyperlink description="${taskName} [${taskId}]" target="SprintTaskView">
<parameter param-name="sprintId"/>
<parameter param-name="taskId"/>
</hyperlink>
@@ -2139,13 +2139,13 @@
<field name="taskActualMilliSeconds" title="${uiLabelMap.ScrumActualHours}" parameter-name="actualHours"><display/></field>
<field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button" /></field>
<field name="editButton" title=" " widget-style="buttontext">
- <hyperlink target="EditSprintTask" description="${uiLabelMap.CommonEdit}" link-type="hidden-form">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditSprintTask" link-type="hidden-form">
<parameter param-name="sprintId" from-field="parameters.parameters.sprintId"/>
<parameter param-name="taskId"/>
</hyperlink>
</field>
<field name="deleteButton" title=" " widget-style="buttontext">
- <hyperlink target="deleteSprintTask" description="${uiLabelMap.CommonDelete}" link-type="hidden-form" confirmation-message="Are you sure to delete this task?">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSprintTask" link-type="hidden-form" confirmation-message="Are you sure to delete this task?">
<parameter param-name="sprintId" from-field="parameters.sprintId"/>
<parameter param-name="custRequestId"/>
<parameter param-name="workEffortId" from-field="taskId"/>
@@ -2418,7 +2418,7 @@
<display-entity entity-name="StatusItem"/>
</field>
<field name="companyNameId" title="${uiLabelMap.ScrumOwnerCompany}" use-when="!isCurrentCompany">
- <hyperlink target="viewprofile" description="${resultCompanyGroup.groupName} [${companyNameId}]">
+ <hyperlink description="${resultCompanyGroup.groupName} [${companyNameId}]" target="viewprofile">
<parameter param-name="partyId" from-field="companyNameId"/>
</hyperlink>
</field>
@@ -2468,7 +2468,7 @@
</entity-condition>
</actions>
<field name="taskName" title="Task Name" >
- <hyperlink target="taskView" description="${taskName}">
+ <hyperlink description="${taskName}" target="taskView">
<parameter param-name="taskId" from-field="taskId"/>
</hyperlink>
</field>
@@ -2484,7 +2484,7 @@
<form name="ListTaskSprint" list-name="notes" title="" type="list" paginate-target="backlogView"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="custRequestId" title="Backlog ID" widget-style="buttontext">
- <hyperlink target="backlogView" description="${custRequestId}">
+ <hyperlink description="${custRequestId}" target="backlogView">
<parameter param-name="custRequestId" from-field="${custRequestId}"/>
</hyperlink>
</field>
@@ -2512,7 +2512,7 @@
<field name="thruDate"><ignored/></field>
<field name="submitButton"><ignored/></field>
<field name="deleteLink" title=" " widget-style="buttontext" use-when="headerItem.equals("EditProjectContents")">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteProjectContent" request-confirmation="true">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProjectContent" also-hidden="false" request-confirmation="true">
<parameter param-name="contentId"/>
<parameter param-name="workEffortId"/>
<parameter param-name="workEffortContentTypeId"/>
@@ -2582,7 +2582,7 @@
<field name="contentName"><display description="${contentMap.contentName} [${contentId}]"/></field>
<field name="fromDate"><display/> </field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteScrumProductContent" request-confirmation="true">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteScrumProductContent" also-hidden="false" request-confirmation="true">
<parameter param-name="contentId"/>
<parameter param-name="fromDate"/>
<parameter param-name="productId"/>
@@ -2689,7 +2689,7 @@
<field name="mimeTypeId"><hidden/></field>
<field name="fromDate"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext" >
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteBacklogItemContent" request-confirmation="true">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteBacklogItemContent" also-hidden="false" request-confirmation="true">
<parameter param-name="custRequestId"/>
<parameter param-name="contentId"/>
<parameter param-name="fromDate"/>
@@ -2764,7 +2764,7 @@
<set field="taskName" from-field="resultTask.workEffortName"/>
</row-actions>
<field name="taskId" title="${uiLabelMap.ScrumTask}" parameter-name="workEffortId">
- <hyperlink target="taskView" link-type="hidden-form" description="${taskName} [${taskId}]" target-window="_BLANK" target-type="intra-app">
+ <hyperlink description="${taskName} [${taskId}]" target="taskView" link-type="hidden-form" target-window="_BLANK" target-type="intra-app">
<parameter param-name="taskId" from-field="taskId"/>
</hyperlink>
</field>
@@ -2868,7 +2868,7 @@
<form name="QuickAddNewTask" type="upload" target="createTaskForBacklog">
<actions>
- <entity-condition list="custRequestList" entity-name="CustRequest">
+ <entity-condition entity-name="CustRequest" list="custRequestList">
<condition-list combine="and">
<condition-list combine="or">
<condition-expr field-name="custRequestTypeId" value="RF_PROD_BACKLOG" operator="equals"/>
@@ -2925,7 +2925,7 @@
</row-actions>
<field name="UnplannedSequence"><hidden value="Y"/></field>
<field name="deleteFlag" position="1" title="${uiLabelMap.ScrumMoveToUnplannedSprint}" widget-style="buttontext">
- <hyperlink target="DeleteProductBacklogItem" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="DeleteProductBacklogItem">
<parameter param-name="productId" from-field="parameters.productId"/>
<parameter param-name="custRequestId" from-field="custRequestId"/>
<parameter param-name="statusId" from-field="parameters.statusId"/>
@@ -3042,14 +3042,14 @@
<display/>
</field>
<field name="deleteButton" title=" " position="1" use-when="showPosition1&&!"CRQ_COMPLETED".equals("${custRequest.statusId}")" widget-style="buttontext">
- <hyperlink target="DeleteUnplanBacklog" description="Delete" confirmation-message="Are you sure to delete this sprint backlog ?" link-type="hidden-form">
+ <hyperlink description="Delete" target="DeleteUnplanBacklog" confirmation-message="Are you sure to delete this sprint backlog ?" link-type="hidden-form">
<parameter param-name="workEffortId"/>
<parameter param-name="custRequestId"/>
<parameter param-name="productId"/>
</hyperlink>
</field>
<field name="newTask" title=" " use-when="showPosition1&&!"CRQ_COMPLETED".equals("${custRequest.statusId}")" widget-style="buttontext">
- <hyperlink target="NewUnplanBacklogTask" description="Add Task" link-type="hidden-form">
+ <hyperlink description="Add Task" target="NewUnplanBacklogTask" link-type="hidden-form">
<parameter param-name="custRequestId"/>
<parameter param-name="productId"/>
</hyperlink>
@@ -3059,12 +3059,12 @@
<display description="${partyList[0].lastName} ${partyList[0].firstName} ${partyList[0].middleName}"></display>
</field>
<field name="editTaskParty" title=" " position="2" use-when="workEffortId!=null&&!"STS_COMPLETED".equals(currentStatusId)" widget-style="buttontext">
- <hyperlink target="EditTask" description="${uiLabelMap.CommonEdit}" link-type="hidden-form" target-window="_BLANK">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditTask" link-type="hidden-form" target-window="_BLANK">
<parameter param-name="taskId" from-field="${workEffortId}"/>
</hyperlink>
</field>
<field name="deleteTaskButton" title=" " position="2" use-when="workEffortId!=null&&!"STS_COMPLETED".equals(currentStatusId)" widget-style="buttontext">
- <hyperlink target="DeleteTaskFromUnplanBacklog" description="Delete" confirmation-message="Are you sure to delete this task ?" link-type="hidden-form">
+ <hyperlink description="Delete" target="DeleteTaskFromUnplanBacklog" confirmation-message="Are you sure to delete this task ?" link-type="hidden-form">
<parameter param-name="workEffortId" from-field="workEffortId"/>
<parameter param-name="custRequestId"/>
<parameter param-name="productId" from-field="parameters.productId"/>
@@ -3072,7 +3072,7 @@
</field>
<field name="setCompleteButton" title=" " widget-style="buttontext" use-when="workEffortId!=null&&!"STS_COMPLETED".equals(currentStatusId)"
position="2">
- <hyperlink target="setCompleteFromUnplanBacklog" description="${uiLabelMap.ScrumSetComplete}" link-type="hidden-form">
+ <hyperlink description="${uiLabelMap.ScrumSetComplete}" target="setCompleteFromUnplanBacklog" link-type="hidden-form">
<parameter param-name="workEffortId" from-field="workEffortId"/>
<parameter param-name="productId" from-field="parameters.productId"/>
</hyperlink>
diff --git a/specialpurpose/scrum/widget/scrumScreens.xml b/specialpurpose/scrum/widget/scrumScreens.xml
index 33255c3..5c0a190 100644
--- a/specialpurpose/scrum/widget/scrumScreens.xml
+++ b/specialpurpose/scrum/widget/scrumScreens.xml
@@ -75,7 +75,7 @@
<set field="titleProperty" value="PageTitleAddSprint"/>
<set field="tabButtonItem" value="editProject"/>
<set field="sprintId" from-field="parameters.sprintId"/>
- <entity-one value-field="projectWorkEffort" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="projectWorkEffort">
<field-map field-name="workEffortId" from-field="parameters.projectId"/>
</entity-one>
</actions>
@@ -113,7 +113,7 @@
<set field="titleProperty" value="PageTitleSprintOverview"/>
<set field="tabButtonItem" value="SprintSummary"/>
<set field="permissionMap.sprintId" from-field="parameters.sprintId"/>
- <entity-one value-field="sprintStatus" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="sprintStatus">
<field-map field-name="workEffortId" from-field="parameters.sprintId"/>
</entity-one>
<script location="component://scrum/groovyScripts/SprintBacklogListItems.groovy"/>
@@ -131,7 +131,7 @@
<widgets>
<section>
<actions>
- <entity-one value-field="project" entity-name="WorkEffort">
+ <entity-one entity-name="WorkEffort" value-field="project">
<field-map field-name="workEffortId" from-field="parameters.projectId"/>
</entity-one>
</actions>
@@ -489,7 +489,7 @@
<set field="titleProperty" value="PageTitleProductBacklog"/>
<set field="tabButtonItem" value="editProductBacklog"/>
<set field="productId" from-field="parameters.productId"/>
- <entity-one value-field="product" entity-name="Product">
+ <entity-one entity-name="Product" value-field="product">
<field-map field-name="productId"/>
</entity-one>
<entity-one entity-name="CustRequest" value-field="custRequest"/>
@@ -650,7 +650,7 @@
<actions>
<set field="tabButtonItem" value="editProductBacklog"/>
<set field="custRequestId" from-field="parameters.custRequestId"/>
- <entity-one value-field="custRequestMap" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequestMap"/>
<entity-and entity-name="CustRequestAndCustRequestItem" list="categoryList">
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="custRequestTypeId" value="RF_PARENT_BACKLOG"/>
@@ -694,7 +694,7 @@
<entity-and entity-name="CustRequestItem" list="custRequestItemList">
<field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
</entity-and>
- <entity-one value-field="custRequest" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest"/>
<set field="parameters.productId" from-field="custRequestItemList[0].productId"/>
<entity-one entity-name="Product" value-field="productMap">
<field-map field-name="productId" from-field="parameters.productId"/>
@@ -717,7 +717,7 @@
</entity-and>
<set field="update.productId" from-field="custRequestItemList[0].productId"/>
<set field="update.custRequestId" from-field="parameters.custRequestId"/>
- <entity-condition list="commEvents" entity-name="CommunicationEventAndCustRequest">
+ <entity-condition entity-name="CommunicationEventAndCustRequest" list="commEvents">
<condition-list combine="and">
<condition-expr field-name="custRequestId" operator="equals" from-field="parameters.custRequestId"/>
<condition-expr field-name="statusId" operator="not-equals" value="COM_CANCELLED"/>
@@ -735,10 +735,10 @@
<field-map field-name="roleTypeId" value="PRODUCT_OWNER"/>
</entity-and>
<set field="productOwnerId" value="${productRole[0].partyId}"/>
- <entity-one value-field="parentCom" entity-name="CommunicationEvent">
+ <entity-one entity-name="CommunicationEvent" value-field="parentCom">
<field-map field-name="communicationEventId" from-field="parameters.parentCommEventId"/>
</entity-one>
- <entity-one value-field="custStatus" entity-name="CustRequest">
+ <entity-one entity-name="CustRequest" value-field="custStatus">
<field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
</entity-one>
<entity-condition entity-name="ProductBacklog" list="productBacklogs">
@@ -778,7 +778,7 @@
<screenlet title="${uiLabelMap.ScrumRevisions}" name="RevisionsList">
<section>
<actions>
- <entity-condition list="plannedTasks" entity-name="ProjectSprintBacklogAndTask">
+ <entity-condition entity-name="ProjectSprintBacklogAndTask" list="plannedTasks">
<condition-list combine="and">
<condition-expr field-name="custRequestId" from-field="parameters.custRequestId"/>
<condition-expr field-name="sprintTypeId" value="SCRUM_SPRINT"/>
@@ -792,7 +792,7 @@
<select-field field-name="taskId"/>
</entity-condition>
<set field="taskIds" type="List" value="${groovy:return org.apache.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(plannedTasks, "taskId", true)}"/>
- <entity-condition list="unplannedTasks" entity-name="UnPlannedBacklogsAndTasks">
+ <entity-condition entity-name="UnPlannedBacklogsAndTasks" list="unplannedTasks">
<condition-list combine="and">
<condition-expr field-name="custRequestId" from-field="parameters.custRequestId"/>
<condition-list combine="or">
@@ -805,7 +805,7 @@
<select-field field-name="workEffortId"/>
</entity-condition>
<set field="workEffortIds" type="List" value="${groovy:return org.apache.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(unplannedTasks, "workEffortId", true)}"/>
- <entity-condition list="listIt" entity-name="WorkEffortAndContentDataResource">
+ <entity-condition entity-name="WorkEffortAndContentDataResource" list="listIt">
<condition-list combine="and">
<condition-expr field-name="workEffortContentTypeId" value="TASK_SUB_INFO"/>
<condition-list combine="or">
@@ -865,12 +865,12 @@
<entity-and entity-name="CustRequestItem" list="custRequestItem">
<field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
</entity-and>
- <entity-one value-field="custRequest" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest"/>
<set field="custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/>
<set field="productId" from-field="custRequestItem[0].productId"/>
<set field="update.productId" from-field="custRequestItem[0].productId"/>
<set field="update.custRequestId" from-field="parameters.custRequestId"/>
- <entity-condition list="commEvents" entity-name="CommunicationEventAndCustRequest">
+ <entity-condition entity-name="CommunicationEventAndCustRequest" list="commEvents">
<condition-list combine="and">
<condition-expr field-name="custRequestId" operator="equals" from-field="parameters.custRequestId"/>
<condition-expr field-name="statusId" operator="not-equals" value="COM_CANCELLED"/>
@@ -884,7 +884,7 @@
<field-map field-name="roleTypeId" value="PRODUCT_OWNER"/>
</entity-and>
<set field="productOwnerId" value="${productRole[0].partyId}"/>
- <entity-one value-field="parentCom" entity-name="CommunicationEvent">
+ <entity-one entity-name="CommunicationEvent" value-field="parentCom">
<field-map field-name="communicationEventId" from-field="parameters.parentCommEventId"/>
</entity-one>
</actions>
@@ -1000,7 +1000,7 @@
<field-map field-name="noteName" value="How to test"/>
</entity-and>
<set field="noteIds" value="${groovy:org.apache.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(noteDataList, 'noteId', true);}" type="List"/>
- <entity-condition list="custNoteList" entity-name="CustRequestNote" >
+ <entity-condition entity-name="CustRequestNote" list="custNoteList" >
<condition-list combine="and">
<condition-expr field-name="custRequestId" from-field="custRequestId"/>
<condition-expr field-name="noteId" operator="not-in" from-field="noteIds" ignore-if-empty="true"/>
@@ -1077,7 +1077,7 @@
<entity-and entity-name="CustRequestItem" list="custRequestItem">
<field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
</entity-and>
- <entity-one value-field="custRequest" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest"/>
<entity-condition list="commEvents" entity-name="CommunicationEventAndCustRequest">
<condition-list combine="and">
<condition-expr field-name="custRequestId" operator="equals" from-field="parameters.custRequestId"/>
@@ -1096,7 +1096,7 @@
<field-map field-name="roleTypeId" value="PRODUCT_OWNER"/>
</entity-and>
<set field="productOwnerId" value="${productRole[0].partyId}"/>
- <entity-one value-field="parentCom" entity-name="CommunicationEvent">
+ <entity-one entity-name="CommunicationEvent" value-field="parentCom">
<field-map field-name="communicationEventId" from-field="parameters.parentCommEventId"/>
</entity-one>
</actions>
@@ -1177,7 +1177,7 @@
<actions>
<set field="tabButtonItem" value="view"/>
<set field="custRequestId" from-field="parameters.custRequestId"/>
- <entity-one value-field="custRequestMap" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequestMap"/>
<entity-and entity-name="CustRequestAndCustRequestItem" list="categoryList">
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="custRequestTypeId" value="RF_PARENT_BACKLOG"/>
@@ -1275,7 +1275,7 @@
<set field="workEffortId" from-field="parameters.projectId"/>
<set field="sprintId" from-field="parameters.sprintId"/>
<entity-one entity-name="WorkEffort" value-field="project"/>
- <entity-one value-field="custRequest" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest"/>
</actions>
<widgets>
<decorator-screen name="CommonSprintScreenDecorator" location="${parameters.mainDecoratorLocation}">
@@ -1317,7 +1317,7 @@
<set field="tabButtonItem" value="SprintList"/>
<set field="workEffortId" from-field="parameters.projectId"/>
<entity-one entity-name="WorkEffort" value-field="project"/>
- <entity-one value-field="custRequest" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest"/>
</actions>
<widgets>
<include-form name="ListDailyMeetingMinute" location="component://scrum/widget/scrumForms.xml"/>
@@ -1331,7 +1331,7 @@
<set field="tabButtonItem" value="SprintList"/>
<set field="workEffortId" from-field="parameters.projectId"/>
<entity-one entity-name="WorkEffort" value-field="project"/>
- <entity-one value-field="custRequest" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest"/>
</actions>
<widgets>
<decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -1359,7 +1359,7 @@
<set field="tabButtonItem" value="SprintList"/>
<set field="workEffortId" from-field="parameters.projectId"/>
<entity-one entity-name="WorkEffort" value-field="project"/>
- <entity-one value-field="custRequest" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest"/>
<set field="permissionMap.projectId" from-field="parameters.projectId"/>
<set field="permissionMap.sprintId" from-field="parameters.sprintId"/>
</actions>
@@ -1462,7 +1462,7 @@
<set field="tabButtonItem" value="listResourcesTask"/>
<set field="titleProperty" value="PageTitleListTaskByParty"/>
<set field="workEffortId" from-field="parameters.projectId"/>
- <entity-condition list="tasks" entity-name="ProjectSprintBacklogTaskAndParty">
+ <entity-condition entity-name="ProjectSprintBacklogTaskAndParty" list="tasks">
<condition-list combine="and">
<condition-expr field-name="memberThruDate" value=""/>
<condition-list combine="or">
@@ -1592,7 +1592,7 @@
<actions>
<set field="titleProperty" value="PageTitleEditProduct"/>
<set field="tabButtonItem" value="edit"/>
- <entity-one value-field="product" entity-name="Product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<set field="permissionMap.productId" from-field="parameters.productId"/>
<script location="component://scrum/groovyScripts/ListScrumRolesPersonAndCompany.groovy"/>
</actions>
@@ -1642,7 +1642,7 @@
<field-map field-name="workEffortId" from-field="workEffortId"/>
</entity-and>
<set field="custRequestId" from-field="custRequestWorkEffort[0].custRequestId"/>
- <entity-one value-field="product" entity-name="Product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<entity-condition entity-name="CommunicationEventAndProduct" list="commEvents">
<condition-list combine="and">
<condition-list combine="or">
@@ -1664,7 +1664,7 @@
<field-map field-name="thruDate" value=""/>
</entity-and>
<set field="workEffortId" from-field="parameters.projectId"/>
- <entity-condition list="sprints" entity-name="ProjectSprint">
+ <entity-condition entity-name="ProjectSprint" list="sprints">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="parameters.productId"/>
</condition-list>
@@ -1690,7 +1690,7 @@
<screenlet title="${uiLabelMap.ScrumRevisions}">
<section>
<actions>
- <entity-condition list="backlogList" entity-name="CustRequestAndCustRequestItem">
+ <entity-condition entity-name="CustRequestAndCustRequestItem" list="backlogList">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="productId"/>
<condition-list combine="or">
@@ -1700,7 +1700,7 @@
</condition-list>
</entity-condition>
<set field="custRequestIds" value="${groovy:org.apache.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(backlogList, 'custRequestId', true);}" type="List"/>
- <entity-condition list="plannedTasks" entity-name="ProjectSprintBacklogAndTask">
+ <entity-condition entity-name="ProjectSprintBacklogAndTask" list="plannedTasks">
<condition-list combine="and">
<condition-expr field-name="custRequestId" operator="in" from-field="custRequestIds"/>
<condition-expr field-name="sprintTypeId" value="SCRUM_SPRINT"/>
@@ -1714,7 +1714,7 @@
<select-field field-name="taskId"/>
</entity-condition>
<set field="taskIds" type="List" value="${groovy:return org.apache.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(plannedTasks, "taskId", true)}"/>
- <entity-condition list="unplannedTasks" entity-name="UnPlannedBacklogsAndTasks">
+ <entity-condition entity-name="UnPlannedBacklogsAndTasks" list="unplannedTasks">
<condition-list combine="and">
<condition-expr field-name="custRequestId" operator="in" from-field="custRequestIds"/>
<condition-list combine="or">
@@ -1729,7 +1729,7 @@
<set field="workEffortIds" type="List" value="${groovy:return org.apache.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(unplannedTasks, "workEffortId", true)}"/>
<set field="parameters.custRequestId" from-field="custRequestWorkEffort[0].custRequestId"/>
<set field="parameters.noConditionFind" value="Y"/>
- <entity-condition list="listIt" entity-name="WorkEffortAndContentDataResource">
+ <entity-condition entity-name="WorkEffortAndContentDataResource" list="listIt">
<condition-list combine="and">
<condition-expr field-name="workEffortContentTypeId" value="TASK_SUB_INFO"/>
<condition-list combine="or">
@@ -1809,7 +1809,7 @@
<set field="titleProperty" value="PageTitleBilling"/>
<set field="tabButtonItem" value="billing"/>
<set field="productId" from-field="parameters.productId"/>
- <entity-one value-field="product" entity-name="Product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<set field="includeMeeting" from-field="parameters.includeMeeting" default-value="N"/>
<set field="organizationPartyId" from-field="userPreferences.ORGANIZATION_PARTY" default-value="${defaultOrganizationPartyId}"/>
<script location="component://scrum/groovyScripts/ProductBilling.groovy"/>
@@ -1823,10 +1823,10 @@
</entity-and>
<set field="partyId" from-field="productRole[0].partyId"/>
<set field="partyIdFrom" from-field="organizationPartyId"/>
- <entity-one value-field="partyMap" entity-name="PartyNameView">
+ <entity-one entity-name="PartyNameView" value-field="partyMap">
<field-map field-name="partyId" from-field="partyId"/>
</entity-one>
- <entity-one value-field="companyMap" entity-name="PartyNameView">
+ <entity-one entity-name="PartyNameView" value-field="companyMap">
<field-map field-name="partyId" from-field="partyIdFrom"/>
</entity-one>
</actions>
@@ -1929,7 +1929,7 @@
<actions>
<set field="titleProperty" value="PageTitleProductBacklogCategories"/>
<set field="tabButtonItem" value="categories"/>
- <entity-one value-field="product" entity-name="Product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<set field="productId" from-field="product.productId"/>
</actions>
<widgets>
@@ -1960,9 +1960,9 @@
<actions>
<set field="titleProperty" value="PageTitleEditProductBacklogCategories"/>
<set field="tabButtonItem" value="categories"/>
- <entity-one value-field="product" entity-name="Product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<set field="productId" from-field="product.productId"/>
- <entity-one value-field="custRequest" entity-name="CustRequest"/>
+ <entity-one entity-name="CustRequest" value-field="custRequest"/>
<set field="custRequestId" from-field="custRequest.custRequestId"/>
</actions>
<widgets>
@@ -2061,7 +2061,7 @@
<field-map field-name="roleTypeId" value="PRODUCT_OWNER"/>
</entity-and>
<set field="productOwnerId" value="${productRole[0].partyId}"/>
- <entity-one value-field="parentCom" entity-name="CommunicationEvent">
+ <entity-one entity-name="CommunicationEvent" value-field="parentCom">
<field-map field-name="communicationEventId" from-field="parameters.parentCommEventId"/>
</entity-one>
<set field="permissionMap.productId" from-field="productId"/>
@@ -2179,7 +2179,7 @@
<set field="productId" from-field="parameters.productId"/>
<set field="titleProperty" value="PageTitleEditCommunication" />
<set field="target" from-field="parameters.target" default-value="updateEmailForProduct"/>
- <entity-one value-field="communicationEvent" entity-name="CommunicationEvent"/>
+ <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
</actions>
<widgets>
<decorator-screen name="CommonScrumProductDecorator" location="${parameters.mainDecoratorLocation}">
@@ -2660,7 +2660,7 @@
<set field="headerItem" value="admin"/>
<set field="tabButtonItem" value="totalBilling"/>
<set field="productId" from-field="parameters.productId"/>
- <entity-one value-field="product" entity-name="Product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<set field="includeMeeting" from-field="parameters.includeMeeting" default-value="N"/>
<set field="organizationPartyId" from-field="userPreferences.ORGANIZATION_PARTY" default-value="${defaultOrganizationPartyId}"/>
<script location="component://scrum/groovyScripts/ProductBilling.groovy"/>
@@ -2674,10 +2674,10 @@
</entity-and>
<set field="partyId" from-field="productRole[0].partyId"/>
<set field="partyIdFrom" from-field="organizationPartyId"/>
- <entity-one value-field="partyMap" entity-name="PartyNameView">
+ <entity-one entity-name="PartyNameView" value-field="partyMap">
<field-map field-name="partyId" from-field="partyId"/>
</entity-one>
- <entity-one value-field="companyMap" entity-name="PartyNameView">
+ <entity-one entity-name="PartyNameView" value-field="companyMap">
<field-map field-name="partyId" from-field="partyIdFrom"/>
</entity-one>
</actions>
@@ -2722,7 +2722,7 @@
<set field="headerItem" value="admin"/>
<set field="tabButtonItem" value="productStatistics"/>
<set field="productId" from-field="parameters.productId"/>
- <entity-one value-field="product" entity-name="Product"/>
+ <entity-one entity-name="Product" value-field="product"/>
</actions>
<widgets>
<decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
diff --git a/specialpurpose/webpos/minilang/CartEvents.xml b/specialpurpose/webpos/minilang/CartEvents.xml
index fcbc028..8a8f2d7 100644
--- a/specialpurpose/webpos/minilang/CartEvents.xml
+++ b/specialpurpose/webpos/minilang/CartEvents.xml
@@ -250,7 +250,7 @@
<field-map field-name="currencyUomId" from-field="parameters.currencyUomId"/>
</entity-and>
<if-not-empty field="productFeaturePrices">
- <first-from-list entry="productFeaturePrice" list="productFeaturePrices"/>
+ <first-from-list list="productFeaturePrices" entry="productFeaturePrice"/>
<set field="amount" from-field="productFeaturePrice.price" type="BigDecimal" default-value="0"/>
<set field="isoCode" from-field="productFeaturePrice.currencyUomId" type="String"/>
<set field="maximumFractionDigits" value="2" type="Integer"/>
diff --git a/specialpurpose/webpos/minilang/PaymentEvents.xml b/specialpurpose/webpos/minilang/PaymentEvents.xml
index 6e7cc13..4f23219 100644
--- a/specialpurpose/webpos/minilang/PaymentEvents.xml
+++ b/specialpurpose/webpos/minilang/PaymentEvents.xml
@@ -562,7 +562,7 @@
</if-not-empty>
</if-not-empty>
<calculate field="payment" type="Integer">
- <calcop field="payment" operator="add"/>
+ <calcop operator="add" field="payment"/>
<number value="1"/>
</calculate>
</then>
