[ofbiz-framework] branch trunk updated: Documented: Help link using asciidoc files via generated html (OFBIZ-11693)
Locked
 
|
This is an automated email from the ASF dual-hosted git repository.
holivier pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new 211540a Documented: Help link using asciidoc files via generated html (OFBIZ-11693) 211540a is described below commit 211540a9665abb526d9e426f47bc7dc8af7e94dd Author: holivier <[hidden email]> AuthorDate: Tue May 19 12:43:59 2020 +0200 Documented: Help link using asciidoc files via generated html (OFBIZ-11693) Migrate AccountingHelData.xml to added some <set field="helpAnchor" to the correct screens Now in accounting component only asciidoc documents are used, help link area now link to userDocUri (ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc as default value in general.property) --- .../accounting/widget/AgreementScreens.xml | 21 ++++++++++++++- .../accounting/widget/BillingAccountScreens.xml | 8 +++++- applications/accounting/widget/CommonScreens.xml | 2 ++ .../accounting/widget/FinAccountScreens.xml | 30 +++++++++++++++++----- applications/accounting/widget/GlSetupScreens.xml | 19 +++++++++++++- .../accounting/widget/GlobalGlAccountsScreens.xml | 5 ++++ applications/accounting/widget/InvoiceScreens.xml | 11 +++++++- .../widget/PaymentGatewayConfigScreens.xml | 16 +++++++----- applications/accounting/widget/PaymentScreens.xml | 8 ++++++ applications/accounting/widget/PeriodScreens.xml | 1 + .../accounting/widget/TaxAuthorityScreens.xml | 12 +++++++-- .../accounting/widget/TransactionScreens.xml | 4 +++ framework/common/config/general.properties | 2 +- 13 files changed, 120 insertions(+), 19 deletions(-) diff --git a/applications/accounting/widget/AgreementScreens.xml b/applications/accounting/widget/AgreementScreens.xml index a2a307d..eda1fee 100644 --- a/applications/accounting/widget/AgreementScreens.xml +++ b/applications/accounting/widget/AgreementScreens.xml @@ -87,6 +87,7 @@ under the License. <screen name="FindAgreement"> <section> <actions> + <set field="helpAnchor" value="_help_for_find_agreements"/> <set field="titleProperty" value="PageTitleFindAgreement"/> </actions> <widgets> @@ -126,9 +127,10 @@ under the License. <actions> <set field="titleProperty" value="PageTitleEditAgreement"/> <set field="tabButtonItem" value="AgreementMain"/> + <set field="helpAnchor" value="_help_for_edit_agreement"/> <set field="agreementId" from-field="parameters.agreementId"/> <entity-one entity-name="Agreement" value-field="agreement"/> - + </actions> <widgets> <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}"> @@ -150,6 +152,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleListAgreementItems"/> <set field="tabButtonItem" value="AgreementItems"/> + <set field="helpAnchor" value="_help_agreement_items_list"/> <set field="agreementId" from-field="parameters.agreementId"/> <entity-one entity-name="Agreement" value-field="agreement"/> <entity-and entity-name="AgreementItem" list="agreementItems"> @@ -178,6 +181,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleEditAgreementItem"/> <set field="tabButtonItem" value="AgreementItems"/> + <set field="helpAnchor" value="_help_for_edit_agreement_item"/> <set field="buttonBarItem" value="EditAgreementItem"/> <set field="agreementId" from-field="parameters.agreementId"/> <entity-one entity-name="Agreement" value-field="agreement"/> @@ -208,6 +212,7 @@ under the License. <set field="titleProperty" value="PageTitleEditAgreementTerm"/> <set field="tabButtonItem" value="AgreementTerms"/> <set field="buttonBarItem" value="EditAgreementTerms"/> + <set field="helpAnchor" value="_help_for_edit_agreement_terms"/> <set field="agreementId" from-field="parameters.agreementId"/> <entity-one entity-name="Agreement" value-field="agreement"/> </actions> @@ -230,6 +235,7 @@ under the License. <set field="titleProperty" value="PageTitleAddAgreementContent"/> <set field="tabButtonItem" value="AgreementContents"/> <set field="buttonBarItem" value="EditAgreementContents"/> + <set field="helpAnchor" value="_help_for_agreement_content"/> <set field="agreementId" from-field="parameters.agreementId"/> <entity-one entity-name="Agreement" value-field="agreement"/> <entity-and entity-name="AgreementContentAndInfo" list="contentDataResourceList"> @@ -257,6 +263,7 @@ under the License. <set field="titleProperty" value="PageTitleListAgreementPromoAppls"/> <set field="tabButtonItem" value="AgreementItems"/> <set field="buttonBarItem" value="ListAgreementPromoAppls"/> + <set field="helpAnchor" value="_help_for_agreements_item_promotions"/> <set field="agreementId" from-field="parameters.agreementId"/> <entity-one entity-name="Agreement" value-field="agreement"/> <entity-one entity-name="AgreementItem" value-field="agreementItem"/> @@ -319,6 +326,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleListAgreementItemTerms"/> <set field="tabButtonItem" value="AgreementItems"/> + <set field="helpAnchor" value="_help_for_agreements_item_terms"/> <set field="buttonBarItem" value="ListAgreementItemTerms"/> <set field="agreementId" from-field="parameters.agreementId"/> <entity-one entity-name="Agreement" value-field="agreement"/> @@ -352,6 +360,7 @@ under the License. <set field="titleProperty" value="PageTitleEditAgreementItemTerm"/> <set field="tabButtonItem" value="AgreementItems"/> <set field="buttonBarItem" value="ListAgreementItemTerms"/> + <set field="helpAnchor" value="_help_edit_agreement_item_term"/> <set field="agreementId" from-field="parameters.agreementId"/> <set field="agreementItemSeqId" from-field="parameters.agreementItemSeqId"/> <set field="agreementTermId" from-field="parameters.agreementTermId"/> @@ -383,6 +392,7 @@ under the License. <set field="titleProperty" value="PageTitleListAgreementItemProducts"/> <set field="tabButtonItem" value="AgreementItems"/> <set field="buttonBarItem" value="ListAgreementItemProducts"/> + <set field="helpAnchor" value="_help_for_agreement_item_products"/> <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/> <entity-one entity-name="AgreementItem" value-field="agreementItem"/> <entity-and entity-name="AgreementProductAppl" list="agreementProducts"> @@ -517,6 +527,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleEditAgreementItemProduct"/> <set field="tabButtonItem" value="AgreementItems"/> + <set field="helpAnchor" value="_help_for_agreement_item_products"/> <set field="agreementId" from-field="parameters.agreementId"/> <set field="agreementItemSeqId" from-field="parameters.agreementItemSeqId"/> @@ -582,6 +593,7 @@ under the License. <set field="titleProperty" value="PageTitleListAgreementItemProducts"/> <set field="tabButtonItem" value="AgreementItems"/> <set field="buttonBarItem" value="ListAgreementItemSupplierProducts"/> + <set field="helpAnchor" value="_help_for_list_agreement_item_supplier_products"/> <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/> <entity-one entity-name="AgreementItem" value-field="agreementItem"/> <entity-and entity-name="SupplierProduct" list="agreementProducts"> @@ -652,6 +664,7 @@ under the License. <set field="titleProperty" value="PageTitleEditAgreementItemProduct"/> <set field="tabButtonItem" value="AgreementItems"/> <set field="buttonBarItem" value="ListAgreementItemSupplierProducts"/> + <set field="helpAnchor" value="_help_for_list_agreement_item_supplier_products"/> <set field="agreementId" from-field="parameters.agreementId"/> <set field="agreementItemSeqId" from-field="parameters.agreementItemSeqId"/> <set field="productId" from-field="parameters.productId"/> @@ -702,6 +715,7 @@ under the License. <set field="titleProperty" value="PageTitleListAgreementItemParties"/> <set field="tabButtonItem" value="AgreementItems"/> <set field="buttonBarItem" value="ListAgreementItemParties"/> + <set field="helpAnchor" value="_the_for_agreement_items_parties_help_screen"/> <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/> <entity-one entity-name="AgreementItem" value-field="agreementItem"/> <entity-and entity-name="AgreementPartyApplic" list="agreementParties"> @@ -733,6 +747,7 @@ under the License. <set field="titleProperty" value="PageTitleEditAgreementItemParty"/> <set field="tabButtonItem" value="AgreementItems"/> <set field="buttonBarItem" value="ListAgreementItemParties"/> + <set field="helpAnchor" value="_help_edit_agreement_item_party"/> <set field="agreementId" from-field="parameters.agreementId"/> <set field="agreementItemSeqId" from-field="parameters.agreementItemSeqId"/> <set field="partyId" from-field="parameters.partyId"/> @@ -764,6 +779,7 @@ under the License. <set field="titleProperty" value="PageTitleListAgreementGeographicalApplic"/> <set field="tabButtonItem" value="AgreementItems"/> <set field="buttonBarItem" value="ListAgreementGeographicalApplic"/> + <set field="helpAnchor" value="_help_for_list_agreement_geo"/> <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/> <entity-one entity-name="AgreementItem" value-field="agreementItem"/> <entity-and entity-name="AgreementGeographicalApplic" list="agreementGeographicalApplics"> @@ -795,6 +811,7 @@ under the License. <set field="titleProperty" value="PageTitleEditAgreementGeographicalApplic"/> <set field="tabButtonItem" value="AgreementItems"/> <set field="buttonBarItem" value="ListAgreementGeographicalApplic"/> + <set field="helpAnchor" value="_help_for_list_agreement_geo"/> <set field="agreementId" from-field="parameters.agreementId"/> <set field="agreementItemSeqId" from-field="parameters.agreementItemSeqId"/> <set field="geoId" from-field="parameters.geoId"/> @@ -825,6 +842,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleEditAgreementWorkEffortApplics"/> <set field="tabButtonItem" value="AgreementWorkEffortApplics"/> + <set field="helpAnchor" value="_help_for_agreement_work_effort_applications"/> <set field="agreementId" from-field="parameters.agreementId"/> <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/> </actions> @@ -845,6 +863,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleFindAgreementRoles"/> <set field="tabButtonItem" value="AgreementRoles"/> + <set field="helpAnchor" value="_help_for_edit_agreements_roles"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <set field="agreementId" from-field="parameters.agreementId"/> <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/> diff --git a/applications/accounting/widget/BillingAccountScreens.xml b/applications/accounting/widget/BillingAccountScreens.xml index 3742e83..53209f0 100644 --- a/applications/accounting/widget/BillingAccountScreens.xml +++ b/applications/accounting/widget/BillingAccountScreens.xml @@ -20,7 +20,6 @@ under the License. <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://ofbiz.apache.org/Widget-Screen" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Screen http://ofbiz.apache.org/dtds/widget-screen.xsd"> - <screen name="CommonBillingAccountDecorator"> <section> @@ -70,6 +69,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleFindBillingAccount"/> <set field="headerItem" value="billingaccount"/> + <set field="helpAnchor" value="_help_for_find_billing_account"/> </actions> <widgets> <decorator-screen name="CommonBillingAccountDecorator" location="${parameters.billingAccountDecoratorLocation}"> @@ -121,6 +121,7 @@ under the License. <set field="titleProperty" value="PageTitleEditBillingAccount"/> <set field="headerItem" value="billingaccount"/> <set field="tabButtonItem" value="EditBillingAccount"/> + <set field="helpAnchor" value="_help_for_edit_billing_account"/> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> <set field="billingAccountId" from-field="parameters.billingAccountId"/> <entity-one entity-name="BillingAccount" value-field="billingAccount"/> @@ -148,6 +149,7 @@ under the License. <set field="titleProperty" value="PageTitleEditBillingAccountRoles"/> <set field="headerItem" value="billingaccount"/> <set field="tabButtonItem" value="EditBillingAccountRoles"/> + <set field="helpAnchor" value="_help_for_billing_account_roles"/> <set field="billingAccountId" from-field="parameters.billingAccountId"/> <entity-one entity-name="BillingAccount" value-field="billingAccount"/> @@ -170,6 +172,7 @@ under the License. <set field="titleProperty" value="PageTitleEditBillingAccountTerms"/> <set field="headerItem" value="billingaccount"/> <set field="tabButtonItem" value="EditBillingAccountTerms"/> + <set field="helpAnchor" value="_help_for_billing_account_terms"/> <set field="billingAccountId" from-field="parameters.billingAccountId"/> <set field="billingAccountTermId" from-field="parameters.billingAccountTermId"/> @@ -210,6 +213,7 @@ under the License. <set field="titleProperty" value="PageTitleEditBillingAccountInvoices"/> <set field="headerItem" value="billingaccount"/> <set field="tabButtonItem" value="BillingAccountInvoices"/> + <set field="helpAnchor" value="_help_for_billing_account_invoices"/> <set field="billingAccountId" from-field="parameters.billingAccountId"/> <set field="billingAccountTermId" from-field="parameters.billingAccountTermId"/> @@ -233,6 +237,7 @@ under the License. <set field="titleProperty" value="PageTitleEditBillingAccountOrders"/> <set field="headerItem" value="billingaccount"/> <set field="tabButtonItem" value="BillingAccountOrders"/> + <set field="helpAnchor" value="_help_for_billing_account_orders"/> <set field="billingAccountId" from-field="parameters.billingAccountId"/> <entity-one entity-name="BillingAccount" value-field="billingAccount"/> @@ -255,6 +260,7 @@ under the License. <set field="titleProperty" value="PageTitleEditBillingAccountPayments"/> <set field="headerItem" value="billingaccount"/> <set field="tabButtonItem" value="BillingAccountPayments"/> + <set field="helpAnchor" value="_help_for_billing_account_payments"/> <set field="billingAccountId" from-field="parameters.billingAccountId"/> <entity-one entity-name="BillingAccount" value-field="billingAccount"/> diff --git a/applications/accounting/widget/CommonScreens.xml b/applications/accounting/widget/CommonScreens.xml index 1bd7916..eb024e4 100644 --- a/applications/accounting/widget/CommonScreens.xml +++ b/applications/accounting/widget/CommonScreens.xml @@ -40,6 +40,7 @@ under the License. <set field="applicationMenuName" value="AccountingAppBar" global="true"/> <set field="applicationMenuLocation" value="component://accounting/widget/AccountingMenus.xml" global="true"/> <set field="applicationTitle" from-field="uiLabelMap.AccountingManagerApplication" global="true"/> + <set field="helpAnchor" from-field="helpAnchor" default-value="_accounting"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> @@ -273,6 +274,7 @@ under the License. </condition> <actions> <set field="headerItem" value="main"/> + <set field="helpAnchor" value="_help_for_accounting_main_screen"/> <entity-condition entity-name="PaymentType" list="paymentTypes"> <order-by field-name="paymentTypeId"/> </entity-condition> diff --git a/applications/accounting/widget/FinAccountScreens.xml b/applications/accounting/widget/FinAccountScreens.xml index 60b3a99..f476b76 100644 --- a/applications/accounting/widget/FinAccountScreens.xml +++ b/applications/accounting/widget/FinAccountScreens.xml @@ -73,6 +73,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleFindFinAccount"/> <set field="tabButtonItem" value="FindFinAccount"/> + <set field="helpAnchor" value="_help_for_find_financial_accounts"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> @@ -119,6 +120,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleEditFinAccount"/> <set field="tabButtonItem" value="EditFinAccount"/> + <set field="helpAnchor" value="_help_for_edit_financial_account"/> <set field="finAccountId" from-field="parameters.finAccountId"/> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> <entity-one entity-name="FinAccount" value-field="finAccount"/> @@ -154,6 +156,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleEditFinAccountRole"/> <set field="tabButtonItem" value="EditFinAccountRoles"/> + <set field="helpAnchor" value="_help_for_edit_financial_account_roles"/> <set field="finAccountId" from-field="parameters.finAccountId"/> <entity-one entity-name="FinAccount" value-field="finAccount"/> <set field="partyId" from-field="parameters.partyId"/> @@ -179,6 +182,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleEditFinAccountTrans"/> <set field="tabButtonItem" value="FinAccountTrans"/> + <set field="helpAnchor" value="_help_for_edit_financial_account_authorizations"/> <set field="finAccountId" from-field="parameters.finAccountId"/> <entity-one entity-name="FinAccount" value-field="finAccount"/> <set field="finAccountTransId" from-field="parameters.finAccountTransId"/> @@ -201,6 +205,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleEditFinAccountAuths"/> <set field="tabButtonItem" value="EditFinAccountAuths"/> + <set field="helpAnchor" value="_help_for_financial_account_transactions_list"/> <set field="finAccountId" from-field="parameters.finAccountId"/> <entity-one entity-name="FinAccount" value-field="finAccount"/> <set field="finAccountAuthId" from-field="parameters.finAccountAuthId"/> @@ -223,6 +228,7 @@ under the License. <actions> <set field="titleProperty" value="AccountingDepositOrWithdrawPayments"/> <set field="tabButtonItem" value="depositWithdraw"/> + <set field="helpAnchor" value="_help_for_financial_account_deposit_withdraw"/> <set field="finAccountId" from-field="parameters.finAccountId"/> <set field="paymentMethodTypeId" from-field="parameters.paymentMethodTypeId"/> <set field="cardType" from-field="parameters.cardType"/> @@ -249,13 +255,13 @@ under the License. <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> <include-form name="PaymentsDepositWithdraw" location="component://accounting/widget/FinAccountForms.xml"/> - </decorator-section> + </decorator-section> <decorator-section name="search-results"> <platform-specific> <html><html-template multi-block="true" location="component://accounting/template/payment/DepositWithdrawPayments.ftl"/></html> </platform-specific> </decorator-section> - </decorator-screen> + </decorator-screen> </widgets> </section> </decorator-section> @@ -267,6 +273,7 @@ under the License. <section> <actions> <set field="tabButtonItem" value="finAccountMain"/> + <set field="helpAnchor" value="_the_financial_account_main_screen"/> </actions> <widgets> <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}"> @@ -282,6 +289,7 @@ under the License. <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="parameters.finAccountTypeId" value="BANK_ACCOUNT"/> + <set field="helpAnchor" value="_the_financial_account_main_screen"/> </actions> <widgets> <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.AccountingBankAccount}"> @@ -295,6 +303,7 @@ under the License. <actions> <set field="titleProperty" value="AccountingFindDepositSlip"/> <set field="tabButtonItem" value="findDepositSlips"/> + <set field="helpAnchor" value="_help_for_find_deposit_slips"/> <set field="finAccountId" from-field="parameters.finAccountId"/> <entity-one entity-name="FinAccount" value-field="finAccount"/> <entity-condition entity-name="PmtGrpMembrPaymentAndFinAcctTrans" list="pmtGrpMembrPaymentAndFinAcctTransList"> @@ -342,6 +351,7 @@ under the License. <actions> <set field="titleProperty" value="AccountingFindDepositSlip"/> <set field="tabButtonItem" value="findDepositSlips"/> + <set field="helpAnchor" value="_help_for_financial_account_edit_deposit_slip_and_member"/> <set field="finAccountId" from-field="parameters.finAccountId"/> <set field="paymentGroupId" from-field="parameters.paymentGroupId"/> <entity-one entity-name="FinAccount" value-field="finAccount"/> @@ -381,6 +391,7 @@ under the License. <actions> <set field="titleProperty" value="AccountingCreateNewDepositSlipForFinancialAccount"/> <set field="tabButtonItem" value="findDepositSlips"/> + <set field="helpAnchor" value="_help_for_financial_account_new_deposit_slip"/> <set field="finAccountId" from-field="parameters.finAccountId"/> <set field="headerItem" value="FindFinAccount"/> <set field="paymentMethodTypeId" from-field="parameters.paymentMethodTypeId"/> @@ -400,13 +411,13 @@ under the License. <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> <include-form name="FindBatchPaymentsForDepositSlip" location="component://accounting/widget/ar/forms/ArPaymentForms.xml"/> - </decorator-section> + </decorator-section> <decorator-section name="search-results"> <platform-specific> <html><html-template multi-block="true" location="component://accounting/template/ar/payment/BatchPayments.ftl"/></html> </platform-specific> </decorator-section> - </decorator-screen> + </decorator-screen> </widgets> </section> </decorator-section> @@ -419,6 +430,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleFindFinAccountTrans"/> <set field="tabButtonItem" value="FinAccountTrans"/> + <set field="helpAnchor" value="_help_for_find_financial_account_transactions"/> <service service-name="getFinAccountTransListAndTotals" result-map="finAccountTransListAndTotals" auto-field-map="true"/> <set field="finAccountTransList" type="List" from-field="finAccountTransListAndTotals.finAccountTransList"/> <set field="searchedNumberOfRecords" type="Integer" from-field="finAccountTransListAndTotals.searchedNumberOfRecords"/> @@ -454,7 +466,7 @@ under the License. <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> <include-form name="FindFinAccountTransactions" location="component://accounting/widget/FinAccountForms.xml"/> - </decorator-section> + </decorator-section> <decorator-section name="search-results"> <platform-specific> <html><html-template multi-block="true" location="component://accounting/template/finaccounttrans/FinAccountTrans.ftl"/></html> @@ -471,6 +483,7 @@ under the License. <actions> <set field="titleProperty" value="AccountingBankReconciliation"/> <set field="tabButtonItem" value="FinAccountTrans"/> + <set field="helpAnchor" value="_help_for_financial_account_bank_reconciliation"/> <set field="finAccountId" from-field="parameters.finAccountId"/> <entity-one entity-name="FinAccount" value-field="finAccount"/> </actions> @@ -538,6 +551,7 @@ under the License. <section> <actions> <set field="tabButtonItem" value="depositWithdraw"/> + <set field="helpAnchor" value="_help_for_financial_account_new_deposit_payment"/> <set field="finAccountId" from-field="parameters.finAccountId"/> <set field="statusId" value="PMNT_RECEIVED"/> <set field="parentTypeId" value="RECEIPT"/> @@ -560,6 +574,7 @@ under the License. <section> <actions> <set field="tabButtonItem" value="depositWithdraw"/> + <set field="helpAnchor" value="_help_for_financial_account_new_withdrawal_payment"/> <set field="finAccountId" from-field="parameters.finAccountId"/> <set field="statusId" value="PMNT_SENT"/> <set field="parentTypeId" value="DISBURSEMENT"/> @@ -583,6 +598,7 @@ under the License. <actions> <set field="titleProperty" value="AccountingEditFinAccountReconciliations"/> <set field="tabButtonItem" value="FindFinAccountReconciliations"/> + <set field="helpAnchor" value="_help_for_edit_financial_account_reconciliations"/> <set field="finAccountId" from-field="parameters.finAccountId"/> <set field="glReconciliationId" from-field="parameters.glReconciliationId" default-value=""/> <set field="tabButtonItem2" value="${groovy:glReconciliationId==null?'NewFinAccountReconciliations':'EditFinAccountReconciliations'}"/> @@ -616,6 +632,7 @@ under the License. <section> <actions> <set field="tabButtonItem" value="FindFinAccountReconciliations"/> + <set field="helpAnchor" value="_help_for_view_financial_account_reconciliations"/> <set field="titleProperty" value="AccountingEditFinAccountReconciliations"/> <set field="finAccountId" from-field="parameters.finAccountId"/> <set field="glReconciliationId" from-field="parameters.glReconciliationId"/> @@ -666,6 +683,7 @@ under the License. <set field="tabButtonItem" value="FindFinAccountReconciliations"/> <set field="titleProperty" value="PageTitleFindFinAccountReconciliations"/> <set field="tabButtonItem2" value="Find"/> + <set field="helpAnchor" value="_help_find_financial_account_reconciliations"/> <set field="finAccountId" from-field="parameters.finAccountId"/> <set field="glReconciliationId" from-field="parameters.glReconciliationId" default-value=""/> <entity-one entity-name="FinAccount" value-field="finAccount"/> @@ -695,7 +713,7 @@ under the License. <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> <include-form name="FindBankReconciliation" location="component://accounting/widget/FinAccountForms.xml"/> - </decorator-section> + </decorator-section> <decorator-section name="search-results"> <include-form name="ListFinAccountReconciliations" location="component://accounting/widget/FinAccountForms.xml"/> </decorator-section> diff --git a/applications/accounting/widget/GlSetupScreens.xml b/applications/accounting/widget/GlSetupScreens.xml index 71eaffb..b2eee02 100644 --- a/applications/accounting/widget/GlSetupScreens.xml +++ b/applications/accounting/widget/GlSetupScreens.xml @@ -53,6 +53,7 @@ under the License. <actions> <set field="titleProperty" value="AccountingAvailableInternalOrganizations"/> <set field="headerItem" value="companies"/> + <set field="helpAnchor" value="_help_for_available_internal_organizations"/> <set field="labelTitleProperty" from-field="uiLabelMap.AccountingAvailableInternalOrganizations"/> <entity-condition entity-name="PartyAcctgPreference" list="parties"/> <service service-name="acctgPrefPermissionCheck" result-map="permResult"> @@ -126,7 +127,7 @@ under the License. <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> </actions> <widgets> - <include-form name="ExportInvoiceCsv" location="component://accounting/widget/GlSetupForms.xml"/> + <include-form name="ExportInvoiceCsv" location="component://accounting/widget/GlSetupForms.xml"/> </widgets> </section> </screen> @@ -136,6 +137,7 @@ under the License. <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="AccountingChartOfAcctsMenu"/> <set field="tabButtonItem" value="ListGlAccountOrganization"/> + <set field="helpAnchor" value="_help_for_chart_of_accounts"/> <set field="labelTitleProperty" from-field="uiLabelMap.AccountingChartOfAcctsMenu"/> </actions> <widgets> @@ -163,6 +165,7 @@ under the License. <set field="titleProperty" value="AccountingTimePeriod"/> <set field="labelTitleProperty" from-field="uiLabelMap.AccountingTimePeriod"/> <set field="tabButtonItem" value="TimePeriods"/> + <set field="helpAnchor" value="_help_for_time_periods"/> <entity-condition entity-name="CustomTimePeriod" list="openTimePeriods"> <condition-list> <condition-expr field-name="organizationPartyId" operator="equals" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/> @@ -204,6 +207,7 @@ under the License. <set field="titleProperty" value="AccountingPreference"/> <set field="labelTitleProperty" from-field="uiLabelMap.AccountingPreference"/> <set field="tabButtonItem" value="PartyAcctgPreference"/> + <set field="helpAnchor" value="_help_for_accounting_preferences"/> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> <set field="organizationPartyId" value="${groovy:if(parameters.organizationPartyId!=null) return parameters.organizationPartyId else return parameters.get('ApplicationDecorator|organizationPartyId')}"/> <set field="partyId" from-field="organizationPartyId"/> @@ -254,6 +258,7 @@ under the License. <set field="titleProperty" value="AccountingGlJournals"/> <set field="labelTitleProperty" from-field="uiLabelMap.AccountingGlJournals"/> <set field="tabButtonItem" value="SetupGlJournals"/> + <set field="helpAnchor" value="_help_for_journals"/> <entity-one entity-name="GlJournal" value-field="glJournal"/> </actions> <widgets> @@ -276,6 +281,7 @@ under the License. <set field="labelTitleProperty" from-field="uiLabelMap.AccountingGlAccountTypeDefaults"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="GlAccountTypeDefaults"/> + <set field="helpAnchor" value="_help_for_gl_account_type_defaults"/> </actions> <widgets> <decorator-screen name="CommonGlSetupDecorator" location="${parameters.commonGlSetupDecoratorLocation}"> @@ -297,6 +303,7 @@ under the License. <set field="labelTitleProperty" from-field="uiLabelMap.AccountingInvoiceSales"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="GlAccountSalInvoice"/> + <set field="helpAnchor" value="_help_for_sales_invoice_default_account"/> </actions> <widgets> <decorator-screen name="CommonGlSetupDecorator" location="${parameters.commonGlSetupDecoratorLocation}"> @@ -317,6 +324,7 @@ under the License. <set field="titleProperty" value="AccountingInvoicePurchase"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="GlAccountPurInvoice"/> + <set field="helpAnchor" value="_help_for_purchase_invoice_default_account"/> </actions> <widgets> <decorator-screen name="CommonGlSetupDecorator" location="${parameters.commonGlSetupDecoratorLocation}"> @@ -337,6 +345,7 @@ under the License. <set field="titleProperty" value="${uiLabelMap.AccountingPaymentType}/${uiLabelMap.FormFieldTitle_glAccountTypeId}"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="GlAccountTypePaymentType"/> + <set field="helpAnchor" value="_help_for_payment_type_gl_account_type"/> </actions> <widgets> <decorator-screen name="CommonGlSetupDecorator" location="${parameters.commonGlSetupDecoratorLocation}"> @@ -357,6 +366,7 @@ under the License. <set field="titleProperty" value="${uiLabelMap.AccountingPaymentMethodId}/${uiLabelMap.AccountingGlAccountId}"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="GlAccountNrPaymentMethod"/> + <set field="helpAnchor" value="_help_for_payment_method_gl_account_type"/> </actions> <widgets> <decorator-screen name="CommonGlSetupDecorator" location="${parameters.commonGlSetupDecoratorLocation}"> @@ -378,6 +388,7 @@ under the License. <set field="labelTitleProperty" from-field="uiLabelMap.AccountingProductGlAccount"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="ProductGlAccounts"/> + <set field="helpAnchor" value="_help_for_product_gl_account"/> <entity-condition entity-name="ProductGlAccount" list="productGlAccounts"> <condition-expr field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/> @@ -404,6 +415,7 @@ under the License. <set field="labelTitleProperty" from-field="uiLabelMap.AccountingFinAccountTypeGlAccount"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="FinAccountTypeGlAccounts"/> + <set field="helpAnchor" value="_help_for_financial_account_gl_account_type_2"/> <entity-condition entity-name="FinAccountTypeGlAccount" list="finAccountTypeGlAccounts"> <condition-expr field-name="organizationPartyId" operator="equals" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/> @@ -434,6 +446,7 @@ under the License. <set field="labelTitleProperty" from-field="uiLabelMap.AccountingProductCategoryGlAccount"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="ProductCategoryGlAccounts"/> + <set field="helpAnchor" value="_help_for_product_category_gl_accounts"/> <entity-condition entity-name="ProductCategoryGlAccount" list="productCategoryGlAccounts"> <condition-expr field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/> @@ -459,6 +472,7 @@ under the License. <set field="titleProperty" value="AccountingVarianceReasonGlAccounts"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="VarianceReasonGlAccounts"/> + <set field="helpAnchor" value="_help_for_variance_reason_gl_accounts"/> <set field="labelTitleProperty" from-field="uiLabelMap.AccountingVarianceReasonGlAccounts"/> <entity-condition entity-name="VarianceReasonGlAccount" list="varianceReasonGlAccounts"> @@ -485,6 +499,7 @@ under the License. <set field="titleProperty" value="AccountingCreditCardTypeGlAccount"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="CreditCardTypeGlAccount"/> + <set field="helpAnchor" value="_help_for_credit_card_type_gl_accounts"/> <set field="labelTitleProperty" from-field="uiLabelMap.AccountingCreditCardTypeGlAccount"/> <entity-condition entity-name="CreditCardTypeGlAccount" list="creditCardTypeGlAccounts"> <condition-expr field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/> @@ -509,6 +524,7 @@ under the License. <set field="titleProperty" value="PageTitleEditTaxAuthorityGlAccounts"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="TaxAuthorityGlAccounts"/> + <set field="helpAnchor" value="_help_for_tax_authority_gl_accounts"/> <set field="labelTitleProperty" from-field="uiLabelMap.PageTitleEditTaxAuthorityGlAccounts"/> <entity-condition entity-name="TaxAuthorityGlAccount" list="taxAuthorityGlAccounts"> <condition-expr field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/> @@ -537,6 +553,7 @@ under the License. <set field="labelTitleProperty" from-field="uiLabelMap.PageTitleEditPartyGlAccounts"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="PartyGlAccounts"/> + <set field="helpAnchor" value="_help_for_party_gl_account_mapping"/> <entity-condition entity-name="PartyGlAccount" list="partyGlAccounts"> <condition-expr field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/> <order-by field-name="partyId"/> diff --git a/applications/accounting/widget/GlobalGlAccountsScreens.xml b/applications/accounting/widget/GlobalGlAccountsScreens.xml index 37881b8..00ac362 100644 --- a/applications/accounting/widget/GlobalGlAccountsScreens.xml +++ b/applications/accounting/widget/GlobalGlAccountsScreens.xml @@ -90,6 +90,7 @@ under the License. <set field="titleProperty" value="AcctgAssignGlAccount"/> <set field="tabButtonItem" value="Chartofaccounts"/> <set field="tabButtonItem2" value="AssignGlAccount"/> + <set field="helpAnchor" value="_help_for_assign_gl_account"/> <set field="labelTitleProperty" value="AcctgAssignGlAccount"/> <!-- <set field="accountId" from-field="parameters.accountId"/> --> @@ -113,6 +114,7 @@ under the License. <set field="titleProperty" value="AcctgNavigateAccts"/> <set field="tabButtonItem" value="Chartofaccounts"/> <set field="tabButtonItem2" value="GlAccountNavigate"/> + <set field="helpAnchor" value="_help_for_navigate_gl_accounts"/> <set field="labelTitleProperty" value="AcctgNavigateAccts"/> <!-- parameters includes requestAttributes and parameter map --> <!-- requestParameters is just the parameter map --> @@ -220,6 +222,7 @@ under the License. <set field="titleProperty" value="PageTitleListAccounts"/> <set field="labelTitleProperty" value="PageTitleListAccounts"/> <set field="tabButtonItem" value="Chartofaccounts"/> + <set field="helpAnchor" value="_help_find_global_gl_account"/> <!-- no longer works requies a fieldMap entity-and entity-name="GlAccount" list="entityList" use-cache="true" > <limit-range start="0" size="20"/> </entity-and --> @@ -321,6 +324,7 @@ under the License. <set field="titleProperty" value="AccountingFX"/> <set field="labelTitleProperty" from-field="uiLabelMap.AccountingFX"/> <set field="tabButtonItem" value="ViewFXConversions"/> + <set field="helpAnchor" value="_help_for_view_foreign_exchange_rates"/> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> <!-- TODO: If UomConversionDated is ever used for another type of conversion besides currencies or if some currencies are stored in UomConversion, we need to change the logic here --> @@ -350,6 +354,7 @@ under the License. <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="FormFieldTitle_costCenters"/> <set field="tabButtonItem" value="CostCenters"/> + <set field="helpAnchor" value="_cost_centers"/> </actions> <widgets> <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}"> diff --git a/applications/accounting/widget/InvoiceScreens.xml b/applications/accounting/widget/InvoiceScreens.xml index f845f2c..d0168b9 100644 --- a/applications/accounting/widget/InvoiceScreens.xml +++ b/applications/accounting/widget/InvoiceScreens.xml @@ -69,13 +69,14 @@ under the License. </widgets> </section> </screen> - + <screen name="FindInvoices"> <section> <actions> <set field="headerItem" value="invoices"/> <set field="tabButtonItem" value="find"/> <set field="titleProperty" value="PageTitleFindInvoice"/> + <set field="helpAnchor" value="_help_for_find_invoices"/> </actions> <widgets> <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}"> @@ -106,6 +107,7 @@ under the License. <section> <actions> <set field="titleProperty" value="AccountingCreateNewInvoice"/> + <set field="helpAnchor" value="_help_for_new_invoice"/> <entity-one entity-name="Invoice" value-field="invoice"/> </actions> <widgets> @@ -132,6 +134,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleEditInvoice"/> <set field="tabButtonItem" value="editInvoice"/> + <set field="helpAnchor" value="_help_for_edit_invoice_header"/> <set field="invoiceId" from-field="parameters.invoiceId"/> <entity-one entity-name="Invoice" value-field="invoice"/> <entity-one entity-name="InvoiceType" value-field="invoiceType"> @@ -169,6 +172,7 @@ under the License. <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="PageTitleInvoiceOverview"/> <set field="tabButtonItem" value="invoiceOverview"/> + <set field="helpAnchor" value="_help_for_invoice_overview"/> <set field="invoiceId" from-field="parameters.invoiceId"/> <entity-one entity-name="Invoice" value-field="invoice"/> <entity-and entity-name="InvoiceRole" list="invoiceRoles"> @@ -357,6 +361,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleListEditInvoiceApplications"/> <set field="tabButtonItem" value="editInvoiceApplications"/> + <set field="helpAnchor" value="_help_for_edit_invoice_applications"/> <set field="invoiceId" from-field="parameters.invoiceId"/> <entity-one entity-name="Invoice" value-field="invoice"/> @@ -445,6 +450,7 @@ under the License. <set field="viewSize" from-field="parameters.viewSize"/> <set field="titleProperty" value="PageTitleListInvoices"/> <set field="tabButtonItem" value="listInvoiceItems"/> + <set field="helpAnchor" value="_help_for_edit_invoice_time_entries"/> <set field="invoiceId" from-field="parameters.invoiceId"/> <set field="invoiceItemSeqd" from-field="parameters.invoiceItemSeqId"/> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> @@ -492,6 +498,7 @@ under the License. <set field="viewSize" from-field="parameters.viewSize"/> <set field="titleProperty" value="PageTitleListInvoiceTimeEntries"/> <set field="tabButtonItem" value="EditInvoiceTimeEntries"/> + <set field="helpAnchor" value="_help_for_edit_invoice_time_entries"/> <set field="invoiceId" from-field="parameters.invoiceId"/> <entity-one entity-name="Invoice" value-field="invoice"/> <entity-and entity-name="TimeEntry" list="timeEntries"> @@ -516,6 +523,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleListInvoiceRoles"/> <set field="tabButtonItem" value="invoiceRoles"/> + <set field="helpAnchor" value="_help_for_invoice_roles"/> <set field="invoiceId" from-field="parameters.invoiceId"/> <entity-one entity-name="Invoice" value-field="invoice"/> <entity-and entity-name="InvoiceRole" list="invoiceRoles"> @@ -580,6 +588,7 @@ under the License. <set field="invoiceId" from-field="parameters.invoiceId"/> <entity-one entity-name="Invoice" value-field="invoice"/> <set field="tabButtonItem" value="sendPerEmail"/> + <set field="helpAnchor" value="_help_for_send_per_email"/> </actions> <widgets> <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}"> diff --git a/applications/accounting/widget/PaymentGatewayConfigScreens.xml b/applications/accounting/widget/PaymentGatewayConfigScreens.xml index 61926bf..8f97727 100644 --- a/applications/accounting/widget/PaymentGatewayConfigScreens.xml +++ b/applications/accounting/widget/PaymentGatewayConfigScreens.xml @@ -53,7 +53,8 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleFindPaymentGatewayConfig"/> - <set field="tabButtonItem" value="paymentGatewayConfigTab"/> + <set field="tabButtonItem" value="paymentGatewayConfigTab"/> + <set field="helpAnchor" value="_payment_gateway_config_management_in_user_interface"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> @@ -83,8 +84,9 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleUpdatePaymentGatewayConfig"/> - <set field="tabButtonItem" value="paymentGatewayConfigTab"/> - + <set field="tabButtonItem" value="paymentGatewayConfigTab"/> + <set field="helpAnchor" value="_help_for_edit_payment_gateway_config"/> + <set field="paymentGatewayConfigId" from-field="parameters.paymentGatewayConfigId"/> <entity-one entity-name="PaymentGatewayConfig" value-field="paymentGatewayConfig"/> <entity-one entity-name="PaymentGatewaySagePay" value-field="paymentGatewaySagePay"> @@ -232,7 +234,8 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleFindPaymentGatewayConfigTypes"/> - <set field="tabButtonItem" value="paymentGatewayConfigTypesTab"/> + <set field="tabButtonItem" value="paymentGatewayConfigTypesTab"/> + <set field="helpAnchor" value="_help_for_find_payment_gateway_config_types"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> @@ -262,8 +265,9 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleUpdatePaymentGatewayConfigType"/> - <set field="tabButtonItem" value="paymentGatewayConfigTypesTab"/> - + <set field="tabButtonItem" value="paymentGatewayConfigTypesTab"/> + <set field="helpAnchor" value="_help_for_edit_payment_gateway_config_type"/> + <set field="paymentGatewayConfigTypeId" from-field="parameters.paymentGatewayConfigTypeId"/> <entity-one entity-name="PaymentGatewayConfigType" value-field="paymentGatewayConfigType"/> </actions> diff --git a/applications/accounting/widget/PaymentScreens.xml b/applications/accounting/widget/PaymentScreens.xml index 9cc8cfd..460a069 100644 --- a/applications/accounting/widget/PaymentScreens.xml +++ b/applications/accounting/widget/PaymentScreens.xml @@ -66,6 +66,7 @@ under the License. <set field="titleProperty" value="PageTitleFindPayment"/> <set field="headerItem" value="payments"/> <set field="tabButtonItem" value="findPayment"/> + <set field="helpAnchor" value="_help_for_find_payments"/> </actions> <widgets> <decorator-screen name="CommonPaymentDecorator" location="${parameters.mainDecoratorLocation}"> @@ -115,6 +116,7 @@ under the License. <set field="titleProperty" value="PageTitleEditPayment"/> <set field="headerItem" value="payments"/> <set field="tabButtonItem" value="editPayment"/> + <set field="helpAnchor" value="_help_for_new_payment"/> <set field="paymentId" from-field="parameters.paymentId"/> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> </actions> @@ -141,6 +143,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleEditPayment"/> <set field="tabButtonItem" value="editPayment"/> + <set field="helpAnchor" value="_help_for_payment_header"/> <set field="paymentId" from-field="parameters.paymentId"/> <entity-one entity-name="Payment" value-field="payment"> <field-map field-name="paymentId" from-field="parameters.paymentId"/> @@ -166,6 +169,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleListPaymentApplications"/> <set field="tabButtonItem" value="editPaymentApplications"/> + <set field="helpAnchor" value="_help_for_payment_applications"/> <set field="paymentId" from-field="parameters.paymentId"/> <entity-one entity-name="Payment" value-field="payment"/> <set field="appliedAmount" type="String" value="${groovy: @@ -345,6 +349,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitlePaymentOverview"/> <set field="tabButtonItem" value="paymentOverview"/> + <set field="helpAnchor" value="_help_for_payment_overview"/> <set field="labelTitleProperty" value="PageTitlePaymentOverview"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <set field="paymentId" from-field="parameters.paymentId"/> @@ -437,6 +442,7 @@ under the License. <set field="titleProperty" value="AccountingManualTransaction"/> <set field="headerItem" value="transaction"/> <set field="tabButtonItem" value="manualtransactiontab"/> + <set field="helpAnchor" value="_help_for_manual_transaction"/> <script location="component://accounting/groovyScripts/payment/ManualTx.groovy"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> </actions> @@ -513,6 +519,7 @@ under the License. <actions> <set field="titleProperty" value="AccountingFindSalesInvoicesByDueDate"/> <set field="headerItem" value="payments"/> + <set field="helpAnchor" value="_help_for_find_sales_invoices_by_due_date"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> @@ -544,6 +551,7 @@ under the License. <actions> <set field="titleProperty" value="AccountingFindPurchaseInvoicesByDueDate"/> <set field="headerItem" value="payments"/> + <set field="helpAnchor" value="_help_for_find_purchase_invoices_by_due_date"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> diff --git a/applications/accounting/widget/PeriodScreens.xml b/applications/accounting/widget/PeriodScreens.xml index 62cd857..016a758 100644 --- a/applications/accounting/widget/PeriodScreens.xml +++ b/applications/accounting/widget/PeriodScreens.xml @@ -26,6 +26,7 @@ under the License. <set field="headerItem" value="main"/> <set field="titleProperty" value="AccountingEditCustomTimePeriods"/> <set field="tabButtonItem" value="EditCustomTimePeriod"/> + <set field="helpAnchor" value="_help_for_time_periods"/> <script location="component://accounting/groovyScripts/period/EditCustomTimePeriod.groovy"/> </actions> <widgets> diff --git a/applications/accounting/widget/TaxAuthorityScreens.xml b/applications/accounting/widget/TaxAuthorityScreens.xml index 0cfe034..cfd9839 100644 --- a/applications/accounting/widget/TaxAuthorityScreens.xml +++ b/applications/accounting/widget/TaxAuthorityScreens.xml @@ -74,6 +74,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleFindTaxAuthority"/> <set field="tabButtonItem" value="FindTaxAuthority"/> + <set field="helpAnchor" value="_help_for_find_tax_authorities"/> </actions> <widgets> <decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.taxAuthDecoratorLocation}"> @@ -96,6 +97,7 @@ under the License. <set field="titleProperty" value="PageTitleEditTaxAuthority"/> <set field="tabButtonItem" value="EditTaxAuthority"/> <set field="labelTitleProperty" value="PageTitleEditTaxAuthority"/> + <set field="helpAnchor" value="_help_for_edit_tax_authority"/> <set field="taxAuthPartyId" from-field="parameters.taxAuthPartyId"/> <set field="taxAuthGeoId" from-field="parameters.taxAuthGeoId"/> @@ -119,6 +121,7 @@ under the License. <set field="titleProperty" value="PageTitleEditTaxAuthorityCategories"/> <set field="tabButtonItem" value="EditTaxAuthorityCategories"/> <set field="labelTitleProperty" value="PageTitleEditTaxAuthorityCategories"/> + <set field="helpAnchor" value="_help_for_edit_tax_authority_categories"/> <set field="taxAuthPartyId" from-field="parameters.taxAuthPartyId"/> <set field="taxAuthGeoId" from-field="parameters.taxAuthGeoId"/> @@ -141,6 +144,7 @@ under the License. <set field="titleProperty" value="PageTitleEditTaxAuthorityAssocs"/> <set field="tabButtonItem" value="EditTaxAuthorityAssocs"/> <set field="labelTitleProperty" value="PageTitleEditTaxAuthorityAssocs"/> + <set field="helpAnchor" value="_help_for_edit_tax_authority_associations"/> <set field="taxAuthPartyId" from-field="parameters.taxAuthPartyId"/> <set field="taxAuthGeoId" from-field="parameters.taxAuthGeoId"/> @@ -163,6 +167,7 @@ under the License. <set field="titleProperty" value="PageTitleEditTaxAuthorityGlAccounts"/> <set field="tabButtonItem" value="EditTaxAuthorityGlAccounts"/> <set field="labelTitleProperty" value="PageTitleEditTaxAuthorityGlAccounts"/> + <set field="helpAnchor" value="_help_for_edit_tax_authority_gl_accounts"/> <set field="taxAuthPartyId" from-field="parameters.taxAuthPartyId"/> <set field="taxAuthGeoId" from-field="parameters.taxAuthGeoId"/> @@ -185,6 +190,7 @@ under the License. <set field="titleProperty" value="PageTitleEditTaxAuthorityRateProducts"/> <set field="tabButtonItem" value="EditTaxAuthorityRateProducts"/> <set field="labelTitleProperty" value="PageTitleEditTaxAuthorityRateProducts"/> + <set field="helpAnchor" value="_help_for_edit_tax_authority_product_rates"/> <set field="taxAuthPartyId" from-field="parameters.taxAuthPartyId"/> <set field="taxAuthGeoId" from-field="parameters.taxAuthGeoId"/> @@ -208,6 +214,7 @@ under the License. <set field="titleProperty" value="PageTitleListTaxAuthorityParties"/> <set field="tabButtonItem" value="ListTaxAuthorityParties"/> <set field="labelTitleProperty" value="Standard costs"/> + <set field="helpAnchor" value="_help_for_list_tax_authority_parties"/> <set field="taxAuthPartyId" from-field="parameters.taxAuthPartyId"/> <set field="taxAuthGeoId" from-field="parameters.taxAuthGeoId"/> @@ -237,6 +244,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleEditTaxAuthorityPartyInfo"/> <set field="tabButtonItem" value="EditTaxAuthorityPartyInfo"/> + <set field="helpAnchor" value="_help_for_edit_tax_authority_party_info"/> <set field="taxAuthPartyId" from-field="parameters.taxAuthPartyId"/> <set field="taxAuthGeoId" from-field="parameters.taxAuthGeoId"/> @@ -262,7 +270,7 @@ under the License. </widgets> </section> </screen> - + <!-- reporting --> <screen name="FindTaxAuthorityReport"> <section> @@ -285,5 +293,5 @@ under the License. </widgets> </section> </screen> - + </screens> diff --git a/applications/accounting/widget/TransactionScreens.xml b/applications/accounting/widget/TransactionScreens.xml index 0940329..d0bcfef 100644 --- a/applications/accounting/widget/TransactionScreens.xml +++ b/applications/accounting/widget/TransactionScreens.xml @@ -56,6 +56,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleFindGatewayResponses"/> <!-- shows up in browser title bar --> <set field="tabButtonItem" value="gatewayresponsestab"/> + <set field="helpAnchor" value="_help_for_find_gateway_responses"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> @@ -87,6 +88,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleViewGatewayResponse"/> <set field="tabButtonItem" value="gatewayresponsestab"/> + <set field="helpAnchor" value="_help_for_view_gateway_response"/> <set field="paymentGatewayResponseId" from-field="parameters.paymentGatewayResponseId"/> <set field="orderPaymentPreferenceId" from-field="parameters.orderPaymentPreferenceId"/> @@ -119,6 +121,7 @@ under the License. <actions> <set field="titleProperty" value="AccountingAuthorize"/> <set field="tabButtonItem" value="authorizetransactiontab"/> + <set field="helpAnchor" value="_help_for_the_authorize_transaction"/> <set field="orderId" from-field="parameters.orderId"/> <set field="orderPaymentPreferenceId" from-field="parameters.orderPaymentPreferenceId"/> @@ -148,6 +151,7 @@ under the License. <actions> <set field="titleProperty" value="AccountingCapture"/> <set field="tabButtonItem" value="capturetransactiontab"/> + <set field="helpAnchor" value="_help_for_capture_transaction"/> <set field="orderId" from-field="parameters.orderId"/> <set field="orderPaymentPreferenceId" from-field="parameters.orderPaymentPreferenceId"/> diff --git a/framework/common/config/general.properties b/framework/common/config/general.properties index 8eee50d..a4706cc 100644 --- a/framework/common/config/general.properties +++ b/framework/common/config/general.properties @@ -135,4 +135,4 @@ saveEntitySyncRemoveInfo=false multitenant=N # -- Default User Documentation website uri -userDocUri=https://ci.apache.org/projects/ofbiz/site/ofbizdoc/html5/user-manual.html +userDocUri=https://ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc/html5/user-manual.html |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |