svn commit: r759666 [3/6] - in /ofbiz/trunk: applications/accounting/webapp
Locked
svn commit: r759666 [3/6] - in /ofbiz/trunk: applications/accounting/webapp
 
|
Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Sun Mar 29 11:00:00 2009 @@ -18,9 +18,9 @@ under the License. --> -<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - + <form name="ListCompanies" type="list" title="Internal Organizations" list-name="parties" 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> @@ -61,7 +61,7 @@ </field> <field name="submitButton" title="${uiLabelMap.AccountingCreateAssignment}"><submit button-type="button"/></field> </form> - + <form name="PartyAcctgPreference" type="single" target="createPartyAcctgPreference" default-service-name="createPartyAcctgPreference" default-map-name="agregatedPartyAcctgPreference" header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="partyAcctgPreference!=null" target="updatePartyAcctgPreference"/> @@ -70,7 +70,7 @@ <!-- the partyId is always displayed --> <field name="partyId" title="${uiLabelMap.AccountingOrganizationPartyId}"><display/></field> <!-- if there is no partyAcctgPreference yet, then we show drop-downs for the fields and a submit button --> - <field name="fiscalYearStartMonth" use-when="partyAcctgPreference==null" + <field name="fiscalYearStartMonth" use-when="partyAcctgPreference==null" tooltip="${uiLabelMap.${bsh:agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("fiscalYearStartMonth")!=null?"AccountingInheritedValue":""}}"> <drop-down> <option key="1" description="${uiLabelMap.AccountingFiscalMonth01}"/> @@ -99,7 +99,7 @@ <option key="31"/> </drop-down> </field> - <field name="taxFormId" use-when="partyAcctgPreference==null" + <field name="taxFormId" use-when="partyAcctgPreference==null" tooltip="${uiLabelMap.${bsh:agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("taxFormId")!=null?"AccountingInheritedValue":""}}"> <drop-down> <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> @@ -108,7 +108,7 @@ </entity-options> </drop-down> </field> - <field name="cogsMethodId" use-when="partyAcctgPreference==null" + <field name="cogsMethodId" use-when="partyAcctgPreference==null" tooltip="${uiLabelMap.${bsh:agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("cogsMethodId")!=null?"AccountingInheritedValue":""}}"> <drop-down> <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> @@ -139,17 +139,17 @@ </entity-options> </drop-down> </field> - <field name="useInvoiceIdForReturns" use-when="partyAcctgPreference==null" + <field name="useInvoiceIdForReturns" use-when="partyAcctgPreference==null" tooltip="${uiLabelMap.${bsh:agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("useInvoiceIdForReturns")!=null?"AccountingInheritedValue":""}}"> <drop-down allow-empty="true"> <option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/> </drop-down> </field> - <field name="quoteIdPrefix" use-when="partyAcctgPreference==null" + <field name="quoteIdPrefix" use-when="partyAcctgPreference==null" tooltip="${uiLabelMap.${bsh:agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("quoteIdPrefix")!=null?"AccountingInheritedValue":""}}"> <text maxlength="10" size="5"/> </field> - <field name="quoteSequenceEnumId" use-when="partyAcctgPreference==null" + <field name="quoteSequenceEnumId" use-when="partyAcctgPreference==null" tooltip="${uiLabelMap.${bsh:agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("quoteSequenceEnumId")!=null?"AccountingInheritedValue":""}}"> <drop-down> <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> @@ -173,95 +173,95 @@ </field> <field name="createButton" use-when="partyAcctgPreference==null" title="${uiLabelMap.CommonAdd}"><submit/></field> <field name="updateButton" use-when="partyAcctgPreference!=null" title="${uiLabelMap.CommonUpdate}"><submit/></field> - + <!-- otherwise, we just display the fields. there is no submit button because we shouldn't try to create it again and don't support an update option right now--> - <field name="fiscalYearStartMonth" use-when="partyAcctgPreference!=null" tooltip="${bsh: + <field name="fiscalYearStartMonth" use-when="partyAcctgPreference!=null" tooltip="${bsh: partyAcctgPreference!= null&&partyAcctgPreference.get("fiscalYearStartMonth")==null&&agregatedPartyAcctgPreference.get("fiscalYearStartMonth")!=null? "AccountingInheritedValue":""}"> <display/> </field> - <field name="fiscalYearStartDay" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: + <field name="fiscalYearStartDay" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: partyAcctgPreference!= null&&partyAcctgPreference.get("fiscalYearStartDay")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("fiscalYearStartDay")!=null? "AccountingInheritedValue":""}}"> <display/> </field> - <field name="taxFormId" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: - partyAcctgPreference!= null&&partyAcctgPreference.get("taxFormId")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("taxFormId")!=null? + <field name="taxFormId" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: + partyAcctgPreference!= null&&partyAcctgPreference.get("taxFormId")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("taxFormId")!=null? "AccountingInheritedValue":""}}"> <display-entity entity-name="Enumeration" key-field-name="enumId"/> </field> - <field name="cogsMethodId" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: + <field name="cogsMethodId" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: partyAcctgPreference!= null&&partyAcctgPreference.get("cogsMethodId")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("cogsMethodId")!=null? "AccountingInheritedValue":""}}"> <display-entity entity-name="Enumeration" key-field-name="enumId"/> </field> - <field name="baseCurrencyUomId" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: + <field name="baseCurrencyUomId" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: partyAcctgPreference!= null&&partyAcctgPreference.get("baseCurrencyUomId")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("baseCurrencyUomId")!=null? "AccountingInheritedValue":""}}"> <display/> </field> - <field name="invoiceIdPrefix" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: + <field name="invoiceIdPrefix" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: partyAcctgPreference!= null&&partyAcctgPreference.get("invoiceIdPrefix")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("invoiceIdPrefix")!=null? "AccountingInheritedValue":""}}"> <display/> </field> - <field name="invoiceSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: + <field name="invoiceSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: partyAcctgPreference!= null&&partyAcctgPreference.get("invoiceSequenceEnumId")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("invoiceSequenceEnumId")!=null? "AccountingInheritedValue":""}}"> <display-entity entity-name="Enumeration" key-field-name="enumId"/> </field> - <field name="useInvoiceIdForReturns" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: + <field name="useInvoiceIdForReturns" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: partyAcctgPreference!= null&&partyAcctgPreference.get("useInvoiceIdForReturns")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("useInvoiceIdForReturns")!=null? "AccountingInheritedValue":""}}"> <display/> </field> - <field name="quoteSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: + <field name="quoteSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: partyAcctgPreference!= null&&partyAcctgPreference.get("quoteSequenceEnumId")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("quoteSequenceEnumId")!=null? "AccountingInheritedValue":""}}"> <display-entity entity-name="Enumeration" key-field-name="enumId"/> </field> - <field name="quoteIdPrefix" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: + <field name="quoteIdPrefix" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: partyAcctgPreference!= null&&partyAcctgPreference.get("quoteIdPrefix")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("quoteIdPrefix")!=null? "AccountingInheritedValue":""}}"> <display/> </field> - <field name="lastQuoteNumber" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: + <field name="lastQuoteNumber" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: partyAcctgPreference!= null&&partyAcctgPreference.get("lastQuoteNumber")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("lastQuoteNumber")!=null? "AccountingInheritedValue":""}}"> <display/> </field> - <field name="orderSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: + <field name="orderSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: partyAcctgPreference!= null&&partyAcctgPreference.get("orderSequenceEnumId")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("orderSequenceEnumId")!=null? "AccountingInheritedValue":""}}"> <display-entity entity-name="Enumeration" key-field-name="enumId"/> - </field> - <field name="orderIdPrefix" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: + </field> + <field name="orderIdPrefix" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: partyAcctgPreference!= null&&partyAcctgPreference.get("orderIdPrefix")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("orderIdPrefix")!=null? "AccountingInheritedValue":""}}"> <display/> </field> - <field name="lastOrderNumber" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: + <field name="lastOrderNumber" use-when="partyAcctgPreference!=null" tooltip="${uiLabelMap.${bsh: partyAcctgPreference!= null&&partyAcctgPreference.get("lastOrderNumber")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("lastOrderNumber")!=null? "AccountingInheritedValue":""}}"> <display/> </field> - + <!-- these 2 are ONLY displayed, never allow manual editing --> - <field name="lastInvoiceNumber" tooltip="${uiLabelMap.${bsh: + <field name="lastInvoiceNumber" tooltip="${uiLabelMap.${bsh: (partyAcctgPreference==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("lastInvoiceNumber")!=null) || (partyAcctgPreference!=null&&partyAcctgPreference.get("lastInvoiceNumber")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("lastInvoiceNumber")!=null)? "AccountingInheritedValue":""}}"> <display/> </field> - <field name="lastInvoiceRestartDate" tooltip="${uiLabelMap.${bsh: + <field name="lastInvoiceRestartDate" tooltip="${uiLabelMap.${bsh: (partyAcctgPreference==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("lastInvoiceRestartDate")!=null) || (partyAcctgPreference!=null&&partyAcctgPreference.get("lastInvoiceRestartDate")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("lastInvoiceRestartDate")!=null)? "AccountingInheritedValue":""}}"> <display/> </field> - + <!-- these 2 are always can be updated --> - <field name="refundPaymentMethodId" tooltip="${uiLabelMap.${bsh: + <field name="refundPaymentMethodId" tooltip="${uiLabelMap.${bsh: (partyAcctgPreference==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("refundPaymentMethodId")!=null) || (partyAcctgPreference!=null&&partyAcctgPreference.get("refundPaymentMethodId")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("refundPaymentMethodId")!=null)? "AccountingInheritedValue":""}}"> @@ -271,7 +271,7 @@ </entity-options> </drop-down> </field> - <field name="errorGlJournalId" tooltip="${uiLabelMap.${bsh: + <field name="errorGlJournalId" tooltip="${uiLabelMap.${bsh: (partyAcctgPreference==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("errorGlJournalId")!=null) || (partyAcctgPreference!=null&&partyAcctgPreference.get("errorGlJournalId")==null&&agregatedPartyAcctgPreference!= null&&agregatedPartyAcctgPreference.get("errorGlJournalId")!=null)? "AccountingInheritedValue":""}}"> @@ -283,7 +283,7 @@ </drop-down> </field> </form> - + <!-- forms for managing FX rates --> <form name="ListConversions" type="list" list-name="conversions" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> @@ -294,7 +294,7 @@ <field name="fromDate" title="${uiLabelMap.CommonFrom}"><display/></field> <field name="thruDate" title="${uiLabelMap.CommonThru}"><display/></field> </form> - + <form name="updateFXConversion" type="single" target="updateFXConversion" default-service-name="updateFXConversion" header-row-style="header-row" default-table-style="basic-table"> <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> @@ -316,17 +316,17 @@ </field> <field name="purposeEnumId" title="${uiLabelMap.CommonPurpose}"> <drop-down allow-empty="true"> - <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> + <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value="CONVERSION_PURPOSE"/> - <entity-order-by field-name="sequenceId"/> + <entity-order-by field-name="sequenceId"/> </entity-options> </drop-down> </field> <field name="conversionFactor"><text/></field> <field name="submitButton" title="${uiLabelMap.AccountingUpdateFX}"><submit/></field> </form> - - + + <form name="ListGlAccountTypeDefaults" type="list" target="" list-name="glAccountTypeDefaults" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> @@ -343,7 +343,7 @@ <field name="glAccountId"> <display-entity entity-name="GlAccount" description="[${glAccountId}] ${accountCode} ${accountName}"/> </field> - <field name="remove" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> + <field name="remove" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink description="${uiLabelMap.CommonRemove}" target="removeGlAccountTypeDefault"> <parameter param-name="glAccountTypeId"/><parameter param-name="glAccountId"/><parameter param-name="organizationPartyId"/> </hyperlink> @@ -416,10 +416,10 @@ </entity-options> </drop-down> </field> - + <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field> </form> - + <!-- forms for Purchase invoice Itemtypes to GLAccount number --> <form name="ListPurInvoiceItemTypeGlAssignments" type="list" list-name="invoiceItemTypes" default-map-name="iTypes" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> @@ -468,7 +468,7 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field> </form> - + <!-- forms for payment types to GLAccount type --> <form name="ListPaymentTypeGlAssignments" type="list" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> @@ -488,7 +488,7 @@ </hyperlink> </field> </form> - + <form name="AddPaymentTypeGlAssignment" type="single" target="addPaymentTypeGlAssignment" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="addPaymentTypeGlAssignment"/> @@ -507,7 +507,7 @@ </entity-options> </drop-down> </field> - + <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field> </form> <!-- forms for payment method Type to GLAccounts --> @@ -536,7 +536,7 @@ </hyperlink> </field> </form> - + <form name="AddPaymentMethodTypeGlAssignment" type="single" target="addPaymentMethodTypeGlAssignment" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="addPaymentMethodTypeGlAssignment"/> @@ -556,7 +556,7 @@ </entity-options> </drop-down> </field> - + <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field> </form> @@ -564,7 +564,7 @@ <form name="ListClosedTimePeriods" type="list" list-name="closedTimePeriods" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-entity entity-name="CustomTimePeriod" default-field-type="display"/> - <field name="organizationPartyId"><hidden/></field> + <field name="organizationPartyId"><hidden/></field> <field name="isClosed"><hidden/></field> <field name="periodTypeId"> <display-entity entity-name="PeriodType"/> @@ -610,7 +610,7 @@ <entity-options entity-name="PeriodType" description="${description}"> <entity-order-by field-name="description"/> </entity-options> - </drop-down> + </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit/></field> </form> @@ -644,7 +644,7 @@ </hyperlink> </field> </form> - + <form name="ListProductGlAccounts" type="list" target="updateProductGlAccount" list-name="productGlAccounts" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <auto-fields-service service-name="updateProductGlAccount" default-field-type="display"/> @@ -657,7 +657,7 @@ <entity-order-by field-name="glAccountId"/> </entity-options> </drop-down> - </field> + </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteProductGlAccount" description="${uiLabelMap.CommonRemove}"> <parameter param-name="organizationPartyId"/><parameter param-name="productId"/><parameter param-name="glAccountTypeId"/> @@ -689,7 +689,7 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> - + <form name="ListFinAccountTypeGlAccounts" type="list" target="updateFinAccountTypeGlAccount" list-name="finAccountTypeGlAccounts" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <auto-fields-service service-name="updateFinAccountTypeGlAccount"/> @@ -702,7 +702,7 @@ <entity-order-by field-name="glAccountId"/> </entity-options> </drop-down> - </field> + </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteFinAccountTypeGlAccount" description="${uiLabelMap.CommonRemove}"> <parameter param-name="organizationPartyId"/><parameter param-name="finAccountTypeId"/> @@ -729,7 +729,7 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> - + <form name="ListProductCategoryGlAccounts" type="list" target="updateProductCategoryGlAccount" list-name="productCategoryGlAccounts" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <auto-fields-service service-name="updateProductCategoryGlAccount" default-field-type="display"/> @@ -742,7 +742,7 @@ <entity-order-by field-name="glAccountId"/> </entity-options> </drop-down> - </field> + </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteProductCategoryGlAccount" description="${uiLabelMap.CommonRemove}"> <parameter param-name="organizationPartyId"/><parameter param-name="productCategoryId"/><parameter param-name="glAccountTypeId"/> @@ -774,20 +774,20 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> - + <form name="ListVarianceReasonGlAccounts" type="list" target="updateVarianceReasonGlAccount" list-name="varianceReasonGlAccounts" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <auto-fields-service service-name="updateVarianceReasonGlAccount" default-field-type="display"/> <field name="organizationPartyId"><hidden/></field> <field name="varianceReasonId"><display-entity entity-name="VarianceReason"/></field> <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"> - <drop-down allow-empty="false"> + <drop-down allow-empty="false"> <entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass"> <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> <entity-order-by field-name="glAccountId"/> </entity-options> </drop-down> - </field> + </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteVarianceReasonGlAccount" description="${uiLabelMap.CommonRemove}"> <parameter param-name="organizationPartyId"/><parameter param-name="varianceReasonId"/> @@ -795,7 +795,7 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - + <form name="AddVarianceReasonGlAccount" type="single" target="createVarianceReasonGlAccount" header-row-style="header-row" default-table-style="basic-table"> <field name="organizationPartyId"><hidden/></field> @@ -816,12 +816,12 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> - + <form name="ListCreditCardTypeGlAccounts" type="list" target="updateCreditCardTypeGlAccount" list-name="creditCardTypeGlAccounts" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <auto-fields-service service-name="updateCreditCardTypeGlAccount" default-field-type="display"/> + <auto-fields-service service-name="updateCreditCardTypeGlAccount" default-field-type="display"/> <field name="organizationPartyId"><hidden/></field> - <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"> + <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"> <drop-down allow-empty="false"> <entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass"> <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/> @@ -834,17 +834,17 @@ <parameter param-name="organizationPartyId"/><parameter param-name="cardType"/> </hyperlink> </field> - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - + <form name="AddCreditCardTypeGlAccount" type="single" target="createCreditCardTypeGlAccount" header-row-style="header-row" default-table-style="basic-table"> - <field name="organizationPartyId"><hidden/></field> + <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" description="${enumCode}" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value="CREDIT_CARD_TYPE"/> - <entity-order-by field-name="enumId"/> + <entity-order-by field-name="enumId"/> </entity-options> </drop-down> </field> @@ -858,7 +858,7 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> - + <form name="ListTaxAuthorityGlAccounts" type="list" target="updateOrganizationTaxAuthorityGlAccount" list-name="taxAuthorityGlAccounts" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <auto-fields-service service-name="updateTaxAuthorityGlAccount" default-field-type="display"/> @@ -868,7 +868,9 @@ </field> <field name="taxAuthPartyId" title="${uiLabelMap.AccountingTaxAuthorityParty}"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}"> - <sub-hyperlink description="${taxAuthPartyId}" target="/partymgr/control/viewprofile?partyId=${taxAuthPartyId}" target-type="inter-app" link-style="buttontext"/> + <sub-hyperlink description="${taxAuthPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext"> + <parameter param-name="partyId" from-field="taxAuthPartyId"/> + </sub-hyperlink> </display-entity> </field> <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"> @@ -878,7 +880,7 @@ <entity-order-by field-name="glAccountId"/> </entity-options> </drop-down> - </field> + </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteOrganizationTaxAuthorityGlAccount" description="${uiLabelMap.CommonDelete}"> <parameter param-name="organizationPartyId"/><parameter param-name="taxAuthGeoId"/><parameter param-name="taxAuthPartyId"/> @@ -895,7 +897,9 @@ </field> <field name="taxAuthPartyId" title="${uiLabelMap.AccountingTaxAuthorityParty}"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}"> - <sub-hyperlink description="${taxAuthPartyId}" target="/partymgr/control/viewprofile?partyId=${taxAuthPartyId}" target-type="inter-app" link-style="buttontext"/> + <sub-hyperlink description="${taxAuthPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext"> + <parameter param-name="partyId" from-field="taxAuthPartyId"/> + </sub-hyperlink> </display-entity> </field> <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"> @@ -912,7 +916,7 @@ <form name="ListPartyGlAccounts" type="list" target="updatePartyGlAccount" list-name="partyGlAccounts" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <auto-fields-service service-name="updatePartyGlAccount" default-field-type="display"/> - <field name="organizationPartyId"><hidden/></field> + <field name="organizationPartyId"><hidden/></field> <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"> <drop-down allow-empty="false"> <entity-options description="${glAccountId} ${accountName}" entity-name="GlAccountOrganizationAndClass"> @@ -920,7 +924,7 @@ <entity-order-by field-name="glAccountId"/> </entity-options> </drop-down> - </field> + </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deletePartyGlAccount" description="${uiLabelMap.CommonDelete}"> <parameter param-name="organizationPartyId"/><parameter param-name="partyId"/><parameter param-name="glAccountId"/><parameter param-name="roleTypeId"/><parameter param-name="glAccountTypeId"/> Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml Sun Mar 29 11:00:00 2009 @@ -71,7 +71,9 @@ <field name="mapKey"><display/></field> <field name="contentId"> <display-entity entity-name="Content" description="${contentName}"> - <sub-hyperlink target="EditContent?contentId=${contentId}" description=" [${contentId}]"/> + <sub-hyperlink target="EditContent" description=" [${contentId}]"> + <parameter param-name="contentId" from-field="contentId"/> + </sub-hyperlink> </display-entity> </field> </form> @@ -92,7 +94,9 @@ --> <field name="contentId"> <display-entity entity-name="Content" description="${contentName}" key-field-name="contentId"> - <sub-hyperlink target="EditContent?contentId=${contentId}" description=" [${contentId}]" link-style="linktext"/> + <sub-hyperlink target="EditContent" description=" [${contentId}]" link-style="linktext"> + <parameter param-name="contentId" from-field="contentId"/> + </sub-hyperlink> </display-entity> </field> Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Sun Mar 29 11:00:00 2009 @@ -20,7 +20,7 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - + <form name="FindContent" target="findContent" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <!--auto-fields-entity entity-name="Content" default-field-type="find" /--> @@ -69,11 +69,13 @@ <field-map field-name="orderBy" value="contentId"/> </service> </actions> - + <field name="contentId"><hidden/></field> <field name="contentName" widget-style="tabletext"> <display-entity entity-name="Content" description="${contentName}" key-field-name="contentId"> - <sub-hyperlink target="editContent?contentId=${contentId}" description="[${contentId}]" link-style="buttontext"/> + <sub-hyperlink target="editContent" description="[${contentId}]" link-style="buttontext"> + <parameter param-name="contentId" from-field="contentId"/> + </sub-hyperlink> </display-entity> </field> <field name="description"><display/></field> @@ -84,19 +86,23 @@ <field name="dataResourceId" use-when="dataResourceId==null"><display/></field> <field name="dataResourceId" use-when="dataResourceId!=null"> <display-entity entity-name="DataResource" description="${dataResourceName}"> - <sub-hyperlink target="EditDataResource?dataResourceId=${dataResourceId}" link-style="buttontext" description="[${dataResourceId}]"/> + <sub-hyperlink target="EditDataResource" link-style="buttontext" description="[${dataResourceId}]"> + <parameter param-name="dataResourceId" from-field="dataResourceId"/> + </sub-hyperlink> </display-entity> </field> <field name="ownerContentId"> <display-entity entity-name="Content" description="${contentName}" key-field-name="contentId"> - <sub-hyperlink target="editContent?contentId=${contentId}" description="[${contentId}]" link-style="buttontext"/> + <sub-hyperlink target="editContent" description="[${contentId}]" link-style="buttontext"> + <parameter param-name="contentId" from-field="contentId"/> + </sub-hyperlink> </display-entity> </field> <on-event-update-area event-type="paginate" area-id="search-results" area-target="findContentSearchResults"/> </form> <form name="LookupContent" target="LookupContent" title="" type="single" extends="FindContent" header-row-style="header-row" default-table-style="basic-table"/> - + <form name="ListLookupContent" extends="ListContent" type="list" list-name="listIt" paginate-target="LookupContent" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> @@ -108,11 +114,11 @@ </actions> <field name="contentId"> <hyperlink also-hidden="false" target-type="plain" description="${contentId}" target="javascript:set_value('${contentId}')"/> - </field> + </field> <field name="contentName" widget-style="tabletext"><display/></field> <field name="createdByUserLogin"><ignored/></field> </form> - + <form name="EditContent" target="updateContent" title="" type="single" default-map-name="currentValue" header-row-style="header-row" default-table-style="basic-table"> <actions> @@ -167,7 +173,7 @@ <field name="createButton" title="${uiLabelMap.CommonCreate}" use-when="currentValue==null" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="updateButton" title="${uiLabelMap.CommonUpdate}" use-when="currentValue!=null" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - + <!-- form name="AddContent" target="createContent" title="" type="single" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"> <auto-fields-entity entity-name="Content" /> @@ -202,11 +208,11 @@ <field name="lastModifiedByUserLogin" position="1"><display/></field> <field name="lastModifiedDate" position="2"><display/></field> </form --> - + <!-- Content Lookup forms --> <form name="mruLookupContent" default-entity-name="Content" 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="${contentId}" target="javascript:set_value('${contentId}')"/> </field> @@ -269,7 +275,9 @@ <field name="contentId"><hidden/></field> <field name="contentIdTo"> <display-entity entity-name="Content" description="${contentName},${description}" key-field-name="contentId"> - <sub-hyperlink target="EditContentAssoc?contentId=${contentIdTo}" description="${contentIdTo}" link-style="tabletext"/> + <sub-hyperlink target="EditContentAssoc" description="${contentIdTo}" link-style="tabletext"> + <parameter param-name="contentId" from-field="contentIdTo"/> + </sub-hyperlink> </display-entity> </field> <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType" description="${description}"></display-entity></field> @@ -297,7 +305,9 @@ </actions> <field name="contentId"> <display-entity entity-name="Content" description="${contentName},${description}"> - <sub-hyperlink target="EditContentAssoc?contentId=${contentId}" description="${contentId}" link-style="tabletext"/> + <sub-hyperlink target="EditContentAssoc" description="${contentId}" link-style="tabletext"> + <parameter param-name="contentId" from-field="contentId"/> + </sub-hyperlink> </display-entity> </field> <field name="contentIdTo"><hidden/></field> @@ -317,12 +327,12 @@ <submit button-type="text-link"/> </field> </form> - + <!-- ContentRole forms --> <form name="AddContentRole" target="addContentRole" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createContentRole"/> - <field name="contentId" widget-style="buttontext" > + <field name="contentId" widget-style="buttontext" > <lookup target-form-name="LookupContent" /> </field> <field name="partyId" widget-style="buttontext"><lookup target-form-name="LookupPerson"/></field> @@ -364,7 +374,7 @@ </hyperlink> </field> </form> - + <!-- ContentPurpose forms --> <form name="AddContentPurpose" target="addContentPurpose" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> @@ -395,18 +405,18 @@ </hyperlink> </field> </form> - + <!-- ContentAttribute forms --> <form name="AddContentAttribute" target="addContentAttribute" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createContentAttribute"/> - <field name="contentId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" > + <field name="contentId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" > <lookup target-form-name="LookupContent" /> </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListContentAttribute" target="updateContentAttribute" title="" type="list" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="ContentAttribute" use-cache="true"> <field-map from-field="contentId" field-name="contentId" /> @@ -422,12 +432,12 @@ </hyperlink> </field> </form> - + <!-- ContentMetaData forms --> <form name="AddContentMetaData" target="addContentMetaData" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createContentMetaData"/> - <field name="contentId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" > + <field name="contentId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" > <lookup target-form-name="LookupContent" /> </field> <field name="metaDataPredicateId"> @@ -460,10 +470,10 @@ </hyperlink> </field> </form> - + <!-- Person Lookup forms --> <form name="mruLookupPerson" list-name="mruList" target="" title="" type="list" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="partyId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/> </field> @@ -506,9 +516,11 @@ <auto-fields-service service-name="updateWorkEffortContent" default-field-type="edit" /> <field name="workEffortId" widget-style="tabletext"> <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}" also-hidden="true"> - <sub-hyperlink target="/workeffort/control/EditWorkEffort?workEffortId=${workEffortId}" description="${workEffortId}" link-style="buttontext" target-type="inter-app"/> + <sub-hyperlink target="/workeffort/control/EditWorkEffort" description="${workEffortId}" link-style="buttontext" target-type="inter-app"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </sub-hyperlink> </display-entity> - </field> + </field> <field name="contentId" widget-style="tabletext"><hidden/></field> <field name="workEffortContentTypeId" widget-style="tabletext"><display-entity entity-name="WorkEffortContentType" description="${description}"/></field> <field name="fromDate" widget-style="tabletext"><display/></field> @@ -539,7 +551,7 @@ <hyperlink also-hidden="false" description="${content.contentName} [${content.contentId}]" target="ViewSimpleContent"> <parameter param-name="contentId" from-field="content.contentId"/> <parameter param-name="dataResourceId" from-field="content.dataResourceId"/> - </hyperlink> + </hyperlink> </field> <field name="contentTypeId"> <display-entity entity-name="ContentType" key-field-name="contentTypeId" description="${description}"/> Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original) +++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Sun Mar 29 11:00:00 2009 @@ -69,7 +69,9 @@ <field name="dataResourceId"><hidden/></field> <field name="dataResourceName" widget-style="tabletext"> <display-entity entity-name="DataResource" description="${dataResourceName}" key-field-name="dataResourceId"> - <sub-hyperlink target="EditDataResource?dataResourceId=${dataResourceId}" description="[${dataResourceId}]" link-style="buttontext"/> + <sub-hyperlink target="EditDataResource" description="[${dataResourceId}]" link-style="buttontext"> + <parameter param-name="dataResourceId" from-field="dataResourceId"/> + </sub-hyperlink> </display-entity> </field> <field name="dataResourceTypeId"><display-entity entity-name="DataResourceType" description="${description}"></display-entity></field> Modified: ofbiz/trunk/applications/content/widget/forum/BlogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/BlogForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/BlogForms.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/BlogForms.xml Sun Mar 29 11:00:00 2009 @@ -24,7 +24,9 @@ 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" widget-style="tabletext"> - <hyperlink target="editBlog?blogContentId=${contentId}" description="${contentName} [${contentId}]"/> + <hyperlink target="editBlog" description="${contentName} [${contentId}]"> + <parameter param-name="blogContentId" from-field="contentId"/> + </hyperlink> </field> <field name="description"><display/></field> <field name="statusId"><display-entity entity-name="StatusItem"></display-entity></field> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml Sun Mar 29 11:00:00 2009 @@ -75,7 +75,9 @@ <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?leaveTypeId=${leaveTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deleteEmplLeaveType" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="leaveTypeId" from-field="leaveTypeId"/> + </hyperlink> </field> <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Sun Mar 29 11:00:00 2009 @@ -35,7 +35,9 @@ </field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView"> - <sub-hyperlink target="viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/> + <sub-hyperlink target="viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field> @@ -67,7 +69,9 @@ </field> <field name="partyId" use-when="emplPosition!=null" title="${uiLabelMap.PartyPartyId}"> <display-entity description="${groupName}" entity-name="PartyNameView"> - <sub-hyperlink target="viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/> + <sub-hyperlink target="viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> @@ -101,7 +105,9 @@ <auto-fields-service service-name="updateEmplPositionFulfillment"/> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView"> - <sub-hyperlink target="viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/> + <sub-hyperlink target="viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="emplPositionId"><hidden/></field> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml Sun Mar 29 11:00:00 2009 @@ -232,11 +232,15 @@ <form name="CurrentEmploymentData" default-map-name="employmentData" type="single"> <field name="company" entry-name="employment.partyIdFrom"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} "> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${employmentData.employment.partyIdFrom}" description="[${employmentData.employment.partyIdFrom}]" target-type="inter-app"/> + <sub-hyperlink target="/partymgr/control/viewprofile" description="[${employmentData.employment.partyIdFrom}]" target-type="inter-app"> + <parameter param-name="partyId" from-field="employmentData.employment.partyIdFrom"/> + </sub-hyperlink> </display-entity> </field> <field name="position" entry-name="emplPositionType.emplPositionTypeId"> - <hyperlink target="emplPositionView?emplPositionId=${employmentData.emplPosition.emplPositionId}" description="${employmentData.emplPositionType.description} [${employmentData.emplPosition.emplPositionId}]"/> + <hyperlink target="emplPositionView" description="${employmentData.emplPositionType.description} [${employmentData.emplPosition.emplPositionId}]"> + <parameter param-name="emplPositionId" from-field="employmentData.emplPosition.emplPositionId"/> + </hyperlink> </field> <field name="salary" entry-name="emplPositionRateAmount.rateAmount"> <display type="currency" currency="${employmentData.emplPositionRateAmount.rateCurrencyUomId}"/> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Sun Mar 29 11:00:00 2009 @@ -303,7 +303,9 @@ <auto-fields-service default-field-type="display" service-name="updatePerformanceNote"/> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/> + <sub-hyperlink target="/partymgr/control/viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> </form> Modified: ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml Sun Mar 29 11:00:00 2009 @@ -29,7 +29,9 @@ <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?skillTypeId=${skillTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deleteSkillType" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="skillTypeId" from-field="skillTypeId"/> + </hyperlink> </field> <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field> @@ -49,7 +51,9 @@ <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?responsibilityTypeId=${responsibilityTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deleteResponsibilityType" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="responsibilityTypeId" from-field="responsibilityTypeId"/> + </hyperlink> </field> <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field> <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field> @@ -70,7 +74,9 @@ <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?terminationTypeId=${terminationTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deleteTerminationType" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="terminationTypeId" from-field="terminationTypeId"/> + </hyperlink> </field> <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field> @@ -189,7 +195,9 @@ <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?terminationReasonId=${terminationReasonId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deleteTerminationReason" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="terminationReasonId" from-field="terminationReasonId"/> + </hyperlink> </field> <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field> </form> Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml Sun Mar 29 11:00:00 2009 @@ -63,7 +63,9 @@ <auto-fields-service service-name="updatePartyQual"/> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView"> - <sub-hyperlink target="viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/> + <sub-hyperlink target="viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="partyQualTypeId"><display-entity entity-name="PartyQualType" description="${description}"/></field> Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml Sun Mar 29 11:00:00 2009 @@ -43,11 +43,15 @@ </field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView"> - <sub-hyperlink target="viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/> + <sub-hyperlink target="viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> - <hyperlink target="deletePartyResume?resumeId=${resumeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deletePartyResume" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="resumeId" from-field="resumeId"/> + </hyperlink> </field> </form> <form name="EditPartyResume" type="single" target="createPartyResume" title="" default-map-name="partyResume" Modified: ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml Sun Mar 29 11:00:00 2009 @@ -37,7 +37,9 @@ </actions> <auto-fields-service default-field-type="display" service-name="updatePayGrade"/> <field name="payGradeId" title="${uiLabelMap.HumanResPayGradeID}" widget-style="linktext"> - <hyperlink also-hidden="true" target="EditPayGrade?payGradeId=${payGradeId}" target-type="plain" description="${payGradeId}"/> + <hyperlink also-hidden="true" target="EditPayGrade" target-type="plain" description="${payGradeId}"> + <parameter param-name="payGradeId" from-field="payGradeId"/> + </hyperlink> </field> </form> <form name="EditPayGrade" type="single" target="updatePayGrade" title="" Modified: ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml Sun Mar 29 11:00:00 2009 @@ -47,7 +47,9 @@ <alt-target use-when="insideEmployee==null" target="updatePersonTrainings"/> <auto-fields-service default-field-type="display" service-name="updatePersonTraining"/> <field name="partyId" widget-style="linktext"> - <hyperlink also-hidden="true" target="viewprofile?partyId=${partyId}" target-type="plain" description="${partyId}"/> + <hyperlink also-hidden="true" target="viewprofile" target-type="plain" description="${partyId}"> + <parameter param-name="partyId" from-field="partyId"/> + </hyperlink> </field> <field name="trainingClassTypeId"><display-entity description="${description}" entity-name="TrainingClassType"/></field> <field name="thruDate"><date-time type="timestamp"/></field> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml Sun Mar 29 11:00:00 2009 @@ -86,10 +86,14 @@ <field name="fromDate"><display/></field> <field name="thruDate"><display/></field> <field name="updateLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="EditProductManufacturingRules?ruleId=${ruleId}" description="${uiLabelMap.CommonSelect}" /> + <hyperlink target="EditProductManufacturingRules" description="${uiLabelMap.CommonSelect}" > + <parameter param-name="ruleId" from-field="ruleId"/> + </hyperlink> </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="DeleteProductManufacturingRule?ruleId=${ruleId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="DeleteProductManufacturingRule" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="ruleId" from-field="ruleId"/> + </hyperlink> </field> </form> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Sun Mar 29 11:00:00 2009 @@ -72,7 +72,9 @@ </service> </actions> <field name="workEffortId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="ShowProductionRun?productionRunId=${workEffortId}" description="${workEffortId}" also-hidden="false"/> + <hyperlink target="ShowProductionRun" description="${workEffortId}" also-hidden="false"> + <parameter param-name="productionRunId" from-field="workEffortId"/> + </hyperlink> </field> <field name="workEffortName" title="${uiLabelMap.ManufacturingProductionRunName}"><display/></field> <field name="productId" title="${uiLabelMap.ProductProductId}"><display/></field> @@ -112,7 +114,9 @@ <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?orderId=${orderId}" description="${orderId}/${orderItemSeqId}" also-hidden="false" target-type="inter-app"/> + <hyperlink target="/ordermgr/control/orderview" description="${orderId}/${orderItemSeqId}" also-hidden="false" target-type="inter-app"> + <parameter param-name="orderId" from-field="orderId"/> + </hyperlink> </field> <!-- <field name="orderItemSeqId"><display/></field> @@ -128,7 +132,9 @@ <form name="ListProductionRunInventoryItems" type="list" title="" list-name="inventoryItems" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="inventoryItemId" widget-style="buttontext"> - <hyperlink target="/facility/control/EditInventoryItem?inventoryItemId=${inventoryItemId}" description="${inventoryItemId}" also-hidden="false" target-type="inter-app"/> + <hyperlink target="/facility/control/EditInventoryItem" description="${inventoryItemId}" also-hidden="false" target-type="inter-app"> + <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> + </hyperlink> </field> <field name="lotId" entry-name="inventoryItemId"><display-entity entity-name="InventoryItem" key-field-name="inventoryItemId" description="${lotId} "/></field> <field name="creationDate" entry-name="inventoryItemId"><display-entity entity-name="InventoryItem" key-field-name="inventoryItemId" description="${datetimeReceived}"/></field> @@ -515,7 +521,9 @@ <form name="ProductionRunTaskInventoryProducedList" type="list" title="" list-name="prunInventoryProduced" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="inventoryItemId" title="${uiLabelMap.ProductInventoryItem}" widget-style="buttontext"> - <hyperlink target="/facility/control/EditInventoryItem?inventoryItemId=${inventoryItemId}" description="${inventoryItemId}" also-hidden="false" target-type="inter-app"/> + <hyperlink target="/facility/control/EditInventoryItem" description="${inventoryItemId}" also-hidden="false" target-type="inter-app"> + <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> + </hyperlink> </field> </form> <form name="ProductionRunTaskFixedAssets" type="list" target="updateWorkEffortFixedAssetAssign" paginate-target="" title="" list-name="records" @@ -669,7 +677,9 @@ </field> <field name="estimatedShipDate"><display/></field> <field name="viewShipmentPlanLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="WorkWithShipmentPlans?shipmentId=${shipmentId}" description="${uiLabelMap.CommonView}" also-hidden="false"/> + <hyperlink target="WorkWithShipmentPlans" description="${uiLabelMap.CommonView}" also-hidden="false"> + <parameter param-name="shipmentId" from-field="shipmentId"/> + </hyperlink> </field> </form> <form name="SelectMrpName" type="single" target="ManufacturingReports" title="" @@ -682,7 +692,9 @@ <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="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="ShowProductionRun?productionRunId=${workEffortIdFrom}" description="${workEffortIdFrom}" also-hidden="false"/> + <hyperlink target="ShowProductionRun" description="${workEffortIdFrom}" also-hidden="false"> + <parameter param-name="productionRunId" from-field="workEffortIdFrom"/> + </hyperlink> </field> <field name="workEffortName" title="${uiLabelMap.ManufacturingTaskName}" entry-name="workEffortIdFrom"> <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName} " cache="true"/> @@ -709,7 +721,9 @@ <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="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="ShowProductionRun?productionRunId=${workEffortIdTo}" description="${workEffortIdTo}" also-hidden="false"/> + <hyperlink target="ShowProductionRun" description="${workEffortIdTo}" also-hidden="false"> + <parameter param-name="productionRunId" from-field="workEffortIdTo"/> + </hyperlink> </field> <field name="workEffortName" title="${uiLabelMap.ManufacturingTaskName}" entry-name="workEffortIdTo"> <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName} " cache="true"/> @@ -781,7 +795,7 @@ <parameter param-name="fromDate" from-field="fromDate"/> <parameter param-name="productId" from-field="productId"/> <parameter param-name="workEffortGoodStdTypeId" from-field="workEffortGoodStdTypeId"/> - <parameter param-name="productionRunId" from-field="productionRunId}"/> + <parameter param-name="productionRunId" from-field="productionRunId"/> </hyperlink> </field> </form> @@ -791,7 +805,9 @@ <set field="quantityOnHandDiff" value="${bsh:-1*quantityOnHandDiff}" type="BigDecimal"/> </row-actions> <field name="inventoryItemId" widget-style="buttontext"> - <hyperlink target="/facility/control/EditInventoryItem?inventoryItemId=${inventoryItemId}" description="${inventoryItemId}" also-hidden="false" target-type="inter-app"/> + <hyperlink target="/facility/control/EditInventoryItem" description="${inventoryItemId}" also-hidden="false" target-type="inter-app"> + <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> + </hyperlink> </field> <field name="productId" entry-name="inventoryItemId"> <display-entity entity-name="InventoryItem" key-field-name="inventoryItemId" description="${productId}"/> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml Sun Mar 29 11:00:00 2009 @@ -26,10 +26,14 @@ <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> <field name="calendarWeekId" title="${uiLabelMap.ManufacturingCalendarWeekId}"><display/></field> <field name="updateLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="EditCalendar?calendarId=${calendarId}" description="${uiLabelMap.CommonUpdate}" /> + <hyperlink target="EditCalendar" description="${uiLabelMap.CommonUpdate}" > + <parameter param-name="calendarId" from-field="calendarId"/> + </hyperlink> </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="RemoveCalendar?calendarId=${calendarId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="RemoveCalendar" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="calendarId" from-field="calendarId"/> + </hyperlink> </field> </form> <form name="ListCalendarWeek" type="list" target="UpdateCalendarWeek" title="" list-name="calendarWeeks" @@ -37,10 +41,14 @@ <field name="calendarWeekId" title="${uiLabelMap.ManufacturingCalendarWeekId}"><display/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> <field name="updateLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="EditCalendarWeek?calendarWeekId=${calendarWeekId}" description="${uiLabelMap.CommonUpdate}" /> + <hyperlink target="EditCalendarWeek" description="${uiLabelMap.CommonUpdate}" > + <parameter param-name="calendarWeekId" from-field="calendarWeekId"/> + </hyperlink> </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="RemoveCalendarWeek?calendarWeekId=${calendarWeekId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="RemoveCalendarWeek" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="calendarWeekId" from-field="calendarWeekId"/> + </hyperlink> </field> </form> <form name="ListCalendarExceptionDay" type="list" target="UpdateCalendarExceptionDay" title="" list-name="calendarExceptionDays" Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml Sun Mar 29 11:00:00 2009 @@ -155,7 +155,9 @@ </field> <!-- <field name="costComponentCalcView" entry-name="costComponentCalcId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="viewCostComponentCalc?costComponentCalcId=${costComponentCalcId}" description="${uiLabelMap.CommonViewFormula}" also-hidden="false"/> + <hyperlink target="viewCostComponentCalc" description="${uiLabelMap.CommonViewFormula}" also-hidden="false"> + <parameter param-name="costComponentCalcId" from-field="costComponentCalcId"/> + </hyperlink> </field> --> <field name="calcelWorkEffortCostCalc" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> @@ -197,7 +199,9 @@ <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field> <field name="editRouting" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="EditRouting?workEffortId=${workEffortIdFrom}" description="${uiLabelMap.ManufacturingEditRouting}" also-hidden="false"/> + <hyperlink target="EditRouting" description="${uiLabelMap.ManufacturingEditRouting}" also-hidden="false"> + <parameter param-name="workEffortId" from-field="workEffortIdFrom"/> + </hyperlink> </field> </form> @@ -208,7 +212,9 @@ <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?workEffortId=${workEffortIdTo}" description="[${workEffortIdTo}] ${workEffortToName}" also-hidden="false"/> + <hyperlink target="EditRoutingTask" description="[${workEffortIdTo}] ${workEffortToName}" also-hidden="false"> + <parameter param-name="workEffortId" from-field="workEffortIdTo"/> + </hyperlink> </field> <field name="workEffortAssocTypeId" ><hidden/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}" ><display/></field> @@ -273,7 +279,9 @@ <form name="ListRoutingProductLink" type="list" target="EditRoutingProductLink" title="" list-name="allRoutingProductLinks" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <field name="productId" widget-style="buttontext"> - <hyperlink description="${productId}" target="/catalog/control/ViewProductManufacturing?productId=${productId}" also-hidden="false" target-type="inter-app"/> + <hyperlink description="${productId}" target="/catalog/control/ViewProductManufacturing" also-hidden="false" target-type="inter-app"> + <parameter param-name="productId" from-field="productId"/> + </hyperlink> </field> <field name="productName" entry-name="productId" title="${uiLabelMap.ProductProductName}"> <display-entity key-field-name="productId" entity-name="Product" description="${internalName}"/> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml Sun Mar 29 11:00:00 2009 @@ -24,7 +24,9 @@ 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?costComponentCalcId=${costComponentCalcId}" description="${costComponentCalcId}" also-hidden="false"/> + <hyperlink target="EditCostCalcs" description="${costComponentCalcId}" also-hidden="false"> + <parameter param-name="costComponentCalcId" from-field="costComponentCalcId"/> + </hyperlink> </field> <field name="costGlAccountTypeId"><hidden/></field> <field name="offsettingGlAccountTypeId"><hidden/></field> @@ -35,7 +37,9 @@ <display-entity entity-name="CustomMethod" key-field-name="customMethodId"/> </field> <field name="removeCostComponentCalc" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="removeCostComponentCalc?costComponentCalcId=${costComponentCalcId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/> + <hyperlink target="removeCostComponentCalc" description="${uiLabelMap.CommonRemove}" also-hidden="false"> + <parameter param-name="costComponentCalcId" from-field="costComponentCalcId"/> + </hyperlink> </field> </form> <form name="EditCostComponentCalc" type="single" target="updateCostComponentCalc" title="" default-map-name="costComponentCalc" |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |