Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Mon Apr 6 06:25:24 2009 @@ -46,32 +46,32 @@ <container style="screenlet-body"> <container> <link target="CreateAcctgTransAndEntries" text="${uiLabelMap.AccountingCreateSalesAcctgTrans}" style="buttontext"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> <parameter param-name="debitGlAccountClassId" from-field="CURRENT_ASSET"/> <parameter param-name="creditGlAccountClassId" from-field="REVENUE"/> <parameter param-name="acctgTransTypeId" value="SALES"/> </link> <link target="TrialBalance" text="${uiLabelMap.AccountingTrialBalance}" style="buttontext"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </container> <container> <link target="CreateAcctgTransAndEntries" text="${uiLabelMap.AccountingCreatePaymentAcctgTrans}" style="buttontext"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> <parameter param-name="debitGlAccountClassId" from-field="CASH_EQUIVALENT"/> <parameter param-name="creditGlAccountClassId" from-field="CURRENT_LIABILITY"/> <parameter param-name="acctgTransTypeId" value="PAYMENT_ACCTG_TRANS"/> </link> <link target="IncomeStatement" text="${uiLabelMap.AccountingIncomeStatement}" style="buttontext"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </container> <container> <link text="${uiLabelMap.PageTitleUnpostedTransactions}" style="buttontext" target="ListUnpostedAcctgTrans"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> <link target="BalanceSheet" text="${uiLabelMap.AccountingBalanceSheet}" style="buttontext"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </container> </container> @@ -104,13 +104,13 @@ <container style="screenlet-body"> <container> <link text="${uiLabelMap.AccountingCreateAnAccountingTransaction}" style="buttontext" target="newAcctgTrans"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> <link text="${uiLabelMap.AccountingCreateAcctgTransAndEntries}" style="buttontext" target="CreateAcctgTransAndEntries"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> <link text="${uiLabelMap.PageTitleUnpostedTransactions}" style="buttontext" target="ListUnpostedAcctgTrans"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </container> <include-form name="FindAcctgTrans" location="component://accounting/widget/GlForms.xml"/> @@ -280,12 +280,12 @@ <link text="${uiLabelMap.AccountingDuplicateAccountingTransaction}" style="buttontext" target="copyAcctgTransAndEntries"> <parameter param-name="revert" value="N"/> <parameter param-name="fromAcctgTransId" from-field="acctgTransId"/> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> <link text="${uiLabelMap.AccountingRevertAccountingTransaction}" style="buttontext" target="copyAcctgTransAndEntries"> <parameter param-name="revert" value="Y"/> <parameter param-name="fromAcctgTransId" from-field="acctgTransId"/> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> <section> <condition> @@ -347,8 +347,8 @@ <container style="screenlet-body"> <container> <link text="${uiLabelMap.AccountingCompleteAcctgTransFields}" style="buttontext" target="completeAcctgTransEntries"> - <parameter param-name="acctgTransId" from-field="acctgTransId"/> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="acctgTransId"/> + <parameter param-name="organizationPartyId"/> </link> <link text="${uiLabelMap.AccountingVerifyTransaction}" style="buttontext" target="postAcctgTrans"> <parameter param-name="acctgTransId"/> @@ -356,8 +356,8 @@ <parameter param-name="verifyOnly" value="Y"/> </link> <link text="${uiLabelMap.AccountingPostTransaction}" style="buttontext" target="postAcctgTrans"> - <parameter param-name="acctgTransId" from-field="acctgTransId"/> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="acctgTransId"/> + <parameter param-name="organizationPartyId"/> </link> </container> <container> Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Mon Apr 6 06:25:24 2009 @@ -47,7 +47,7 @@ <auto-fields-entity entity-name="GlAccount" default-field-type="display"/> <field name="glAccountId" widget-style="buttontext"> <hyperlink also-hidden="false" description="${glAccountId}" target="GlAccountNavigate"> - <parameter param-name="glAccountId" from-field="glAccountId"/> + <parameter param-name="glAccountId"/> </hyperlink> </field> <field name="glAccountClassId"> Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Mon Apr 6 06:25:24 2009 @@ -34,7 +34,7 @@ <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"> - <parameter param-name="glAccountId" from-field="glAccountId"/> + <parameter param-name="glAccountId"/> </hyperlink> </field> </form> @@ -78,7 +78,7 @@ <!--auto-fields-entity entity-name="GlAccount" default-field-type="display"/--> <field name="glAccountId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${glAccountId}" target="GlAccountNavigate"> - <parameter param-name="glAccountId" from-field="glAccountId"/> + <parameter param-name="glAccountId"/> </hyperlink> </field> <field name="accountName" entry-name="glAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountName}"/></field> @@ -147,14 +147,14 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="acctgTransId"> <hyperlink also-hidden="false" description="${acctgTransId}" target="ListAcctgTransEntries"> - <parameter param-name="acctgTransId" from-field="acctgTransId"/> + <parameter param-name="acctgTransId"/> </hyperlink> </field> <field name="acctgTransEntrySeqId"><display/></field> <field name="glAccountId"> <display-entity entity-name="GlAccount" description="${accountName}"> <sub-hyperlink target="ListGlAccountEntries" description="[${glAccountId}]"> - <parameter param-name="glAccountId" from-field="glAccountId"/> + <parameter param-name="glAccountId"/> </sub-hyperlink> </display-entity> </field> @@ -174,7 +174,7 @@ header-row-style="header-row" default-table-style="basic-table"> <field name="backToAdmin" title="${uiLabelMap.CommonEmptyHeader}"> <hyperlink also-hidden="false" description="${uiLabelMap.AccountingBackToAdmin}" target="AdminMain"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </hyperlink> </field> </form> @@ -183,9 +183,9 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="glReconciliationId"> <hyperlink also-hidden="false" description="${glReconciliationId}" target="EditGlReconciliation"> - <parameter param-name="glReconciliationId" from-field="glReconciliationId"/> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> - <parameter param-name="glAccountId" from-field="glAccountId"/> + <parameter param-name="glReconciliationId"/> + <parameter param-name="organizationPartyId"/> + <parameter param-name="glAccountId"/> </hyperlink> </field> <field name="glReconciliationName"><display/></field> @@ -194,8 +194,8 @@ <field name="glAccountId"> <display-entity entity-name="GlAccount" description="${accountName}"> <sub-hyperlink target="ListGlAccountEntries" description="[${glAccountId}]"> - <parameter param-name="glAccountId" from-field="glAccountId"/> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="glAccountId"/> + <parameter param-name="organizationPartyId"/> </sub-hyperlink> </display-entity> </field> @@ -208,7 +208,7 @@ <field name="glReconciliationId"><display/></field> <field name="acctgTransId"> <hyperlink also-hidden="false" description="${acctgTransId}" target="ListAcctgTransEntries"> - <parameter param-name="acctgTransId" from-field="acctgTransId"/> + <parameter param-name="acctgTransId"/> </hyperlink> </field> <field name="acctgTransEntrySeqId"><display/></field> Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Mon Apr 6 06:25:24 2009 @@ -236,7 +236,7 @@ <screenlet title="${uiLabelMap.AccountingInvoiceHeader}"> <container> <link target="editInvoice" text="${uiLabelMap.CommonUpdate}" style="buttontext"> - <parameter param-name="invoiceId" from-field="invoiceId"/> + <parameter param-name="invoiceId"/> </link> </container> <include-form name="invoiceHeader" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> @@ -249,7 +249,7 @@ navigation-form-name="ListInvoiceApplications"> <container> <link target="editInvoiceApplications" text="${uiLabelMap.CommonUpdate}" style="buttontext"> - <parameter param-name="invoiceId" from-field="invoiceId"/> + <parameter param-name="invoiceId"/> </link> </container> <include-form name="ListInvoiceApplications" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> @@ -259,7 +259,7 @@ <screenlet title="${uiLabelMap.AccountingInvoiceRoles}" navigation-form-name="invoiceRoles"> <container> <link target="invoiceRoles" text="${uiLabelMap.CommonUpdate}" style="buttontext"> - <parameter param-name="invoiceId" from-field="invoiceId"/> + <parameter param-name="invoiceId"/> </link> </container> <include-form name="invoiceRoles" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> @@ -273,7 +273,7 @@ <screenlet title="${uiLabelMap.AccountingInvoiceItems}" navigation-form-name="invoiceItems"> <container> <link target="listInvoiceItems" text="${uiLabelMap.CommonUpdate}" style="buttontext"> - <parameter param-name="invoiceId" from-field="invoiceId"/> + <parameter param-name="invoiceId"/> </link> </container> <include-form name="invoiceItems" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> @@ -286,7 +286,7 @@ <screenlet title="${uiLabelMap.AccountingInvoiceTimeEntries}" navigation-form-name="ListTimeEntries"> <container> <link target="editInvoiceTimeEntries" text="${uiLabelMap.CommonUpdate}" style="buttontext"> - <parameter param-name="invoiceId" from-field="invoiceId"/> + <parameter param-name="invoiceId"/> </link> </container> <include-form name="ListTimeEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/Menus.xml (original) +++ ofbiz/trunk/applications/accounting/widget/Menus.xml Mon Apr 6 06:25:24 2009 @@ -450,8 +450,8 @@ </menu-item> <menu-item name="EditFixedAssetMeters" title="${uiLabelMap.AccountingFixedAssetMeters}"> <link target="EditFixedAssetMeters"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> - <parameter param-name="maintHistSeqId" from-field="maintHistSeqId"/> + <parameter param-name="fixedAssetId"/> + <parameter param-name="maintHistSeqId"/> <parameter param-name="productMeterTypeId" from-field="fixedAssetMaint.intervalMeterTypeId"/> </link> </menu-item> @@ -467,63 +467,63 @@ default-menu-item-name="EditFixedAsset"> <menu-item name="EditFixedAsset" title="${uiLabelMap.AccountingFixedAsset}"> <link target="EditFixedAsset"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="fixedAssetId"/> </link> </menu-item> <menu-item name="FixedAssetChildren" title="${uiLabelMap.CommonEntityChildren}"> <link target="FixedAssetChildren"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="fixedAssetId"/> <parameter param-name="trail" from-field="fixedAssetId"/> </link> </menu-item> <menu-item name="ListFixedAssetProducts" title="${uiLabelMap.AccountingFixedAssetProducts}"> <link target="ListFixedAssetProducts"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="fixedAssetId"/> </link> </menu-item> <menu-item name="ListFixedAssetCalendar" title="${uiLabelMap.AccountingFixedAssetCalendar}"> <link target="month"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="fixedAssetId"/> </link> </menu-item> <menu-item name="EditFixedAssetStdCosts" title="${uiLabelMap.AccountingFixedAssetStdCosts}"> <link target="EditFixedAssetStdCosts"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="fixedAssetId"/> </link> </menu-item> <menu-item name="EditFixedAssetIdents" title="${uiLabelMap.AccountingFixedAssetIdents}"> <link target="EditFixedAssetIdents"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="fixedAssetId"/> </link> </menu-item> <menu-item name="EditFixedAssetRegistrations" title="${uiLabelMap.AccountingFixedAssetRegistrations}"> <link target="EditFixedAssetRegistrations"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="fixedAssetId"/> </link> </menu-item> <menu-item name="EditFixedAssetMeters" title="${uiLabelMap.AccountingFixedAssetMeters}"> <link target="EditFixedAssetMeters"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="fixedAssetId"/> </link> </menu-item> <menu-item name="ListFixedAssetMaints" title="${uiLabelMap.AccountingFixedAssetMaints}"> <link target="ListFixedAssetMaints"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="fixedAssetId"/> </link> </menu-item> <menu-item name="EditPartyFixedAssetAssignments" title="${uiLabelMap.AccountingPartyFixedAssetAssignments}"> <link target="EditPartyFixedAssetAssignments"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="fixedAssetId"/> </link> </menu-item> <menu-item name="FixedAssetDepreciation" title="${uiLabelMap.AccountingFixedAssetDepreciation}"> <link target="showFixedAssetDepreciation"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="fixedAssetId"/> </link> </menu-item> <menu-item name="FixedAssetGeoLocation" title="${uiLabelMap.CommonGeoLocation}"> <link target="FixedAssetGeoLocation"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="fixedAssetId"/> </link> </menu-item> </menu> @@ -532,17 +532,17 @@ selected-menuitem-context-field-name="parameters.viewMode"> <menu-item name="D" title="${uiLabelMap.CommonDay}"> <link target="day"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="fixedAssetId"/> </link> </menu-item> <menu-item name="W" title="${uiLabelMap.CommonWeek}"> <link target="week"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="fixedAssetId"/> </link> </menu-item> <menu-item name="M" title="${uiLabelMap.CommonMonth}"> <link target="month"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="fixedAssetId"/> </link> </menu-item> </menu> @@ -551,22 +551,22 @@ default-menu-item-name="EditFinAccount"> <menu-item name="EditFinAccount" title="${uiLabelMap.AccountingFinAccount}"> <link target="EditFinAccount"> - <parameter param-name="finAccountId" from-field="finAccountId"/> + <parameter param-name="finAccountId"/> </link> </menu-item> <menu-item name="EditFinAccountRoles" title="${uiLabelMap.PartyRoles}"> <link target="EditFinAccountRoles"> - <parameter param-name="finAccountId" from-field="finAccountId"/> + <parameter param-name="finAccountId"/> </link> </menu-item> <menu-item name="EditFinAccountTrans" title="${uiLabelMap.AccountingFinAccountTransations}"> <link target="EditFinAccountTrans"> - <parameter param-name="finAccountId" from-field="finAccountId"/> + <parameter param-name="finAccountId"/> </link> </menu-item> <menu-item name="EditFinAccountAuths" title="${uiLabelMap.AccountingFinAccountAuth}"> <link target="EditFinAccountAuths"> - <parameter param-name="finAccountId" from-field="finAccountId"/> + <parameter param-name="finAccountId"/> </link> </menu-item> </menu> @@ -594,37 +594,37 @@ default-menu-item-name="PartyAccountsSummary"> <menu-item name="PartyAccountsSummary" title="${uiLabelMap.AcctgPartyGlJournalSummary}"> <link target="PartyAccountsSummary"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="AccountReconciliation" title="${uiLabelMap.AccountingAcctRecon}"> <link target="findGlAccountReconciliation"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="AccountReconciliations" title="${uiLabelMap.AccountingAcctRecons}"> <link target="findGlAccountReconciliations"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="FindAcctgTrans" title="${uiLabelMap.AccountingAcctgTrans}"> <link target="FindAcctgTrans"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="FindAcctgTransEntries" title="${uiLabelMap.AccountingAcctgTransEntries}"> <link target="FindAcctgTransEntries"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="OrganizationAccountingReports" title="${uiLabelMap.AccountingReports}"> <link target="TrialBalance"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="ChecksTabButton" title="${uiLabelMap.AccountingChecks}"> <link target="listChecksToPrint"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> </menu> @@ -632,27 +632,27 @@ selected-menuitem-context-field-name="tabButtonItem2" default-menu-item-name="TrialBalance"> <menu-item name="TrialBalance" title="${uiLabelMap.AccountingTrialBalance}"> <link target="TrialBalance"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="IncomeStatement" title="${uiLabelMap.AccountingIncomeStatement}"> <link target="IncomeStatement"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="BalanceSheet" title="${uiLabelMap.AccountingBalanceSheet}"> <link target="BalanceSheet"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="ComparativeBalanceSheet" title="${uiLabelMap.AccountingComparativeBalanceSheet}"> <link target="ComparativeBalanceSheet"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="TransactionTotals" title="${uiLabelMap.AccountingTransactionTotals}"> <link target="TransactionTotals"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> </menu> @@ -660,27 +660,27 @@ default-menu-item-name="PartyAcctgPreference"> <menu-item name="PartyAcctgPreference" title="${uiLabelMap.AccountingPreference}"> <link target="PartyAcctgPreference"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="ListGlAccountOrganization" title="${uiLabelMap.AccountingChartOfAcctsMenu}"> <link target="ListGlAccountOrganization"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="SetupGlJournals" title="${uiLabelMap.AccountingGlJournals}"> <link target="SetupGlJournals"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="GlAccountAssignment" title="${uiLabelMap.AccountingGlAccountDefault}"> <link target="GlAccountAssignment"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="TimePeriods" title="${uiLabelMap.AccountingTimePeriod}"> <link target="TimePeriods"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="ViewFXConversions" title="${uiLabelMap.AccountingFX}"> @@ -688,7 +688,7 @@ <if-service-permission service-name="acctgFxPermissionCheck" main-action="UPDATE"/> </condition> <link target="viewFXConversions"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> </menu> @@ -696,62 +696,62 @@ selected-menuitem-context-field-name="tabButtonItem2" default-menu-item-name="GlAccountSalInvoice"> <menu-item name="GlAccountTypeDefaults" title="${uiLabelMap.AccountingGlAccountTypeDefaults}"> <link target="GlAccountTypeDefaults"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="ProductGlAccounts" title="${uiLabelMap.AccountingProductGlAccount}"> <link target="editProductGlAccounts"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="ProductCategoryGlAccounts" title="${uiLabelMap.AccountingProductCategoryGlAccount}"> <link target="editProductCategoryGlAccounts"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="FinAccountTypeGlAccounts" title="${uiLabelMap.AccountingFinAccountTypeGlAccount}"> <link target="editFinAccountTypeGlAccounts"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="GlAccountSalInvoice" title="${uiLabelMap.AccountingInvoiceSales}"> <link target="GlAccountSalInvoice"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="GlAccountPurInvoice" title="${uiLabelMap.AccountingInvoicePurchase}"> <link target="GlAccountPurInvoice"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="GlAccountTypePaymentType" title="${uiLabelMap.AccountingPaymentType}/${uiLabelMap.FormFieldTitle_glAccountTypeId}"> <link target="GlAccountTypePaymentType"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="GlAccountNrPaymentMethod" title="${uiLabelMap.AccountingPaymentMethodId}/${uiLabelMap.AccountingGlAccountId}"> <link target="GlAccountNrPaymentMethod"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="VarianceReasonGlAccounts" title="${uiLabelMap.AccountingVarianceReasonGlAccounts}"> <link target="editVarianceReasonGlAccounts"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="CreditCardTypeGlAccount" title="${uiLabelMap.AccountingCreditCardTypeGlAccount}"> <link target="editCreditCardTypeGlAccounts"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="TaxAuthorityGlAccounts" title="${uiLabelMap.AccountingTaxAuthorityGlAccounts}"> <link target="editOrganizationTaxAuthorityGlAccount"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="PartyGlAccounts" title="${uiLabelMap.AccountingPartyGlAccounts}"> <link target="editPartyGlAccounts"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> </menu> @@ -759,12 +759,12 @@ selected-menuitem-context-field-name="tabButtonItem2" default-menu-item-name="GlAccountSalInvoice"> <menu-item name="PrintChecksTabButton" title="${uiLabelMap.AccountingPrintChecks}"> <link target="listChecksToPrint"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> <menu-item name="SendChecksTabButton" title="${uiLabelMap.AccountingSendChecks}"> <link target="listChecksToSend"> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="organizationPartyId"/> </link> </menu-item> </menu> Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Mon Apr 6 06:25:24 2009 @@ -340,7 +340,7 @@ <container style="lefthalf"> <screenlet title="${uiLabelMap.AccountingPaymentHeader}"> <link target="editPayment" text="${uiLabelMap.CommonUpdate}" style="buttontext"> - <parameter param-name="paymentId" from-field="paymentId"/> + <parameter param-name="paymentId"/> </link> <include-form name="paymentHeader" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> </screenlet> @@ -348,7 +348,7 @@ <container style="righthalf"> <screenlet title="${uiLabelMap.AccountingPaymentsApplied} ${appliedAmount?currency(${payment.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${payment.currencyUomId})}"> <link target="editPaymentApplications" text="${uiLabelMap.CommonUpdate}" style="buttontext"> - <parameter param-name="paymentId" from-field="paymentId"/> + <parameter param-name="paymentId"/> </link> <include-form name="paymentApplications" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> </screenlet> Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Mon Apr 6 06:25:24 2009 @@ -96,8 +96,8 @@ </row-actions> <field name="glAccountId" use-when="!showTotals"> <hyperlink target="FindAcctgTransEntries" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"> - <parameter param-name="glAccountId" from-field="glAccountId"/> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="glAccountId"/> + <parameter param-name="organizationPartyId"/> </hyperlink> </field> <field name="debit" use-when="showDebit"><display description="${absolutePostedBalance}" type="currency" currency="${currencyUomId}"/></field> @@ -133,8 +133,8 @@ </row-actions> <field name="glAccountId"> <hyperlink target="FindAcctgTransEntries" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"> - <parameter param-name="glAccountId" from-field="glAccountId"/> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="glAccountId"/> + <parameter param-name="organizationPartyId"/> </hyperlink> </field> <field name="totalAmount"><display type="currency" currency="${currencyUomId}"/></field> @@ -184,8 +184,8 @@ </row-actions> <field name="glAccountId"> <hyperlink target="FindAcctgTransEntries" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"> - <parameter param-name="glAccountId" from-field="glAccountId"/> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="glAccountId"/> + <parameter param-name="organizationPartyId"/> </hyperlink> </field> <field name="totalAmount"><display type="currency" currency="${currencyUomId}"/></field> @@ -199,8 +199,8 @@ </row-actions> <field name="glAccountId"> <hyperlink target="FindAcctgTransEntries" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"> - <parameter param-name="glAccountId" from-field="glAccountId"/> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="glAccountId"/> + <parameter param-name="organizationPartyId"/> </hyperlink> </field> <field name="totalAmount"><display type="currency" currency="${currencyUomId}"/></field> @@ -214,8 +214,8 @@ </row-actions> <field name="glAccountId"> <hyperlink target="FindAcctgTransEntries" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"> - <parameter param-name="glAccountId" from-field="glAccountId"/> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="glAccountId"/> + <parameter param-name="organizationPartyId"/> </hyperlink> </field> <field name="totalAmount"><display type="currency" currency="${currencyUomId}"/></field> Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml Mon Apr 6 06:25:24 2009 @@ -41,8 +41,8 @@ <field name="taxAuthorityEdit" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink description="${uiLabelMap.CommonEdit}" target="EditTaxAuthority" also-hidden="false"> - <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> - <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> + <parameter param-name="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId"/> </hyperlink> </field> </form> @@ -88,16 +88,16 @@ <field name="productCategoryId" title="${uiLabelMap.ProductCategory}"> <display-entity entity-name="ProductCategory" description="${description}"> <sub-hyperlink description="${productCategoryId}" target="/catalog/control/EditCategory" target-type="inter-app" link-style="buttontext"> - <parameter param-name="productCategoryId" from-field="productCategoryId"/> + <parameter param-name="productCategoryId"/> </sub-hyperlink> </display-entity> </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteTaxAuthorityCategory" description="${uiLabelMap.CommonDelete}" also-hidden="false"> - <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> - <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> - <parameter param-name="productCategoryId" from-field="productCategoryId"/> + <parameter param-name="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId"/> + <parameter param-name="productCategoryId"/> </hyperlink> </field> </form> @@ -147,11 +147,11 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteTaxAuthorityAssoc" description="${uiLabelMap.CommonDelete}" also-hidden="false"> - <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> - <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> - <parameter param-name="toTaxAuthPartyId" from-field="toTaxAuthPartyId"/> - <parameter param-name="toTaxAuthGeoId" from-field="toTaxAuthGeoId"/> - <parameter param-name="fromDate" from-field="fromDate"/> + <parameter param-name="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId"/> + <parameter param-name="toTaxAuthPartyId"/> + <parameter param-name="toTaxAuthGeoId"/> + <parameter param-name="fromDate"/> </hyperlink> </field> </form> @@ -191,7 +191,7 @@ <field name="glAccountId" title="${uiLabelMap.AccountingGlAccount}"> <display-entity entity-name="GlAccount" description="${accountName}"> <sub-hyperlink description="${glAccountId}" target="EditGlAccount" link-style="buttontext"> - <parameter param-name="glAccountId" from-field="glAccountId"/> + <parameter param-name="glAccountId"/> </sub-hyperlink> </display-entity> </field> @@ -205,10 +205,10 @@ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteTaxAuthorityGlAccount" description="${uiLabelMap.CommonDelete}" also-hidden="false"> - <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> - <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> - <parameter param-name="glAccountId" from-field="glAccountId"/> - <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + <parameter param-name="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId"/> + <parameter param-name="glAccountId"/> + <parameter param-name="organizationPartyId"/> </hyperlink> </field> </form> @@ -268,9 +268,9 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteTaxAuthorityRateProduct" description="${uiLabelMap.CommonDelete}" also-hidden="false"> - <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> - <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> - <parameter param-name="taxAuthorityRateSeqId" from-field="taxAuthorityRateSeqId"/> + <parameter param-name="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId"/> + <parameter param-name="taxAuthorityRateSeqId"/> </hyperlink> </field> </form> @@ -348,7 +348,7 @@ <field name="partyId"> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"> <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext"> - <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="partyId"/> </sub-hyperlink> </display-entity> </field> @@ -361,18 +361,18 @@ <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="EditTaxAuthorityPartyInfo" description="${uiLabelMap.CommonEdit}" also-hidden="false"> - <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> - <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> - <parameter param-name="partyId" from-field="partyId"/> - <parameter param-name="fromDate" from-field="fromDate"/> + <parameter param-name="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId"/> + <parameter param-name="partyId"/> + <parameter param-name="fromDate"/> </hyperlink> </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteTaxAuthorityPartyInfo" description="${uiLabelMap.CommonDelete}" also-hidden="false"> - <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> - <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> - <parameter param-name="partyId" from-field="partyId"/> - <parameter param-name="fromDate" from-field="fromDate"/> + <parameter param-name="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId"/> + <parameter param-name="partyId"/> + <parameter param-name="fromDate"/> </hyperlink> </field> </form> @@ -386,7 +386,7 @@ <field use-when="partyTaxAuthInfo!=null" name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"> <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext"> - <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="partyId"/> </sub-hyperlink> </display-entity> </field> Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml (original) +++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml Mon Apr 6 06:25:24 2009 @@ -24,39 +24,39 @@ <menu-item name="EditTaxAuthority" title="${uiLabelMap.AccountingTaxAuthority}"> <link target="EditTaxAuthority"> - <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> - <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> + <parameter param-name="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId"/> </link> </menu-item> <menu-item name="EditTaxAuthorityCategories" title="${uiLabelMap.ProductCategories}"> <link target="EditTaxAuthorityCategories"> - <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> - <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> + <parameter param-name="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId"/> </link> </menu-item> <menu-item name="EditTaxAuthorityAssocs" title="${uiLabelMap.CommonAssocs}"> <link target="EditTaxAuthorityAssocs"> - <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> - <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> + <parameter param-name="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId"/> </link> </menu-item> <menu-item name="EditTaxAuthorityGlAccounts" title="${uiLabelMap.AccountingGlAccs}"> <link target="EditTaxAuthorityGlAccounts"> - <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> - <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> + <parameter param-name="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId"/> </link> </menu-item> <menu-item name="EditTaxAuthorityRateProducts" title="${uiLabelMap.AccountingProductRates}"> <link target="EditTaxAuthorityRateProducts"> - <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> - <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> + <parameter param-name="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId"/> </link> </menu-item> <menu-item name="ListTaxAuthorityParties" title="${uiLabelMap.PartyParties}"> <link target="ListTaxAuthorityParties"> - <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> - <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> + <parameter param-name="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId"/> </link> </menu-item> </menu> Modified: ofbiz/trunk/applications/accounting/widget/TransactionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/TransactionForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/TransactionForms.xml Mon Apr 6 06:25:24 2009 @@ -54,7 +54,7 @@ <!-- note that this overrides auto-fields-entity --> <field name="paymentGatewayResponseId" widget-style="buttontext"> <hyperlink description="${paymentGatewayResponseId}" target="ViewGatewayResponse"> - <parameter param-name="paymentGatewayResponseId" from-field="paymentGatewayResponseId"/> + <parameter param-name="paymentGatewayResponseId"/> </hyperlink> </field> </form> @@ -64,7 +64,7 @@ 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"> - <parameter param-name="orderId" from-field="orderId"/> + <parameter param-name="orderId"/> </hyperlink> </field> <field name="orderPaymentPreferenceId"><display/></field> Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml Mon Apr 6 06:25:24 2009 @@ -52,7 +52,7 @@ </row-actions> <field name="invoiceId" widget-style="buttontext"> <hyperlink description="${invoiceId}" target="invoiceOverview"> - <parameter param-name="invoiceId" from-field="invoiceId"/> + <parameter param-name="invoiceId"/> </hyperlink> </field> <field name="invoiceTypeId"><display-entity entity-name="InvoiceType" description="${description}"/></field> Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml Mon Apr 6 06:25:24 2009 @@ -30,7 +30,7 @@ </actions> <field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${partyId}" target="editVendor"> - <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="partyId"/> </hyperlink> </field> <field name="manifestCompanyName" title="${uiLabelMap.PartyManifestCompanyName}"><display/></field> Modified: ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml Mon Apr 6 06:25:24 2009 @@ -53,7 +53,7 @@ </row-actions> <field name="invoiceId" widget-style="buttontext"> <hyperlink description="${invoiceId}" target="invoiceOverview"> - <parameter param-name="invoiceId" from-field="invoiceId"/> + <parameter param-name="invoiceId"/> </hyperlink> </field> <field name="invoiceTypeId"><display-entity entity-name="InvoiceType" description="${description}"/></field> Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml Mon Apr 6 06:25:24 2009 @@ -183,11 +183,11 @@ <auto-fields-service service-name="updateContentPurposeOperation" default-field-type="display"/> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation"> - <parameter param-name="contentPurposeTypeId" from-field="contentPurposeTypeId"/> - <parameter param-name="contentOperationId" from-field="contentOperationId"/> - <parameter param-name="roleTypeId" from-field="roleTypeId"/> - <parameter param-name="statusId" from-field="statusId"/> - <parameter param-name="privilegeEnumId" from-field="privilegeEnumId"/> + <parameter param-name="contentPurposeTypeId"/> + <parameter param-name="contentOperationId"/> + <parameter param-name="roleTypeId"/> + <parameter param-name="statusId"/> + <parameter param-name="privilegeEnumId"/> </hyperlink> </field> </form> @@ -403,9 +403,9 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="editContent" title="${uiLabelMap.CommonEmptyHeader}"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit"> - <parameter param-name="contentId" from-field="contentId"/> - <parameter param-name="drDataResourceId" from-field="drDataResourceId"/> - <parameter param-name="contentIdTo" from-field="contentIdTo"/> + <parameter param-name="contentId"/> + <parameter param-name="drDataResourceId"/> + <parameter param-name="contentIdTo"/> </hyperlink> </field> <field name="contentId"><display/></field> Modified: ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml Mon Apr 6 06:25:24 2009 @@ -42,7 +42,7 @@ </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentType"> - <parameter param-name="contentTypeId" from-field="contentTypeId"/> + <parameter param-name="contentTypeId"/> </hyperlink> </field> </form> @@ -75,8 +75,8 @@ </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentTypeAttr"> - <parameter param-name="contentTypeId" from-field="contentTypeId"/> - <parameter param-name="attrName" from-field="attrName"/> + <parameter param-name="contentTypeId"/> + <parameter param-name="attrName"/> </hyperlink> </field> </form> @@ -103,7 +103,7 @@ </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssocType"> - <parameter param-name="contentAssocTypeId" from-field="contentAssocTypeId"/> + <parameter param-name="contentAssocTypeId"/> </hyperlink> </field> </form> @@ -130,7 +130,7 @@ </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurposeType"> - <parameter param-name="contentPurposeTypeId" from-field="contentPurposeTypeId"/> + <parameter param-name="contentPurposeTypeId"/> </hyperlink> </field> </form> @@ -157,7 +157,7 @@ </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssocPredicate"> - <parameter param-name="contentAssocPredicateId" from-field="contentAssocPredicateId"/> + <parameter param-name="contentAssocPredicateId"/> </hyperlink> </field> </form> @@ -184,7 +184,7 @@ </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentOperation"> - <parameter param-name="contentOperationId" from-field="contentOperationId"/> + <parameter param-name="contentOperationId"/> </hyperlink> </field> </form> @@ -222,11 +222,11 @@ <auto-fields-service service-name="updateContentPurposeOperation" default-field-type="display"/> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation"> - <parameter param-name="contentPurposeTypeId" from-field="contentPurposeTypeId"/> - <parameter param-name="contentOperationId" from-field="contentOperationId"/> - <parameter param-name="roleTypeId" from-field="roleTypeId"/> - <parameter param-name="statusId" from-field="statusId"/> - <parameter param-name="privilegeEnumId" from-field="privilegeEnumId"/> + <parameter param-name="contentPurposeTypeId"/> + <parameter param-name="contentOperationId"/> + <parameter param-name="roleTypeId"/> + <parameter param-name="statusId"/> + <parameter param-name="privilegeEnumId"/> </hyperlink> </field> </form> Modified: ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml Mon Apr 6 06:25:24 2009 @@ -42,7 +42,7 @@ </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceType"> - <parameter param-name="dataResourceTypeId" from-field="dataResourceTypeId"/> + <parameter param-name="dataResourceTypeId"/> </hyperlink> </field> </form> @@ -75,8 +75,8 @@ </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceTypeAttr"> - <parameter param-name="dataResourceTypeId" from-field="dataResourceTypeId"/> - <parameter param-name="attrName" from-field="attrName"/> + <parameter param-name="dataResourceTypeId"/> + <parameter param-name="attrName"/> </hyperlink> </field> </form> @@ -103,7 +103,7 @@ </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeCharacterSet"> - <parameter param-name="characterSetId" from-field="characterSetId"/> + <parameter param-name="characterSetId"/> </hyperlink> </field> </form> @@ -142,7 +142,7 @@ </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataCategory"> - <parameter param-name="dataCategoryId" from-field="dataCategoryId"/> + <parameter param-name="dataCategoryId"/> </hyperlink> </field> </form> @@ -181,7 +181,7 @@ </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeFileExtension"> - <parameter param-name="fileExtensionId" from-field="fileExtensionId"/> + <parameter param-name="fileExtensionId"/> </hyperlink> </field> </form> @@ -208,7 +208,7 @@ </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeMetaDataPredicate"> - <parameter param-name="metaDataPredicateId" from-field="metaDataPredicateId"/> + <parameter param-name="metaDataPredicateId"/> </hyperlink> </field> </form> @@ -235,7 +235,7 @@ </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeMimeType"> - <parameter param-name="mimeTypeId" from-field="mimeTypeId"/> + <parameter param-name="mimeTypeId"/> </hyperlink> </field> </form> @@ -262,7 +262,7 @@ <auto-fields-service service-name="updateMimeTypeHtmlTemplate"/> <field name="mimeTypeId" widget-style="tabletext"> <hyperlink target-type="intra-app" target="editMimeType" description="${mimeTypeId}"> - <parameter param-name="mimeTypeId" from-field="mimeTypeId"/> + <parameter param-name="mimeTypeId"/> </hyperlink> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> @@ -270,9 +270,9 @@ </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeMimeTypeHtmlTemplate"> - <parameter param-name="mimeTypeId" from-field="mimeTypeId"/> - <parameter param-name="dataResourceId" from-field="dataResourceId"/> - <parameter param-name="fromDate" from-field="fromDate"/> + <parameter param-name="mimeTypeId"/> + <parameter param-name="dataResourceId"/> + <parameter param-name="fromDate"/> </hyperlink> </field> </form> Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Mon Apr 6 06:25:24 2009 @@ -158,17 +158,17 @@ </actions> <field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${contentId}" target="EditLayout"> - <parameter param-name="contentId" from-field="contentId"/> - <parameter param-name="drDataResourceId" from-field="drDataResourceId"/> + <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"> - <parameter param-name="contentId" from-field="contentId"/> - <parameter param-name="drDataResourceId" from-field="drDataResourceId"/> - <parameter param-name="viewSize" from-field="viewSize"/> - <parameter param-name="viewIndex" from-field="viewIndex"/> - <parameter param-name="entityName" from-field="entityName"/> + <parameter param-name="contentId"/> + <parameter param-name="drDataResourceId"/> + <parameter param-name="viewSize"/> + <parameter param-name="viewIndex"/> + <parameter param-name="entityName"/> </hyperlink> </field> <field name="contentName"><display/></field> @@ -177,10 +177,10 @@ <!-- <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeLayout"> - <parameter param-name="contentId" from-field="contentId"/> - <parameter param-name="contentIdTo" from-field="contentIdTo"/> - <parameter param-name="contentAssocTypeId" from-field="contentAssocTypeId"/> - <parameter param-name="fromDate" from-field="fromDate"/> + <parameter param-name="contentId"/> + <parameter param-name="contentIdTo"/> + <parameter param-name="contentAssocTypeId"/> + <parameter param-name="fromDate"/> </hyperlink> </field> --> @@ -190,8 +190,8 @@ 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"> - <parameter param-name="contentId" from-field="contentId"/> - <parameter param-name="drDataResourceId" from-field="drDataResourceId"/> + <parameter param-name="contentId"/> + <parameter param-name="drDataResourceId"/> </hyperlink> </field> <field name="contentName"><display/></field> @@ -199,7 +199,7 @@ <field name="drObjectInfo"><display/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeLayout"> - <parameter param-name="contentId" from-field="contentId"/> + <parameter param-name="contentId"/> <parameter param-name="contentIdTo" from-field="caContentIdTo"/> <parameter param-name="contentAssocTypeId" from-field="caContentAssocTypeId"/> <parameter param-name="fromDate" from-field="caFromDate"/> @@ -392,8 +392,8 @@ 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"> - <parameter param-name="contentId" from-field="contentId"/> - <parameter param-name="drDataResourceId" from-field="drDataResourceId"/> + <parameter param-name="contentId"/> + <parameter param-name="drDataResourceId"/> </hyperlink> </field> <field name="contentName"><display/></field> Modified: ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml Mon Apr 6 06:25:24 2009 @@ -46,7 +46,7 @@ <auto-fields-entity entity-name="Survey" default-field-type="display"/> <field name="surveyId" title="${uiLabelMap.ContentSurveySurveyId}" widget-style="buttontext"> <hyperlink description="${surveyId}" target="EditSurvey" also-hidden="false"> - <parameter param-name="surveyId" from-field="surveyId"/> + <parameter param-name="surveyId"/> </hyperlink> </field> <on-event-update-area event-type="paginate" area-id="search-results" area-target="ListFindSurveySearchResults"/> @@ -266,7 +266,7 @@ <auto-fields-entity entity-name="SurveyResponse" default-field-type="display"/> <field name="surveyResponseId" widget-style="buttontext"> <hyperlink also-hidden="false" description="${surveyResponseId}" target="EditSurveyResponse"> - <parameter param-name="surveyResponseId" from-field="surveyResponseId"/> + <parameter param-name="surveyResponseId"/> </hyperlink> </field> </form> 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=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml Mon Apr 6 06:25:24 2009 @@ -61,7 +61,7 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="webSiteId" title="${uiLabelMap.CommonId}" widget-style="buttontext"> <hyperlink description="${webSiteId}" target="EditWebSite" also-hidden="false"> - <parameter param-name="webSiteId" from-field="webSiteId"/> + <parameter param-name="webSiteId"/> </hyperlink> </field> <field name="siteName" title="${uiLabelMap.CommonName}"><display/></field> @@ -76,7 +76,7 @@ <field name="contentId"> <display-entity entity-name="Content" description="${contentName}"> <sub-hyperlink target="EditContent" description=" [${contentId}]"> - <parameter param-name="contentId" from-field="contentId"/> + <parameter param-name="contentId"/> </sub-hyperlink> </display-entity> </field> @@ -94,14 +94,14 @@ <!-- <field name="contentId" title="Content ID" widget-style="linktext"> <hyperlink description="${contentId}" target="EditContent" also-hidden="true"> - <parameter param-name="contentId" from-field="contentId"/> + <parameter param-name="contentId"/> </hyperlink> </field> --> <field name="contentId"> <display-entity entity-name="Content" description="${contentName}" key-field-name="contentId"> <sub-hyperlink target="EditContent" description=" [${contentId}]" link-style="linktext"> - <parameter param-name="contentId" from-field="contentId"/> + <parameter param-name="contentId"/> </sub-hyperlink> </display-entity> @@ -114,10 +114,10 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="RemoveWebSiteContent" description="${uiLabelMap.CommonDelete}" also-hidden="false"> - <parameter param-name="webSiteId" from-field="webSiteId"/> - <parameter param-name="contentId" from-field="contentId"/> - <parameter param-name="webSiteContentTypeId" from-field="webSiteContentTypeId"/> - <parameter param-name="fromDate" from-field="fromDate"/> + <parameter param-name="webSiteId"/> + <parameter param-name="contentId"/> + <parameter param-name="webSiteContentTypeId"/> + <parameter param-name="fromDate"/> </hyperlink> </field> <sort-order> Modified: ofbiz/trunk/applications/content/widget/SurveyMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyMenus.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/SurveyMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/SurveyMenus.xml Mon Apr 6 06:25:24 2009 @@ -23,27 +23,27 @@ default-menu-item-name="Survey"> <menu-item name="Survey" title="${uiLabelMap.ContentSurveySurveyId}"> <link target="EditSurvey"> - <parameter param-name="surveyId" from-field="surveyId"/> + <parameter param-name="surveyId"/> </link> </menu-item> <menu-item name="SurveyMultiResps" title="${uiLabelMap.ContentSurveyMultiResps}"> <link target="EditSurveyMultiResps"> - <parameter param-name="surveyId" from-field="surveyId"/> + <parameter param-name="surveyId"/> </link> </menu-item> <menu-item name="SurveyQuestions" title="${uiLabelMap.ContentSurveyQuestions}"> <link target="EditSurveyQuestions"> - <parameter param-name="surveyId" from-field="surveyId"/> + <parameter param-name="surveyId"/> </link> </menu-item> <menu-item name="FindSurveyResponse" title="${uiLabelMap.ContentSurveyFindResponse}"> <link target="FindSurveyResponse"> - <parameter param-name="surveyId" from-field="surveyId"/> + <parameter param-name="surveyId"/> </link> </menu-item> <menu-item name="SurveyResponses" title="${uiLabelMap.ContentSurveyResponseSummary}"> <link target="ViewSurveyResponses"> - <parameter param-name="surveyId" from-field="surveyId"/> + <parameter param-name="surveyId"/> </link> </menu-item> </menu> Modified: ofbiz/trunk/applications/content/widget/SurveyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyScreens.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/SurveyScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/SurveyScreens.xml Mon Apr 6 06:25:24 2009 @@ -279,7 +279,7 @@ <widgets> <container> <link text="${uiLabelMap.ContentSurveyCreateResponse}" target="EditSurveyResponse" style="buttontext"> - <parameter param-name="surveyId" from-field="surveyId"/> + <parameter param-name="surveyId"/> </link> </container> <include-form name="FindSurveyResponse" location="component://content/webapp/content/survey/SurveyForms.xml"/> @@ -337,7 +337,7 @@ <decorator-section name="body"> <container> <link text="${uiLabelMap.ContentSurveyCreateResponse}" target="EditSurveyResponse" style="buttontext"> - <parameter param-name="surveyId" from-field="surveyId"/> + <parameter param-name="surveyId"/> </link> </container> <container style="screenlet"> |
Free forum by Nabble | Edit this page |