[ofbiz-framework] branch trunk updated (3ebb9f6 -> 42df37b)
Locked
 
|
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git. from 3ebb9f6 Documented: All setup help file in docbook format migration to asciidoc format (OFBIZ-11363) new a40a235 Documented: Agreement Help Docbook file migration to asciidoc format (OFBIZ-10290) new 0340b17 Documented: Financial Account Help Docbook file migration to asciidoc format (OFBIZ-10296) new 2cd22bb Documented: Global GL Setting Help Docbook file migration to asciidoc format (OFBIZ-10297) new 47353fc Documented: Invoice Docbook files migration to asciidoc format (OFBIZ-10292) new 508c5aa Documented: Payments Docbook files migration to asciidoc format (OFBIZ-10294) new 63d1df7 Documented: Payment-gateway Docbook files migration to asciidoc format (OFBIZ-10294) new 0f937ea Documented: Billing Account Docbook files migration to asciidoc format (OFBIZ-10293) new fad7ad0 Documented: Tax-AUthorities Docbook files migration to asciidoc format (OFBIZ-10291) new 3e2e71a Documented: Organization-Gl-Settings Docbook files migration to asciidoc format (OFBIZ-11352) new 7e3268e Documented: Add help for main accounting screen at the end of intro (OFBIZ-10289) new 615f9c9 Documented: remove empty help files in Accounting (OFBIZ-10288) new 42df37b Documented: Add Accounting Glossary in Accounting documentation (OFBIZ-10626) The 12 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../accounting/data/helpdata/HELP_ACCOUNTING.xml | 45 ----- .../helpdata/HELP_ACCOUNTING_AssignGlAccount.xml | 32 ---- .../HELP_ACCOUNTING_AuthorizeTransaction.xml | 102 ----------- .../HELP_ACCOUNTING_BankReconciliation.xml | 199 --------------------- .../HELP_ACCOUNTING_BillingAccountInvoices.xml | 95 ---------- .../HELP_ACCOUNTING_BillingAccountOrders.xml | 29 --- .../HELP_ACCOUNTING_BillingAccountPayments.xml | 131 -------------- .../HELP_ACCOUNTING_CaptureTransaction.xml | 55 ------ .../data/helpdata/HELP_ACCOUNTING_CostCenters.xml | 22 --- .../helpdata/HELP_ACCOUNTING_EditAgreement.xml | 49 ----- .../HELP_ACCOUNTING_EditAgreementContents.xml | 42 ----- ..._ACCOUNTING_EditAgreementGeographicalApplic.xml | 23 --- .../helpdata/HELP_ACCOUNTING_EditAgreementItem.xml | 50 ------ .../HELP_ACCOUNTING_EditAgreementItemParty.xml | 26 --- .../HELP_ACCOUNTING_EditAgreementItemProduct.xml | 22 --- ...ACCOUNTING_EditAgreementItemSupplierProduct.xml | 22 --- .../HELP_ACCOUNTING_EditAgreementItemTerm.xml | 22 --- .../HELP_ACCOUNTING_EditAgreementRoles.xml | 41 ----- .../HELP_ACCOUNTING_EditAgreementTerms.xml | 106 ----------- ...P_ACCOUNTING_EditAgreementWorkEffortApplics.xml | 41 ----- .../HELP_ACCOUNTING_EditBillingAccount.xml | 159 ---------------- .../HELP_ACCOUNTING_EditBillingAccountRoles.xml | 98 ---------- .../HELP_ACCOUNTING_EditBillingAccountTerms.xml | 106 ----------- .../helpdata/HELP_ACCOUNTING_EditCostCalcs.xml | 22 --- ...ELP_ACCOUNTING_EditCreditCardTypeGlAccounts.xml | 101 ----------- .../HELP_ACCOUNTING_EditCustomTimePeriod.xml | 22 --- .../HELP_ACCOUNTING_EditDepositSlipAndMembers.xml | 61 ------- .../helpdata/HELP_ACCOUNTING_EditFinAccount.xml | 142 --------------- .../HELP_ACCOUNTING_EditFinAccountAuths.xml | 94 ---------- ...LP_ACCOUNTING_EditFinAccountReconciliations.xml | 38 ---- .../HELP_ACCOUNTING_EditFinAccountRoles.xml | 59 ------ .../HELP_ACCOUNTING_EditFinAccountTrans.xml | 91 ---------- ...ELP_ACCOUNTING_EditFinAccountTypeGlAccounts.xml | 95 ---------- .../HELP_ACCOUNTING_EditGlAccountCategory.xml | 22 --- ...HELP_ACCOUNTING_EditGlAccountCategoryMember.xml | 22 --- .../HELP_ACCOUNTING_EditInvoiceItemType.xml | 22 --- ...TING_EditOrganizationTaxAuthorityGlAccounts.xml | 99 ---------- .../HELP_ACCOUNTING_EditPartyGlAccount.xml | 109 ----------- .../HELP_ACCOUNTING_EditPaymentGatewayConfig.xml | 42 ----- ...ELP_ACCOUNTING_EditPaymentGatewayConfigType.xml | 23 --- .../HELP_ACCOUNTING_EditPaymentMethodType.xml | 22 --- ...LP_ACCOUNTING_EditProductCategoryGlAccounts.xml | 110 ------------ .../HELP_ACCOUNTING_EditProductGlAccounts.xml | 113 ------------ .../helpdata/HELP_ACCOUNTING_EditTaxAuthority.xml | 35 ---- .../HELP_ACCOUNTING_EditTaxAuthorityAssocs.xml | 81 --------- .../HELP_ACCOUNTING_EditTaxAuthorityCategories.xml | 62 ------- .../HELP_ACCOUNTING_EditTaxAuthorityGlAccounts.xml | 92 ---------- .../HELP_ACCOUNTING_EditTaxAuthorityPartyInfo.xml | 32 ---- ...ELP_ACCOUNTING_EditTaxAuthorityRateProducts.xml | 109 ----------- ...ELP_ACCOUNTING_EditVarianceReasonGlAccounts.xml | 104 ----------- .../data/helpdata/HELP_ACCOUNTING_Features.xml | 31 ---- .../helpdata/HELP_ACCOUNTING_FinAccountMain.xml | 35 ---- .../helpdata/HELP_ACCOUNTING_FindAgreement.xml | 48 ----- .../HELP_ACCOUNTING_FindBillingAccount.xml | 26 --- .../helpdata/HELP_ACCOUNTING_FindDepositSlips.xml | 64 ------- .../helpdata/HELP_ACCOUNTING_FindFinAccount.xml | 41 ----- ...LP_ACCOUNTING_FindFinAccountReconciliations.xml | 23 --- .../HELP_ACCOUNTING_FindFinAccountTrans.xml | 59 ------ .../HELP_ACCOUNTING_FindGatewayResponses.xml | 44 ----- .../HELP_ACCOUNTING_FindGlAccountCategory.xml | 22 --- .../HELP_ACCOUNTING_FindGlobalGlAccount.xml | 31 ---- .../HELP_ACCOUNTING_FindPaymentGatewayConfig.xml | 23 --- ...LP_ACCOUNTING_FindPaymentGatewayConfigTypes.xml | 25 --- ...LP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml | 49 ----- .../HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml | 77 -------- .../helpdata/HELP_ACCOUNTING_FindTaxAuthority.xml | 106 ----------- .../helpdata/HELP_ACCOUNTING_GlAccountNavigate.xml | 71 -------- .../HELP_ACCOUNTING_GlAccountNrPaymentMethod.xml | 155 ---------------- .../HELP_ACCOUNTING_GlAccountPurInvoice.xml | 155 ---------------- .../HELP_ACCOUNTING_GlAccountSalInvoice.xml | 165 ----------------- .../HELP_ACCOUNTING_GlAccountTypeDefaults.xml | 158 ---------------- .../HELP_ACCOUNTING_GlAccountTypePaymentType.xml | 66 ------- ..._ACCOUNTING_ListAgreementGeographicalApplic.xml | 37 ---- .../HELP_ACCOUNTING_ListAgreementItemParties.xml | 37 ---- .../HELP_ACCOUNTING_ListAgreementItemProducts.xml | 47 ----- ...CCOUNTING_ListAgreementItemSupplierProducts.xml | 53 ------ .../HELP_ACCOUNTING_ListAgreementItemTerms.xml | 46 ----- .../HELP_ACCOUNTING_ListAgreementItems.xml | 22 --- .../HELP_ACCOUNTING_ListAgreementPromoAppls.xml | 49 ----- .../helpdata/HELP_ACCOUNTING_ListCompanies.xml | 28 --- .../HELP_ACCOUNTING_ListGlAccountOrganization.xml | 138 -------------- .../HELP_ACCOUNTING_ListTaxAuthorityParties.xml | 87 --------- .../helpdata/HELP_ACCOUNTING_ManualTransaction.xml | 74 -------- .../helpdata/HELP_ACCOUNTING_NewDepositPayment.xml | 93 ---------- .../helpdata/HELP_ACCOUNTING_NewDepositSlip.xml | 53 ------ .../HELP_ACCOUNTING_NewWithdrawalPayment.xml | 95 ---------- .../HELP_ACCOUNTING_PartyAccountsSummary.xml | 22 --- .../HELP_ACCOUNTING_PartyAcctgPreference.xml | 136 -------------- .../helpdata/HELP_ACCOUNTING_PaymentMethodType.xml | 22 --- .../HELP_ACCOUNTING_PaymentsDepositWithdraw.xml | 73 -------- .../helpdata/HELP_ACCOUNTING_SetupGlJournals.xml | 86 --------- .../data/helpdata/HELP_ACCOUNTING_TimePeriods.xml | 180 ------------------- .../helpdata/HELP_ACCOUNTING_ViewFXConversions.xml | 45 ----- .../HELP_ACCOUNTING_ViewGatewayResponse.xml | 26 --- ...OUNTING_ViewGlReconciliationWithTransaction.xml | 81 --------- .../helpdata/HELP_ACCOUNTING_ViewRateAmounts.xml | 22 --- .../data/helpdata/HELP_ACCOUNTING_agreements.xml | 48 ----- .../helpdata/HELP_ACCOUNTING_billing_accounts.xml | 81 --------- .../data/helpdata/HELP_ACCOUNTING_editInvoice.xml | 34 ---- .../HELP_ACCOUNTING_editInvoiceApplications.xml | 142 --------------- .../HELP_ACCOUNTING_editInvoiceTimeEntries.xml | 43 ----- .../data/helpdata/HELP_ACCOUNTING_editPayment.xml | 45 ----- .../HELP_ACCOUNTING_editPaymentApplications.xml | 87 --------- .../HELP_ACCOUNTING_financial_accounts.xml | 111 ------------ .../data/helpdata/HELP_ACCOUNTING_findInvoices.xml | 74 -------- .../data/helpdata/HELP_ACCOUNTING_findPayments.xml | 73 -------- .../HELP_ACCOUNTING_global_gl_settings.xml | 46 ----- .../helpdata/HELP_ACCOUNTING_invoiceOverview.xml | 40 ----- .../data/helpdata/HELP_ACCOUNTING_invoiceRoles.xml | 53 ------ .../data/helpdata/HELP_ACCOUNTING_invoices.xml | 63 ------- .../helpdata/HELP_ACCOUNTING_listInvoiceItems.xml | 65 ------- .../data/helpdata/HELP_ACCOUNTING_newInvoice.xml | 64 ------- .../data/helpdata/HELP_ACCOUNTING_newPayment.xml | 89 --------- .../HELP_ACCOUNTING_organization_gl_settings.xml | 38 ---- .../helpdata/HELP_ACCOUNTING_paymentOverview.xml | 48 ----- .../helpdata/HELP_ACCOUNTING_payment_gateway.xml | 35 ---- .../HELP_ACCOUNTING_payment_gateway_config.xml | 44 ----- .../data/helpdata/HELP_ACCOUNTING_payments.xml | 30 ---- .../data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml | 44 ----- .../helpdata/HELP_ACCOUNTING_tax_authorities.xml | 56 ------ .../data/helpdata/HELP_PORTLET_ListBankAccount.xml | 31 ---- .../asciidoc/_include/HELP_AssignGlAccount.adoc | 32 ++++ .../_include/HELP_AuthorizeTransaction.adoc | 67 +++++++ .../asciidoc/_include/HELP_BankReconciliation.adoc | 98 ++++++++++ .../_include/HELP_BillingAccountInvoices.adoc | 63 +++++++ .../_include/HELP_BillingAccountOrders.adoc} | 27 ++- .../_include/HELP_BillingAccountPayments.adoc | 78 ++++++++ .../asciidoc/_include/HELP_CaptureTransaction.adoc | 39 ++++ .../docs/asciidoc/_include/HELP_EditAgreement.adoc | 43 +++++ .../_include/HELP_EditAgreementContents.adoc} | 37 ++-- .../asciidoc/_include/HELP_EditAgreementItem.adoc | 43 +++++ .../_include/HELP_EditAgreementRoles.adoc} | 36 ++-- .../asciidoc/_include/HELP_EditAgreementTerms.adoc | 62 +++++++ .../HELP_EditAgreementWorkEffortApplics.adoc} | 36 ++-- .../asciidoc/_include/HELP_EditBillingAccount.adoc | 88 +++++++++ .../_include/HELP_EditBillingAccountRoles.adoc | 55 ++++++ .../_include/HELP_EditBillingAccountTerms.adoc | 58 ++++++ .../HELP_EditCreditCardTypeGlAccounts.adoc | 58 ++++++ .../_include/HELP_EditDepositSlipAndMembers.adoc | 35 ++++ .../asciidoc/_include/HELP_EditFinAccount.adoc | 70 ++++++++ .../_include/HELP_EditFinAccountAuths.adoc | 60 +++++++ .../HELP_EditFinAccountReconciliations.adoc} | 31 ++-- .../_include/HELP_EditFinAccountRoles.adoc | 34 ++++ .../_include/HELP_EditFinAccountTrans.adoc | 44 +++++ .../HELP_EditFinAccountTypeGlAccounts.adoc | 52 ++++++ ...ELP_EditOrganizationTaxAuthorityGlAccounts.adoc | 56 ++++++ .../asciidoc/_include/HELP_EditPartyGlAccount.adoc | 66 +++++++ .../_include/HELP_EditPaymentGatewayConfig.adoc} | 31 ++-- .../HELP_EditProductCategoryGlAccounts.adoc | 59 ++++++ .../_include/HELP_EditProductGlAccounts.adoc | 64 +++++++ .../asciidoc/_include/HELP_EditTaxAuthority.adoc} | 32 ++-- .../_include/HELP_EditTaxAuthorityAssocs.adoc | 42 +++++ .../_include/HELP_EditTaxAuthorityCategories.adoc | 40 +++++ .../_include/HELP_EditTaxAuthorityGlAccounts.adoc | 51 ++++++ .../_include/HELP_EditTaxAuthorityPartyInfo.adoc} | 28 ++- .../HELP_EditTaxAuthorityRateProducts.adoc | 57 ++++++ .../HELP_EditVarianceReasonGlAccounts.adoc | 53 ++++++ .../docs/asciidoc/_include/HELP_FindAgreement.adoc | 39 ++++ .../_include/HELP_FindBillingAccount.adoc} | 26 ++- .../asciidoc/_include/HELP_FindDepositSlips.adoc | 48 +++++ .../HELP_FindFinAccount.adoc} | 23 +-- .../HELP_FindFinAccountTrans.adoc} | 24 +-- .../_include/HELP_FindGatewayResponses.adoc} | 32 ++-- .../HELP_FindPurchaseInvoicesByDueDate.adoc | 39 ++++ .../_include/HELP_FindSalesInvoicesByDueDate.adoc | 59 ++++++ .../asciidoc/_include/HELP_FindTaxAuthority.adoc | 62 +++++++ .../asciidoc/_include/HELP_GlAccountNavigate.adoc | 77 ++++++++ .../_include/HELP_GlAccountNrPaymentMethod.adoc | 74 ++++++++ .../_include/HELP_GlAccountPurInvoice.adoc | 89 +++++++++ .../_include/HELP_GlAccountSalInvoice.adoc | 112 ++++++++++++ .../_include/HELP_GlAccountTypeDefaults.adoc | 92 ++++++++++ .../_include/HELP_GlAccountTypePaymentType.adoc | 66 +++++++ .../HELP_ListAgreementGeographicalApplic.adoc} | 24 +-- .../_include/HELP_ListAgreementItemParties.adoc} | 32 ++-- .../_include/HELP_ListAgreementItemProducts.adoc | 41 +++++ .../HELP_ListAgreementItemSupplierProducts.adoc | 52 ++++++ .../_include/HELP_ListAgreementItemTerms.adoc | 37 ++++ .../_include/HELP_ListAgreementPromoAppls.adoc | 42 +++++ .../_include/HELP_ListGlAccountOrganization.adoc | 94 ++++++++++ .../_include/HELP_ListTaxAuthorityParties.adoc | 49 +++++ .../asciidoc/_include/HELP_ManualTransaction.adoc | 43 +++++ .../asciidoc/_include/HELP_NewDepositPayment.adoc | 48 +++++ .../HELP_NewDepositSlip.adoc} | 28 ++- .../_include/HELP_NewWithdrawalPayment.adoc | 51 ++++++ .../_include/HELP_PartyAcctgPreference.adoc | 81 +++++++++ .../_include/HELP_PaymentsDepositWithdraw.adoc | 44 +++++ .../asciidoc/_include/HELP_SetupGlJournals.adoc | 49 +++++ .../docs/asciidoc/_include/HELP_TimePeriods.adoc | 86 +++++++++ .../asciidoc/_include/HELP_ViewFXConversions.adoc | 44 +++++ .../_include/HELP_ViewGatewayResponse.adoc} | 27 ++- .../HELP_ViewGlReconciliationWithTransaction.adoc | 49 +++++ .../docs/asciidoc/_include/HELP_editInvoice.adoc} | 28 ++- .../_include/HELP_editInvoiceApplications.adoc | 85 +++++++++ .../HELP_editInvoiceTimeEntries.adoc} | 24 +-- .../docs/asciidoc/_include/HELP_editPayment.adoc | 34 ++++ .../_include/HELP_editPaymentApplications.adoc | 67 +++++++ .../docs/asciidoc/_include/HELP_findInvoices.adoc | 50 ++++++ .../docs/asciidoc/_include/HELP_findPayments.adoc | 49 +++++ .../asciidoc/_include/HELP_invoiceOverview.adoc | 36 ++++ .../docs/asciidoc/_include/HELP_invoiceRoles.adoc | 55 ++++++ .../asciidoc/_include/HELP_listInvoiceItems.adoc | 69 +++++++ .../docs/asciidoc/_include/HELP_newInvoice.adoc | 42 +++++ .../docs/asciidoc/_include/HELP_newPayment.adoc | 70 ++++++++ .../asciidoc/_include/HELP_paymentOverview.adoc | 37 ++++ .../docs/asciidoc/_include/HELP_sendPerEmail.adoc | 34 ++++ .../src/docs/asciidoc/_include/acc-agreements.adoc | 42 +++++ .../asciidoc/_include/acc-billing-accounts.adoc | 64 +++++++ .../asciidoc/_include/acc-financial-accounts.adoc | 64 +++++++ .../asciidoc/_include/acc-global-settings.adoc | 113 ++++++------ .../src/docs/asciidoc/_include/acc-glossary.adoc | 193 ++++++++++++++++++++ .../src/docs/asciidoc/_include/acc-intro.adoc | 23 ++- .../src/docs/asciidoc/_include/acc-invoices.adoc | 67 +++++++ .../_include/acc-organization-gl-settings.adoc | 61 +++++++ .../asciidoc/_include/acc-payment-gateway.adoc | 60 +++++++ .../docs/asciidoc/_include/acc-payments.adoc} | 41 +++-- .../asciidoc/_include/acc-tax-authorities.adoc | 55 ++++++ .../accounting/src/docs/asciidoc/accounting.adoc | 14 ++ 217 files changed, 4738 insertions(+), 8198 deletions(-) delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_AssignGlAccount.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_AuthorizeTransaction.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_BankReconciliation.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_BillingAccountInvoices.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_BillingAccountOrders.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_BillingAccountPayments.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_CaptureTransaction.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_CostCenters.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreement.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementContents.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementGeographicalApplic.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItem.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemParty.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemProduct.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemSupplierProduct.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemTerm.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementRoles.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementTerms.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementWorkEffortApplics.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditBillingAccount.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditBillingAccountRoles.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditBillingAccountTerms.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCostCalcs.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCreditCardTypeGlAccounts.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCustomTimePeriod.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditDepositSlipAndMembers.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccount.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountAuths.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountReconciliations.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountRoles.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountTrans.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountTypeGlAccounts.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditGlAccountCategory.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditGlAccountCategoryMember.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditInvoiceItemType.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditOrganizationTaxAuthorityGlAccounts.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPartyGlAccount.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentGatewayConfig.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentGatewayConfigType.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentMethodType.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditProductCategoryGlAccounts.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditProductGlAccounts.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthority.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityAssocs.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityCategories.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityGlAccounts.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityPartyInfo.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityRateProducts.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_EditVarianceReasonGlAccounts.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_Features.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_FinAccountMain.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_FindAgreement.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_FindBillingAccount.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_FindDepositSlips.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccount.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccountReconciliations.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccountTrans.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGatewayResponses.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGlAccountCategory.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGlobalGlAccount.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPaymentGatewayConfig.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPaymentGatewayConfigTypes.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_FindTaxAuthority.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountNavigate.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountNrPaymentMethod.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountPurInvoice.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountSalInvoice.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountTypeDefaults.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountTypePaymentType.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementGeographicalApplic.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemParties.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemProducts.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemSupplierProducts.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemTerms.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItems.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementPromoAppls.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_ListCompanies.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_ListGlAccountOrganization.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_ListTaxAuthorityParties.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_ManualTransaction.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositPayment.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositSlip.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_NewWithdrawalPayment.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_PartyAccountsSummary.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_PartyAcctgPreference.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_PaymentMethodType.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_PaymentsDepositWithdraw.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_SetupGlJournals.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_TimePeriods.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewFXConversions.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewGatewayResponse.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewGlReconciliationWithTransaction.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewRateAmounts.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_agreements.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_billing_accounts.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoice.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceApplications.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceTimeEntries.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_editPayment.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_editPaymentApplications.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_financial_accounts.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_findInvoices.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_findPayments.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_global_gl_settings.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceOverview.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceRoles.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_invoices.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_listInvoiceItems.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_newInvoice.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_organization_gl_settings.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_paymentOverview.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway_config.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml delete mode 100644 applications/accounting/data/helpdata/HELP_ACCOUNTING_tax_authorities.xml delete mode 100644 applications/accounting/data/helpdata/HELP_PORTLET_ListBankAccount.xml create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_AssignGlAccount.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_AuthorizeTransaction.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_BankReconciliation.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_BillingAccountInvoices.adoc copy applications/accounting/{data/helpdata/HELP_ACCOUNTING_main.xml => src/docs/asciidoc/_include/HELP_BillingAccountOrders.adoc} (52%) create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_BillingAccountPayments.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_CaptureTransaction.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreement.adoc copy applications/accounting/{data/helpdata/HELP_ACCOUNTING_main.xml => src/docs/asciidoc/_include/HELP_EditAgreementContents.adoc} (52%) create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementItem.adoc copy applications/accounting/{data/helpdata/HELP_ACCOUNTING_main.xml => src/docs/asciidoc/_include/HELP_EditAgreementRoles.adoc} (52%) create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementTerms.adoc copy applications/accounting/{data/helpdata/HELP_ACCOUNTING_main.xml => src/docs/asciidoc/_include/HELP_EditAgreementWorkEffortApplics.adoc} (52%) create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditBillingAccount.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditBillingAccountRoles.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditBillingAccountTerms.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditCreditCardTypeGlAccounts.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditDepositSlipAndMembers.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccount.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountAuths.adoc copy applications/accounting/{data/helpdata/HELP_ACCOUNTING_main.xml => src/docs/asciidoc/_include/HELP_EditFinAccountReconciliations.adoc} (52%) create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountRoles.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountTrans.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountTypeGlAccounts.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditOrganizationTaxAuthorityGlAccounts.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditPartyGlAccount.adoc copy applications/accounting/{data/helpdata/HELP_ACCOUNTING_main.xml => src/docs/asciidoc/_include/HELP_EditPaymentGatewayConfig.adoc} (52%) create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditProductCategoryGlAccounts.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditProductGlAccounts.adoc copy applications/accounting/{data/helpdata/HELP_ACCOUNTING_main.xml => src/docs/asciidoc/_include/HELP_EditTaxAuthority.adoc} (52%) create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityAssocs.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityCategories.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityGlAccounts.adoc copy applications/accounting/{data/helpdata/HELP_ACCOUNTING_main.xml => src/docs/asciidoc/_include/HELP_EditTaxAuthorityPartyInfo.adoc} (52%) create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityRateProducts.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_EditVarianceReasonGlAccounts.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_FindAgreement.adoc copy applications/accounting/{data/helpdata/HELP_ACCOUNTING_main.xml => src/docs/asciidoc/_include/HELP_FindBillingAccount.adoc} (52%) create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_FindDepositSlips.adoc copy applications/accounting/src/docs/asciidoc/{accounting.adoc => _include/HELP_FindFinAccount.adoc} (50%) copy applications/accounting/src/docs/asciidoc/{accounting.adoc => _include/HELP_FindFinAccountTrans.adoc} (50%) copy applications/accounting/{data/helpdata/HELP_ACCOUNTING_main.xml => src/docs/asciidoc/_include/HELP_FindGatewayResponses.adoc} (52%) create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_FindPurchaseInvoicesByDueDate.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_FindSalesInvoicesByDueDate.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_FindTaxAuthority.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountNavigate.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountNrPaymentMethod.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountPurInvoice.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountSalInvoice.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountTypeDefaults.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountTypePaymentType.adoc copy applications/accounting/src/docs/asciidoc/{accounting.adoc => _include/HELP_ListAgreementGeographicalApplic.adoc} (52%) copy applications/accounting/{data/helpdata/HELP_ACCOUNTING_main.xml => src/docs/asciidoc/_include/HELP_ListAgreementItemParties.adoc} (52%) create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemProducts.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemSupplierProducts.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemTerms.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementPromoAppls.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_ListGlAccountOrganization.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_ListTaxAuthorityParties.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_ManualTransaction.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_NewDepositPayment.adoc copy applications/accounting/src/docs/asciidoc/{accounting.adoc => _include/HELP_NewDepositSlip.adoc} (51%) create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_NewWithdrawalPayment.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_PartyAcctgPreference.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_PaymentsDepositWithdraw.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_SetupGlJournals.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_TimePeriods.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_ViewFXConversions.adoc copy applications/accounting/{data/helpdata/HELP_ACCOUNTING_main.xml => src/docs/asciidoc/_include/HELP_ViewGatewayResponse.adoc} (52%) create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_ViewGlReconciliationWithTransaction.adoc copy applications/accounting/{data/helpdata/HELP_ACCOUNTING_main.xml => src/docs/asciidoc/_include/HELP_editInvoice.adoc} (52%) create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_editInvoiceApplications.adoc copy applications/accounting/src/docs/asciidoc/{accounting.adoc => _include/HELP_editInvoiceTimeEntries.adoc} (51%) create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_editPayment.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_editPaymentApplications.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_findInvoices.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_findPayments.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_invoiceOverview.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_invoiceRoles.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_listInvoiceItems.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_newInvoice.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_newPayment.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_paymentOverview.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/HELP_sendPerEmail.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/acc-billing-accounts.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/acc-glossary.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/acc-invoices.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/acc-organization-gl-settings.adoc create mode 100644 applications/accounting/src/docs/asciidoc/_include/acc-payment-gateway.adoc rename applications/accounting/{data/helpdata/HELP_ACCOUNTING_main.xml => src/docs/asciidoc/_include/acc-payments.adoc} (52%) create mode 100644 applications/accounting/src/docs/asciidoc/_include/acc-tax-authorities.adoc |
|
|
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit a40a23583b2f835e4b9947f6670fc71813f4bd0c Author: holivier <[hidden email]> AuthorDate: Wed Jan 29 19:16:07 2020 +0100 Documented: Agreement Help Docbook file migration to asciidoc format (OFBIZ-10290) All the new files are now included in the Agreement documentation presentation, at the end in a sub-chapter Agreement management in User Interface. --- .../helpdata/HELP_ACCOUNTING_EditAgreement.xml | 49 ---------- .../HELP_ACCOUNTING_EditAgreementContents.xml | 42 -------- ..._ACCOUNTING_EditAgreementGeographicalApplic.xml | 23 ----- .../helpdata/HELP_ACCOUNTING_EditAgreementItem.xml | 50 ---------- .../HELP_ACCOUNTING_EditAgreementItemParty.xml | 26 ----- .../HELP_ACCOUNTING_EditAgreementItemProduct.xml | 22 ----- ...ACCOUNTING_EditAgreementItemSupplierProduct.xml | 22 ----- .../HELP_ACCOUNTING_EditAgreementItemTerm.xml | 22 ----- .../HELP_ACCOUNTING_EditAgreementRoles.xml | 41 -------- .../HELP_ACCOUNTING_EditAgreementTerms.xml | 106 --------------------- ...P_ACCOUNTING_EditAgreementWorkEffortApplics.xml | 41 -------- .../helpdata/HELP_ACCOUNTING_FindAgreement.xml | 48 ---------- ..._ACCOUNTING_ListAgreementGeographicalApplic.xml | 37 ------- .../HELP_ACCOUNTING_ListAgreementItemParties.xml | 37 ------- .../HELP_ACCOUNTING_ListAgreementItemProducts.xml | 47 --------- ...CCOUNTING_ListAgreementItemSupplierProducts.xml | 53 ----------- .../HELP_ACCOUNTING_ListAgreementItemTerms.xml | 46 --------- .../HELP_ACCOUNTING_ListAgreementItems.xml | 22 ----- .../HELP_ACCOUNTING_ListAgreementPromoAppls.xml | 49 ---------- .../data/helpdata/HELP_ACCOUNTING_agreements.xml | 48 ---------- .../docs/asciidoc/_include/HELP_EditAgreement.adoc | 43 +++++++++ .../_include/HELP_EditAgreementContents.adoc | 36 +++++++ .../asciidoc/_include/HELP_EditAgreementItem.adoc | 43 +++++++++ .../asciidoc/_include/HELP_EditAgreementRoles.adoc | 35 +++++++ .../asciidoc/_include/HELP_EditAgreementTerms.adoc | 62 ++++++++++++ .../HELP_EditAgreementWorkEffortApplics.adoc | 35 +++++++ .../docs/asciidoc/_include/HELP_FindAgreement.adoc | 39 ++++++++ .../HELP_ListAgreementGeographicalApplic.adoc | 35 +++++++ .../_include/HELP_ListAgreementItemParties.adoc | 31 ++++++ .../_include/HELP_ListAgreementItemProducts.adoc | 41 ++++++++ .../HELP_ListAgreementItemSupplierProducts.adoc | 52 ++++++++++ .../_include/HELP_ListAgreementItemTerms.adoc | 37 +++++++ .../_include/HELP_ListAgreementPromoAppls.adoc | 42 ++++++++ .../src/docs/asciidoc/_include/acc-agreements.adoc | 42 ++++++++ 34 files changed, 573 insertions(+), 831 deletions(-) diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreement.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreement.xml deleted file mode 100644 index 48cde42..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreement.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Agreement help screen</title> - <para>The 'Agreement' sub menu is used to enter the basic details required for setting up a new - agreement or editing an existing one.</para> - <para>It can be used to create or update the following details for an Agreement:</para> - <itemizedlist> - <listitem><para>The parties the agreement is between and their roles</para></listitem> - <listitem><para>The agreement type (eg Sales, Purchase, Commission, Employment etc)</para></listitem> - <listitem><para>Specific products </para></listitem> - <listitem><para>Start and End Date</para></listitem> - <listitem><para>Description</para></listitem> - </itemizedlist> - <section> - <title>How do I edit an agreement?</title> - <orderedlist> - <listitem><para>Find the agreement that needs to be amended</para></listitem> - <listitem><para>Click on Agreement Id</para></listitem> - <listitem><para>The 'Edit Agreement' screen will be displayed</para></listitem> - <listitem><para>Amend the details required and press the 'Submit' button (NOTE: Additional agreement details can be updated via the other tabs eg Agreement Terms, Agreement Roles, Agreement Items and Agreement Work Effort Appls)</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I copy an existing agreement?</title> - <orderedlist> - <listitem><para>Find the agreement that needs to be copied</para></listitem> - <listitem><para>Click on the Agreement Id</para></listitem> - <listitem><para>The 'Edit Agreement' screen will be displayed</para></listitem> - <listitem><para>At the bottom of the screen press the 'Copy' in the 'Copy Agreement' window (NOTE: The default tick boxes will copy the agreement terms, products and party. If not required then click on the boxes to stop them being copied)</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementContents.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementContents.xml deleted file mode 100644 index 9bc0dc6..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementContents.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Agreement Content help screen</title> - <para>This screen use for uploading any contents that concern the agreement. The screen consists of :</para> - <itemizedlist> - <listitem><para>- Add Agreement Content</para></listitem> - <listitem><para>- Agreement Content List</para></listitem> - </itemizedlist> - <section> - <title>Add Agreement Content</title> - <para> - To upload the content. The content can be classified by choosing the Content Type Id and Mime Type Id. - </para> - </section> - <section> - <title>Agreement Content List</title> - <para> - To Show the list of contents. There are 2 buttons in each content: - <orderedlist> - <listitem><para>Download : To download the uploaded content</para></listitem> - <listitem><para>Delete : To delete the uploaded content</para></listitem> - </orderedlist> - </para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementGeographicalApplic.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementGeographicalApplic.xml deleted file mode 100644 index 644a1a2..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementGeographicalApplic.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Agreement Geo help screen</title> - <para>This screen is used to create a geographical location for an agreement item.</para> - <para>NOTE: A new entry can be created or removed but not updated.</para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItem.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItem.xml deleted file mode 100644 index ac01729..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItem.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Agreement Item help screen</title> - <para>This screen allows specific items to be added to agreement. Currently these are limited to the following:</para> - <itemizedlist> - <listitem><para>Pricing</para></listitem> - <listitem><para>Commission Rate</para></listitem> - <listitem><para>Sub-Agreement</para></listitem> - <listitem><para>Exhibit</para></listitem> - <listitem><para>Section</para></listitem> - </itemizedlist> - <section> - <title>How do I create an agreement item?</title> - <orderedlist> - <listitem><para>Press the 'Create Agreement Item' button</para></listitem> - <listitem><para>The 'Edit Agreement Item' screen is displayed</para></listitem> - <listitem><para>Select the 'Agreement Item Type Id' from the drop down box</para></listitem> - <listitem><para>Use the drop down box to select the 'Currency' for the Agreement Item</para></listitem> - <listitem><para>Enter any 'Agreement Text' if required</para></listitem> - <listitem><para>Enter path for 'Agreement Image' if required</para></listitem> - <listitem><para>Press the 'Submit' button</para></listitem> - <listitem><para>A new sub menu will be displayed containing 'Promotions','Terms','Products','Party' and 'Geo' for additional details that can be setup for the agreement item</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I edit an agreement item?</title> - <orderedlist> - <listitem><para>Select the agreement item to be updated by clicking on the Agreement Item Id</para></listitem> - <listitem><para>The 'Edit Agreement Item' screen is displayed</para></listitem> - <listitem><para>Update the fields required (NOTE: Additional details can be updated by selecting the Promotions, Terms, Product, Party or Geo sub menus)</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemParty.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemParty.xml deleted file mode 100644 index 9766a35..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemParty.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Agreement Item Party help screen</title> - <para>This screen is used to add or update a party linked to an agreement item. This could be useful for storing specific contact names associated with an agreement item.</para> - <section> - <title>How do I update a party for an agreement item?</title> - <para>Parties for an agreement item cannot be updated. They can only be added or removed.</para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemProduct.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemProduct.xml deleted file mode 100644 index 1c1acbc..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemProduct.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Agreement Item Product help screen</title> - <para>This screen is used to create or update a product entry for an agreement item.</para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemSupplierProduct.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemSupplierProduct.xml deleted file mode 100644 index c3ca22c..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemSupplierProduct.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Agreement Item Supplier Product help screen</title> - <para>This screen is used to create or update a product entry for a supplier agreement item. Any updates made in this screen can also be viewed in Catalog Manager for the product under the product 'Suppliers' and 'Agreements' tabs.</para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemTerm.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemTerm.xml deleted file mode 100644 index f9094e8..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemTerm.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Agreement Item Term help screen</title> - <para>This screen is used to create or update the terms for an agreement item.</para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementRoles.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementRoles.xml deleted file mode 100644 index c6318b5..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementRoles.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Agreements Roles help screen</title> - <para>This screen is used to assign a party roles for an agreement.</para> - <section> - <title>How do I add a party role to an agreement?</title> - <orderedlist> - <listitem><para>Use the lookup to select the 'Party Id'</para></listitem> - <listitem><para>Use the drop down box to select the 'Party Role Id'</para></listitem> - <listitem><para>Press the 'Add' button (NOTE: If the party does not have this role associated with them then an error will be displayed)</para></listitem> - <listitem><para>The new entry will be displayed in the lower part of the screen</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I update a party role for an agreement?</title> - <para>Party roles can only be added and deleted. They cannot be updated.</para> - </section> - <section> - <title>How do I delete a party role from an agreement?</title> - <orderedlist> - <listitem><para>Press the 'Remove' button for the entry that needs to be deleted.</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementTerms.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementTerms.xml deleted file mode 100644 index ca5075d..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementTerms.xml +++ /dev/null @@ -1,106 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. - --> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Agreement Terms help screen</title> - <para>Agreement Terms are the rules that make up the agreement. - Agreements may have a one or more terms.</para> - <para>Examples of agreement terms from a sales and purchase viewpoint - include the following:</para> - <itemizedlist> - <listitem> - <para>Payment due within a certain timeframe (eg 30 days)</para> - </listitem> - <listitem> - <para>Discounts for early payment</para> - </listitem> - <listitem> - <para>Specifying Late fee penalties</para> - </listitem> - <listitem> - <para>Purchasing agreements</para> - </listitem> - <listitem> - <para>Specifying commission rates</para> - </listitem> - <listitem> - <para>Exclusive Relationship</para> - </listitem> - </itemizedlist> - <para>NOTE: Agreements can also be specified for Employment, Legal, Non - Compete etc.</para> - <para>Agreement terms are configured by linking them to the Invoice - Item Type.</para> - <para>IMPORTANT NOTE: The drop down box for 'Invoice Item Type' - contains what appears to be duplicates for items such as 'Invoice - Fee', 'Invoice Discount', 'Invoice Finished Good Item' etc. These are - NOT duplicates one of these entries refers to the Sales Invoice and - the other refers to the Purchase Invoice. As the descriptions are - exactly the same it is impossible to know which refers to which so - needs to be done using trial and error!</para> - <section> - <title>How do I add a payment term for 30 days?</title> - <orderedlist> - <listitem> - <para>Select 'Payment Net Days' from the 'Term Type Id' drop down - box</para> - </listitem> - <listitem> - <para>Enter '30' in the 'Term Days' field</para> - </listitem> - <listitem> - <para>Press the 'Submit' button</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I add a discount term of 2% if paid within 10 days? - </title> - <orderedlist> - <listitem> - <para>Select 'Payment Discounted if paid with Specified Days' from - the 'Term Type Id' drop down box</para> - </listitem> - <listitem> - <para>Enter '2' in the 'Term Value' field</para> - </listitem> - <listitem> - <para>Enter '10' in the 'Term Days' field</para> - </listitem> - <listitem> - <para>Press the 'Submit' button</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I specify pricing in a specific currency only for this - customer or supplier?</title> - <para>This is done using the 'Agreement Items' sub menu</para> - </section> - <section> - <title>How do I delete a payment term?</title> - <orderedlist> - <listitem> - <para>Locate the payment term required</para> - </listitem> - <listitem> - <para>Press the 'Remove'on the entry that needs to be removed</para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementWorkEffortApplics.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementWorkEffortApplics.xml deleted file mode 100644 index 988b37a..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementWorkEffortApplics.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Agreement Work Effort Applications help screen</title> - <para>This screen is used to link a work effort to the whole agreement or an individual agreement item.</para> - <section> - <title>How do I add a work effort to an agreement?</title> - <orderedlist> - <listitem><para>Use the drop down box to select the 'Agreement Item Seq Id'</para></listitem> - <listitem><para>Use the lookup to select the 'Workeffort Id'</para></listitem> - <listitem><para>Press the 'Add' button</para></listitem> - <listitem><para>The new entry is displayed in the lower part of the screen</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I update a work effort for an agreement?</title> - <para>Work efforts can only be added or deleted. They cannot be updated</para> - </section> - <section> - <title>How do I delete a work effort from an agreement?</title> - <orderedlist> - <listitem><para>Press the 'Delete' button for the entry that needs to be deleted</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindAgreement.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindAgreement.xml deleted file mode 100644 index 1ed8deb..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindAgreement.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Find Agreements help screen</title> - <para> The default screen is for the Agreements tab is 'Find Agreements'. It is used to locate existing agreements that have been created. The user has the option to</para> - <itemizedlist><listitem><para>use the 'Find' button to locate an existing agreement or </para></listitem> - <listitem><para>create a new one by clicking on the 'Create Agreement' button.</para></listitem> - </itemizedlist> - <section> - <title>How do I locate an existing agreement?</title> - <orderedlist> - <listitem><para>Enter search option details if known</para></listitem> - <listitem><para>Press the 'Find' button</para></listitem> - <listitem><para>A list of existing agreements will be displayed</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I create a new agreement?</title> - <orderedlist> - <listitem><para>Press the 'Create Agreement' button</para></listitem> - <listitem><para>The 'Edit Agreement' screen is displayed</para></listitem> - <listitem><para>Enter the details required and press the 'Submit' button</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I cancel an agreement?</title> - <orderedlist> - <listitem><para>Locate the agreement required</para></listitem> - <listitem><para>Press the 'Cancel' button on the agreement entry that needs to be cancelled</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementGeographicalApplic.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementGeographicalApplic.xml deleted file mode 100644 index 55c63fb..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementGeographicalApplic.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The List Agreement Geo help screen</title> - <para>This screen is used to display a list of the geographical locations that are valid for the agreement item.</para> - <section> - <title>How do I create a new geographical location for an agreement item?</title> - <orderedlist> - <listitem><para>Press the 'New' button</para></listitem> - <listitem><para>The 'Edit Agreement Geographical Application' screen is displayed</para></listitem> - <listitem><para>Use the drop down box to select the 'Geo Id'</para></listitem> - <listitem><para>Press the 'Submit' button</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I delete a geographical location for an agreement item?</title> - <orderedlist> - <listitem><para>Press the 'Delete' button for the entry that needs to be deleted</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemParties.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemParties.xml deleted file mode 100644 index 1f0e867..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemParties.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Agreement Items Parties help screen</title> - <para>This screen is used to display any parties that have been linked to this agreement item.</para> - <section> - <title>How do I create a party for an agreement item?</title> - <orderedlist> - <listitem><para>Press the 'New' button</para></listitem> - <listitem><para>The 'Edit Agreement Item Party' screen is displayed</para></listitem> - <listitem><para>Manually enter or use the lookup to select the 'Party Id'</para></listitem> - <listitem><para>Press the 'Submit' button</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I remove a party for an agreement item?</title> - <orderedlist> - <listitem><para>Press the 'Delete' button for the entry that needs to be deleted.</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemProducts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemProducts.xml deleted file mode 100644 index 231a4fe..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemProducts.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Agreement Item Products help screen</title> - <para>This screen is used to link a specific product or products to an agreement. This can be useful for restricting a discount or product pricing to a particular product (or range of products) for a specific customer.</para> - <section> - <title>How do I add a product to an agreement item?</title> - <orderedlist> - <listitem><para>Press the 'New Product' button</para></listitem> - <listitem><para>The 'Edit Agreement Item Product' screen is displayed</para></listitem> - <listitem><para>Manually enter or use the lookup to select the 'Product Id'</para></listitem> - <listitem><para>Enter the 'Price' to be associated to the product for this agreement item</para></listitem> - <listitem><para>Press the 'Submit' button</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I update a product linked to an agreement item?</title> - <orderedlist> - <listitem><para>Select the product required by clicking on the 'Product Id'</para></listitem> - <listitem><para>The 'Edit Agreement Item Product' screen is displayed</para></listitem> - <listitem><para>Update the 'Price' for the product (NOTE: Only product price is available for update)</para></listitem> - <listitem><para>Press the 'Submit' button</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I delete a product from an agreement item?</title> - <orderedlist> - <listitem><para>Press the 'Remove' button on the entry that needs to be deleted</para></listitem> - </orderedlist> - </section> - </section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemSupplierProducts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemSupplierProducts.xml deleted file mode 100644 index f874400..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemSupplierProducts.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The List Agreement Item Supplier Products help screen</title> - <para>This screen is used to link a specific product (or range of products) to an agreement. This can be useful for restricting a discount or product pricing to a product (or range of products) for a particular supplier.</para> - <para>NOTE: Products created here will be linked to the product and can be view using Catalog Manager. Entries can be viewed under the Product 'Suppliers' and 'Agreements' tabs.</para> - <section> - <title>How do I add a product to an agreement item?</title> - <orderedlist> - <listitem><para>Press the 'New Product' button</para></listitem> - <listitem><para>The 'Edit Agreement Item Product' screen is displayed</para></listitem> - <listitem><para>Manually enter or use the lookup to select the 'Product Id'</para></listitem> - <listitem><para>Enter the 'Available From Date'</para></listitem> - <listitem><para>Leave the 'Thru Date' blank</para></listitem> - <listitem><para>Using the drop down box select the 'Supplier Order Pref Id'</para></listitem> - <listitem><para>Enter the 'Last Price'</para></listitem> - <listitem><para>Enter 'Supplier Product Id'</para></listitem> - <listitem><para>Enter any other details as required or leave blank</para></listitem> - <listitem><para>Press the 'Submit' button</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I update a product linked to an agreement item?</title> - <orderedlist> - <listitem><para>Select the product required by clicking on the 'Product Id'</para></listitem> - <listitem><para>The 'Edit Agreement Item Product' screen is displayed</para></listitem> - <listitem><para>Update the details as required</para></listitem> - <listitem><para>Press the 'Submit' button</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I delete a product from an agreement item?</title> - <orderedlist> - <listitem><para>Press the 'Remove' button on the entry that needs to be deleted</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemTerms.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemTerms.xml deleted file mode 100644 index c8032a6..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemTerms.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Agreements Item Terms help screen</title> - <para>This screen is used to enter or maintain terms that are specific to an agreement item. The terms available are the same as those found under the 'Agreement Terms' tab and any related terms will be displayed both here and under the 'Agreement Items' tab .</para> - <section> - <title>How do I create a term for an agreement item?</title> - <orderedlist> - <listitem><para>Press the 'Create Term' button</para></listitem> - <listitem><para>The 'Edit Agreement Item Term' screen is displayed</para></listitem> - <listitem><para>Enter the term details required</para></listitem> - <listitem><para>Press the 'Submit' button</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I update a term for an agreement item?</title> - <orderedlist> - <listitem><para>Select the term for the agreement item by clicking on the term id</para></listitem> - <listitem><para>The 'Edit Agreement Item Term' screen is displayed</para></listitem> - <listitem><para>Update the details required</para></listitem> - <listitem><para>Press the 'Submit' button</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I delete a term for an agreement item?</title> - <orderedlist> - <listitem><para>Press the 'Remove' button on the term entry that needs to be deleted.</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItems.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItems.xml deleted file mode 100644 index 359c295..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItems.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The List Agreement Items help screen</title> - <para>This screen is used to display a list of items that have been created for an agreement.</para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementPromoAppls.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementPromoAppls.xml deleted file mode 100644 index 251e7da..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementPromoAppls.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Agreements Item Promotions help screen</title> - <para>This screen is used to enter or maintain any promotions that are associated with the Agreement Item. This can be useful if you want to limit where a particular promotion is applied. Promotions are setup in Catalog Manager and can be selected here.</para> - <section> - <title>How do I add a promotion to an agreement item?</title> - <orderedlist> - <listitem><para>Press the 'Add New Promotion' button</para></listitem> - <listitem><para>The 'Edit Agreement Promo Applications' screen is displayed</para></listitem> - <listitem><para>Select the 'Product Promo Id' from the drop down box</para></listitem> - <listitem><para>Enter the 'From Date'</para></listitem> - <listitem><para>Enter the 'Thru Date' if required (NOTE:This can be left blank)</para></listitem> - <listitem><para>Enter the 'Sequence Num' if required</para></listitem> - <listitem><para>Press the 'Submit' button</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I edit an existing promotion for an agreement item?</title> - <orderedlist> - <listitem><para>Select the agreement item promotion by clicking on on the promotion id</para></listitem> - <listitem><para>The 'Edit Agreement Promo Applications' screen is displayed</para></listitem> - <listitem><para>Update the details required</para></listitem> - <listitem><para>Press the 'Submit' button</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I delete a promotion from an agreement item?</title> - <orderedlist> - <listitem><para>Press the 'Remove' button on the entry that needs to be deleted.</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_agreements.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_agreements.xml deleted file mode 100644 index 896318b..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_agreements.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>Agreements.</title> - <para>An agreement is a way of recording a business arrangements or contract that your business makes with other companies or individuals. Common examples include Payment Terms (where you allow a customer up to 30 days to pay you) or Prompt Payment Discounts (where you offer a reduction on the amount owing if your customer pays you before a certain date)</para> - <para>It can be used for the following:</para> - <itemizedlist> - <listitem><para>Defining Payment Terms for Customers or Suppliers</para></listitem> - <listitem><para>Defining Sales Commissions</para></listitem> - <listitem><para>Setting up Prompt Payment Discounts</para></listitem> - <listitem><para>Setting up Price Lists (NOTE TO DO: Need to investigate how this logic overlaps with PRICE RULES in Catalog Manager)</para></listitem> - <listitem><para>Defining Late Fee Penalties</para></listitem> - <listitem><para>Defining preferred freight carriers or specific codes to be used</para></listitem> - </itemizedlist> - <xi:include href="HELP_ACCOUNTING_FindAgreement.xml"/> - <xi:include href="HELP_ACCOUNTING_EditAgreement.xml"/> - <xi:include href="HELP_ACCOUNTING_EditAgreementTerms.xml"/> - <xi:include href="HELP_ACCOUNTING_EditAgreementItem.xml"/> - <xi:include href="HELP_ACCOUNTING_ListAgreementPromoAppls.xml"/> - <xi:include href="HELP_ACCOUNTING_ListAgreementItemTerms.xml"/> - <xi:include href="HELP_ACCOUNTING_EditAgreementItemTerm.xml"/> - <xi:include href="HELP_ACCOUNTING_ListAgreementItemProducts.xml"/> - <xi:include href="HELP_ACCOUNTING_EditAgreementItemProduct.xml"/> - <xi:include href="HELP_ACCOUNTING_ListAgreementItemSupplierProducts.xml"/> - <xi:include href="HELP_ACCOUNTING_EditAgreementItemSupplierProduct.xml"/> - <xi:include href="HELP_ACCOUNTING_ListAgreementItemParties.xml"/> - <xi:include href="HELP_ACCOUNTING_EditAgreementItemParty.xml"/> - <xi:include href="HELP_ACCOUNTING_ListAgreementGeographicalApplic.xml"/> - <xi:include href="HELP_ACCOUNTING_EditAgreementGeographicalApplic.xml"/> - <xi:include href="HELP_ACCOUNTING_EditAgreementWorkEffortApplics.xml"/> - <xi:include href="HELP_ACCOUNTING_EditAgreementRoles.xml"/> -</section> diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreement.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreement.adoc new file mode 100644 index 0000000..5188d9b --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreement.adoc @@ -0,0 +1,43 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Edit Agreement +The 'Agreement' sub menu is used to enter the basic details required for setting up a new agreement or editing an existing one. + +It can be used to create or update the following details for an Agreement: + +* The parties the agreement is between and their roles +* The agreement type (eg Sales, Purchase, Commission, Employment etc) +* Specific products +* Start and End Date +* Description + + +== How do I edit an agreement? +. Find the agreement that needs to be amended +. Click on Agreement Id +. The 'Edit Agreement' screen will be displayed +. Amend the details required and press the 'Submit' button (NOTE: Additional agreement details can be updated via the other tabs eg Agreement Terms, Agreement Roles, Agreement Items and Agreement Work Effort Appls) + + +== How do I copy an existing agreement? +. Find the agreement that needs to be copied +. Click on the Agreement Id <<true_a_id_howdo_a_how_do_i_edit_an_agreement, How do it?>> +. The 'Edit Agreement' screen will be displayed +. At the bottom of the screen press the 'Copy' in the 'Copy Agreement' window (NOTE: The default tick boxes will copy the agreement terms, products and party. If not required then click on the boxes to stop them being copied) diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementContents.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementContents.adoc new file mode 100644 index 0000000..3fe9b4d --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementContents.adoc @@ -0,0 +1,36 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Agreement Content +This screen use for uploading any contents that concern the agreement. +The screen consists of : + +* Add Agreement Content +* Agreement Content List + +== Add Agreement Content +To upload the content. +The content can be classified by choosing the Content Type Id and Mime Type Id. + +== Agreement Content List +To Show the list of contents. +There are 2 buttons in each content: + +. Download : To download the uploaded content +. Delete : To delete the uploaded content diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementItem.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementItem.adoc new file mode 100644 index 0000000..893a463 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementItem.adoc @@ -0,0 +1,43 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Edit Agreement Item +This screen allows specific items to be added to agreement. +Currently these are limited to the following: + +* Pricing +* Commission Rate +* Sub-Agreement +* Exhibit +* Section + +== How do I create an agreement item? +. Press the 'Create Agreement Item' button +. The 'Edit Agreement Item' screen is displayed +. Select the 'Agreement Item Type Id' from the drop down box +. Use the drop down box to select the 'Currency' for the Agreement Item +. Enter any 'Agreement Text' if required +. Enter path for 'Agreement Image' if required +. Press the 'Submit' button +. A new sub menu will be displayed containing 'Promotions','Terms','Products','Party' and 'Geo' for additional details that can be setup for the agreement item + +== How do I edit an agreement item? +. Select the agreement item to be updated by clicking on the Agreement Item Id +. The 'Edit Agreement Item' screen is displayed <<true_a_id_howdo_a_how_do_i_edit_an_agreement, How do it?>> +. Update the fields required (NOTE: Additional details can be updated by selecting the Promotions, Terms, Product, Party or Geo sub menus) diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementRoles.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementRoles.adoc new file mode 100644 index 0000000..30c7eea --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementRoles.adoc @@ -0,0 +1,35 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Edit Agreements Roles +This screen is used to assign a party roles for an agreement. + +== How do I add a party role to an agreement? +. Use the lookup to select the 'Party Id' +. Use the drop down box to select the 'Party Role Id' +. Press the 'Add' button (NOTE: If the party does not have this role associated with them then an error will be displayed) +. The new entry will be displayed in the lower part of the screen + + +== How do I update a party role for an agreement? +Party roles can only be added and deleted. +They cannot be updated. + +== How do I delete a party role from an agreement? +. Press the 'Remove' button for the entry that needs to be deleted. diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementTerms.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementTerms.adoc new file mode 100644 index 0000000..2e7a746 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementTerms.adoc @@ -0,0 +1,62 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Edit Agreement Terms +Agreement Terms are the rules that make up the agreement. +Agreements may have a one or more terms. + +Examples of agreement terms from a sales and purchase viewpoint include the following: + +* Payment due within a certain timeframe (eg 30 days) +* Discounts for early payment +* Specifying Late fee penalties +* Purchasing agreements +* Specifying commission rates +* Exclusive Relationship + +NOTE: Agreements can also be specified for Employment, Legal, Non Compete etc. + +Agreement terms are configured by linking them to the Invoice Item Type. + +IMPORTANT: The drop down box for 'Invoice Item Type' contains what appears to be duplicates for items such as + 'Invoice Fee', 'Invoice Discount', 'Invoice Finished Good Item' etc. + + These are NOT duplicates + + - one of these entries refers to the Sales Invoice + + - and the other refers to the Purchase Invoice. + + As the descriptions are exactly the same it is impossible to know which refers to which + so needs to be done using trial and error! + +== How do I add a payment term for 30 days? +. Select 'Payment Net Days' from the 'Term Type Id' drop down box +. Enter '30' in the 'Term Days' field +. Press the 'Submit' button + + +== How do I add a discount term of 2% if paid within 10 days? +. Select 'Payment Discounted if paid with Specified Days' from the 'Term Type Id' drop down box +. Enter '2' in the 'Term Value' field +. Enter '10' in the 'Term Days' field +. Press the 'Submit' button + + +== How do I specify pricing in a specific currency only for thiscustomer or supplier? +This is done using the 'Agreement Items' sub menu + +== How do I delete a payment term? +. Locate the payment term required +. Press the 'Remove'on the entry that needs to be removed diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementWorkEffortApplics.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementWorkEffortApplics.adoc new file mode 100644 index 0000000..1817b9d --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditAgreementWorkEffortApplics.adoc @@ -0,0 +1,35 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Agreement Work Effort Applications +This screen is used to link a work effort to the whole agreement or an individual agreement item. + +== How do I add a work effort to an agreement? +. Use the drop down box to select the 'Agreement Item Seq Id' +. Use the lookup to select the 'Workeffort Id' +. Press the 'Add' button +. The new entry is displayed in the lower part of the screen + + +== How do I update a work effort for an agreement? +Work efforts can only be added or deleted. +They cannot be updated + +== How do I delete a work effort from an agreement? +. Press the 'Delete' button for the entry that needs to be deleted diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_FindAgreement.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_FindAgreement.adoc new file mode 100644 index 0000000..c4edac1 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_FindAgreement.adoc @@ -0,0 +1,39 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Find Agreements +The default screen is for the Agreements tab is 'Find Agreements'. It is used to locate existing agreements that have been created. +The user has the option to + +* use the 'Find' button to locate an existing agreement or +* create a new one by clicking on the 'Create Agreement' button. + +== How do I locate an existing agreement? +. Enter search option details if known +. Press the 'Find' button <<PARTY,party>> +. A list of existing agreements will be displayed + +== How do I create a new agreement? +. Press the 'Create Agreement' button +. The 'Edit Agreement' screen is displayed +. Enter the details required and press the 'Submit' button + +== How do I cancel an agreement? +. Locate the agreement required +. Press the 'Cancel' button on the agreement entry that needs to be cancelled diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementGeographicalApplic.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementGeographicalApplic.adoc new file mode 100644 index 0000000..095b937 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementGeographicalApplic.adoc @@ -0,0 +1,35 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for List Agreement Geo +This screen is used to display a list of the geographical locations that are valid for the agreement item. + +== How do I create a new geographical location for an agreement item? +. Press the 'New' button +. The 'Edit Agreement Geographical Application' screen is displayed +. Use the drop down box to select the 'Geo Id' +. Press the 'Submit' button + +== How do I delete a geographical location for an agreement item? +. Press the 'Delete' button for the entry that needs to be deleted + +== Help Edit Agreement Geo +This screen is used to create a geographical location for an agreement item. + +NOTE: A new entry can be created or removed but not updated. diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemParties.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemParties.adoc new file mode 100644 index 0000000..ceac114 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemParties.adoc @@ -0,0 +1,31 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += The for Agreement Items Parties help screen +This screen is used to display any parties that have been linked to this agreement item. + +== How do I create a party for an agreement item? +. Press the 'New' button +. The 'Edit Agreement Item Party' screen is displayed +. Manually enter or use the lookup to select the 'Party Id' +. Press the 'Submit' button + + +== How do I remove a party for an agreement item? +. Press the 'Delete' button for the entry that needs to be deleted. diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemProducts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemProducts.adoc new file mode 100644 index 0000000..e808400 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemProducts.adoc @@ -0,0 +1,41 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Agreement Item Products +This screen is used to link a specific product or products to an agreement. +This can be useful for restricting a discount or product pricing to a particular product (or range of products) for a specific customer. + +== How do I add a product to an agreement item? +. Press the 'New Product' button +. The 'Edit Agreement Item Product' screen is displayed +. Manually enter or use the lookup to select the 'Product Id' +. Enter the 'Price' to be associated to the product for this agreement item +. Press the 'Submit' button + +== How do I update a product linked to an agreement item? +. Select the product required by clicking on the 'Product Id' +. The 'Edit Agreement Item Product' screen is displayed +. Update the 'Price' for the product (NOTE: Only product price is available for update) +. Press the 'Submit' button + +== How do I delete a product from an agreement item? +. Press the 'Remove' button on the entry that needs to be deleted + +== Help Edit Agreement Item Product +This screen is used to create or update a product entry for an agreement item. diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemSupplierProducts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemSupplierProducts.adoc new file mode 100644 index 0000000..60860e4 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemSupplierProducts.adoc @@ -0,0 +1,52 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for List Agreement Item Supplier Products +This screen is used to link a specific product (or range of products) to an agreement. +This can be useful for restricting a discount or product pricing to a product (or range of products) for a particular supplier. + +NOTE: Products created here will be linked to the product and can be view using Catalog Manager. +Entries can be viewed under the Product 'Suppliers' and 'Agreements' tabs. + +== How do I add a product to an agreement item? +. Press the 'New Product' button +. The 'Edit Agreement Item Product' screen is displayed +. Manually enter or use the lookup to select the 'Product Id' +. Enter the 'Available From Date' +. Leave the 'Thru Date' blank +. Using the drop down box select the 'Supplier Order Pref Id' +. Enter the 'Last Price' +. Enter 'Supplier Product Id' +. Enter any other details as required or leave blank +. Press the 'Submit' button + + +== How do I update a product linked to an agreement item? +. Select the product required by clicking on the 'Product Id' +. The 'Edit Agreement Item Product' screen is displayed +. Update the details as required +. Press the 'Submit' button + + +== How do I delete a product from an agreement item? +. Press the 'Remove' button on the entry that needs to be deleted + +== Help Edit Agreement Item Supplier Product +This screen is used to create or update a product entry for a supplier agreement item. +Any updates made in this screen can also be viewed in Catalog Manager for the product under the product 'Suppliers' and 'Agreements' tabs. \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemTerms.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemTerms.adoc new file mode 100644 index 0000000..d074859 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementItemTerms.adoc @@ -0,0 +1,37 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Agreements Item Terms +This screen is used to enter or maintain terms that are specific to an agreement item. +The terms available are the same as those found under the 'Agreement Terms' tab and any related terms will be displayed both here and under the 'Agreement Items' tab . + +== How do I create a term for an agreement item? +. Press the 'Create Term' button +. The 'Edit Agreement Item Term' screen is displayed +. Enter the term details required +. Press the 'Submit' button + +== How do I update a term for an agreement item? +. Select the term for the agreement item by clicking on the term id +. The 'Edit Agreement Item Term' screen is displayed +. Update the details required +. Press the 'Submit' button + +== How do I delete a term for an agreement item? +. Press the 'Remove' button on the term entry that needs to be deleted. diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementPromoAppls.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementPromoAppls.adoc new file mode 100644 index 0000000..057a3f4 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ListAgreementPromoAppls.adoc @@ -0,0 +1,42 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Agreements Item Promotions +This screen is used to enter or maintain any promotions that are associated with the Agreement Item. +This can be useful if you want to limit where a particular promotion is applied. +Promotions are setup in Catalog Manager and can be selected here. + +== How do I add a promotion to an agreement item? +. Press the 'Add New Promotion' button +. The 'Edit Agreement Promo Applications' screen is displayed +. Select the 'Product Promo Id' from the drop down box +. Enter the 'From Date' +. Enter the 'Thru Date' if required (NOTE:This can be left blank) +. Enter the 'Sequence Num' if required +. Press the 'Submit' button + +== How do I edit an existing promotion for an agreement item? +. Select the agreement item promotion by clicking on on the promotion id +. The 'Edit Agreement Promo Applications' screen is displayed +. Update the details required +. Press the 'Submit' button + + +== How do I delete a promotion from an agreement item? +. Press the 'Remove' button on the entry that needs to be deleted. diff --git a/applications/accounting/src/docs/asciidoc/_include/acc-agreements.adoc b/applications/accounting/src/docs/asciidoc/_include/acc-agreements.adoc index ea30e47..4fe9d7e 100644 --- a/applications/accounting/src/docs/asciidoc/_include/acc-agreements.adoc +++ b/applications/accounting/src/docs/asciidoc/_include/acc-agreements.adoc @@ -67,3 +67,45 @@ payments into one large payment that is paid monthly. If you have installed OFBiz with the demo data then there are already two example Commission Agreements created for you. + +== Agreement management in User Interface +include::HELP_FindAgreement.adoc[leveloffset=+2] + +include::HELP_EditAgreement.adoc[leveloffset=+2] + +=== Help Agreement Items List +This screen is used to display a list of items that have been created for an agreement. + +include::HELP_EditAgreementItem.adoc[leveloffset=+2] + +include::HELP_ListAgreementItemParties.adoc[leveloffset=+2] + +=== Help Edit Agreement Item Party +This screen is used to add or update a party linked to an agreement item. +This could be useful for storing specific contact names associated with an agreement item. + +==== How do I update a party for an agreement item? +Parties for an agreement item cannot be updated. +They can only be added or removed. + +include::HELP_ListAgreementItemTerms.adoc[leveloffset=+2] + +=== Help Edit Agreement Item Term +This screen is used to create or update the terms for an agreement item. + +For more information about Agreement Term look at <<_help_edit_agreement_terms>> + +include::HELP_ListAgreementItemProducts.adoc[leveloffset=+2] + +include::HELP_ListAgreementItemSupplierProducts.adoc[leveloffset=+2] + +include::HELP_ListAgreementGeographicalApplic.adoc[leveloffset=+2] + +include::HELP_ListAgreementPromoAppls.adoc[leveloffset=+2] + +include::HELP_EditAgreementRoles.adoc[leveloffset=+2] + +include::HELP_EditAgreementTerms.adoc[leveloffset=+2] + +include::HELP_EditAgreementWorkEffortApplics.adoc[leveloffset=+2] + +include::HELP_EditAgreementContents.adoc[leveloffset=+2] |
|
|
In reply to this post by mbrohl
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit 0340b17575e81a98d2d13156ca64db4a0f6cae89 Author: holivier <[hidden email]> AuthorDate: Mon Feb 3 19:46:18 2020 +0100 Documented: Financial Account Help Docbook file migration to asciidoc format (OFBIZ-10296) All the new files are now included in the Financial Account documentation presentation, at the end in a sub-chapter Financial Account management in User Interface. --- .../HELP_ACCOUNTING_BankReconciliation.xml | 199 --------------------- .../HELP_ACCOUNTING_EditDepositSlipAndMembers.xml | 61 ------- .../helpdata/HELP_ACCOUNTING_EditFinAccount.xml | 142 --------------- .../HELP_ACCOUNTING_EditFinAccountAuths.xml | 94 ---------- ...LP_ACCOUNTING_EditFinAccountReconciliations.xml | 38 ---- .../HELP_ACCOUNTING_EditFinAccountRoles.xml | 59 ------ .../HELP_ACCOUNTING_EditFinAccountTrans.xml | 91 ---------- ...ELP_ACCOUNTING_EditFinAccountTypeGlAccounts.xml | 95 ---------- .../helpdata/HELP_ACCOUNTING_FinAccountMain.xml | 35 ---- .../helpdata/HELP_ACCOUNTING_FindDepositSlips.xml | 64 ------- .../helpdata/HELP_ACCOUNTING_FindFinAccount.xml | 41 ----- ...LP_ACCOUNTING_FindFinAccountReconciliations.xml | 23 --- .../HELP_ACCOUNTING_FindFinAccountTrans.xml | 59 ------ .../helpdata/HELP_ACCOUNTING_NewDepositPayment.xml | 93 ---------- .../helpdata/HELP_ACCOUNTING_NewDepositSlip.xml | 53 ------ .../HELP_ACCOUNTING_NewWithdrawalPayment.xml | 95 ---------- .../HELP_ACCOUNTING_PaymentsDepositWithdraw.xml | 73 -------- ...OUNTING_ViewGlReconciliationWithTransaction.xml | 81 --------- .../HELP_ACCOUNTING_financial_accounts.xml | 111 ------------ .../asciidoc/_include/HELP_BankReconciliation.adoc | 98 ++++++++++ .../_include/HELP_EditDepositSlipAndMembers.adoc | 35 ++++ .../asciidoc/_include/HELP_EditFinAccount.adoc | 70 ++++++++ .../_include/HELP_EditFinAccountAuths.adoc | 60 +++++++ .../HELP_EditFinAccountReconciliations.adoc | 30 ++++ .../_include/HELP_EditFinAccountRoles.adoc | 34 ++++ .../_include/HELP_EditFinAccountTrans.adoc | 44 +++++ .../HELP_EditFinAccountTypeGlAccounts.adoc | 52 ++++++ .../asciidoc/_include/HELP_FindDepositSlips.adoc | 48 +++++ .../asciidoc/_include/HELP_FindFinAccount.adoc | 36 ++++ .../_include/HELP_FindFinAccountTrans.adoc | 37 ++++ .../asciidoc/_include/HELP_NewDepositPayment.adoc | 48 +++++ .../asciidoc/_include/HELP_NewDepositSlip.adoc | 29 +++ .../_include/HELP_NewWithdrawalPayment.adoc | 51 ++++++ .../_include/HELP_PaymentsDepositWithdraw.adoc | 44 +++++ .../HELP_ViewGlReconciliationWithTransaction.adoc | 49 +++++ .../asciidoc/_include/acc-financial-accounts.adoc | 64 +++++++ 36 files changed, 829 insertions(+), 1507 deletions(-) diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_BankReconciliation.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_BankReconciliation.xml deleted file mode 100644 index 85e2918..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_BankReconciliation.xml +++ /dev/null @@ -1,199 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to you under the Apache License, Version - 2.0 (the "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 Unless required by - applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - CONDITIONS OF ANY KIND, either express or implied. See the License for - the specific language governing permissions and limitations under the - License. - --> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Financial Account Bank Reconciliation screen.</title> - <para>Bank Reconciliation is a regular task where transactions from the - company bank statement are matched against transactions that have - occurred in the General Ledger. This is done based on a specific - date(NOTE: This can be done daily, weekly but is usually an end of - month).</para> - <para> A specific GL account is normally used to represent the company - bank account and any accounting transaction that involves the bank - account will automatically record and entry in - the GL. </para> - <para>The bank reconciliation process ensures that the GL account and - the - bank statement reconcile to the same amounts. </para> - <para>Differences can occur between the GL and the bank statement for a - variety of valid reasons including the following:</para> - <itemizedlist> - <listitem> - <para>Payments or Deposits in process (especially cheques)</para> - </listitem> - <listitem> - <para>Interest or Bank Charges that are not known in advance but are - applied to the bank account</para> - </listitem> - <listitem> - <para>Currency or Exchange Rate variations / charges</para> - </listitem> - <listitem> - <para>Any outstanding </para> - </listitem> - </itemizedlist> - <para>NOTE: The differences will occur because of timing differences of - when and how transactions are recorded. Examples are as follows: - </para> - <orderedlist> - <listitem> - <para>Bank charges are known to the bank first and only once they - have applied the charge to the bank account can the company - duplicate the transaction in the GL to make the balance reconcile. - </para> - </listitem> - <listitem> - <para>A customer cheque payment may be recorded in the GL first - before it is paid into the bank account</para> - </listitem> - </orderedlist> - <section> - <title>How do I create a Bank Reconciliation?</title> - <para>The bank reconciliation process is made up of 3 steps.</para> - <orderedlist> - <listitem> - <para>Creating an account reconciliation group</para> - </listitem> - <listitem> - <para>Assigning transactions to the reconciliation</para> - </listitem> - <listitem> - <para>Validating the figures and confirming the reconciliation - </para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I create an account reconciliation group for Bank - Reconciliation?</title> - <orderedlist> - <listitem> - <para>Go to the Financial Account 'Reconciliation' sub menu for the - bank account to be reconciled</para> - </listitem> - <listitem> - <para>Press the 'Create New Financial Account Reconciliations' - button</para> - </listitem> - <listitem> - <para>Complete the details (eg name, description, organisation and - opening balance) required on the 'Add New Financial Account - Reconciliations' screen and press the 'Create' button</para> - </listitem> - <listitem> - <para>The new account reconciliation group is created and may be - used to assign transactions to</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I locate transactions that have not been assigned to a - Bank Reconciliation?</title> - <orderedlist> - <listitem> - <para>Go to the Financial Account 'Transactions' sub menu of the - bank account to be reconciled</para> - </listitem> - <listitem> - <para>The 'Find Transactions For Financial Account: XXXX' is - displayed </para> - </listitem> - <listitem> - <para>Use the dropdown box for 'GL Reconciliation Id' field to - select 'Not Assigned' and then press the 'Search' button</para> - </listitem> - <listitem> - <para>A list of transactions (deposits, withdrawals or adjustments) - that have not been reconciled will be displayed (NOTE: If no - transactions are displayed then there are no transactions to - reconcile)</para> - </listitem> - <listitem> - <para>Click on the 'check box' at the end of the transaction line - that corresponds to the entry that needs to be assigned (NOTE:More - than one transaction can be selected at a time)</para> - </listitem> - <listitem> - <para>Above the 'check box' is the 'Assign to Reconciliation' button - and to the left of this is a dropdown box to select the - reconciliation that the transaction is to be assigned to.</para> - </listitem> - <listitem> - <para>Using the drop down box select the reconciliation required and - press the 'Assign to Reconciliation' button</para> - </listitem> - <listitem> - <para>The transaction is removed from the 'Not Assigned' status and - added to the specified reconciliation group</para> - </listitem> - </orderedlist> - <para></para> - </section> - <section> - <title>How do I validate and confirm the Bank Reconciliation?</title> - <para>Validation can be done for individual transactions or for the complete account reconciliation group. The user controls this by the search criteria entered on this screen.</para> - <orderedlist> - <listitem> - <para>Go to the 'Transactions' sub menu for the bank account and press the 'Bank Reconciliation' button</para> - </listitem> - <listitem> - <para>Select the 'GL Reconciliation Id' that is to be reconciled</para> - </listitem> - <listitem> - <para>Click on the 'Select All' check box on the right hand side of the screen. (NOTE: All transactions in this group will be reconciled)</para> - </listitem> - <listitem> - <para>Press the 'Reconcile' button above the 'Select All' check box</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I view a Bank Reconciliation?</title> - <para>Once all the transactions in a reconciliation group have been reconciled then the status of the group is changed to 'Reconciled'. This means that no new transactions can be added to the is group and the reconciled balance is fixed.</para> - <orderedlist> - <listitem> - <para>Go to the 'Reconciliation' sub menu for the bank account</para> - </listitem> - <listitem> - <para>A list of all the bank reconciliation groups are displayed with details of the status (eg Created or Reconciled)</para> - </listitem> - <listitem> - <para>Click on the 'GL Reconciliation Id' of the group and the details are displayed</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I cancel a Bank Reconciliation?</title> - <para>If a bank reconciliation needs to be cancelled due to a mistake or error then the bank reconciliation can be cancelled as long as it has not been fully reconciled (i.e. the status of the reconciliation has not been changed to 'Reconciled'. This will allow you to start the bank reconcilation again.</para> - <orderedlist> - <listitem> - <para>Go to the 'Reconciliation' sub menu for the bank account</para> - </listitem> - <listitem> - <para>A list of all the bank reconciliation groups are displayed (NOTE: If no transactions are associated with a reconciliation group then it will not be displayed here)</para> - </listitem> - <listitem> - <para>Click on the 'Cancel' button associated with the 'GL Reconciliation Id' of the group that needs to be cancelled</para> - </listitem> - <listitem> - <para>All transactions will be removed from the reconciliation group and their status will be changed back to 'Not Assigned' so that they can be re-assigned to this or any other reconciliation.</para> - </listitem> - </orderedlist> - </section> - </section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditDepositSlipAndMembers.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditDepositSlipAndMembers.xml deleted file mode 100644 index 62388f8..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditDepositSlipAndMembers.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Financial Account Edit Deposit Slip screen.</title> - <para>This screen displays the details of a Payment Group and its transactions. The Deposit Slip - for the Payment Group can be printed if required and the Payment Group itself can be - updated.</para> - <para>Details that can be updated include the name of the Payment Group itself and the addition, - removal or update of transactions.</para> - <para>NOTE: Any changes to the Payment Group will be automatically updated to the Deposit - Slip.</para> - <section> - <title>How do I update a Deposit Slip?</title> - <para> - <orderedlist> - <listitem> - <para>Select the Payment Group required</para> - </listitem> - <listitem> - <para>Update the 'Payment Group Name' if required</para> - </listitem> - <listitem> - <para>Use the lookup for 'Payment Id' to add new transactions to the Payment - Group if required</para> - </listitem> - <listitem> - <para>Use the 'Cancel' button next to a particular transaction to remove it from - the Payment Group</para> - </listitem> - <listitem> - <para>Press the 'Update' or 'Add' buttons as required</para> - </listitem> - <listitem> - <para>Press the 'Print Deposit Slip' button</para> - </listitem> - </orderedlist> - </para> - <para>The Deposit Slip will be displayed with the latest details of the transactions for the - Payment Group</para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccount.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccount.xml deleted file mode 100644 index bb40eef..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccount.xml +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Financial Account screen.</title> - <para>This screen allows the user to create a new financial account or to edit an existing - one.</para> - <para>The 'Financial Account' submenu is the first of four submenus used in the creation or - update of a Financial Account. On the creation or update of a Financial Account it is the - default screen that is displayed.</para> - <para>It can be used for updating the basic details of a Financial account such as:</para> - <para> - <itemizedlist> - <listitem> - <para>Type of Account (eg Deposit, Investment, Gift Certificate)</para> - </listitem> - <listitem> - <para>Account Status (Active, Frozen, Cancel, etc)</para> - </listitem> - <listitem> - <para>Account Name and Code</para> - </listitem> - <listitem> - <para>Currency </para> - </listitem> - <listitem> - <para>Owner Party ID</para> - </listitem> - <listitem> - <para>Default GL Account for Posting</para> - </listitem> - <listitem> - <para>Replenishment Level </para> - </listitem> - </itemizedlist> - </para> - <section> - <title>How do I create a new Financial Account?</title> - <para>Select the 'Create New Financial Account' button from the 'Find Financial Accounts' - screen</para> - <orderedlist> - <listitem> - <para>The 'Create/Update Financial Account' screen is displayed.</para> - </listitem> - <listitem> - <para>Keep the default entry of 'Deposit Account' for the Fin Account Type - field</para> - </listitem> - <listitem> - <para>Keep the default entry of 'Active' for the status field</para> - </listitem> - <listitem> - <para>Enter a description (eg ABC Customer Prepaid Account) for the 'Fin Account - Name' field</para> - </listitem> - <listitem> - <para>Leave the Fin Account Pin field blank (NOTE TO CHECK: I think this is only - used in creation of Gift Cards and Certificates..)</para> - </listitem> - <listitem> - <para>Leave the Fin Account Code field blank (NOTE TO CHECK: I think this is only - used in the creation of Gift Cards and Certificates...)</para> - </listitem> - <listitem> - <para>The currency field will be the default currency of Company (eg USD). If this - account is to be in another currency (eg EUR) then select it from the drop down - list.</para> - </listitem> - <listitem> - <para>Set the Organization Party ID field to be 'Company'</para> - </listitem> - <listitem> - <para>Fill in the Owner Party Id field with the party id of the customer who has the - Financial Account (eg DemoCustomer or DemoCustCompany)</para> - </listitem> - <listitem> - <para>Fill in the 'Post to Gl Account field' to post the transactions for this - financial account to post to a specific GL Account</para> - </listitem> - <listitem> - <para>Select the current date from the calendar to fill in the 'From date' field - (NOTE: It can be left blank and still appears to work)</para> - </listitem> - <listitem> - <para>Leave the 'Thru date' field blank (NOTE TO CHECK: I think this could be used - to close or stop the use of an account ..)</para> - </listitem> - <listitem> - <para>Leave the default of 'Is Refundable' as 'Y' (NOTE TO CHECK: I think this will - allow money to be refunded to this account - eg if you have a return or credit - for the customer)</para> - </listitem> - <listitem> - <para>Leave the 'Replenish Payment ID' blank (NOTE TO CHECK: Not sure what this is - - maybe to automatically replenish account if it gets to a certain limit???)Leave - the 'Replenish Level' blank (NOTE TO CHECK: Not sure what this is but probably - linked to Replenish Payment ID where you set the limit - eg $100)</para> - </listitem> - </orderedlist> - <para>Press the 'Create' button and message appears saying that the account was successfully - created </para> - </section> - <section> - <title>How do I update an existing Financial Account?</title> - <orderedlist> - <listitem> - <para>Press the 'Search' button on the Financial Account main screen</para> - </listitem> - <listitem> - <para>A list of all existing Financial Accounts will be displayed</para> - </listitem> - <listitem> - <para>The 'Create/Update Financial' screen is displayed</para> - </listitem> - <listitem> - <para>Update the details of the financial account </para> - </listitem> - <listitem> - <para>Press the 'Update' button</para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountAuths.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountAuths.xml deleted file mode 100644 index 07ca699..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountAuths.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Financial Account Authorizations screen.</title> - <para>An authorization is a temporary transaction showing a commitment to take money from a - financial account. It is like a 'transaction in progress' where there can be delay between - when you buy something and the time it actually appears on your statement.</para> - <para>Authorizations can be time limit specific meaning that they can be controlled by entering - a start and end date so that they are only valid for a certain length of time. They can also - be expired. When an authorization is expired it removes the commitment from the financial - account. The history of expired authorizations are shown on the financial account.</para> - <para>NOTE:This could be very useful in ensuring that customers are not overcommitted and - keeping within their approved credit limits.</para> - <section> - <title>How do I add an authorization?</title> - <para> - <orderedlist> - <listitem> - <para>Enter an amount in the 'Amount' field (Eg 1000)</para> - </listitem> - <listitem> - <para>Leave the 'Currency' field blank as the default currency will be - used</para> - </listitem> - <listitem> - <para>Enter a date in the 'Authorisation Date' field</para> - </listitem> - <listitem> - <para>Leave the 'From Date' field blank</para> - </listitem> - <listitem> - <para>Leave the 'Thru Date' field blank</para> - </listitem> - <listitem> - <para>Press the 'Add' button</para> - </listitem> - </orderedlist> - </para> - <para>NOTE: When you now view the Financial Account detail the 'Actual Balance' and - 'Available Balance' fields will be different.</para> - </section> - <section> - <title>How do I update an authorization?</title> - <para>An authorization cannot be updated. It can only be expired. If you have made a mistake - and need to change an authorization then it needs to expired and then re-created - correctly.</para> - </section> - <section> - <title>How do I delete an authorization?</title> - <para>Authorizations are not deleted they are instead expired. This means that the history - of the authorizations will remain on the account as an audit trail.</para> - <para>Example: To expire an authorisation</para> - <para> - <orderedlist> - <listitem> - <para>Select the 'Authorizations' tab for the Financial Account</para> - </listitem> - <listitem> - <para>Any authorizations will be displayed at the bottom of the screen</para> - </listitem> - <listitem> - <para>If the authorization is still current the 'Thru Date' field will be blank - (NOTE TO CHECK: May not always be true as you can specify a future date for - it to expire......!!!)</para> - </listitem> - <listitem> - <para>Select the 'Expire' button next to the authorisation to be expired</para> - </listitem> - </orderedlist> - </para> - <para>The authorization is removed from the financial account and the screen is redisplayed - with the 'Thru Date' field completed </para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountReconciliations.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountReconciliations.xml deleted file mode 100644 index cd15a16..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountReconciliations.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Financial Account Reconciliations screen.</title> - <para>This screen is used to create or update a reconciliation group / bank reconciliation. The following details can be input or updated for the reconciliation:</para> - <itemizedlist> - <listitem><para>GL Reconciliation Name or Identifier</para></listitem> - <listitem><para>Description for the reconciliation</para></listitem> - <listitem><para>Organisation Party Id for the reconciliation</para></listitem> - <listitem><para>Opening Balance for the reconciliation</para></listitem> - <listitem><para>Reconciliation date</para></listitem> - </itemizedlist> - <section> - <title></title> - <para></para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountRoles.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountRoles.xml deleted file mode 100644 index 8754962..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountRoles.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Financial Account Roles screen.</title> - <para>The Financial Account Roles sub menu screen allows you specify a party and link them to a - role for a particular financial account.</para> - <para>It can be used to add party roles eg 'Approver' or 'Administrator' for credit limits or - updates to the account. If an account belongs to a company then you may want to add a person - as a 'Contact' for dealing with the account.</para> - <para>The roles can also be time bound. This means that you can specify a start and end date for - the party role.</para> - <section> - <title>How do I add a Party Role to a Financial Account?</title> - <para> - <orderedlist> - <listitem> - <para>Select the 'Roles' sub menu for the Financial Account</para> - </listitem> - <listitem> - <para>Fill in the Party Id field by using the field lookup tool or by directly - entering the party id (eg flexadmin)</para> - </listitem> - <listitem> - <para>Select the role from the drop down list for the Role Type Id field (eg - administrator)</para> - </listitem> - <listitem> - <para>Enter the From Date field </para> - </listitem> - <listitem> - <para>Enter if the Thru Date field (optional)</para> - </listitem> - <listitem> - <para>Press the 'Add' button </para> - </listitem> - </orderedlist> - </para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountTrans.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountTrans.xml deleted file mode 100644 index 400fe74..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountTrans.xml +++ /dev/null @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Financial Account Transactions screen.</title> - <section> - <title>How do I add transactions to a financial account?</title> - <para>An example of how to bring in an opening balance is shown below:</para> - <para> - <orderedlist> - <listitem> - <para>Navigate to the the Financial Account Transactions sub menu</para> - </listitem> - <listitem> - <para>Select 'Adjustment' in the Fin Account Trans Type Id field</para> - </listitem> - <listitem> - <para>Leave the 'Party Id' field blank</para> - </listitem> - <listitem> - <para>Fill in the 'Transaction Date' field</para> - </listitem> - <listitem> - <para>Fill in the 'Entry Date' field (NOTE TO CHECK: Need to check exactly what - this is - is it the date the transaction is entered or is it the date the - transaction is processed?)</para> - </listitem> - <listitem> - <para>Fill in the 'Amount' field with the transaction amount (Eg. In our case - this is the opening balance such as 353.88 - dont think we need the $ - sign)</para> - </listitem> - <listitem> - <para>Leave the 'Payment Id' field blank</para> - </listitem> - <listitem> - <para>Leave the 'Order Id' field blank</para> - </listitem> - <listitem> - <para>Leave the 'Order Item Seq Id' field blank</para> - </listitem> - <listitem> - <para>Leave the 'Reason Enum Id' field blank (NOTE TO CHECK: This could be - useful in identifying transactions to a greater level of detail....)</para> - </listitem> - <listitem> - <para>Fill in the 'Comments' field (Eg: Opening Balance from XYZ - Statement)</para> - </listitem> - <listitem> - <para>Press the 'Add' button and the transaction will be displayed at the bottom - of the screen</para> - </listitem> - </orderedlist> - </para> - <para>NOTE: When you now view the Financial Account detail the 'Actual Balance' and - 'Available Balance' fields will show the entered opening balance (eg 353.88)</para> - </section> - <section> - <title>Other ways to add transactions to a financial account?</title> - <para> - <itemizedlist> - <listitem> - <para>By selecting financial account as a payment method for a customer</para> - </listitem> - <listitem> - <para>By selecting financial account as a refund method for a customer </para> - </listitem> - </itemizedlist> - </para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountTypeGlAccounts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountTypeGlAccounts.xml deleted file mode 100644 index 9237b54..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountTypeGlAccounts.xml +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. - --> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Financial Account GL Account Type help screen</title> - <para>The FinAccount Type GL Account (Financial Account Type / GL - Account Type) is used to specify the default account to be used for a - specific type of Financial Account. This setup will translate to one - side of the journal entry only.</para> - <para>IMPORTANT NOTE: There is a limitation that only one account can - be specified per Financial Account type. Currently there are 6 types - of Financial Account (Bank, Deposit, Investment, Gift Certificate, - Replenish, Service Credit) - so if you have more than one of these - type of accounts that you need to track separately then there could be - a problem. </para> - <para>This mapping is normally be triggered if something is paid or - uses a Financial Account. Using the demo data this mapping is - triggered when someone purchases a gift certificate, or pays money - into a financial account.</para> - <section> - <title>How do I add a new Financial Account Type / GL Account mapping? - </title> - <para>By default there are 4 Financial Account Type / GL Type mappings - that are configured as part of the OFBiz demo data.</para> - <orderedlist> - <listitem> - <para>Select the 'FinAccount Type Id' from the drop down list</para> - </listitem> - <listitem> - <para>Select the ' GL Account' to map it to from the drop down list - </para> - </listitem> - <listitem> - <para>Press the 'Add' button</para> - </listitem> - <listitem> - <para>The new mapping will be displayed in the list at the bottom of - the screen</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I update a Financial Account Type / GL Account mapping? - </title> - <para>A Financial Account Type / GL Account Type mapping can be - updated by modifying the GL Account only. Unlike other screens in - this area if the GL Account Type needs to be updated then it can be - done by creating a new record with the correct GL Account type which - will overwrite the existing record.</para> - <orderedlist> - <listitem> - <para>Locate the entry that needs to be updated in the list of - Financial Account Type / GL Account Type mappings</para> - </listitem> - <listitem> - <para>Modify the 'GL Account 'by using the drop down list next to - the GL Account field</para> - </listitem> - <listitem> - <para>Press the 'Update' button</para> - </listitem> - <listitem> - <para>The updated mapping will be displayed</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I remove a Financial Account Type / GL Account mapping? - </title> - <orderedlist> - <listitem> - <para>Locate the entry that needs to be deleted in the list of - Financial Account Type / GL Account Type mappings</para> - </listitem> - <listitem> - <para>Press the 'Remove' button next to the entry</para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FinAccountMain.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FinAccountMain.xml deleted file mode 100644 index b5537c2..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FinAccountMain.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. - --> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Financial Account Main screen.</title> - <para>The default screen for Financial Accounts displays a list of any - bank accounts that have been created. Details listed include the - account the following</para> - <itemizedlist> - <listitem> - <para>account name</para> - </listitem> - <listitem> - <para>organisation the account is linked to</para> - </listitem> - <listitem> - <para>account balances (available and actual)</para> - </listitem> - </itemizedlist> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindDepositSlips.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindDepositSlips.xml deleted file mode 100644 index c65dc02..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindDepositSlips.xml +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Find Deposit Slips screen.</title> - <para>This screen is used to locate payment groups and their associated deposit slips that have - been created. Deposit slips are created by grouping transactions together into a Payment - Group. This can be done using the 'Accounting / Payment Group' tab, the 'Financial Account / - Deposit Withdraw' tab or the 'Create New Deposit Slip' button. </para> - <para>Currently Deposit Slips are created for AR Batch Payments only.</para> - <para>The deposit slips are available in PDF format and there is an option to cancel the batch - that generated the deposit slip if required.</para> - <section> - <title>How do I locate an existing Deposit Slip?</title> - <para>Enter some characters from the 'Payment Group Id' or 'Payment Group Name' if - known</para> - <para>Press the 'Search' button</para> - </section> - <section> - <title>How do I update an existing Deposit Slip?</title> - <para> - <orderedlist> - <listitem> - <para>Locate the Payment Group required</para> - </listitem> - <listitem> - <para>Select the Payment Group by clicking on the Payment Group Id</para> - </listitem> - </orderedlist> - </para> - <para>The 'Edit Payment Group' screen is displayed</para> - <para>Add any new payment deposits or update existing deposits for the Payment Group</para> - <para>All changes in the Payment Group will automatically be updated to the Deposit - Slip</para> - </section> - <section> - <title>How do I delete an existing Deposit Slip?</title> - <para>A deposit slip can not be directly deleted but it is removed when a Payment Group is - cancelled</para> - <para>Press the 'Cancel' button next to the Payment Group required to cancel a payment - group</para> - <para>The Payment Group is removed from the 'Find Deposits' screen and no deposit slips can - be viewed or printed.</para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccount.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccount.xml deleted file mode 100644 index 891a0d7..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccount.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Find Financial Accounts screen.</title> - <para>This screen is used to locate existing financial accounts that - have been created.</para> - <para>It also includes the option to use the 'Advanced Search' button to display additional fields that can be used to locate a specific financial account.</para> - <para>New Financial Accounts can be created using the 'Create New Financial Account' button.</para> - <section> - <title>How do locate an existing Financial Account?</title> - <para>Press the 'Search' button</para> - <para>A list of all existing Financial Accounts will be displayed.</para> - </section> - <section> - <title>How do I delete an existing Financial Account?</title> - <para>Press the 'Search' button on the Financial Account main screen</para> - <para>A list of all existing Financial Accounts will be displayed</para> - <para>Press the 'Delete' button next to the Financial Account that needs to be deleted.</para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccountReconciliations.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccountReconciliations.xml deleted file mode 100644 index 6c6de04..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccountReconciliations.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Find Financial Account Reconciliations screen.</title> - <para>This screen displays the details of any reconciliations in progress for a financial account. Only reconciliations that have actual transactions associated with them will be displayed. If a reconciliation group has no transactions assigned to it then it will not be displayed.</para> - </section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccountTrans.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccountTrans.xml deleted file mode 100644 index c6e89ab..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccountTrans.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Find Financial Account Transactions screen.</title> - <para>A transaction is an entry that is shown on the financial account. - Transactions can be one - of the following types:</para> - <para> - <itemizedlist> - <listitem> - <para>Deposits</para> - </listitem> - <listitem> - <para>Withdrawals</para> - </listitem> - <listitem> - <para>Adjustments</para> - </listitem> - </itemizedlist> - </para> - <para>Transactions are used to show entries and the financial history - of the financial account. - Similar to a bank account or credit card statement the transaction will show - details of what - was spent or paid into the account.</para> - <para>Some transaction totals have been added to this screen to help as - part of the - reconciliation processes. Additional details available include number of - transactions, - transaction totals and status.</para> - <section> - <title>How do I find transactions for a Financial Account?</title> - <itemizedlist> - <listitem> - <para>Press the 'Search' button</para> - </listitem> - <listitem> - <para>A list of transactions for the financial account will be - displayed</para> - </listitem> - </itemizedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositPayment.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositPayment.xml deleted file mode 100644 index 08b8321..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositPayment.xml +++ /dev/null @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Financial Account New Deposit Payment screen.</title> - <para>This screen allows the user to create an incoming payment to a financial account that has - been linked to the company bank account.</para> - <para/> - <section> - <title>How do I create a New Deposit Payment?</title> - <para> - <orderedlist> - <listitem> - <para>Press the 'Create New Deposit Payment' button</para> - </listitem> - <listitem> - <para>The 'Create New Deposit for Financial Account' screen is displayed</para> - </listitem> - <listitem> - <para>Select the 'Payment Type' from the drop down menu (NOTE: Only incoming - transaction payment types are shown)</para> - </listitem> - <listitem> - <para>Select the 'Payment Method Type' from the drop down menu (eg Cash)</para> - </listitem> - <listitem> - <para>Enter or use the lookup to select the 'From Party Id' (eg - DemoCustomer)</para> - </listitem> - <listitem> - <para>Enter or use the lookup to select the 'To Party Id' (eg Company)</para> - </listitem> - <listitem> - <para>Enter the date of the deposit in the 'Effective Date' field</para> - </listitem> - <listitem> - <para>Enter the amount in the 'Amount' field for the deposit</para> - </listitem> - <listitem> - <para>If required then tick the box next to 'Deposit Payment in:....' (NOTE: If - this is ticked then the transaction will not be displayed and so will not - have a deposit slip associated with it)</para> - </listitem> - <listitem> - <para>Press the 'Create' button</para> - </listitem> - </orderedlist> - </para> - <para>The new transaction will be created.</para> - <para>NOTE: The default status of the payment will be 'Received'.A new payment transaction - will be created and it will be linked to the specified bank account but the status of - the transaction will be 'Created'.</para> - </section> - <section> - <title>How do I view a newly created Deposit Payment transaction?</title> - <para> - <orderedlist> - <listitem> - <para>Go to the 'Transactions' submenu</para> - </listitem> - <listitem> - <para>Press the 'Search' button</para> - </listitem> - <listitem> - <para>The newly created transaction should be displayed in the search results at - the bottom of the screen.</para> - </listitem> - </orderedlist> - </para> - <para>NOTE: If when the transaction was created the 'Deposit Payment in:....' was ticked - then the transaction will not be displayed on this screen. It will still show up under - the 'Transactions' tab and linked to the bank account.</para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositSlip.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositSlip.xml deleted file mode 100644 index dddbb57..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewDepositSlip.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Financial Account New Deposit Slip screen.</title> - <para>This screen allows the user to create an Payment Group and the transactions associated - with the Payment Group will generate a deposit slip.</para> - <section> - <title>How do I create a New Deposit Slip?</title> - <para> - <orderedlist> - <listitem> - <para>Press the 'Find' button to list all the available transactions</para> - </listitem> - <listitem> - <para>Select the transactions to include in the Payment Group by using the - 'Select All' or the check box that corresponds to the transactions - required</para> - </listitem> - <listitem> - <para>Enter a 'Payment Group Name' if required (If none is entered then by - default this will be 'Payment Group Name')</para> - </listitem> - <listitem> - <para>Press the 'Create Batch' button</para> - </listitem> - <listitem> - <para>A button to print the deposit slip will be displayed as well as the edit - screen to make any further changes to the Payment Batch</para> - </listitem> - </orderedlist> - </para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewWithdrawalPayment.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewWithdrawalPayment.xml deleted file mode 100644 index c10cc07..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_NewWithdrawalPayment.xml +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Financial Account New Withdrawal Payment screen.</title> - <para>This screen allows the user to create an outgoing payment to a financial account that has - been linked to the company bank account.</para> - <section> - <title>How do I create a New Withdrawal Payment?</title> - <para> - <orderedlist> - <listitem> - <para>Press the 'Create New Withdrawal Payment' button</para> - </listitem> - <listitem> - <para>The 'Create New Withdrawal for Financial Account' screen is - displayed</para> - </listitem> - <listitem> - <para>Select the 'Payment Type' from the drop down menu (NOTE: Only outgoing - transaction payment types are shown)</para> - </listitem> - <listitem> - <para>Select the 'Payment Method Type' from the drop down menu (eg Cash)</para> - </listitem> - <listitem> - <para>Enter or use the lookup to select the 'From Party Id' (eg Company)</para> - </listitem> - <listitem> - <para>Enter or use the lookup to select the 'To Party Id' (eg - DemoSupplier)</para> - </listitem> - <listitem> - <para>Enter the date of the withdrawal in the 'Effective Date' field</para> - </listitem> - <listitem> - <para>Enter the amount in the 'Amount' field for the withdrawal</para> - </listitem> - <listitem> - <para>If required tick the box next to 'Withdrawal Payment from:....' (NOTE: If - this is ticked then the transaction will not be displayed but it can be - found under the 'Transactions' tab for the bank account.)</para> - </listitem> - <listitem> - <para>Press the 'Create' button</para> - </listitem> - </orderedlist> - </para> - <para>The new transaction will be created.</para> - <para>NOTE: The default status of the payment will be 'Sent'. A new payment transaction will - be created and it will be linked to the specified bank account and will have a default - status of 'Created'.</para> - </section> - <section> - <title>How do I view a newly created Withdrawal Payment transaction?</title> - <para> - <orderedlist> - <listitem> - <para>Go to the 'Transactions' submenu</para> - </listitem> - <listitem> - <para>Press the 'Search' button</para> - </listitem> - </orderedlist> - </para> - <para>The newly created transaction should be displayed in the search results at the bottom - of the screen.</para> - <para>NOTE: If when the transaction was created the 'Withdrawal Payment from:....' was - ticked then the transaction will not be displayed on this screen. It will still show up - under the 'Transactions' tab and linked to the bank account</para> - </section> - <section> - <title/> - <para/> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_PaymentsDepositWithdraw.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_PaymentsDepositWithdraw.xml deleted file mode 100644 index b9dfda7..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_PaymentsDepositWithdraw.xml +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Financial Account Deposit / Withdraw screen.</title> - <para>By default this screen will display all payment transactions both incoming and outgoing - that have not already been associated with a financial account that represents one of the - company's bank accounts.</para> - <para>This screen also gives the option to create new deposit or withdrawal payments.</para> - <para>The user can select a number of incoming deposit payments (eg Customer Payments etc) and - group them together into a payment group (i.e AR Batch of Payments) that will create a - 'deposit slip'.</para> - <para>If you select a number of incoming payments and dont group them then no payment group is - created (and therefore not deposit slip either) but the individual transactions will be - created for the 'bank account' financial account.</para> - <para>Note that outgoing payments cannot be grouped together and will not create a 'deposit - slip'.</para> - <section> - <title>How do I list Deposit or Withdrawal Payments not linked to a Bank Account?</title> - <para> - <orderedlist> - <listitem> - <para>Press the 'Find' button on the 'Deposit/Withdraw' screen.</para> - </listitem> - </orderedlist> - </para> - <para>All deposit and withdrawal transactions not associated with a bank 'financial account' - will be displayed.</para> - </section> - <section> - <title>How do I group payments and create a deposit slip?</title> - <para> - <orderedlist> - <listitem> - <para>Press 'Find' to list all Deposit or Withdrawal payments</para> - </listitem> - <listitem> - <para>Use the 'Select All' or click on the check box associated with the - transactions required </para> - </listitem> - <listitem> - <para>Enter a name for the Payment Party Group Name (eg XYZ Deposits) to group - the transactions together</para> - </listitem> - <listitem> - <para>Press the 'Deposit/Withdraw' button</para> - </listitem> - </orderedlist> - </para> - <para>A deposit will be created that can be viewed under the 'Deposit Slip' tab and grouped - transaction will be created under the 'Transactions' tab with a link to the deposit slip - breakdown</para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewGlReconciliationWithTransaction.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewGlReconciliationWithTransaction.xml deleted file mode 100644 index 510ef7b..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewGlReconciliationWithTransaction.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to you under the Apache License, Version - 2.0 (the "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 Unless required by - applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - CONDITIONS OF ANY KIND, either express or implied. See the License for - the specific language governing permissions and limitations under the - License. - --> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The View Financial Account Reconciliations screen.</title> - <para>This screen gives an overview of a reconciliation group / bank - reconciliation. Note that a reconciliation must have at least one - transaction associated with it for this screen to be displayed. It is - used as follows:</para> - <itemizedlist> - <listitem> - <para>to view transactions associated with a reconciliation group / - bank reconciliation</para> - </listitem> - <listitem> - <para>to remove transactions from a reconciliation group / bank - reconciliation</para> - </listitem> - <listitem> - <para>to reconcile the reconciliation group / bank reconciliation - </para> - </listitem> - </itemizedlist> - <para>The screen displays the current reconciliation details plus - details of the previous reconciliation if one exists. This ensures the - closing balance of the previous reconciliation is the same as the - opening balance for the current one.</para> - <section> - <title>How do I edit reconciliation?</title> - <orderedlist> - <listitem> - <para>Press the 'Edit' button in the 'Current Bank Reconciliation'part of the screen</para> - </listitem> - <listitem> - <para>The 'Edit Financial Account Reconciliations' screen isdisplayed</para> - </listitem> - <listitem> - <para>Update the details required</para> - </listitem> - <listitem> - <para>Press the 'Update' button</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I remove a transaction from a bank reconciliation?</title> - <para>On the lower part of the screen a list of all transactions associated with the reconciliation is displayed.</para> - <orderedlist> - <listitem> - <para>Press the 'Remove' button next to the entry that needs to be removed</para> - </listitem> - <listitem> - <para>The transaction is removed</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I reconcile a bank reconciliation?</title> - <orderedlist> - <listitem><para>A total of all transactions associated with the reconciliation is shown in the lower part of the screen</para></listitem> - <listitem><para>Press the 'Reconcile' button next to the total</para></listitem> - <listitem><para>Each transaction status will be changed to 'Approved' and the reconciliation / bank reconciliation status will be changed to 'Reconciled' (NOTE: This means that no new transactions can be added to this reconciliation and it will no longer be available to assign transactions to)</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_financial_accounts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_financial_accounts.xml deleted file mode 100644 index df57f17..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_financial_accounts.xml +++ /dev/null @@ -1,111 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>Financial Accounts.</title> - <para>A financial account is a tool (similar to bank account statement) that is used for - monitoring monetary transactions. Normally they will be linked to a party and the various - transactions details (eg payments or receipts) will be shown as entries.</para> - <para>The entries for a financial account can be displayed using the 'Financial Account' tab in - Accounting or in Party Manager if you enter a party as the owner of the financial - account.</para> - <para>Currently in OFBiz financial accounts can have the following types:</para> - <para> - <itemizedlist> - <listitem> - <para>Bank Account (by default this type will post to 213500 CUSTOMER DEPOSIT - ACCOUNTS)</para> - </listitem> - <listitem> - <para>Deposit Account (by default this type will post to 213500 CUSTOMER DEPOSIT - ACCOUNTS)</para> - </listitem> - <listitem> - <para>Gift Certificate (by default this type will post to 213200 GIFT CERTIFICATES - UNREDEEMED)</para> - </listitem> - <listitem> - <para>Investment Account (by default this type will post to 213500 CUSTOMER DEPOSIT - ACCOUNTS)</para> - </listitem> - <listitem> - <para>Replenish Account (no default posting account in demo data setup)</para> - </listitem> - <listitem> - <para>Service Credit Account (no default posting account in demo data setup)</para> - </listitem> - </itemizedlist> - </para> - <para>NOTE:</para> - <para> - <orderedlist> - <listitem> - <para>In GL Account Defaults there is a specific tab 'FinAccount Type Gl Account' - for specifying which type of Financial accounts are posted to which general - ledger account.</para> - </listitem> - <listitem> - <para>In GL Account Defaults there is also a tab 'Payment Method Id / GL Account ID' - for specifying the account to post transactions to if 'Financial Account' is - selected as the Payment Method instead of (Cash, Cheque, Credit Card, etc). By - default the demo setup posts transactions to 111100 GENERAL CHECKING - ACCOUNT.</para> - </listitem> - </orderedlist> - </para> - <para>You can also setup each financial account to post to a specific general ledger account for - each party. This is done via a specific field during the creation or update of a financial - account. This will override the default setting by type.</para> - <para>Financial Accounts can be used for the following</para> - <para> - <orderedlist> - <listitem> - <para>Managing and Tracking Customer Prepaid Accounts</para> - </listitem> - <listitem> - <para>Managing and Tracking Customer Credit Limit (NOTE: Need to verify this)</para> - </listitem> - <listitem> - <para>Managing Electronic Gift Certificates / Gift Vouchers/ Gift Card</para> - </listitem> - <listitem> - <para>Reload of Electronic Gift Card</para> - </listitem> - <listitem> - <para>Company Bank Account Transaction Tracking</para> - </listitem> - </orderedlist> - </para> - <xi:include href="HELP_ACCOUNTING_FinAccountMain.xml"/> - <xi:include href="HELP_ACCOUNTING_FindFinAccount.xml"/> - <xi:include href="HELP_ACCOUNTING_EditFinAccountRoles.xml"/> - <xi:include href="HELP_ACCOUNTING_FindFinAccountTrans.xml"/> - <xi:include href="HELP_ACCOUNTING_PaymentsDepositWithdraw.xml"/> - <xi:include href="HELP_ACCOUNTING_FindDepositSlips.xml"/> - <xi:include href="HELP_ACCOUNTING_NewDepositPayment.xml"/> - <xi:include href="HELP_ACCOUNTING_NewWithdrawalPayment.xml"/> - <xi:include href="HELP_ACCOUNTING_NewDepositSlip.xml"/> - <xi:include href="HELP_ACCOUNTING_EditDepositSlipAndMembers.xml"/> - <xi:include href="HELP_ACCOUNTING_FindFinAccountReconciliations.xml"/> - <xi:include href="HELP_ACCOUNTING_BankReconciliation.xml"/> - <xi:include href="HELP_ACCOUNTING_EditFinAccountReconciliations.xml"/> - <xi:include href="HELP_ACCOUNTING_ViewGlReconciliationWithTransaction.xml"/> - <xi:include href="HELP_ACCOUNTING_EditFinAccountTrans.xml"/> - <xi:include href="HELP_ACCOUNTING_EditFinAccountAuths.xml"/> - -</section> diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_BankReconciliation.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_BankReconciliation.adoc new file mode 100644 index 0000000..4df6cd2 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_BankReconciliation.adoc @@ -0,0 +1,98 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Financial Account Bank Reconciliation. +Bank Reconciliation is a regular task where transactions from the company bank statement are matched against transactions +that have occurred in the General Ledger. +This is done based on a specific date + +NOTE: This can be done daily, weekly but is usually an end of month. + +A specific GL account is normally used to represent the company bank account and any accounting transaction that involves +the bank account will automatically record and entry in the GL. + +The bank reconciliation process ensures that the GL account and the bank statement reconcile to the same amounts. + +Differences can occur between the GL and the bank statement for a variety of valid reasons including the following: + +* Payments or Deposits in process (especially cheques) +* Interest or Bank Charges that are not known in advance but are applied to the bank account +* Currency or Exchange Rate variations / charges +* Any outstanding + +NOTE: The differences will occur because of timing differences of when and how transactions are recorded. + Examples are as follows: + + 1) Bank charges are known to the bank first and only once they have applied the charge to the bank account can + the company duplicate the transaction in the GL to make the balance reconcile. + + 2) A customer cheque payment may be recorded in the GL first before it is paid into the bank account + +== How do I create a Bank Reconciliation? +The bank reconciliation process is made up of 3 steps. + +. Creating an account reconciliation group +. Assigning transactions to the reconciliation +. Validating the figures and confirming the reconciliation + +== How do I create an account reconciliation group for BankReconciliation? +. Go to the Financial Account 'Reconciliation' sub menu for the bank account to be reconciled +. Press the 'Create New Financial Account Reconciliations' button +. Complete the details (eg name, description, organisation and opening balance) required on the + 'Add New Financial Account Reconciliations' screen and press the 'Create' button +. The new account reconciliation group is created and may be used to assign transactions to + +== How do I locate transactions that have not been assigned to aBank Reconciliation? +. Go to the Financial Account 'Transactions' sub menu of the bank account to be reconciled +. The 'Find Transactions For Financial Account: XXXX' is displayed +. Use the dropdown box for 'GL Reconciliation Id' field to select 'Not Assigned' and then press the 'Search' button +. A list of transactions (deposits, withdrawals or adjustments) that have not been reconciled will be displayed + + (NOTE: If no transactions are displayed then there are no transactions to reconcile) +. Click on the 'check box' at the end of the transaction line that corresponds to the entry that needs to be assigned + + (NOTE:More than one transaction can be selected at a time) +. Above the 'check box' is the 'Assign to Reconciliation' button and to the left of this is a dropdown box to select + the reconciliation that the transaction is to be assigned to. +. Using the drop down box select the reconciliation required and press the 'Assign to Reconciliation' button +. The transaction is removed from the 'Not Assigned' status and added to the specified reconciliation group + +== How do I validate and confirm the Bank Reconciliation? +Validation can be done for individual transactions or for the complete account reconciliation group. + +The user controls this by the search criteria entered on this screen. + +. Go to the 'Transactions' sub menu for the bank account and press the 'Bank Reconciliation' button +. Select the 'GL Reconciliation Id' that is to be reconciled +. Click on the 'Select All' check box on the right hand side of the screen. (NOTE: All transactions in this group will be reconciled) +. Press the 'Reconcile' button above the 'Select All' check box + +== How do I view a Bank Reconciliation? +Once all the transactions in a reconciliation group have been reconciled then the status of the group is changed to 'Reconciled'. +This means that no new transactions can be added to the is group and the reconciled balance is fixed. + +. Go to the 'Reconciliation' sub menu for the bank account +. A list of all the bank reconciliation groups are displayed with details of the status (eg Created or Reconciled) +. Click on the 'GL Reconciliation Id' of the group and the details are displayed + +== How do I cancel a Bank Reconciliation? +If a bank reconciliation needs to be cancelled due to a mistake or error then the bank reconciliation can be cancelled as long as +it has not been fully reconciled (i.e. the status of the reconciliation has not been changed to 'Reconciled'). +This will allow you to start the bank reconcilation again. + +. Go to the 'Reconciliation' sub menu for the bank account +. A list of all the bank reconciliation groups are displayed (NOTE: If no transactions are associated with a + reconciliation group then it will not be displayed here) +. Click on the 'Cancel' button associated with the 'GL Reconciliation Id' of the group that needs to be cancelled +. All transactions will be removed from the reconciliation group and their status will be changed back to 'Not Assigned' + so that they can be re-assigned to this or any other reconciliation. diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditDepositSlipAndMembers.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditDepositSlipAndMembers.adoc new file mode 100644 index 0000000..0d9839b --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditDepositSlipAndMembers.adoc @@ -0,0 +1,35 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Financial Account Edit Deposit Slip and member +This screen displays the details of a Payment Group and its transactions. +The Deposit Slip for the Payment Group can be printed if required and the Payment Group itself can be updated. + +Details that can be updated include the name of the Payment Group itself and the addition, removal or update of transactions. + +NOTE: Any changes to the Payment Group will be automatically updated to the Deposit Slip. + +== How do I update a Deposit Slip? +. Select the Payment Group required +. Update the 'Payment Group Name' if required +. Use the lookup for 'Payment Id' to add new transactions to the Payment Group if required +. Use the 'Cancel' button next to a particular transaction to remove it from the Payment Group +. Press the 'Update' or 'Add' buttons as required +. Press the 'Print Deposit Slip' button + +The Deposit Slip will be displayed with the latest details of the transactions for the Payment Group \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccount.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccount.adoc new file mode 100644 index 0000000..d0abae1 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccount.adoc @@ -0,0 +1,70 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Edit Financial Account +This screen allows the user to create a new financial account or to edit an existing one. + +The 'Financial Account' submenu is the first of four submenus used in the creation or update of a Financial Account. +On the creation or update of a Financial Account it is the default screen that is displayed. + +It can be used for updating the basic details of a Financial account such as: + +* Type of Account (eg Deposit, Investment, Gift Certificate) +* Account Status (Active, Frozen, Cancel, etc) +* Account Name and Code +* Currency +* Owner Party ID +* Default GL Account for Posting +* Replenishment Level + +== How do I create a new Financial Account? +Select the 'Create New Financial Account' button from the 'Find Financial Accounts' screen + +. The 'Create/Update Financial Account' screen is displayed. +. Keep the default entry of 'Deposit Account' for the Fin Account Type field +. Keep the default entry of 'Active' for the status field +. Enter a description (eg ABC Customer Prepaid Account) for the 'Fin Account Name' field +. Leave the Fin Account Pin field blank + + (NOTE TO CHECK: I think this is only used in creation of Gift Cards and Certificates..) +. Leave the Fin Account Code field blank + + (NOTE TO CHECK: I think this is only used in the creation of Gift Cards and Certificates...) +. The currency field will be the default currency of Company (eg USD). If this account is to be in another currency (eg EUR) + then select it from the drop down list. +. Set the Organization Party ID field to be 'Company' +. Fill in the Owner Party Id field with the party id of the customer who has the Financial Account (eg DemoCustomer or DemoCustCompany) +. Fill in the 'Post to Gl Account field' to post the transactions for this financial account to post to a specific GL Account +. Select the current date from the calendar to fill in the 'From date' field (NOTE: It can be left blank and still appears to work) +. Leave the 'Thru date' field blank + + (NOTE TO CHECK: I think this could be used to close or stop the use of an account ..) +. Leave the default of 'Is Refundable' as 'Y' + + (NOTE TO CHECK: I think this will allow money to be refunded to this account - eg + if you have a return or credit for the customer) +. Leave the 'Replenish Payment ID' blank + + (NOTE TO CHECK: Not sure what this is - maybe to automatically replenish account if it + gets to a certain limit???) +. Leave the 'Replenish Level' blank + + (NOTE TO CHECK: Not sure what this is but probably linked to Replenish Payment ID where you set the limit - eg $100) + +Press the 'Create' button and message appears saying that the account was successfully created + +== How do I update an existing Financial Account? +. Press the 'Search' button on the Financial Account main screen +. A list of all existing Financial Accounts will be displayed +. The 'Create/Update Financial' screen is displayed +. Update the details of the financial account +. Press the 'Update' button diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountAuths.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountAuths.adoc new file mode 100644 index 0000000..6f40a47 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountAuths.adoc @@ -0,0 +1,60 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Edit Financial Account Authorizations. +An authorization is a temporary transaction showing a commitment to take money from a financial account. +It is like a 'transaction in progress' where there can be delay between when you buy something and the time + it actually appears on your statement. + +Authorizations can be time limit specific meaning that they can be controlled by entering a start and +end date so that they are only valid for a certain length of time. + +They can also be expired. + +When an authorization is expired it removes the commitment from the financial account. + +The history of expired authorizations are shown on the financial account. + +NOTE: This could be very useful in ensuring that customers are not overcommitted and keeping within their approved credit limits. + +== How do I add an authorization? +. Enter an amount in the 'Amount' field (Eg 1000) +. Leave the 'Currency' field blank as the default currency will be used +. Enter a date in the 'Authorisation Date' field +. Leave the 'From Date' field blank +. Leave the 'Thru Date' field blank +. Press the 'Add' button + +NOTE: When you now view the Financial Account detail the 'Actual Balance' and 'Available Balance' fields will be different. + +== How do I update an authorization? +An authorization cannot be updated. +It can only be expired. +If you have made a mistake and need to change an authorization then it needs to expired and then re-created correctly. + +== How do I delete an authorization? +Authorizations are not deleted they are instead expired. + +This means that the history of the authorizations will remain on the account as an audit trail. + +Example: To expire an authorisation + +. Select the 'Authorizations' tab for the Financial Account +. Any authorizations will be displayed at the bottom of the screen +. If the authorization is still current the 'Thru Date' field will be blank + + (NOTE TO CHECK: May not always be true as you can specify a future date for it to expire......!!!) +. Select the 'Expire' button next to the authorisation to be expired + +The authorization is removed from the financial account and the screen is redisplayed with the 'Thru Date' field completed + \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountReconciliations.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountReconciliations.adoc new file mode 100644 index 0000000..af95467 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountReconciliations.adoc @@ -0,0 +1,30 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Edit Financial Account Reconciliations +This screen is used to create or update a reconciliation group / bank reconciliation. + +The following details can be input or updated for the reconciliation: + +* GL Reconciliation Name or Identifier +* Description for the reconciliation +* Organisation Party Id for the reconciliation +* Opening Balance for the reconciliation +* Reconciliation date + + diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountRoles.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountRoles.adoc new file mode 100644 index 0000000..22b7b2e --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountRoles.adoc @@ -0,0 +1,34 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Edit Financial Account Roles. +The Financial Account Roles sub menu screen allows you specify a party and link them to a role for a particular financial account. + +It can be used to add party roles eg 'Approver' or 'Administrator' for credit limits or updates to the account. +If an account belongs to a company then you may want to add a person as a 'Contact' for dealing with the account. + +The roles can also be time bound. +This means that you can specify a start and end date for the party role. + +== How do I add a Party Role to a Financial Account? +. Select the 'Roles' sub menu for the Financial Account +. Fill in the Party Id field by using the field lookup tool or by directly entering the party id (eg flexadmin) +. Select the role from the drop down list for the Role Type Id field (eg administrator) +. Enter the From Date field +. Enter if the Thru Date field (optional) +. Press the 'Add' button diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountTrans.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountTrans.adoc new file mode 100644 index 0000000..8bfac05 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountTrans.adoc @@ -0,0 +1,44 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Financial Account Transactions List. + +== How do I add transactions to a financial account? +An example of how to bring in an opening balance is shown below: + +. Navigate to the the Financial Account Transactions sub menu +. Select 'Adjustment' in the Fin Account Trans Type Id field +. Leave the 'Party Id' field blank +. Fill in the 'Transaction Date' field +. Fill in the 'Entry Date' field (NOTE TO CHECK: Need to check exactly what this is - is it the date the transaction is entered + or is it the date the transaction is processed?) +. Fill in the 'Amount' field with the transaction amount + (Eg. In our case this is the opening balance such as 353.88 - dont think we need the $ sign) +. Leave the 'Payment Id' field blank +. Leave the 'Order Id' field blank +. Leave the 'Order Item Seq Id' field blank +. Leave the 'Reason Enum Id' field blank (NOTE TO CHECK: This could be useful in identifying transactions to a greater level of detail....) +. Fill in the 'Comments' field (Eg: Opening Balance from XYZ Statement) +. Press the 'Add' button and the transaction will be displayed at the bottom of the screen + +NOTE: When you now view the Financial Account detail the 'Actual Balance' and 'Available Balance' fields will show + the entered opening balance (eg 353.88) + +== Other ways to add transactions to a financial account? +* By selecting financial account as a payment method for a customer +* By selecting financial account as a refund method for a customer diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountTypeGlAccounts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountTypeGlAccounts.adoc new file mode 100644 index 0000000..ee778bd --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditFinAccountTypeGlAccounts.adoc @@ -0,0 +1,52 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Financial Account GL Account Type +The FinAccount Type GL Account (Financial Account Type / GL Account Type) is used to specify the default account to be used +for a specific type of Financial Account. + +This setup will translate to one side of the journal entry only. + +IMPORTANT: There is a limitation that only one account can be specified per Financial Account type. + + Currently there are 6 types of Financial Account + + (Bank, Deposit, Investment, Gift Certificate, Replenish, Service Credit) + + so if you have more than one of these type of accounts that you need to track separately then there could be a problem. + +This mapping is normally be triggered if something is paid or uses a Financial Account. +Using the demo data this mapping is triggered when someone purchases a gift certificate, or pays money into a financial account. + +== How do I add a new Financial Account Type / GL Account mapping? +By default there are 4 Financial Account Type / GL Type mappings that are configured as part of the OFBiz demo data. + +. Select the 'FinAccount Type Id' from the drop down list +. Select the ' GL Account' to map it to from the drop down list +. Press the 'Add' button +. The new mapping will be displayed in the list at the bottom of the screen + +== How do I update a Financial Account Type / GL Account mapping? +A Financial Account Type / GL Account Type mapping can be updated by modifying the GL Account only. + +Unlike other screens in this area if the GL Account Type needs to be updated then it can be done by creating a new record with +the correct GL Account type which will overwrite the existing record. + +. Locate the entry that needs to be updated in the list of Financial Account Type / GL Account Type mappings +. Modify the 'GL Account 'by using the drop down list next to the GL Account field +. Press the 'Update' button +. The updated mapping will be displayed + +== How do I remove a Financial Account Type / GL Account mapping? +. Locate the entry that needs to be deleted in the list of Financial Account Type / GL Account Type mappings +. Press the 'Remove' button next to the entry diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_FindDepositSlips.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_FindDepositSlips.adoc new file mode 100644 index 0000000..c9fc2fe --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_FindDepositSlips.adoc @@ -0,0 +1,48 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Find Deposit Slips. +This screen is used to locate payment groups and their associated deposit slips that have been created. + +Deposit slips are created by grouping transactions together into a Payment Group. + +This can be done using the 'Accounting / Payment Group' tab, the 'Financial Account / Deposit Withdraw' tab +or the 'Create New Deposit Slip' button. + +Currently Deposit Slips are created for AR Batch Payments only. + +The deposit slips are available in PDF format and there is an option to cancel the batch that generated the deposit slip if required. + +== How do I locate an existing Deposit Slip? +. Enter some characters from the 'Payment Group Id' or 'Payment Group Name' if known +. Press the 'Search' button + +== How do I update an existing Deposit Slip? +. Locate the Payment Group required +. Select the Payment Group by clicking on the Payment Group Id + +The 'Edit Payment Group' screen is displayed + +Add any new payment deposits or update existing deposits for the Payment Group + +All changes in the Payment Group will automatically be updated to the Deposit Slip + +== How do I delete an existing Deposit Slip? +A deposit slip can not be directly deleted but it is removed when a Payment Group is cancelled + +Press the 'Cancel' button next to the Payment Group required to cancel a payment group + +The Payment Group is removed from the 'Find Deposits' screen and no deposit slips can be viewed or printed. \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_FindFinAccount.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_FindFinAccount.adoc new file mode 100644 index 0000000..d1d3edc --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_FindFinAccount.adoc @@ -0,0 +1,36 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Find Financial Accounts. +This screen is used to locate existing financial accounts that have been created. + +It also includes the option to use the 'Advanced Search' button to display additional fields that can be used to locate a specific financial account. + +New Financial Accounts can be created using the 'Create New Financial Account' button. + +== How do locate an existing Financial Account? +Press the 'Search' button + +A list of all existing Financial Accounts will be displayed. + +== How do I delete an existing Financial Account? +Press the 'Search' button on the Financial Account main screen + +A list of all existing Financial Accounts will be displayed + +Press the 'Delete' button next to the Financial Account that needs to be deleted. \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_FindFinAccountTrans.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_FindFinAccountTrans.adoc new file mode 100644 index 0000000..cc17033 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_FindFinAccountTrans.adoc @@ -0,0 +1,37 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Find Financial Account Transactions +A transaction is an entry that is shown on the financial account. + +Transactions can be one of the following types: + +* Deposits +* Withdrawals +* Adjustments + +Transactions are used to show entries and the financial history of the financial account. +Similar to a bank account or credit card statement the transaction will show details of what was spent or paid into the account. + +Some transaction totals have been added to this screen to help as part of the reconciliation processes. +Additional details available include number of transactions, transaction totals and status. + +== How do I find transactions for a Financial Account? +* Press the 'Search' button +* A list of transactions for the financial account will be displayed diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_NewDepositPayment.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_NewDepositPayment.adoc new file mode 100644 index 0000000..31ff305 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_NewDepositPayment.adoc @@ -0,0 +1,48 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Financial Account New Deposit Payment + +This screen allows the user to create an incoming payment to a financial account that has been linked to the company bank account. + +== How do I create a New Deposit Payment? +. Press the 'Create New Deposit Payment' button +. The 'Create New Deposit for Financial Account' screen is displayed +. Select the 'Payment Type' from the drop down menu (NOTE: Only incoming transaction payment types are shown) +. Select the 'Payment Method Type' from the drop down menu (eg Cash) +. Enter or use the lookup to select the 'From Party Id' (eg DemoCustomer) +. Enter or use the lookup to select the 'To Party Id' (eg Company) +. Enter the date of the deposit in the 'Effective Date' field +. Enter the amount in the 'Amount' field for the deposit +. If required then tick the box next to 'Deposit Payment in:....' + + (NOTE: If this is ticked then the transaction will not be displayed and so will not have a deposit slip associated with it) +. Press the 'Create' button + +The new transaction will be created. + +NOTE: The default status of the payment will be 'Received'.A new payment transaction will be created and it will be linked + to the specified bank account but the status of the transaction will be 'Created'. + +== How do I view a newly created Deposit Payment transaction? +. Go to the 'Transactions' submenu +. Press the 'Search' button +. The newly created transaction should be displayed in the search results at the bottom of the screen. + +NOTE: If when the transaction was created the 'Deposit Payment in:....' was ticked then the transaction will not +be displayed on this screen. + +It will still show up under the 'Transactions' tab and linked to the bank account. \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_NewDepositSlip.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_NewDepositSlip.adoc new file mode 100644 index 0000000..ddcd814 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_NewDepositSlip.adoc @@ -0,0 +1,29 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Financial Account New Deposit Slip +This screen allows the user to create an Payment Group and the transactions associated with the Payment Group will generate +a deposit slip. + +== How do I create a New Deposit Slip? +. Press the 'Find' button to list all the available transactions +. Select the transactions to include in the Payment Group by using the 'Select All' or the check box that corresponds to + the transactions required +. Enter a 'Payment Group Name' if required (If none is entered then by default this will be 'Payment Group Name') +. Press the 'Create Batch' button +. A button to print the deposit slip will be displayed as well as the edit screen to make any further changes to the Payment Batch diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_NewWithdrawalPayment.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_NewWithdrawalPayment.adoc new file mode 100644 index 0000000..2cf2bff --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_NewWithdrawalPayment.adoc @@ -0,0 +1,51 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Financial Account New Withdrawal Payment. +This screen allows the user to create an outgoing payment to a financial account that has been linked to the company bank account. + +== How do I create a New Withdrawal Payment? +. Press the 'Create New Withdrawal Payment' button +. The 'Create New Withdrawal for Financial Account' screen is displayed +. Select the 'Payment Type' from the drop down menu (NOTE: Only outgoing transaction payment types are shown) +. Select the 'Payment Method Type' from the drop down menu (eg Cash) +. Enter or use the lookup to select the 'From Party Id' (eg Company) +. Enter or use the lookup to select the 'To Party Id' (eg DemoSupplier) +. Enter the date of the withdrawal in the 'Effective Date' field +. Enter the amount in the 'Amount' field for the withdrawal +. If required tick the box next to 'Withdrawal Payment from:....' + + (NOTE: If this is ticked then the transaction will not be displayed but it can be found under the 'Transactions' tab for + the bank account.) +. Press the 'Create' button + +The new transaction will be created. + +NOTE: The default status of the payment will be 'Sent'. A new payment transaction will be created and it will be linked to + the specified bank account and will have a default status of 'Created'. + +== How do I view a newly created Withdrawal Payment transaction? +. Go to the 'Transactions' submenu +. Press the 'Search' button + +The newly created transaction should be displayed in the search results at the bottom of the screen. + +NOTE: If when the transaction was created the 'Withdrawal Payment from:....' was ticked then the transaction will + not be displayed on this screen. + + It will still show up under the 'Transactions' tab and linked to the bank account + + diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_PaymentsDepositWithdraw.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_PaymentsDepositWithdraw.adoc new file mode 100644 index 0000000..580e655 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_PaymentsDepositWithdraw.adoc @@ -0,0 +1,44 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Financial Account Deposit / Withdraw +By default this screen will display all payment transactions both incoming and outgoing that have not already been associated +with a financial account that represents one of the company's bank accounts. + +This screen also gives the option to create new deposit or withdrawal payments. + +The user can select a number of incoming deposit payments (eg Customer Payments etc) and group them together into a payment +group (i.e AR Batch of Payments) that will create a 'deposit slip'. + +If you select a number of incoming payments and dont group them then no payment group is created (and therefore not deposit slip +either) but the individual transactions will be created for the 'bank account' financial account. + +NOTE: Outgoing payments cannot be grouped together and will not create a 'deposit slip'. + +== How do I list Deposit or Withdrawal Payments not linked to a Bank Account? +. Press the 'Find' button on the 'Deposit/Withdraw' screen. + +All deposit and withdrawal transactions not associated with a bank 'financial account' will be displayed. + +== How do I group payments and create a deposit slip? +. Press 'Find' to list all Deposit or Withdrawal payments +. Use the 'Select All' or click on the check box associated with the transactions required +. Enter a name for the Payment Party Group Name (eg XYZ Deposits) to group the transactions together +. Press the 'Deposit/Withdraw' button + +A deposit will be created that can be viewed under the 'Deposit Slip' tab and grouped transaction will be created under the 'Transactions' tab with a link to the deposit slip breakdown \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ViewGlReconciliationWithTransaction.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ViewGlReconciliationWithTransaction.adoc new file mode 100644 index 0000000..f70cab0 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ViewGlReconciliationWithTransaction.adoc @@ -0,0 +1,49 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for View Financial Account Reconciliations +This screen gives an overview of a reconciliation group / bank reconciliation. + +Note that a reconciliation must have at least one transaction associated with it for this screen to be displayed. +It is used as follows: + +* to view transactions associated with a reconciliation group / bank reconciliation +* to remove transactions from a reconciliation group / bank reconciliation +* to reconcile the reconciliation group / bank reconciliation + +The screen displays the current reconciliation details plus details of the previous reconciliation if one exists. +This ensures the closing balance of the previous reconciliation is the same as the opening balance for the current one. + +== How do I edit reconciliation? +. Press the 'Edit' button in the 'Current Bank Reconciliation'part of the screen +. The 'Edit Financial Account Reconciliations' screen isdisplayed +. Update the details required +. Press the 'Update' button + +== How do I remove a transaction from a bank reconciliation? +On the lower part of the screen a list of all transactions associated with the reconciliation is displayed. + +. Press the 'Remove' button next to the entry that needs to be removed +. The transaction is removed + +== How do I reconcile a bank reconciliation? +. A total of all transactions associated with the reconciliation is shown in the lower part of the screen +. Press the 'Reconcile' button next to the total +. Each transaction status will be changed to 'Approved' and the reconciliation / bank reconciliation status will be changed to + 'Reconciled' + + (NOTE: This means that no new transactions can be added to this reconciliation and it will no longer be available to assign transactions to) + diff --git a/applications/accounting/src/docs/asciidoc/_include/acc-financial-accounts.adoc b/applications/accounting/src/docs/asciidoc/_include/acc-financial-accounts.adoc index 1e33c47..ba043a1 100644 --- a/applications/accounting/src/docs/asciidoc/_include/acc-financial-accounts.adoc +++ b/applications/accounting/src/docs/asciidoc/_include/acc-financial-accounts.adoc @@ -21,6 +21,13 @@ under the License. A "Financial Account" is a tool (similar to bank account statement) that is used for monitoring monetary transactions. Normally it will be linked to a party and the various transactions details (e.g. payments or receipts) will be shown as entries. +Financial Accounts can be used for the following : + +. Managing and Tracking Customer Prepaid Accounts +. Managing and Tracking Customer Credit Limit (NOTE: Need to verify this) +. Managing Electronic Gift Certificates / Gift Vouchers/ Gift Card +. Reload of Electronic Gift Card +. Company Bank Account Transaction Tracking At the time of writing, OFBiz allows you to create the following type of financial accounts @@ -73,3 +80,60 @@ By default this type of financial account will post to 213500 CUSTOMER DEPOSIT A A "Store Credit Account" is a financial account that is used to to maintain the refund amount Specify the type (Billing Account or Financial Account) of Store Credit Account used for refund return. Default to Financial Account. +== Financial Accounts in User Interface + +=== Setup +NOTE: 1) In GL Account Defaults there is a specific tab 'FinAccount Type Gl Account' for specifying which type of + Financial accounts are posted to which general ledger account. + + 2) In GL Account Defaults there is also a tab 'Payment Method Id / GL Account ID' for specifying the account + to post transactions to if 'Financial Account' is selected as the Payment Method instead of + (Cash, Cheque, Credit Card, etc). By default the demo setup posts transactions to 111100 GENERAL CHECKING ACCOUNT. + +You can also setup each financial account to post to a specific general ledger account for each party. +This is done via a specific field during the creation or update of a financial account. +This will override the default setting by type. + +include::HELP_EditFinAccountTypeGlAccounts.adoc[leveloffset=+2] + +=== The Financial Account Main screen. +The default screen for Financial Accounts displays a list of any bank accounts that have been created. +Details listed include the account the following + +* account name +* organisation the account is linked to +* account balances (available and actual) + +include::HELP_FindFinAccount.adoc[leveloffset=+2] + +include::HELP_EditFinAccount.adoc[leveloffset=+2] + +include::HELP_EditFinAccountAuths.adoc[leveloffset=+2] + +include::HELP_EditFinAccountRoles.adoc[leveloffset=+2] + +include::HELP_FindFinAccountTrans.adoc[leveloffset=+2] + +include::HELP_EditFinAccountTrans.adoc[leveloffset=+2] + +include::HELP_PaymentsDepositWithdraw.adoc[leveloffset=+2] + +include::HELP_NewDepositPayment.adoc[leveloffset=+2] + +include::HELP_NewWithdrawalPayment.adoc[leveloffset=+2] + +include::HELP_FindDepositSlips.adoc[leveloffset=+2] + +include::HELP_NewDepositSlip.adoc[leveloffset=+2] + +include::HELP_EditDepositSlipAndMembers.adoc[leveloffset=+2] + +=== Help Find Financial Account Reconciliations. +This screen displays the details of any reconciliations in progress for a financial account. + +Only reconciliations that have actual transactions associated with them will be displayed. + +If a reconciliation group has no transactions assigned to it then it will not be displayed. + + +include::HELP_BankReconciliation.adoc[leveloffset=+2] + +include::HELP_EditFinAccountReconciliations.adoc[leveloffset=+2] + +include::HELP_ViewGlReconciliationWithTransaction.adoc[leveloffset=+2] |
|
|
In reply to this post by mbrohl
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit 2cd22bbcc6b8aefd902322905191524ebd959cfc Author: holivier <[hidden email]> AuthorDate: Wed Feb 5 19:06:58 2020 +0100 Documented: Global GL Setting Help Docbook file migration to asciidoc format (OFBIZ-10297) All the new files are now included in the Global Gl Setting documentation presentation, each of the three Help file are included in the concerning sub-chapter. --- .../helpdata/HELP_ACCOUNTING_AssignGlAccount.xml | 32 ------ .../data/helpdata/HELP_ACCOUNTING_CostCenters.xml | 22 ---- .../helpdata/HELP_ACCOUNTING_EditCostCalcs.xml | 22 ---- .../HELP_ACCOUNTING_EditCustomTimePeriod.xml | 22 ---- .../HELP_ACCOUNTING_EditGlAccountCategory.xml | 22 ---- ...HELP_ACCOUNTING_EditGlAccountCategoryMember.xml | 22 ---- .../HELP_ACCOUNTING_EditInvoiceItemType.xml | 22 ---- .../HELP_ACCOUNTING_EditPaymentMethodType.xml | 22 ---- .../HELP_ACCOUNTING_FindGlAccountCategory.xml | 22 ---- .../HELP_ACCOUNTING_FindGlobalGlAccount.xml | 31 ------ .../helpdata/HELP_ACCOUNTING_GlAccountNavigate.xml | 71 ------------- .../helpdata/HELP_ACCOUNTING_ViewFXConversions.xml | 45 -------- .../helpdata/HELP_ACCOUNTING_ViewRateAmounts.xml | 22 ---- .../HELP_ACCOUNTING_global_gl_settings.xml | 46 --------- .../asciidoc/_include/HELP_AssignGlAccount.adoc | 32 ++++++ .../asciidoc/_include/HELP_GlAccountNavigate.adoc | 77 ++++++++++++++ .../asciidoc/_include/HELP_ViewFXConversions.adoc | 44 ++++++++ .../asciidoc/_include/acc-global-settings.adoc | 113 +++++++++++---------- 18 files changed, 214 insertions(+), 475 deletions(-) diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_AssignGlAccount.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_AssignGlAccount.xml deleted file mode 100644 index d0a932a..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_AssignGlAccount.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Assign GL Account help screen</title> - <para>The chart of accounts for the default organisation is built up by selecting or 'assigning' accounts that you want to use from the global chart of accounts master template. This means that if you want to create a new account then it needs to be created in the global chart of accounts before it can be assigned to be used. </para> - <section> - <title>How do I assign a GL account?</title> - <orderedlist> - <listitem><para>Click on the 'Assign GL Account' tab</para></listitem> - <listitem><para>Use the drop down box to select the 'GL Account Id' to required</para></listitem> - <listitem><para>Use the drop down box to select the 'Party Id' to assign the GL Account to (NOTE: Only parties that have been setup under 'Organization GL Settings' will be displayed)</para></listitem> - <listitem><para>Press the 'Create Assignment' button</para></listitem> - </orderedlist> - <para>NOTE: All assignments for a party can be viewed under 'Organization GL Settings / Setup / Chart of Accounts' for the party required.</para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_CostCenters.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_CostCenters.xml deleted file mode 100644 index 9f25923..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_CostCenters.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Cost Centers help screen</title> - <para></para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCostCalcs.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCostCalcs.xml deleted file mode 100644 index 05d4842..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCostCalcs.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Cost Calculations help screen</title> - <para></para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCustomTimePeriod.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCustomTimePeriod.xml deleted file mode 100644 index e919e98..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCustomTimePeriod.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Custom Time Period help screen</title> - <para></para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditGlAccountCategory.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditGlAccountCategory.xml deleted file mode 100644 index 1f8ad85..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditGlAccountCategory.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit GL Account Category help screen</title> - <para></para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditGlAccountCategoryMember.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditGlAccountCategoryMember.xml deleted file mode 100644 index a78bf15..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditGlAccountCategoryMember.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit GL Category Member help screen</title> - <para></para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditInvoiceItemType.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditInvoiceItemType.xml deleted file mode 100644 index b125f6b..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditInvoiceItemType.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Invoice Item Type help screen</title> - <para></para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentMethodType.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentMethodType.xml deleted file mode 100644 index d1ba35f..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentMethodType.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Payment Method Type help screen</title> - <para></para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGlAccountCategory.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGlAccountCategory.xml deleted file mode 100644 index c8f938d..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGlAccountCategory.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Find GL Account Category help screen</title> - <para></para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGlobalGlAccount.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGlobalGlAccount.xml deleted file mode 100644 index 64f5f5d..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGlobalGlAccount.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Find Global GL Account help screen</title> - <para> The default screen for the Global GL Settings tab is 'List Accounts'. If the demo data has been loaded then the default screen displays a list of the general ledger accounts that form the Global Chart of Accounts template. Each general ledger account must exist in the global template before it can be assigned to an organisation (eg Company) for transaction and reporting use.</para> - <para>It is used to view or edit the details of the general ledger accounts in the global template and there are options to print or export the account details.</para> - <section> - <title>How do I view details for an account?</title> - <orderedlist> - <listitem><para>Locate the account required</para></listitem> - <listitem><para>Click on account id</para></listitem> - <listitem><para>The account details will be displayed</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountNavigate.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountNavigate.xml deleted file mode 100644 index 5abd276..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountNavigate.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Navigate GL Accounts help screen</title> - <para>This screen is split into two areas:</para> - <itemizedlist> - <listitem><para>one for navigating the general ledger accounts in the global template and;</para></listitem> - <listitem><para>the other for adding or editing the details of an account</para></listitem> - </itemizedlist> - <para>This screen can also be used as follows:</para> - <itemizedlist> - <listitem><para>To locate a particular account</para></listitem> - <listitem><para>To view the chart of account structure or hierarchy</para></listitem> - <listitem><para>To update the details of an existing account</para></listitem> - <listitem><para>To add a new account to the chart of accounts template</para></listitem> - </itemizedlist> - <para>NOTE: When adding or creating an account it is important to understand the fields used in the chart of accounts hierarchy. The following list tries to define these.</para> - <itemizedlist> - <listitem><para>GL Account Id: A unique identifier used to identify the account. (NOTE: If using the demo data chart of accounts template then keep any new accounts within the same structure)</para></listitem> - <listitem><para>GL Account Type Id: This appears to be a way of translating a business transaction into an accounting transaction (NOTE: In 'Organization GL Settings / Setup / GL Account Type Defaults' it is the GL Account Id that is used to specify which GL account that particular type of transaction will post to such as Accounts Payable, Accounts Receivable etc. When a payment is created thne based on the type of payment made such as 'Customer Deposit' then it will translate to a G [...] - <listitem><para>GL Account Class Id: This appears to be a classification system and hierarchy for reporting purposes.</para></listitem> - <listitem><para>GL Resource Type Id: This appears to be a way of specifying the type of account possibly for reporting (eg Services, Finished Goods, Labour, etc)</para></listitem> - <listitem><para>GL Xbrl Class Id: This appears to be indicate the which accounting standards are used. Current examples are as US Generally Accepted Accounting Principles (US GAAP) or International Accounting Standards (IAS) </para></listitem> - <listitem><para>Parent GL Account Id: The GL Account of an account that is the next level up in the chart of account hierarchy</para></listitem> - <listitem><para>Account Code: This is the same as the GL Accound Id...not sure why???</para></listitem> - <listitem><para>Account Name: The name or description of the account</para></listitem> - <listitem><para>Description: A further or long description of the account or the details it will contain</para></listitem> - <listitem><para>Product Id: This may be for specifying that only details for a specific product can be posted to this account...Needs To be verified...</para></listitem> - <listitem><para>Posted Balance: For the Global Template this cannot be updated and is zero</para></listitem> - </itemizedlist> - <section> - <title>How do I add a new GL account?</title> - <orderedlist> - <listitem><para>Click on the 'Navigate Accounts' tab</para></listitem> - <listitem><para>The default display will be to add a new account</para></listitem> - <listitem><para>Enter the 'GL Account Id' for the new account (NOTE:This must be entered)</para></listitem> - <listitem><para>Enter the 'GL Account Type' for the new account</para></listitem> - <listitem><para>Enter the 'GL Account Class Id' for the new account</para></listitem> - <listitem><para>Enter the 'GL Resource Type Id' for the new account</para></listitem> - <listitem><para>Enter the 'Parent GL Account Id' if required</para></listitem> - <listitem><para>Enter the 'Account Code' for the new account (NOTE: This should be the same as the GL Account Id)</para></listitem> - <listitem><para>Enter the 'Account Name' for the new account</para></listitem> - <listitem><para>Press the 'Add' button</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I update an existing GL account?</title> - <orderedlist> - <listitem><para>Use the 'Navigate Accounts' window to find the account required</para></listitem> - <listitem><para>Click on the Account Id and the details will be displayed in the lower part of the screen</para></listitem> - <listitem><para>Update the details required</para></listitem> - <listitem><para>Press the 'Update' button</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewFXConversions.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewFXConversions.xml deleted file mode 100644 index 62b56c2..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewFXConversions.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The View Foreign Exchange Rates help screen</title> - <para>Foreign exchange rates are used to convert from one currency to another. Usually a business will want to work in one main currency (eg GBP) but will allow transactions in other currencies (eg EUR, USD). These currencies will need to be converted to the main currency at some point in order to generate financial reports (eg Balance Sheet or Income Statement) and most importantly to adhere to tax authority regulations.</para> - <para>OFBiz currently allows you to input to 3 different rates for the same currency using the 'Purpose' field. With this you can specify whether the conversion is to be used internally, externally or leave the field blank. Also the start and end date for a conversion can be specified beforehand.</para> - <section> - <title>How do I add a new foreign exchange rate?</title> - <para>To add a new rate for US Dollars (USD) to Euro (EUR)</para> - <itemizedlist> - <listitem><para>Using the drop down box on the 'From Currency' field, select 'American Dollar - USD'</para></listitem> - <listitem><para>Using the drop down box on the 'To Currency' field, select 'Euro - EUR'</para></listitem> - <listitem><para>The 'Purpose' field can be left blank or you can select 'Internal Conversion' or 'External Conversion' from the drop down list</para></listitem> - <listitem><para>Enter the exchange rate in the 'Rate' field (eg 0.72883) </para></listitem> - <listitem><para>Enter the 'From Date' (NOTE: If left blank then will default to the current date and time)</para></listitem> - <listitem><para>Leave the 'Thru Date' blank</para></listitem> - <listitem><para>Click the 'Update Foreign Currency Rates' button</para></listitem> - <listitem><para>The new foreign exchange rate will be displayed</para></listitem> - </itemizedlist> - </section> - <section> - <title>How do I update an existing foreign exchange rate?</title> - <para>NOTE: Existing foreign exchange rates cannot be updated - instead the existing rate is expired and a new rate is created. Currently up to 3 different exchange rates can be created by using the 'Purpose' field to distinguish them.</para> - </section> - <section> - <title>How do I delete a foreign exchange rate?</title> - <para>Foreign exchange rates cannot be deleted. Existing rates can be expired by entering a new exchange rate for the same currency and purpose.</para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewRateAmounts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewRateAmounts.xml deleted file mode 100644 index 7f9ec24..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewRateAmounts.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The View Rates help screen</title> - <para></para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_global_gl_settings.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_global_gl_settings.xml deleted file mode 100644 index b78b4e8..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_global_gl_settings.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>Global GL Settings.</title> - <para>The Global GL Settings tab is where a limited global or 'master' accounting configuration can be done.</para> - <para>These include:</para> - <itemizedlist> - <listitem><para>Reviewing the chart of account structure or hierarchy (Navigate Accounts)</para></listitem> - <listitem><para>Adding new accounts</para></listitem> - <listitem><para>Updating an existing account (eg. change the description, change the type of account, change the parent account or hierarchy)</para></listitem> - <listitem><para>Linking an account from the master chart to 'Company' or any other of your company departments, subsidiaries or business units</para></listitem> - <listitem><para>Creating new component costs for products</para></listitem> - <listitem><para>Setting default accounts for different types of payments</para></listitem> - <listitem><para>Setting default accounts for invoice line items (Note: This includes all types eg: payroll, commission, purchase, return, sales etc)</para></listitem> - </itemizedlist> - <para>NOTE: Some of the configuration specified here can be over-ridden using the 'Organization GL Settings' tab</para> - <xi:include href="HELP_ACCOUNTING_FindGlobalGlAccount.xml"/> - <xi:include href="HELP_ACCOUNTING_GlAccountNavigate.xml"/> - <xi:include href="HELP_ACCOUNTING_AssignGlAccount.xml"/> - <xi:include href="HELP_ACCOUNTING_EditCustomTimePeriod.xml"/> - <xi:include href="HELP_ACCOUNTING_EditCostCalcs.xml"/> - <xi:include href="HELP_ACCOUNTING_EditPaymentMethodType.xml"/> - <xi:include href="HELP_ACCOUNTING_EditInvoiceItemType.xml"/> - <xi:include href="HELP_ACCOUNTING_ViewRateAmounts.xml"/> - <xi:include href="HELP_ACCOUNTING_ViewFXConversions.xml"/> - <xi:include href="HELP_ACCOUNTING_FindGlAccountCategory.xml"/> - <xi:include href="HELP_ACCOUNTING_EditGlAccountCategory.xml"/> - <xi:include href="HELP_ACCOUNTING_EditGlAccountCategoryMember.xml"/> - <xi:include href="HELP_ACCOUNTING_CostCenters.xml"/> -</section> diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_AssignGlAccount.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_AssignGlAccount.adoc new file mode 100644 index 0000000..3b97ed5 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_AssignGlAccount.adoc @@ -0,0 +1,32 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Assign GL Account +The chart of accounts for the default organisation is built up by selecting or 'assigning' accounts that you want to use +from the global chart of accounts master template. + +This means that if you want to create a new account then it needs to be created in the global chart of accounts before +it can be assigned to be used. + +== How do I assign a GL account? +. Click on the 'Assign GL Account' tab +. Use the drop down box to select the 'GL Account Id' to required +. Use the drop down box to select the 'Party Id' to assign the GL Account to + + (NOTE: Only parties that have been setup under 'Organization GL Settings' will be displayed) +. Press the 'Create Assignment' button + +NOTE: All assignments for a party can be viewed under 'Organization GL Settings / Setup / Chart of Accounts' for the party required. \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountNavigate.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountNavigate.adoc new file mode 100644 index 0000000..94809b7 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountNavigate.adoc @@ -0,0 +1,77 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Navigate GL Accounts +This screen is split into two areas: + +* one for navigating the general ledger accounts in the global template and; +* the other for adding or editing the details of an account + +This screen can also be used as follows: + +* To locate a particular account +* To view the chart of account structure or hierarchy +* To update the details of an existing account +* To add a new account to the chart of accounts template + +NOTE: When adding or creating an account it is important to understand the fields used in the chart of accounts hierarchy. + +The following list tries to define these. + +* GL Account Id: A unique identifier used to identify the account. (NOTE: If using the demo data chart of accounts template + then keep any new accounts within the same structure) +* GL Account Type Id: This appears to be a way of translating a business transaction into an accounting transaction + + (NOTE: In 'Organization GL Settings / Setup / GL Account Type Defaults' it is the GL Account Id that is used to specify + which GL account that particular type of transaction will post to such as Accounts Payable, Accounts Receivable etc. + When a payment is created thne based on the type of payment made such as 'Customer Deposit' then it will translate + to a GL Account Type Id which in turn will map to an actual GL Account) +* GL Account Class Id: This appears to be a classification system and hierarchy for reporting purposes. +* GL Resource Type Id: This appears to be a way of specifying the type of account possibly for reporting + (eg Services, Finished Goods, Labour, etc) +* GL Xbrl Class Id: This appears to be indicate the which accounting standards are used. Current examples are as US Generally + Accepted Accounting Principles (US GAAP) or International Accounting Standards (IAS) +* Parent GL Account Id: The GL Account of an account that is the next level up in the chart of account hierarchy +* Account Code: This is the same as the GL Accound Id...not sure why??? +* Account Name: The name or description of the account +* Description: A further or long description of the account or the details it will contain +* Product Id: This may be for specifying that only details for a specific product can be posted to this account + + ...Needs To be verified... +* Posted Balance: For the Global Template this cannot be updated and is zero + + +== How do I add a new GL account? +. Click on the 'Navigate Accounts' tab +. The default display will be to add a new account +. Enter the 'GL Account Id' for the new account + + (NOTE:This must be entered) +. Enter the 'GL Account Type' for the new account +. Enter the 'GL Account Class Id' for the new account +. Enter the 'GL Resource Type Id' for the new account +. Enter the 'Parent GL Account Id' if required +. Enter the 'Account Code' for the new account + + (NOTE: This should be the same as the GL Account Id) +. Enter the 'Account Name' for the new account +. Press the 'Add' button + + +== How do I update an existing GL account? +. Use the 'Navigate Accounts' window to find the account required +. Click on the Account Id and the details will be displayed in the lower part of the screen +. Update the details required +. Press the 'Update' button diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ViewFXConversions.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ViewFXConversions.adoc new file mode 100644 index 0000000..aac841d --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ViewFXConversions.adoc @@ -0,0 +1,44 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for View Foreign Exchange Rates +OFBiz currently allows you to input to 3 different rates for the same currency using the 'Purpose' field. +With this you can specify whether the conversion is to be used internally, externally or leave the field blank. +Also the start and end date for a conversion can be specified beforehand. + +== How do I add a new foreign exchange rate? +To add a new rate for US Dollars (USD) to Euro (EUR) + +* Using the drop down box on the 'From Currency' field, select 'American Dollar - USD' +* Using the drop down box on the 'To Currency' field, select 'Euro - EUR' +* The 'Purpose' field can be left blank or you can select 'Internal Conversion' or 'External Conversion' from the drop down list +* Enter the exchange rate in the 'Rate' field (eg 0.72883) +* Enter the 'From Date' (NOTE: If left blank then will default to the current date and time) +* Leave the 'Thru Date' blank +* Click the 'Update Foreign Currency Rates' button +* The new foreign exchange rate will be displayed + + +== How do I update an existing foreign exchange rate? +NOTE: Existing foreign exchange rates cannot be updated - instead the existing rate is expired and a new rate is created. + +Currently up to 3 different exchange rates can be created by using the 'Purpose' field to distinguish them. + +== How do I delete a foreign exchange rate? +Foreign exchange rates cannot be deleted. +Existing rates can be expired by entering a new exchange rate for the same currency and purpose. \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/acc-global-settings.adoc b/applications/accounting/src/docs/asciidoc/_include/acc-global-settings.adoc index a80895a..94ad837 100644 --- a/applications/accounting/src/docs/asciidoc/_include/acc-global-settings.adoc +++ b/applications/accounting/src/docs/asciidoc/_include/acc-global-settings.adoc @@ -17,47 +17,62 @@ specific language governing permissions and limitations under the License. //// = Global General Ledger Settings - -The Global General Ledger Settings are master templates that we can use to setup -up our chart of accounts, default transactions or other settings that can be applied + +The Global General Ledger Settings are master templates that we can use to setup +up our chart of accounts, default transactions or other settings that can be applied across many OFBiz modules. -We need settings at a global level because OFBiz is an integrated system so certain +We need settings at a global level because OFBiz is an integrated system so certain areas like accounting are linked to many other modules. It also makes sense to have a central place to setup things that will be used globally. At the time of writing, the following are available as part of the Global GL Settings: - * Chart of Accounts - a comprehensive master template for a complete chart of + * Chart of Accounts - a comprehensive master template for a complete chart of accounts. * Custom Time Periods - a master list to display or setup financial periods * Costs - a master list of any cost calculations to be used for assets or tasks - * Payment Method Type - a master list of the ways payments can be made (e.g. cash, + * Payment Method Type - a master list of the ways payments can be made (e.g. cash, credit card etc) and the default accounts to be used for each - * Invoice Item Type - a master list of all the transaction line types that can + * Invoice Item Type - a master list of all the transaction line types that can occur on any invoice and the default account to be used for each - * Rates - a list of rates (e.g. pay rates, overtime rates etc) that can be used + * Rates - a list of rates (e.g. pay rates, overtime rates etc) that can be used for billing work,tasks or as part of salary calculations - * Foreign Exchange Rates - a master list of exchange rates to be used and dates + * Foreign Exchange Rates - a master list of exchange rates to be used and dates they are valid * GL Account Category - currently this is set to be a list of cost centres * Cost Centers - a way to specify how to process percentage allocations between cost centres for specific accounts -== Master Template - Chart of Accounts +NOTE: Some of the configuration specified here can be over-ridden using the 'Organization GL Settings' tab -If you load the demo data, then by default over 450 accounts are included as part +== Master Template - Chart of Accounts +If you load the demo data, then by default over 450 accounts are included as part of the OFBiz global chart of accounts master template. -To setup a chart of accounts in OFBiz simply means that we need to select the +To setup a chart of accounts in OFBiz simply means that we need to select the accounts we want to use from the global chart of accounts master template. All general ledger accounts must exist in the global template before they can be assigned to be used at the organisation level (e.g. Company) -== Custom Time Periods +=== Help Find Global GL Account +The default screen for the Global GL Settings tab is 'List Accounts'. + +It is used to view or edit the details of the general ledger accounts in the global template and there are options to print +or export the account details. -Time periods are a defined period of time (usually a month, quarter or year) that +==== How do I view details for an account? +. Locate the account required +. Click on account id +. The account details will be displayed + +include::HELP_GlAccountNavigate.adoc[leveloffset=+2] + +include::HELP_AssignGlAccount.adoc[leveloffset=+2] + +== Custom Time Periods +Time periods are a defined period of time (usually a month, quarter or year) that is used to group business transactions. It is a key part of any general accounting setup. Time periods can be used for the definition of : @@ -67,10 +82,9 @@ setup. Time periods can be used for the definition of : * Sales Periods == Costs - -A business is designed to be profi table. This means that you need to be able to -track all the costs involved in your business to ensure that you are not losing -money. +A business is designed to be profi table. This means that you need to be able to +track all the costs involved in your business to ensure that you are not losing +money. Some example costs that you may want to setup and track are as follows: @@ -81,13 +95,12 @@ Some example costs that you may want to setup and track are as follows: * Quality Assurance or Regulatory Costs === Direct and Indirect Costs - -Costs can also be broken down into “Direct” and “Indirect” costs. +Costs can also be broken down into “Direct” and “Indirect” costs. Direct costs are costs that are easily identifiable as directly related to what -you do to produce and sell to your customers. +you do to produce and sell to your customers. Indirect costs are costs that cannot easily be directly linked to what you on sell - to your customers. Included in this would be rent, electricity or general + to your customers. Included in this would be rent, electricity or general administration costs. === Fixed and variable Costs @@ -95,14 +108,13 @@ Variable costs are those that rise and fall based on the amount product you prod or sell. If you sell or produce a lot of products it will cost more than if you produce a smaller amount. -Fixed costs are ones that remain the same no matter how much is being produced or +Fixed costs are ones that remain the same no matter how much is being produced or sold. -Before you can calculate costs you need to define a formula of how to do it and +Before you can calculate costs you need to define a formula of how to do it and in OFBiz this is called a “Cost Component Calculation”. == Payment Method Type - A “Payment Method” is simply a way to define the ways in which payments can be made. Examples include: @@ -114,14 +126,13 @@ Examples include: * Financial Account * Gift Certificate -Each payment method can be linked to a different General Ledger account in the -Chart of Accounts. By doing this OFBiz will be able to help us create an accounting -transaction based on how the payment wasmade. This is very useful if we want to +Each payment method can be linked to a different General Ledger account in the +Chart of Accounts. By doing this OFBiz will be able to help us create an accounting +transaction based on how the payment wasmade. This is very useful if we want to automate the creation of accounting transactions. == Invoice Item Types - -An “Invoice Item Type” is another way to describe the different type of individual +An “Invoice Item Type” is another way to describe the different type of individual line items that appear on an invoice. For example an invoice is usually made up of: * A header - which contains details of the supplier, customer, invoice date etc @@ -129,7 +140,7 @@ line items that appear on an invoice. For example an invoice is usually made up * A footer - which summarises the totals, taxes and discounts Invoice item types can refer to any of these three areas on an invoice. They can -also be broken down into specific categories that allow us to classify or report +also be broken down into specific categories that allow us to classify or report on the total or frequency of that type. Some examples of Invoice Item Types are: @@ -137,58 +148,56 @@ Some examples of Invoice Item Types are: * Type of Product (Standard, Digital, Service) * Shipping or Handling Charges * Promotions (Discounted Products, Free Products) - * Discounts (Product Discount, Invoice Discount, Early Payment) + * Discounts (Product Discount, Invoice Discount, Early Payment) * Returned Items (Faulty, Replacement) -OFBiz allows us to setup a code for each of the different line item types that can +OFBiz allows us to setup a code for each of the different line item types that can appear on an invoice. We can then link each item type to a specific General Ledger account. By doing this OFBiz will be able to help us create an accounting transactions -based on the item types that appear on the invoice. +based on the item types that appear on the invoice. This is very useful if we want to automate the creation of accounting transactions. == Rates - -Rates are used to create a “pay rate” or “charge amount” that can be used in the +Rates are used to create a “pay rate” or “charge amount” that can be used in the calculation of a task, employee salary or a service that involves people. Rates are closely linked to the OFBiz Human Resources Manager application but are -also used across multiple OFBiz applications (Manufacturing, Asset Maintenance, +also used across multiple OFBiz applications (Manufacturing, Asset Maintenance, Project Tasks, Timesheet Entry etc) where person related work tasks are required. == Foreign Exchange Rates - Foreign exchange rates are used to convert from one currency to another. A business -will usually want to work in one main currency (e.g. GBP) but will allow transactions -in other currencies (e.g. EUR, USD). These currencies will need to be converted -to the main currency in order to generate financial reports (e.g. Balance Sheet +will usually want to work in one main currency (e.g. GBP) but will allow transactions +in other currencies (e.g. EUR, USD). These currencies will need to be converted +to the main currency in order to generate financial reports (e.g. Balance Sheet or Income Statement) and most importantly to adhere to Tax Authority regulations. -== GL Account Category +include::HELP_ViewFXConversions.adoc[leveloffset=+2] -A “General Ledger Account Category” (or GL Account Category) is a generic term to -describe the way you can segment or classify accounts. Categories can be setup and +== GL Account Category +A “General Ledger Account Category” (or GL Account Category) is a generic term to +describe the way you can segment or classify accounts. Categories can be setup and then linked to the required accounts. -Another way to think about it is that it is like adding an extra tag to an account -so that you can easily retrieve that account to do any additional reporting or +Another way to think about it is that it is like adding an extra tag to an account +so that you can easily retrieve that account to do any additional reporting or processing. -In OFBiz at the time of writing, the GL Account Category has been used to implement +In OFBiz at the time of writing, the GL Account Category has been used to implement cost centre functionality for the Chart of Accounts. == Cost Centers - A cost centre is an area or part of an organisation where costs (direct or indirect) can be allocated . -By default OFBiz will allocate and post 100% of any accounting value to the -specified General Ledger account. Setting up Cost Centres allows you to split the +By default OFBiz will allocate and post 100% of any accounting value to the +specified General Ledger account. Setting up Cost Centres allows you to split the amount across different areas using a percentage calculation. -For example: You want to buy something that and three departments will +For example: You want to buy something that and three departments will contribute to buying it. If the product costs $90 then each department will pay $30 towards the cost. -OFBiz will allow you to setup the percentage that each cost centre will contribute +OFBiz will allow you to setup the percentage that each cost centre will contribute so that you can view and track how much each department has contributed or spent. |
|
|
In reply to this post by mbrohl
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit 47353fcdcb33fcbf9e2686a6802e39ff73ee6225 Author: holivier <[hidden email]> AuthorDate: Fri Feb 7 12:11:25 2020 +0100 Documented: Invoice Docbook files migration to asciidoc format (OFBIZ-10292) All the help files associated to it are called via include in the main document --- .../data/helpdata/HELP_ACCOUNTING_editInvoice.xml | 34 ----- .../HELP_ACCOUNTING_editInvoiceApplications.xml | 142 --------------------- .../HELP_ACCOUNTING_editInvoiceTimeEntries.xml | 43 ------- .../data/helpdata/HELP_ACCOUNTING_findInvoices.xml | 74 ----------- .../helpdata/HELP_ACCOUNTING_invoiceOverview.xml | 40 ------ .../data/helpdata/HELP_ACCOUNTING_invoiceRoles.xml | 53 -------- .../data/helpdata/HELP_ACCOUNTING_invoices.xml | 63 --------- .../helpdata/HELP_ACCOUNTING_listInvoiceItems.xml | 65 ---------- .../data/helpdata/HELP_ACCOUNTING_newInvoice.xml | 64 ---------- .../data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml | 44 ------- .../HELP_editInvoice.adoc} | 22 +--- .../_include/HELP_editInvoiceApplications.adoc | 85 ++++++++++++ .../HELP_editInvoiceTimeEntries.adoc} | 24 ++-- .../docs/asciidoc/_include/HELP_findInvoices.adoc | 50 ++++++++ .../asciidoc/_include/HELP_invoiceOverview.adoc | 36 ++++++ .../docs/asciidoc/_include/HELP_invoiceRoles.adoc | 55 ++++++++ .../asciidoc/_include/HELP_listInvoiceItems.adoc | 69 ++++++++++ .../docs/asciidoc/_include/HELP_newInvoice.adoc | 42 ++++++ .../docs/asciidoc/_include/HELP_sendPerEmail.adoc | 34 +++++ .../src/docs/asciidoc/_include/acc-invoices.adoc | 67 ++++++++++ .../accounting/src/docs/asciidoc/accounting.adoc | 2 + 21 files changed, 459 insertions(+), 649 deletions(-) diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoice.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoice.xml deleted file mode 100644 index e019cd5..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoice.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Invoice Header screen.</title> - <para>The Invoice Header screen is used to view or update details from - the invoice header. Examples of the type of information that can be - changed are Due Date, Description, Currency.</para> - <section> - <title>How do I update the header details for an Invoice?</title> - <orderedlist> - <listitem><para>Select the 'Header' sub menu and the header details of the - invoice will be displayed</para></listitem> - <listitem><para>Update the fields required</para></listitem> - <listitem><para> Press the 'Update' button</para></listitem> - </orderedlist> - </section> -</section> - diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceApplications.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceApplications.xml deleted file mode 100644 index 52520ab..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceApplications.xml +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Invoice Applications screen.</title> - <para>The Invoice Applications sub menu is where payments that have been made (or received) can - be linked or allocated to an invoice. The phrase 'applying' an amount to an invoice is often - used to describe this. The screen is divided into 3 main areas as follows.</para> - <itemizedlist> - <listitem> - <para>Payments Applied (which shows details of the total amount 'Applied' and the total - amount 'Open'. Note that 'Open' here means outstanding)</para> - </listitem> - <listitem> - <para>Possible Payments to Apply (which shows all the payments that have been sent from - the same party id as the invoice - for a sales invoice this would be the customer - party id)</para> - </listitem> - <listitem> - <para>Assign Payment to Invoice (which allows you to manually assign a specific payment - id to this invoice)</para> - </listitem> - </itemizedlist> - <para>GENERAL NOTE: General Ledger accounting transactions are generated during the payment - application process but unless your GL is setup with Unapplied Cash and Applied Cash - accounts - I'm not sure that there will be any true accounting impact. In the Sales Order - process the accounting transaction generated the following GL Accounting transaction is - generated for 'Payment Applied' o add some text here.</para> - <para>DR 120000 Accounts Receivable / CR 120000 Accounts Receivable - This transaction doesnt - really do anything! </para> - <para>It is used to link payments to invoices. It is also used to allocate which part of a - payment is allocated or applied to a specific invoice. This is extremely useful if your - customers pay multiple invoices with a single payment.</para> - <para>Example:</para> - <para> - <itemizedlist> - <listitem> - <para>A customer could send a single payment of $1000 that can be used to pay for - two invoices (eg $400 and $600)</para> - </listitem> - <listitem> - <para>Using this applications sub menu allows you to allocate part of the $400 to - one invoice and the balance ($600) to the other invoice </para> - </listitem> - </itemizedlist> - </para> - <para>By default all 'unapplied' payments that have been entered into OFBiz from the customer - will be available for selection even if they have not yet been flagged as formally - 'Received'. This means that these are payments that have not already been linked to another - invoice. If only part of a payment amount has been linked to an invoice then the remaining - amount is left available to be allocated to another invoice. Also note that a single invoice - could be paid by multiple payments being applied to it.</para> - <section> - <title>How do I apply a payment (or payments) to an invoice?</title> - <orderedlist> - <listitem> - <para>Select the 'Applications' sub menu for the invoice</para> - </listitem> - <listitem> - <para>A list of unapplied payments for the party id will be displayed </para> - </listitem> - <listitem> - <para>Press the 'Apply' button next to the entry that needs to be applied to the - invoice (NOTE: More than one entry may be used. Also only part of a larger - amount may be used)The Payments Applied total at the top of the screen will be - updated with the amount selected. Also the Amount Open will be reduced by the - amount selected.</para> - </listitem> - <listitem> - <para> Once the total invoice amount has been selected a message will be displayed - and only the first part of the screen will be displayed </para> - </listitem> - <listitem> - <para>The top part of the screen will now be updated to show the 'Payments Applied' - total is equal to the invoice total and the 'Amount Open' is zero. </para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I update an applied payment for an invoice?</title> - <orderedlist> - <listitem> - <para>Payments that have been applied to an invoice can be updated. This means that - you can change the details of the payment transaction or adjust the amount that - was applied to the invoice.</para> - </listitem> - <listitem> - <para>Select the 'Applications' sub menu for the invoice</para> - </listitem> - <listitem> - <para>A list of payments already applied to the invoice will be displayed in the top - part of the screen</para> - </listitem> - <listitem> - <para>Enter or use the lookup to change the 'Payment Id' if required </para> - </listitem> - <listitem> - <para>Enter the updated amount in the 'Amount to Apply' field if required</para> - </listitem> - <listitem> - <para>Press the 'Update' button</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I remove an applied payment (or payments) from an invoice?</title> - <para>NOTE TO CHECK: It can be done before transaction has been posted to GL but also need - to check if its can be done if the transaction has been posted. </para> - <orderedlist> - <listitem> - <para>Select the 'Applications' sub menu for the invoice</para> - </listitem> - <listitem> - <para>A list of payments already applied to the invoice will be displayed in the top - part of the screen</para> - </listitem> - <listitem> - <para>Press the 'Remove' button next to the payment entry that needs to be - removed</para> - </listitem> - <listitem> - <para>The entry will be removed and the top part of the screen will be update the - 'Payments Applied' total and 'Amount Open'</para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceTimeEntries.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceTimeEntries.xml deleted file mode 100644 index fec7258..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_editInvoiceTimeEntries.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Invoice Time Entries screen.</title> - <para>he Time Entries screen displays any time logged against the - invoice. For example these time entries can be from employee or - external supplier timesheets that are tracked within OFBiz. is used to - track any individual work or billable hours against an invoice.</para> - <section> - <title>How do I add a new time entry for an invoice?</title> - <para>Threre are two options</para> - <orderedlist> - <listitem><para>Add time entry to a new invoice and add time entry - to an existing invoice.</para></listitem> - <listitem><para>Timesheet entries can be added to an existing invoice from - Workeffort Manager.</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I update a time entry for an invoice?</title> - <para>NOTE: To check if this can only be done via timesheets.</para> - </section> - <section> - <title>How do I remove a time entry from an invoice?</title> - <para>NOTE: To check if this is done via timesheets </para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_findInvoices.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_findInvoices.xml deleted file mode 100644 index ced94c9..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_findInvoices.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Find Invoices screen.</title> - <para>The default screen is for the Invoices tab is 'Find Invoices'. It - is used to locate existing invoices that have been created - automatically by the system or manually by the user. It can also be - used to create a new Sales or Purchase Invoice. </para> - <section> - <title>How do I view all invoices?</title> - <orderedlist> - <listitem><para>Press the 'Search' button to view all invoices</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I locate an existing invoice?</title> - <orderedlist> - <listitem><para>Enter the 'Invoice ID' if known</para></listitem> - <listitem><para>Enter a word from the invoice description in the 'Description' - field if known</para></listitem> - <listitem><para>Enter the 'Invoice Type' if known</para></listitem> - <listitem><para>Enter the 'From Party Id' if known (NOTE: In most cases for a - Sales Invoices this will be Company. For Purchase Invoice it will be - the supplier party id)</para></listitem> - <listitem><para>Enter the 'Billing Account Id' if known</para></listitem> - <listitem><para>Enter the invoice status in the 'Status Id' field if known - </para></listitem> - <listitem><para>Enter the 'To Party Id' if known (NOTE: In most cases for a - Purchase Invoice this will be company. For Sales Invoices it will be - the customer party id)</para></listitem> - <listitem><para>Press the 'Search' button to view all invoices</para></listitem> - <listitem><para>All invoices that meet the search criteria will be displayed. - </para></listitem> - </orderedlist> - </section> - <section> - <title>How do I update an invoice?</title> - <orderedlist> - <listitem><para>Locate the invoice using the 'Find Invoices' screen</para></listitem> - <listitem><para>Using the relevant sub menu make the required changes.</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I delete an invoice?</title> - <para>Invoices cannot be deleted through the user interface. They can - only be cancelled (eg if they have been entered or created by - mistake).</para> - - <para>NOTE: They can probably be deleted using Entity Data Maintenance - in the Webtools menu but this is not recommended for 2 reasons: - </para> - <orderedlist> - <listitem><para>It may cause data integrity problems.</para></listitem> - <listitem><para>In case of audit it would be a problem. - </para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceOverview.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceOverview.xml deleted file mode 100644 index 74fed52..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceOverview.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Invoice Overview screen.</title> - <para>The Invoice Overview screen is used to display the summary of an invoice in a single view. The screen is divided into sections that show various information related to the invoice (eg Roles, Status, Terms, Items, Payments Applied, etc).</para> - <para>The following options are currently available from this screen:</para> - <itemizedlist> - <listitem><para>Create New (Create a new invoice)</para></listitem> - <listitem><para>Copy (Create a copy of the current invoice)</para></listitem> - <listitem><para>PDF (View a PDF of the current invoice)</para></listitem> - <listitem><para>PDF default currency (NOTE TO CHECK: Need to see how this is different from just the PDF view......)</para></listitem> - <listitem><para>Status to 'Approved' (Change the status of the current invoice to 'Approved)</para></listitem> - <listitem><para>Status to 'Sent' (Change the status of the current invoice to 'Sent')</para></listitem> - <listitem><para>Status to 'Ready' (Change the status of the current invoice to 'Ready'. NOTE: This will create the relevant accounting transactions and post them to the general ledger)</para></listitem> - <listitem><para>Status to 'Cancelled' (Change the status of the current invoice to 'Cancelled')</para></listitem> - <listitem><para>Save as Template (NOTE TO CHECK: Save the current invoice format as a template)</para></listitem> - </itemizedlist> -</section> - diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceRoles.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceRoles.xml deleted file mode 100644 index 5bce782..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoiceRoles.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Invoice Roles screen.</title> - <para>The Invoice Roles screen allows parties with specific roles to be associated with and invoice. If the e-commerce or Sales Order entry route has already been used then the invoice generated will already contain the relevant roles from the various parties.</para> - <para>For a Sales Order examples of roles will include Bill From Customer, Bill To Customer, End User Customer,Ship To Customer etc.</para> - <section> - <title>How do I add a party role to an invoice?</title> - <para>Party roles will automatically be added to an invoices that have been generated as a result of E-Commerce order entry or Sales Order entry. They can also be added be added manually.</para> - <orderedlist> - <listitem><para>Select the 'Roles' sub menu</para></listitem> - <listitem><para>Enter or use the lookup to enter the party to be added to the invoice in the 'Party Id' field</para></listitem> - <listitem><para>Use the drop down box to select the 'Role Type Id' </para></listitem> - <listitem><para>Leave the 'Date Time Performed' field blank (NOTE: This field is optional and can be entered if required. This field can be used to indicate the date and time this role was performed by the party for this invoice)</para></listitem> - <listitem><para>Leave the 'Percentage' field blank (NOTE: This field is optional and can be entered if required. If roles are shared then this field can be used to indicate the assigned percentage for this role) </para></listitem> - <listitem><para>Press the 'Submit' button</para></listitem> - <listitem><para>The new role entry will be displayed on the bottom part of the screen</para></listitem> - <listitem><para>NOTE: If you select a role that is not associated with the party that has been entered an error message will be displayed. To fix it you will need to add the role to the party or choose another party that already has that role associated with it.</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I update a party role on an invoice?</title> - <para>A party role cannot be updated via the current user interface. It can only be removed. If a party role needs to be updated then the entry must be deleted and then re-created. </para> - </section> - <section> - <title>How do I remove a party role from an invoice?</title> - <orderedlist> - <listitem><para>Locate the entry that needs to be removed</para></listitem> - <listitem><para>Press the 'Remove' button next to the entry that needs to be deleted</para></listitem> - <listitem><para>The entry is now removed from the list of invoice roles </para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoices.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoices.xml deleted file mode 100644 index 0083bb7..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_invoices.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>Invoices.</title> - <para> - Sales invoices are generated when customers buy something from your - business. - You will need to provide a detailed list of the items bought and relevant - taxes paid. They are often referred to a 'tax invoices' as they - contain - information relating to the amount of sales tax (eg VAT / GST) - charged on the product or service. - </para> - <para> Purchase invoices are generated by your suppliers when you - order something from them. You may send them an order in the form of - a Purchase Order. They will then send you the products and an invoice - for payment. This invoice is the Purchase Invoice and it will contain - details of the items bought plus any taxes.</para> - <para> Both of these documents are used as proof to various tax - authorities (eg Inland Revenue, Customs etc) that the required tax - has been charged or collected.</para> - <para> - GENERAL NOTE: The following is an extract from Ian McNulty's - documentation work on accounting:</para> - <para>Invoices are created automatically by the system when - certain criteria are met for each item on an order. The criteria - will vary depending on the type of product associated with the - order item, and the type of order (ie purchase/sales).</para> - <para>For Sales Orders that include digital goods, an invoice - will be created when the order is placed, and that invoice will be - for all digital goods in the order. If there are non-digital or - physical goods they will go in a separate invoice.</para> - <para>For Sales Orders that need physical fulfillment, an - invoice will be created for all items in a shipment when the - shipment goes into the 'Packed' status.</para> - <para>For Purchase Orders an invoice will be created from a - shipment when the shipment goes into the Received status.</para> - <xi:include href="HELP_ACCOUNTING_findInvoices.xml" /> - <xi:include href="HELP_ACCOUNTING_invoiceOverview.xml" /> - <xi:include href="HELP_ACCOUNTING_editInvoice.xml" /> - <xi:include href="HELP_ACCOUNTING_newInvoice.xml" /> - <xi:include href="HELP_ACCOUNTING_editInvoiceApplications.xml" /> - <xi:include href="HELP_ACCOUNTING_listInvoiceItems.xml" /> - <xi:include href="HELP_ACCOUNTING_editInvoiceTimeEntries.xml" /> - <xi:include href="HELP_ACCOUNTING_sendPerEmail.xml" /> - <xi:include href="HELP_ACCOUNTING_invoiceRoles.xml" /> - </section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_listInvoiceItems.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_listInvoiceItems.xml deleted file mode 100644 index eab91d1..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_listInvoiceItems.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Invoice Items screen.</title> - <para>The Invoice Items screen displays the individual invoice line details and allows the user to update or remove an entry. As each invoice line is created it is allocated a specific sequence (or Item Number) which acts as a unique identifier.</para> - <section> - <title>How do I create a new invoice line item?</title> - <para>Note that only invoices that have specific statuses can have new line items created. This means that if an invoice has already been paid and processed OFBiz will not allow any amendments to it.</para> - <orderedlist> - <listitem><para>Select the 'Items' sub menu for the invoice</para></listitem> - <listitem><para>The 'Add a new invoice item' screen will be displayed</para></listitem> - <listitem><para>Leave the 'Item No' field blank (as it will be automatically generated)</para></listitem> - <listitem><para>Select the 'Invoice Item Type' from the drop down box (NOTE: A typical line using the demo could be 'Invoice Finished Good Item' but ensure that it corresponds with the type of products setup in your catalog)</para></listitem> - <listitem><para>Enter a description describing what the line item is (NOTE: If you are going to enter a product in the Product Id field from the catalog then leave the 'Description' field blank as it will be used to show the product description)</para></listitem> - <listitem><para>Leave the 'Override GL Account Id' field blank as it will use the default account based on the Chart of Accounts setup</para></listitem> - <listitem><para>Use the lookup or enter a product code in the 'Product Id' field (NOTE: This can be left blank if your invoice line is not related to a product in the catalog)</para></listitem> - <listitem><para>Enter a number in the 'Quantity' field</para></listitem> - <listitem><para>Enter a 'Unit Price' only if the Product Id field is blank (NOTE: If a Product Id has been entered then leave the 'Unit Price' field blank as it will pick up the product price from the catalog)</para></listitem> - <listitem><para>Leave the 'Inventory Item' field blank</para></listitem> - <listitem><para>Leave the 'Product Feature Id' field blank</para></listitem> - <listitem><para>Leave the 'UOM' field blank</para></listitem> - <listitem><para>Select 'Yes' for the 'Taxable Flag' field</para></listitem> - </orderedlist> - <para>NOTE TO CHECK: Need to do some tests to see what line item type needs to be used for 'Sales Tax'. I think that it could be 'Invoice Item Sales Tax' since tax is currently calculated at invoice item line level. Also the automatically generated invoices from Order Entry and E-Commerce show taxes at the invoice item line level (think there may be some work going on - see JIRA on to consolidate entries). Need to do some tests using 'Invoice Sales Tax' to see how it works....... [...] - </section> - <section> - <title>How do I update an invoice line item?</title> - <para>Not all the fields on the invoice item line can be updated. For example Taxable Flag and Inventory Item cannot be updated. If these fields need to be amended then the invoice item will need to be removed and then re-created.</para> - <orderedlist> - <listitem><para>Select the 'Items' sub menu for the invoice</para></listitem> - <listitem><para>Any existing line items will be displayed in the 'Items' box</para></listitem> - <listitem><para>Amend the details in the line item that needs to be updated (eg Quantity, Invoice Item Type, Product Id, Description, Override GL Account, Unit Price)</para></listitem> - <listitem><para>Press the 'Update' button displayed at the end of the line item that has been updated </para></listitem> - </orderedlist> - </section> - <section> - <title>How do I delete an invoice item?</title> - <orderedlist> - <listitem><para>Select the 'Items' sub menu for the invoice</para></listitem> - <listitem><para>Any existing line items will be displayed in the 'Items' box</para></listitem> - <listitem><para>Press the 'Remove' button displayed at the end of the line item that needs to be deleted</para></listitem> - </orderedlist> - </section> - -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_newInvoice.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_newInvoice.xml deleted file mode 100644 index a56bb98..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_newInvoice.xml +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The New Invoice screen.</title> - <para>This screen allows the user to create a new Sales or Purchase - Invoice. Sales Invoices are created when a customer buys something - from you. Purchase Invoices are created when you buy something from a - supplier.</para> - <section> - <title>How do I create a new Sales invoice?</title> - <orderedlist> - <listitem><para>Press the 'Create New' button</para></listitem> - <listitem><para>The New Sales Invoice / New Purchase Invoice screen is - displayed></para></listitem> - <listitem><para>Using the top part of the screen, leave Invoice type with its - default of 'Sales Invoice'</para></listitem> - <listitem><para>Leave 'Organization Party Id' with its default of 'Company' - </para></listitem> - <listitem><para>Enter or use the lookup to find the 'To Party Id' (eg - DemoCustomer)</para></listitem> - <listitem><para>Press the 'Create' button in the top part of the screen</para></listitem> - <listitem><para>The invoice header has been created and the default header - screen will be displayed</para></listitem> - <listitem><para>Details on the invoice will need to be entered via the other sub - menus (eg Items, Time Entries etc) </para></listitem> - </orderedlist> - </section> - <section> - <title>How do I create a new Purchase invoice?</title> - <orderedlist> - <listitem><para>Press the 'Create New' button</para></listitem> - <listitem><para>The New Sales Invoice / New Purchase Invoice screen is - displayed></para></listitem> - <listitem><para>Using the bottom part of the screen, leave Invoice type with its - default of 'Purchase Invoice'</para></listitem> - <listitem><para>Leave 'Organization Party Id' with its default of 'Company' - </para></listitem> - <listitem><para>Enter or use the lookup to find the 'From Party Id' (eg - DemoSupplier)</para></listitem> - <listitem><para>Press the 'Create' button in the bottom part of the screen - </para></listitem> - <listitem><para>The invoice header has been created and the default header - screen will be displayed</para></listitem> - <listitem><para>Details on the invoice will need to be entered via the other sub - menus (eg Items, Time Entries etc) </para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml deleted file mode 100644 index 448127a..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_sendPerEmail.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Send Per Email screen.</title> - <para>This is used to send a copy of the invoice details to one or more - email addresses. The invoice is included as an attachment and the user - can add a simple accompanying email message.</para> - <section> - <title>How do I send a copy of an invoice via email?</title> - <orderedlist> - <listitem><para>Select the 'Send per Email' sub menu</para></listitem> - <listitem><para>The 'Send per Email' default screen will be displayed</para></listitem> - <listitem><para>Enter the 'From Email Address' (NOTE TO CHECK: Shouldnt this be - defaulted from the user login.....????)</para></listitem> - <listitem><para>Leave the 'To Email Address' as it is as this will be defaulted - using the customer details from the invoice</para></listitem> - <listitem><para>If required enter the 'Copy Email address' for anyone that needs - to be copied on the email</para></listitem> - <listitem><para>Leave the 'Subject' as the default of 'Please find attached - invoice'</para></listitem> - <listitem><para>Leave the 'Other Currency' box blank (NOTE TO CHECK: Investigate - what effect this has on the email.....)</para></listitem> - <listitem><para>Enter a short email message in the 'Email Body' </para></listitem> - <listitem><para>Press the 'Submit' button </para></listitem> - </orderedlist> - </section> -</section> - diff --git a/applications/accounting/src/docs/asciidoc/accounting.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_editInvoice.adoc similarity index 52% copy from applications/accounting/src/docs/asciidoc/accounting.adoc copy to applications/accounting/src/docs/asciidoc/_include/HELP_editInvoice.adoc index 526f29c..3167f97 100644 --- a/applications/accounting/src/docs/asciidoc/accounting.adoc +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_editInvoice.adoc @@ -16,20 +16,12 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. //// -= Accounting += Help for Edit Invoice Header +The Invoice Header screen is used to view or update details from the invoice header. -The OFBiz accounting system is a core application component and has most of the -modern features you would expect in a general purpose double-entry accounting -system. However, OFBiz goes beyond that by and seamlessly integrates with other -OFBiz applications such as Inventory, Purchasing and Manufacturing to give your -business a complete ERP solution. This makes the system as a whole robust and -integrated to provide more value than a plain accounting system. +Examples of the type of information that can be changed are Due Date, Description, Currency. - -include::_include/acc-intro.adoc[leveloffset=+1] - -include::_include/acc-agreements.adoc[leveloffset=+1] - -include::_include/acc-financial-accounts.adoc[leveloffset=+1] - -include::_include/acc-global-settings.adoc[leveloffset=+1] +== How do I update the header details for an Invoice? +. Select the 'Header' sub menu and the header details of the invoice will be displayed +. Update the fields required +. Press the 'Update' button diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_editInvoiceApplications.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_editInvoiceApplications.adoc new file mode 100644 index 0000000..e3713d3 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_editInvoiceApplications.adoc @@ -0,0 +1,85 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Edit Invoice Applications +The Invoice Applications sub menu is where payments that have been made (or received) can be linked or allocated to an invoice. + +The phrase 'applying' an amount to an invoice is often used to describe this. + +The screen is divided into 3 main areas as follows. + +* Payments Applied (which shows details of the total amount 'Applied' and the total amount 'Open'. + + Note that 'Open' here means outstanding) +* Possible Payments to Apply (which shows all the payments that have been sent from the same party id as the invoice, + for a sales invoice this would be the customer party id) +* Assign Payment to Invoice (which allows you to manually assign a specific payment id to this invoice) + +NOTE: General Ledger accounting transactions are generated during the payment application process but unless your GL is setup + with Unapplied Cash and Applied Cash accounts + + - I'm not sure that there will be any true accounting impact. + + In the Sales Order process the accounting transaction generated the following GL Accounting transaction is generated + for 'Payment Applied' o add some text here. + +DR 120000 Accounts Receivable / CR 120000 Accounts Receivable - This transaction doesnt really do anything! + +It is used to link payments to invoices. +It is also used to allocate which part of a payment is allocated or applied to a specific invoice. +This is extremely useful if your customers pay multiple invoices with a single payment. + +Example: + +* A customer could send a single payment of $1000 that can be used to pay for two invoices (eg $400 and $600) +* Using this applications sub menu allows you to allocate part of the $400 to one invoice and the balance ($600) to the other + invoice + +By default all 'unapplied' payments that have been entered into OFBiz from the customer will be available for selection even +if they have not yet been flagged as formally 'Received'. This means that these are payments that have not already been linked +to another invoice. + +If only part of a payment amount has been linked to an invoice then the remaining amount is left available to be allocated +to another invoice. + +Also note that a single invoice could be paid by multiple payments being applied to it. + +== How do I apply a payment (or payments) to an invoice? +. Select the 'Applications' sub menu for the invoice +. A list of unapplied payments for the party id will be displayed +. Press the 'Apply' button next to the entry that needs to be applied to the invoice + + (NOTE: More than one entry may be used. Also only part of a larger amount may be used) + + The Payments Applied total at the top of the screen will be updated with + the amount selected. Also the Amount Open will be reduced by the amount selected. +. Once the total invoice amount has been selected a message will be displayed and only the first part of the screen will be + displayed +. The top part of the screen will now be updated to show the 'Payments Applied' total is equal to the invoice total and + the 'Amount Open' is zero. + +== How do I update an applied payment for an invoice? +. Payments that have been applied to an invoice can be updated. This means that you can change the details of the payment + transaction or adjust the amount that was applied to the invoice. +. Select the 'Applications' sub menu for the invoice +. A list of payments already applied to the invoice will be displayed in the top part of the screen +. Enter or use the lookup to change the 'Payment Id' if required +. Enter the updated amount in the 'Amount to Apply' field if required +. Press the 'Update' button + +== How do I remove an applied payment (or payments) from an invoice? +WARNING: TO CHECK: It can be done before transaction has been posted to GL but also need to check if its can be done if + the transaction has been posted. + +. Select the 'Applications' sub menu for the invoice +. A list of payments already applied to the invoice will be displayed in the top part of the screen +. Press the 'Remove' button next to the payment entry that needs to be removed +. The entry will be removed and the top part of the screen will be update the 'Payments Applied' total and 'Amount Open' diff --git a/applications/accounting/src/docs/asciidoc/accounting.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_editInvoiceTimeEntries.adoc similarity index 51% copy from applications/accounting/src/docs/asciidoc/accounting.adoc copy to applications/accounting/src/docs/asciidoc/_include/HELP_editInvoiceTimeEntries.adoc index 526f29c..7ee96a6 100644 --- a/applications/accounting/src/docs/asciidoc/accounting.adoc +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_editInvoiceTimeEntries.adoc @@ -16,20 +16,20 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. //// -= Accounting += Help for Edit Invoice Time Entries +he Time Entries screen displays any time logged against the invoice. +For example these time entries can be from employee or external supplier timesheets that are tracked within OFBiz. +It is used to track any individual work or billable hours against an invoice. -The OFBiz accounting system is a core application component and has most of the -modern features you would expect in a general purpose double-entry accounting -system. However, OFBiz goes beyond that by and seamlessly integrates with other -OFBiz applications such as Inventory, Purchasing and Manufacturing to give your -business a complete ERP solution. This makes the system as a whole robust and -integrated to provide more value than a plain accounting system. +== How do I add a new time entry for an invoice? +Threre are two options +. Add time entry to a new invoice and add time entry to an existing invoice. +. Timesheet entries can be added to an existing invoice from Workeffort Manager. -include::_include/acc-intro.adoc[leveloffset=+1] +== How do I update a time entry for an invoice? +WARNING: To CHECK if this can only be done via timesheets. -include::_include/acc-agreements.adoc[leveloffset=+1] +== How do I remove a time entry from an invoice? -include::_include/acc-financial-accounts.adoc[leveloffset=+1] - -include::_include/acc-global-settings.adoc[leveloffset=+1] +WARNING: TO CHECK if this is done via timesheets \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_findInvoices.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_findInvoices.adoc new file mode 100644 index 0000000..e9b76ca --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_findInvoices.adoc @@ -0,0 +1,50 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Find Invoices +The default screen is for the Invoices tab is 'Find Invoices'. It is used to locate existing invoices that have been created +automatically by the system or manually by the user. +It can also be used to create a new Sales or Purchase Invoice. + +== How do I view all invoices? +. Press the 'Search' button to view all invoices + +== How do I locate an existing invoice? +. Enter the 'Invoice ID' if known +. Enter a word from the invoice description in the 'Description' field if known +. Enter the 'Invoice Type' if known +. Enter the 'From Party Id' if known + + (NOTE: In most cases for a Sales Invoices this will be Company. For Purchase Invoice it will be the supplier party id) +. Enter the 'Billing Account Id' if known +. Enter the invoice status in the 'Status Id' field if known +. Enter the 'To Party Id' if known + + (NOTE: In most cases for a Purchase Invoice this will be company. For Sales Invoices it will be the customer party id) +. Press the 'Search' button to view all invoices +. All invoices that meet the search criteria will be displayed. + +== How do I update an invoice? +. Locate the invoice using the 'Find Invoices' screen +. Using the relevant sub menu make the required changes. + +== How do I delete an invoice? +Invoices cannot be deleted through the user interface. +They can only be cancelled (eg if they have been entered or created by mistake). + +NOTE: They can probably be deleted using Entity Data Maintenance in the Webtools menu but this is not recommended for 2 reasons: + + 1) It may cause data integrity problems. + + 2) In case of audit it would be a problem. diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_invoiceOverview.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_invoiceOverview.adoc new file mode 100644 index 0000000..2c9b28c --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_invoiceOverview.adoc @@ -0,0 +1,36 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Invoice Overview +The Invoice Overview screen is used to display the summary of an invoice in a single view. +The screen is divided into sections that show various information related to the invoice (eg Roles, Status, Terms, Items, Payments Applied, etc). + +The following options are currently available from this screen: + +* Create New (Create a new invoice) +* Copy (Create a copy of the current invoice) +* PDF (View a PDF of the current invoice) +* PDF default currency + + (NOTE TO CHECK: Need to see how this is different from just the PDF view......) +* Status to 'Approved' (Change the status of the current invoice to 'Approved) +* Status to 'Sent' (Change the status of the current invoice to 'Sent') +* Status to 'Ready' (Change the status of the current invoice to 'Ready'. + + NOTE: This will create the relevant accounting transactions and post them to the general ledger) +* Status to 'Cancelled' (Change the status of the current invoice to 'Cancelled') +* Save as Template + + (NOTE TO CHECK: Save the current invoice format as a template) diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_invoiceRoles.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_invoiceRoles.adoc new file mode 100644 index 0000000..c5ad14f --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_invoiceRoles.adoc @@ -0,0 +1,55 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Invoice Roles +The Invoice Roles screen allows parties with specific roles to be associated with and invoice. +If the e-commerce or Sales Order entry route has already been used then the invoice generated will already contain the relevant +roles from the various parties. + +For a Sales Order examples of roles will include Bill From Customer, Bill To Customer, End User Customer,Ship To Customer etc. + +== How do I add a party role to an invoice? +Party roles will automatically be added to an invoices that have been generated as a result of E-Commerce order entry or +Sales Order entry. + +They can also be added be added manually. + +. Select the 'Roles' sub menu +. Enter or use the lookup to enter the party to be added to the invoice in the 'Party Id' field +. Use the drop down box to select the 'Role Type Id' +. Leave the 'Date Time Performed' field blank + + (NOTE: This field is optional and can be entered if required. This field can be used to indicate the date and time this role + was performed by the party for this invoice) +. Leave the 'Percentage' field blank + + (NOTE: This field is optional and can be entered if required. If roles are shared then this field can be used to indicate + the assigned percentage for this role) +. Press the 'Submit' button + +The new role entry will be displayed on the bottom part of the screen + +NOTE: If you select a role that is not associated with the party that has been entered an error message will be displayed. + To fix it you will need to add the role to the party or choose another party that already has that role associated with it. + +== How do I update a party role on an invoice? +A party role cannot be updated via the current user interface. +It can only be removed. +If a party role needs to be updated then the entry must be deleted and then re-created. + +== How do I remove a party role from an invoice? +. Locate the entry that needs to be removed +. Press the 'Remove' button next to the entry that needs to be deleted +. The entry is now removed from the list of invoice roles diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_listInvoiceItems.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_listInvoiceItems.adoc new file mode 100644 index 0000000..992f6f6 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_listInvoiceItems.adoc @@ -0,0 +1,69 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Edit Invoice Items +The Invoice Items screen displays the individual invoice line details and allows the user to update or remove an entry. +As each invoice line is created it is allocated a specific sequence (or Item Number) which acts as a unique identifier. + +== How do I create a new invoice line item? +Note that only invoices that have specific statuses can have new line items created. +This means that if an invoice has already been paid and processed OFBiz will not allow any amendments to it. + +. Select the 'Items' sub menu for the invoice +. The 'Add a new invoice item' screen will be displayed +. Leave the 'Item No' field blank (as it will be automatically generated) +. Select the 'Invoice Item Type' from the drop down box + + (NOTE: A typical line using the demo could be 'Invoice Finished Good Item' but ensure that it corresponds with + the type of products setup in your catalog) +. Enter a description describing what the line item is + + (NOTE: If you are going to enter a product in the Product Id field from the catalog then leave the 'Description' field + blank as it will be used to show the product description) +. Leave the 'Override GL Account Id' field blank as it will use the default account based on the Chart of Accounts setup +. Use the lookup or enter a product code in the 'Product Id' field + + (NOTE: This can be left blank if your invoice line is not related to a product in the catalog) +. Enter a number in the 'Quantity' field +. Enter a 'Unit Price' only if the Product Id field is blank + + (NOTE: If a Product Id has been entered then leave the 'Unit Price' field blank as it will pick up the product price + from the catalog) +. Leave the 'Inventory Item' field blank +. Leave the 'Product Feature Id' field blank +. Leave the 'UOM' field blank +. Select 'Yes' for the 'Taxable Flag' field + +WARNING: TO CHECK: Need to do some tests to see what line item type needs to be used for 'Sales Tax'. + + I think that it could be 'Invoice Item Sales Tax' since tax is currently calculated at invoice item line level. + + Also the automatically generated invoices from Order Entry and E-Commerce show taxes at the invoice item line level + (think there may be some work going on - see JIRA on to consolidate entries). + + Need to do some tests using 'Invoice Sales Tax' to see how it works......... + +== How do I update an invoice line item? +Not all the fields on the invoice item line can be updated. +For example Taxable Flag and Inventory Item cannot be updated. + +If these fields need to be amended then the invoice item will need to be removed and then re-created. + +. Select the 'Items' sub menu for the invoice +. Any existing line items will be displayed in the 'Items' box +. Amend the details in the line item that needs to be updated (eg Quantity, Invoice Item Type, Product Id, Description, + Override GL Account, Unit Price) +. Press the 'Update' button displayed at the end of the line item that has been updated + +== How do I delete an invoice item? +. Select the 'Items' sub menu for the invoice +. Any existing line items will be displayed in the 'Items' box +. Press the 'Remove' button displayed at the end of the line item that needs to be deleted diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_newInvoice.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_newInvoice.adoc new file mode 100644 index 0000000..f69d4cb --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_newInvoice.adoc @@ -0,0 +1,42 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for New Invoice +This screen allows the user to create a new Sales or Purchase Invoice. + +Sales Invoices are created when a customer buys something from you. + +Purchase Invoices are created when you buy something from a supplier. + +== How do I create a new Sales invoice? +. Press the 'Create New' button +. The New Sales Invoice / New Purchase Invoice screen is displayed> +. Using the top part of the screen, leave Invoice type with its default of 'Sales Invoice' +. Leave 'Organization Party Id' with its default of 'Company' +. Enter or use the lookup to find the 'To Party Id' (eg DemoCustomer) +. Press the 'Create' button in the top part of the screen +. The invoice header has been created and the default header screen will be displayed +. Details on the invoice will need to be entered via the other sub menus (eg Items, Time Entries etc) + +== How do I create a new Purchase invoice? +. Press the 'Create New' button +. The New Sales Invoice / New Purchase Invoice screen is displayed> +. Using the bottom part of the screen, leave Invoice type with its default of 'Purchase Invoice' +. Leave 'Organization Party Id' with its default of 'Company' +. Enter or use the lookup to find the 'From Party Id' (eg DemoSupplier) +. Press the 'Create' button in the bottom part of the screen +. The invoice header has been created and the default header screen will be displayed +. Details on the invoice will need to be entered via the other sub menus (eg Items, Time Entries etc) diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_sendPerEmail.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_sendPerEmail.adoc new file mode 100644 index 0000000..6a1ee1e --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_sendPerEmail.adoc @@ -0,0 +1,34 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Send Per Email +This is used to send a copy of the invoice details to one or more email addresses. +The invoice is included as an attachment and the user can add a simple accompanying email message. + +== How do I send a copy of an invoice via email? +. Select the 'Send per Email' sub menu +. The 'Send per Email' default screen will be displayed +. Enter the 'From Email Address' + + (NOTE TO CHECK: Shouldnt this be defaulted from the user login.....????) +. Leave the 'To Email Address' as it is as this will be defaulted using the customer details from the invoice +. If required enter the 'Copy Email address' for anyone that needs to be copied on the email +. Leave the 'Subject' as the default of 'Please find attached invoice' +. Leave the 'Other Currency' box blank + + (NOTE TO CHECK: Investigate what effect this has on the email.....) +. Enter a short email message in the 'Email Body' +. Press the 'Submit' button diff --git a/applications/accounting/src/docs/asciidoc/_include/acc-invoices.adoc b/applications/accounting/src/docs/asciidoc/_include/acc-invoices.adoc new file mode 100644 index 0000000..8a2c0bc --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/acc-invoices.adoc @@ -0,0 +1,67 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Invoices. + +Sales invoices are generated when customers buy something from your business. +You will need to provide a detailed list of the items bought and relevant taxes paid. +They are often referred to a 'tax invoices' as they contain information relating to the amount of sales tax (eg VAT / GST) +charged on the product or service. + +Purchase invoices are generated by your suppliers when you order something from them. + +You may send them an order in the form of a Purchase Order. + +They will then send you the products and an invoice for payment. + +This invoice is the Purchase Invoice and it will contain details of the items bought plus any taxes. + + +Both of these documents are used as proof to various tax authorities (eg Inland Revenue, Customs etc) that the required tax +has been charged or collected. + +NOTE: The following is an extract from Ian McNulty's documentation work on accounting: + +Invoices are created automatically by the system when certain criteria are met for each item on an order. +The criteria will vary depending on the type of product associated with the order item, and the type of order +(ie purchase/sales). + +For Sales Orders that include digital goods, an invoice will be created when the order is placed, and that invoice will be +for all digital goods in the order. + +If there are non-digital or physical goods they will go in a separate invoice. + +For Sales Orders that need physical fulfillment, an invoice will be created for all items in a shipment when the shipment +goes into the 'Packed' status. + +For Purchase Orders an invoice will be created from a shipment when the shipment goes into the Received status. + +== Invoices management in User Interface +include::HELP_findInvoices.adoc[leveloffset=+2] + +include::HELP_invoiceOverview.adoc[leveloffset=+2] + +include::HELP_editInvoice.adoc[leveloffset=+2] + +include::HELP_newInvoice.adoc[leveloffset=+2] + +include::HELP_editInvoiceApplications.adoc[leveloffset=+2] + +include::HELP_listInvoiceItems.adoc[leveloffset=+2] + +include::HELP_editInvoiceTimeEntries.adoc[leveloffset=+2] + +include::HELP_sendPerEmail.adoc[leveloffset=+2] + +include::HELP_invoiceRoles.adoc[leveloffset=+2] diff --git a/applications/accounting/src/docs/asciidoc/accounting.adoc b/applications/accounting/src/docs/asciidoc/accounting.adoc index 526f29c..71b493b 100644 --- a/applications/accounting/src/docs/asciidoc/accounting.adoc +++ b/applications/accounting/src/docs/asciidoc/accounting.adoc @@ -28,6 +28,8 @@ integrated to provide more value than a plain accounting system. include::_include/acc-intro.adoc[leveloffset=+1] +include::_include/acc-invoices.adoc[leveloffset=+1] + include::_include/acc-agreements.adoc[leveloffset=+1] include::_include/acc-financial-accounts.adoc[leveloffset=+1] |
|
|
In reply to this post by mbrohl
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit 508c5aaf9204b2643b78b2510c21e245b1a4668d Author: holivier <[hidden email]> AuthorDate: Wed Feb 12 16:18:45 2020 +0100 Documented: Payments Docbook files migration to asciidoc format (OFBIZ-10294) All the help files associated to it are called via include in the main document --- ...LP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml | 49 ------------ .../HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml | 77 ------------------- .../data/helpdata/HELP_ACCOUNTING_editPayment.xml | 45 ----------- .../HELP_ACCOUNTING_editPaymentApplications.xml | 87 --------------------- .../data/helpdata/HELP_ACCOUNTING_findPayments.xml | 73 ------------------ .../data/helpdata/HELP_ACCOUNTING_newPayment.xml | 89 ---------------------- .../helpdata/HELP_ACCOUNTING_paymentOverview.xml | 48 ------------ .../data/helpdata/HELP_ACCOUNTING_payments.xml | 30 -------- .../HELP_FindPurchaseInvoicesByDueDate.adoc | 39 ++++++++++ .../_include/HELP_FindSalesInvoicesByDueDate.adoc | 59 ++++++++++++++ .../docs/asciidoc/_include/HELP_editPayment.adoc | 34 +++++++++ .../_include/HELP_editPaymentApplications.adoc | 67 ++++++++++++++++ .../docs/asciidoc/_include/HELP_findPayments.adoc | 49 ++++++++++++ .../docs/asciidoc/_include/HELP_newPayment.adoc | 70 +++++++++++++++++ .../asciidoc/_include/HELP_paymentOverview.adoc | 37 +++++++++ .../acc-payments.adoc} | 27 ++++--- .../accounting/src/docs/asciidoc/accounting.adoc | 2 + 17 files changed, 372 insertions(+), 510 deletions(-) diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml deleted file mode 100644 index e895ead..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Find Purchase Invoices By Due Date help screen. - </title> - <para>This screen allows the user to search for and locate Purchase - Invoices based on their due date. The 'Due Date' can be defined as the - last possible date that payments can be received for the invoice - without triggering any late payment penalties. The 'Invoice Date' can - be defined as the date that the invoice was created and this is - normally based on when products were received or services were - provided.</para> - <para>NOTE TO CHECK: See if the same bug that exists with Sales - Invoices is here too.</para> - <para>A Purchase Invoice may be due to be paid immediately or you may - be given a 'grace period' after which the invoice is due.</para> - <section> - <title>How do I find Purchase Invoices by Due Date?</title> - <orderedlist> - <listitem><para>Press the 'Find Purchase Invoices by Due Date' button</para></listitem> - <listitem><para>The Find Purchase Invoices by Due Date screen is displayed - </para></listitem> - <listitem><para>Enter the 'Organization Party Id' (eg. Normally this will be - Company)</para></listitem> - <listitem><para>Enter the 'Party Id' that the Purchase Invoice (eg. Normally - this will be the Supplier Party Id)</para></listitem> - <listitem><para>Enter a number in the 'Days Offset' field that represents the - number of in which the invoice will become due (eg If an invoice is - due to be paid in 5 days then enter 5 or greater)</para></listitem> - <listitem><para>Press the 'Select' button</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml deleted file mode 100644 index 0521b69..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Find Sales Invoices By Due Date help screen. - </title> - <para>This screen allows the user to search for and locate Sales - Invoices based on their due date. The 'Due Date' can be defined as the - last possible date that payments can be received for the invoice - without triggering late payment penalties. The 'Invoice Date' can be - defined as the date that the invoice was created and this is normally - based on when products were shipped or services were provided.</para> - - <para>NOTE TO CHECK: There appears to be a minor bug here as if the - Invoice 'Due Date' is different to the Invoice Date (eg. Invoice - Creation Date) then the Invoice Date is used as the Due Date in this - screen which I dont think is correct......</para> - - <para>A Sales Invoice may be due to be paid immediately or as in some - cases the customer is given a 'grace period' after which the invoice - is generated and becomes due. Examples of this include only generating - a customer invoice after a certain amount of time after the dispatch - of their order. (NOTE: There are several ways this can be achieved in - OFBiz including the use of agreements and billing accounts). - </para> - <para>This screen can be used to locate Sales Invoices as follows: - </para><itemizedlist> - <listitem><para>That will become due within a fixed timeframe (eg the next 5 - days)</para></listitem> - <listitem><para>That may already be overdue</para></listitem> - <listitem><para>That have been automatically generated by the system (eg as a - result of Agreements based on payment in 30 days etc....TO CHECK) - </para></listitem> - </itemizedlist> - <para>NOTE: See details from Jacopo below regarding future work - regarding Find Sales Invoice by Due Date and Find Purchase Invoice by - Due Date functionality:</para> - - <para>* The two links are used to search invoices' due dates for - payments - there are plans to add links to quickly create payments for - them etc. So they are somewhat in the middle between an invoice thing - and a payment thing. By the way, for now I will close this issue - because - the best spot to place them is in the AR and AP applications, - but there - is still a lot of work to do to make them usable. </para> - <section> - <title>How do I find a Sales Invoice by Due Date?</title> - <orderedlist> - <listitem><para>Press the 'Find Sales Invoices by Due Date' button</para></listitem> - <listitem><para>The Find Sales Invoices by Due Date screen is displayed</para></listitem> - <listitem><para>Enter the 'Organization Party Id' (eg. Normally this will be - Company)</para></listitem> - <listitem><para>Enter the 'Party Id' that the Sales Invoice (eg. Normally this - will be the Customer Party Id)</para></listitem> - <listitem><para>Enter a number in the 'Days Offset' field that represents the - number of in which the invoice will become due (eg If an invoice is - due to be paid in 5 days then enter 5 or greater)</para></listitem> - <listitem><para>Press the 'Select' button</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPayment.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPayment.xml deleted file mode 100644 index 78e617c..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPayment.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Payment Header help screen.</title> - <para>The Header screen displays the header details for the payment - transaction and allows all fields to be updated if required. </para> - - <para>The following options are currently available from this screen: - </para><itemizedlist> - <listitem><para>Create New (Create a new payment)</para></listitem> - <listitem><para>Status to 'Received' (Change the status of the current payment - to 'Received. NOTE: This will create the relevant accounting - transactions and post them to the general ledger)</para></listitem> - <listitem><para>Status to 'Cancelled' (Change the status of the current payment - to 'Cancelled')</para></listitem> - <listitem><para>Status to 'Confirmed' (Change the status of the current invoice - to 'Confirmed'. NOTE: This status option will not appear until the - status has been changed to 'Received')</para></listitem> - </itemizedlist> - <section> - <title>How do I update the header details for a Payment?</title> - <orderedlist> - <listitem><para>Select the 'Header' sub menu and the header details of the - payment will be displayed</para></listitem> - <listitem><para>Update the fields required</para></listitem> - <listitem><para>Press the 'Update' button</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPaymentApplications.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPaymentApplications.xml deleted file mode 100644 index f7e701b..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_editPaymentApplications.xml +++ /dev/null @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Payment Applications help screen.</title> - <para>The Payments Applications sub menu is where payments that have - been made (or received) can be linked or allocated to an invoice, - another payment, a billing account or a tax authority.</para> - <para>NOTE: General Ledger accounting transactions are generated during - the payment application process but unless your GL is setup with - Unapplied Cash and Applied Cash accounts - I'm not sure that there will - be any true accounting impact. In the Sales Order process the - accounting transaction generated the following GL Accounting - transaction is generated for 'Payment Applied'</para> - <para>The following options are currently available from this screen: - </para><itemizedlist> - <listitem><para>Create New (Create a new payment)</para></listitem> - <listitem><para>Status to 'Received' (Change the status of the current payment - to 'Received. NOTE: This will create the relevant accounting - transactions and post them to the general ledger)</para></listitem> - <listitem><para>Status to 'Cancelled' (Change the status of the current payment - to 'Cancelled')</para></listitem> - <listitem><para>Status to 'Confirmed' (Change the status of the current - invoice to 'Confirmed'. NOTE: This status option will not appear until - the status has been changed to 'Received') - </para></listitem> - </itemizedlist> - <section> - <title>How do I apply a payment to an invoice?</title> - <orderedlist> - <listitem><para>Select the 'Applications' sub menu for the payment</para></listitem> - <listitem><para>A list of invoices will be displayed in the 'Possible Invoices - to Apply' box (NOTE: If no open invoices exist for the party that is - sending the payment then this may not list any invoices)</para></listitem> - <listitem><para>Press the 'Apply' button next to the invoice (or invoices) that - this payment is for</para></listitem> - </orderedlist> - <para>NOTE: Although it can be overriden the 'Amount to Apply' field - will default to the lesser of the invoice total or the payment - amount. This can be shown by examples as follows:</para> - <para>* If a payment of $150 is received but the invoice total is $120 - then the 'Amount to Apply' will default to $120</para> - <para>* If a payment of $150 is received but the invoice total is $170 - then the 'Amount to Apply' will default to $150 - </para> - </section> - <section> - <title>How do I apply a payment to an invoice, tax authority, billing - account or another payment?</title> - <orderedlist> - <listitem><para>Select the 'Applications' sub menu for the payment</para></listitem> - <listitem><para>Using the 'Apply this payment to' box at the bottom of the - screen</para></listitem> - <listitem><para>Enter or use the lookup to enter the 'Invoice Id' to apply the - payment to (NOTE: This can be used if the invoice is to another party - eg ordered by a subsidiary but paid for by another company of the - same group)</para></listitem> - <listitem><para>Enter or use the lookup to enter the 'To Payment Id' to apply - the payment to if required (NOTE TO CHECK: How does this work....?) - </para></listitem> - <listitem><para>Enter or use the lookup to enter the 'Billing Account Id' to - apply the payment to if required</para></listitem> - <listitem><para>Enter or use the drop down box to select the 'Tax Auth Geo Id' - to apply the payment to if required (NOTE TO CHECK: This is a country - so need to test how this actually works......)</para></listitem> - <listitem><para>Enter an amount in the 'Amount to Apply' (NOTE: This must be - less than or equal to the payment amount)</para></listitem> - <listitem><para>Press the 'Apply' button - </para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_findPayments.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_findPayments.xml deleted file mode 100644 index aea05b4..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_findPayments.xml +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Find Payments help screen.</title> - <para>The default screen is 'Find Payment' which allows the user to - search for and view the details related to a payment transaction. - Specific search criteria can be entered as a filter to locate the - payment quickly. </para> - <para> - Payments can be incoming or outgoing and the demo data contains a - list of payment type descriptions that describe the reason for the - payment in more detail (eg Customer Deposit, Tax Payment, Commission - Payment etc). - </para> - <para>This screen is used to locate existing payments that have been - created - automatically by the system or manually by the user. There are - links - from this page that can be used to do the following: </para> - <itemizedlist> - <listitem><para>Create a new incoming or outgoing payment - </para></listitem> - <listitem><para>Find Sales Invoices by due date - </para></listitem> - <listitem><para>Find Purchase Invoices by due date </para></listitem> - </itemizedlist> - <section> - <title>How do I view all payments?</title> - <orderedlist> - <listitem><para>Press the 'Search' button to view all payments</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I locate an existing payment?</title> - <orderedlist> - <listitem><para>Enter the 'Payment ID' if known</para></listitem> - <listitem><para>Enter a word from the payments 'Comment'field if known</para></listitem> - <listitem><para>Enter the 'Payment Type Id' if known</para></listitem> - <listitem><para>Enter the 'From Party Id' if known (NOTE: In most cases for an - incoming payment this will be the customer party id)</para></listitem> - <listitem><para>Enter the payment amount in the 'Amount' field if known</para></listitem> - <listitem><para>Enter some details from the payment reference number in the - 'Reference No' field if known - </para></listitem> - <listitem><para>Enter the status of the payment in the 'Status Id' field if - known</para></listitem> - <listitem><para>Enter the 'To Party Id' if known (NOTE: In most cases for an - incoming payment this will the the customer party id. For outgoing - payments this will be the supplier id, or customer id for a refund) - </para></listitem> - <listitem><para>Press the 'Search' button to view all payments</para></listitem> - <listitem><para>All payments that meet the search criteria will be displayed. - </para></listitem> - </orderedlist> - </section> - -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml deleted file mode 100644 index 57c1a1e..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_newPayment.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The New Payment help screen.</title> - <para>This screen is used to create a new payment. Payments can be - incoming (eg from a customer) or outgoing (eg to a supplier). Payment - types are used to describe what the payments are used for in the - system.</para> - <para>Examples of incoming payment types are as follows:</para> - <itemizedlist> - <listitem><para>Customer Deposit</para></listitem> - <listitem><para>Customer Payment</para></listitem> - <listitem><para>Interest In</para></listitem> - </itemizedlist> - <para>Examples of outgoing payment types are as follows:</para> - <itemizedlist> - <listitem><para>Commission Payment</para></listitem> - <listitem><para>Pay Check</para></listitem> - <listitem><para>Income Tax Payment</para></listitem> - <listitem><para>Vendor Payment</para></listitem> - </itemizedlist> - <section> - <title>How do I create a new incoming payment?</title> - <orderedlist> - <listitem><para>Press the 'Create New Payment' button</para></listitem> - <listitem><para>The New Incoming Payment / New Outgoing Payment screen is - displayed</para></listitem> - <listitem><para>Leave 'Organization Party Id' with its default of 'Company' - </para></listitem> - <listitem><para> - Select the 'Payment Type Id' from the drop down box (NOTE: This - is currently limited to the following: Customer Deposit, Customer - Payment, Interest In and Gift Certificate Deposit) - </para></listitem> - <listitem><para>Enter the payment amount in the 'Amount' field</para></listitem> - <listitem><para>Enter or use the lookup to find the 'From Party Id'</para></listitem> - <listitem><para>Select the 'Payment Method Type' from the drop down box (eg how - the payment was paid - cash, cheque, money order etc)</para></listitem> - <listitem><para>Leave the 'Currency' field with its default of 'USD' (NOTE: This - default comes from Company)</para></listitem> - <listitem><para>Press the 'Create' button</para></listitem> - <listitem><para>The payment header is created and the default header - screen will be displayed subsection content</para></listitem> - </orderedlist> - <para>NOTE: Need to understand what happens if customer pays in a - currency that is not the company default.... if the exchange rate is - specified then I think it should convert the currency to the default - currency for accounting purposes.... need to investigate and test. - </para> - </section> - <section> - <title>How do I create a new outgoing payment?</title> - <orderedlist> - <listitem><para>Press the 'Create New Payment' button</para></listitem> - <listitem><para>The New Incoming Payment / New Outgoing Payment screen is - displayed</para></listitem> - <listitem><para>Leave 'Organization Party Id' with its default of 'Company' - </para></listitem> - <listitem><para>Select the 'Payment Type Id' from the drop down box (NOTE: This - is currently limited to 11 entries including Commission Payment, - Customer Refund, Vendor Payment, Income Tax Payment)</para></listitem> - <listitem><para>Enter the payment amount in the 'Amount' field</para></listitem> - <listitem><para>Enter or use the lookup to find the 'To Party Id'</para></listitem> - <listitem><para>Select the 'Payment Method Type' from the drop down box (eg how - the payment is to be paid - cash, cheque, money order etc)</para></listitem> - <listitem><para>Leave the 'Currency' field with its default of 'USD' (NOTE: This - default comes from Company)</para></listitem> - <listitem><para>Press the 'Create' button</para></listitem> - <listitem><para>The payment header is created and the default header screen will - be displayed subsection content</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_paymentOverview.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_paymentOverview.xml deleted file mode 100644 index c4960ac..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_paymentOverview.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Payment Overview help screen.</title> - <para>The Payments Overview screen displays the summary details of the - payment. On one side it shows information related to the payment - transaction header (eg Payment Type, Status, Amount, Effective Date - etc) and the other it shows if the payment has been applied (or - matched) to an invoice or billing account etc.</para> - <para>The following options are currently available from this screen: - </para> - <itemizedlist> - <listitem><para>Create New (Create a new payment)</para></listitem> - <listitem><para>Status to 'Received' (Change the status of the current payment - to 'Received. NOTE: This will create the relevant accounting - transactions and post them to the general ledger)</para></listitem> - <listitem><para>Status to 'Cancelled' (Change the status of the current payment - to 'Cancelled')</para></listitem> - <listitem><para>Status to 'Confirmed' (Change the status of the current invoice - to 'Confirmed'. NOTE: This status option will not appear until the - status has been changed to 'Received')</para></listitem> - </itemizedlist> - - <para>NOTE: The general ledger transactions generated as a result of - the payment are based on the GL Account Type defaults for Company as - follows:</para> - <itemizedlist> - <listitem><para>Debit Entry (GL Account Type defaults)</para></listitem> - <listitem><para>Credit Entry (Payment Method Id / GL Account Id)</para></listitem> - </itemizedlist> - -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml deleted file mode 100644 index 8cb64b4..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_payments.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>Payments.</title> - <para>Payments are transactions that received by or generated by a business. They can be incoming or outgoing. Incoming payments are normally from customers and outgoing ones to suppliers. </para> - <xi:include href="HELP_ACCOUNTING_findPayments.xml" /> - <xi:include href="HELP_ACCOUNTING_newPayment.xml" /> - <xi:include href="HELP_ACCOUNTING_paymentOverview.xml" /> - <xi:include href="HELP_ACCOUNTING_editPaymentApplications.xml" /> - <xi:include href="HELP_ACCOUNTING_editPayment.xml" /> - <xi:include href="HELP_ACCOUNTING_FindSalesInvoicesByDueDate.xml" /> - <xi:include href="HELP_ACCOUNTING_FindPurchaseInvoicesByDueDate.xml" /> - -</section> diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_FindPurchaseInvoicesByDueDate.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_FindPurchaseInvoicesByDueDate.adoc new file mode 100644 index 0000000..b416a95 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_FindPurchaseInvoicesByDueDate.adoc @@ -0,0 +1,39 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Find Purchase Invoices By Due Date +This screen allows the user to search for and locate Purchase Invoices based on their due date. + +The 'Due Date' can be defined as the last possible date that payments can be received for the invoice without triggering any +late payment penalties. + +The 'Invoice Date' can be defined as the date that the invoice was created and this is normally based on when products were +received or services were provided. + +NOTE: TO CHECK: See if the same bug that exists with Sales Invoices is here too. + +A Purchase Invoice may be due to be paid immediately or you may be given a 'grace period' after which the invoice is due. + +== How do I find Purchase Invoices by Due Date? +. Press the 'Find Purchase Invoices by Due Date' button +. The Find Purchase Invoices by Due Date screen is displayed +. Enter the 'Organization Party Id' (eg. Normally this will be Company) +. Enter the 'Party Id' that the Purchase Invoice (eg. Normally this will be the Supplier Party Id) +. Enter a number in the 'Days Offset' field that represents the number of in which the invoice will become due + + (eg If an invoice is due to be paid in 5 days then enter 5 or greater) +. Press the 'Select' button diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_FindSalesInvoicesByDueDate.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_FindSalesInvoicesByDueDate.adoc new file mode 100644 index 0000000..13bfff2 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_FindSalesInvoicesByDueDate.adoc @@ -0,0 +1,59 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Find Sales Invoices By Due Date +This screen allows the user to search for and locate Sales Invoices based on their due date. + +The 'Due Date' can be defined as the last possible date that payments can be received for the invoice without triggering +late payment penalties. + +The 'Invoice Date' can be defined as the date that the invoice was created and this is normally based on when products +were shipped or services were provided. + +NOTE: TO CHECK: There appears to be a minor bug here as if the Invoice 'Due Date' is different to the Invoice Date (eg. + Invoice Creation Date) then the Invoice Date is used as the Due Date in this screen which I dont think is correct...... + +A Sales Invoice may be due to be paid immediately or as in some cases the customer is given a 'grace period' after which +the invoice is generated and becomes due. + +Examples of this include only generating a customer invoice after a certain amount of time after the dispatch of their order. + +(NOTE: There are several ways this can be achieved in OFBiz including the use of agreements and billing accounts). + +This screen can be used to locate Sales Invoices as follows: + +* That will become due within a fixed timeframe (eg the next 5 days) +* That may already be overdue +* That have been automatically generated by the system + + (eg as a result of Agreements based on payment in 30 days etc....TO CHECK) + +NOTE: TO CHECK See details from Jacopo below regarding future work regarding Find Sales Invoice by Due Date and + Find Purchase Invoice by Due Date functionality: + + - The two links are used to search invoices' due dates for payments - there are plans to add links to quickly + create payments for them etc. + + - So they are somewhat in the middle between an invoice thing and a payment thing. + + - By the way, for now I will close this issue because the best spot to place them is in the AR and AP applications, + but there is still a lot of work to do to make them usable. + +== How do I find a Sales Invoice by Due Date? +. Press the 'Find Sales Invoices by Due Date' button +. The Find Sales Invoices by Due Date screen is displayed +. Enter the 'Organization Party Id' (eg. Normally this will be Company) +. Enter the 'Party Id' that the Sales Invoice (eg. Normally this will be the Customer Party Id) +. Enter a number in the 'Days Offset' field that represents the number of in which the invoice will become due + + (eg If an invoice is due to be paid in 5 days then enter 5 or greater) +. Press the 'Select' button diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_editPayment.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_editPayment.adoc new file mode 100644 index 0000000..4cf19a6 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_editPayment.adoc @@ -0,0 +1,34 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Payment Header +The Header screen displays the header details for the payment transaction and allows all fields to be updated if required. + +The following options are currently available from this screen: + +* Create New (Create a new payment) +* Status to 'Received' (Change the status of the current payment to 'Received. + + NOTE: This will create the relevant accounting transactions and post them to the general ledger) +* Status to 'Cancelled' (Change the status of the current payment to 'Cancelled') +* Status to 'Confirmed' (Change the status of the current invoice to 'Confirmed'. + + NOTE: This status option will not appear until the status has been changed to 'Received') + +== How do I update the header details for a Payment? +. Select the 'Header' sub menu and the header details of the payment will be displayed +. Update the fields required +. Press the 'Update' button diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_editPaymentApplications.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_editPaymentApplications.adoc new file mode 100644 index 0000000..83dc5ba --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_editPaymentApplications.adoc @@ -0,0 +1,67 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Payment Applications +The Payments Applications sub menu is where payments that have been made (or received) can be linked or allocated to an invoice, +another payment, a billing account or a tax authority. + +NOTE: General Ledger accounting transactions are generated during the payment application process but unless your GL is setup + with Unapplied Cash and Applied Cash accounts + + TO CHECK I'm not sure that there will be any true accounting impact. + +In the Sales Order process the accounting transaction generated the following GL Accounting transaction is generated for +'Payment Applied' + +The following options are currently available from this screen: + +* Create New (Create a new payment) +* Status to 'Received' (Change the status of the current payment to 'Received. + + NOTE: This will create the relevant accounting transactions and post them to the general ledger) +* Status to 'Cancelled' (Change the status of the current payment to 'Cancelled') +* Status to 'Confirmed' (Change the status of the current invoice to 'Confirmed'. + + NOTE: This status option will not appear until the status has been changed to 'Received') + + +== How do I apply a payment to an invoice? +. Select the 'Applications' sub menu for the payment +. A list of invoices will be displayed in the 'Possible Invoices to Apply' box + + (NOTE: If no open invoices exist for the party that is sending the payment then this may not list any invoices) +. Press the 'Apply' button next to the invoice (or invoices) that this payment is for + +NOTE: Although it can be overriden the 'Amount to Apply' field will default to the lesser of the invoice total or + the payment amount. + +This can be shown by examples as follows: + +* If a payment of $150 is received but the invoice total is $120 then the 'Amount to Apply' will default to $120 +* If a payment of $150 is received but the invoice total is $170 then the 'Amount to Apply' will default to $150 + +== How do I apply a payment to an invoice, tax authority, billingaccount or another payment? +. Select the 'Applications' sub menu for the payment +. Using the 'Apply this payment to' box at the bottom of the screen +. Enter or use the lookup to enter the 'Invoice Id' to apply the payment to + + (NOTE: This can be used if the invoice is to another party eg ordered by a subsidiary but paid for by another company of + the same group) +. Enter or use the lookup to enter the 'To Payment Id' to apply the payment to if required + + (NOTE TO CHECK: How does this work....?) +. Enter or use the lookup to enter the 'Billing Account Id' to apply the payment to if required +. Enter or use the drop down box to select the 'Tax Auth Geo Id' to apply the payment to if required + + (NOTE TO CHECK: This is a country so need to test how this actually works......) +. Enter an amount in the 'Amount to Apply' + + (NOTE: This must be less than or equal to the payment amount) +. Press the 'Apply' button diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_findPayments.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_findPayments.adoc new file mode 100644 index 0000000..b098288 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_findPayments.adoc @@ -0,0 +1,49 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Find Payments +The default screen is 'Find Payment' which allows the user to search for and view the details related to a payment transaction. +Specific search criteria can be entered as a filter to locate the payment quickly. + +Payments can be incoming or outgoing and the demo data contains a list of payment type descriptions that describe the reason +for the payment in more detail (eg Customer Deposit, Tax Payment, Commission Payment etc). + +This screen is used to locate existing payments that have been created automatically by the system or manually by the user. +There are links from this page that can be used to do the following: + +* Create a new incoming or outgoing payment +* Find Sales Invoices by due date +* Find Purchase Invoices by due date + +== How do I view all payments? +. Press the 'Search' button to view all payments + + +== How do I locate an existing payment? +. Enter the 'Payment ID' if known +. Enter a word from the payments 'Comment'field if known +. Enter the 'Payment Type Id' if known +. Enter the 'From Party Id' if known + + (NOTE: In most cases for an incoming payment this will be the customer party id) +. Enter the payment amount in the 'Amount' field if known +. Enter some details from the payment reference number in the 'Reference No' field if known +. Enter the status of the payment in the 'Status Id' field if known +. Enter the 'To Party Id' if known + + (NOTE: In most cases for an incoming payment this will the the customer party id. For outgoing payments this will be the supplier id, or customer id for a refund) +. Press the 'Search' button to view all payments +. All payments that meet the search criteria will be displayed. diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_newPayment.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_newPayment.adoc new file mode 100644 index 0000000..541e9ca --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_newPayment.adoc @@ -0,0 +1,70 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for New Payment +This screen is used to create a new payment. +Payments can be incoming (eg from a customer) or outgoing (eg to a supplier). +Payment types are used to describe what the payments are used for in the system. + +Examples of incoming payment types are as follows: + +* Customer Deposit +* Customer Payment +* Interest In + +Examples of outgoing payment types are as follows: + +* Commission Payment +* Pay Check +* Income Tax Payment +* Vendor Payment + + +== How do I create a new incoming payment? +. Press the 'Create New Payment' button +. The New Incoming Payment / New Outgoing Payment screen is displayed +. Leave 'Organization Party Id' with its default of 'Company' +. Select the 'Payment Type Id' from the drop down box + + (NOTE: This is currently limited to the following: Customer Deposit, Customer Payment, Interest In and Gift Certificate Deposit) +. Enter the payment amount in the 'Amount' field +. Enter or use the lookup to find the 'From Party Id' +. Select the 'Payment Method Type' from the drop down box (eg how the payment was paid - cash, cheque, money order etc) +. Leave the 'Currency' field with its default of 'USD' + + (NOTE: This default comes from Company) +. Press the 'Create' button +. The payment header is created and the default header screen will be displayed subsection content + +NOTE: TO CHECK Need to understand what happens if customer pays in a currency that is not the company default.... + + if the exchange rate is specified then I think it should convert the currency to the default currency for accounting purposes.... + + need to investigate and test. + +== How do I create a new outgoing payment? +. Press the 'Create New Payment' button +. The New Incoming Payment / New Outgoing Payment screen is displayed +. Leave 'Organization Party Id' with its default of 'Company' +. Select the 'Payment Type Id' from the drop down box + + (NOTE: This is currently limited to 11 entries including Commission Payment, Customer Refund, Vendor Payment, Income Tax Payment) +. Enter the payment amount in the 'Amount' field +. Enter or use the lookup to find the 'To Party Id' +. Select the 'Payment Method Type' from the drop down box + + (eg how the payment is to be paid - cash, cheque, money order etc) +. Leave the 'Currency' field with its default of 'USD' + + (NOTE: This default comes from Company) +. Press the 'Create' button +. The payment header is created and the default header screen will be displayed subsection content diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_paymentOverview.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_paymentOverview.adoc new file mode 100644 index 0000000..8a2e072 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_paymentOverview.adoc @@ -0,0 +1,37 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Payment Overview +The Payments Overview screen displays the summary details of the payment. + +On one side it shows information related to the payment transaction header (eg Payment Type, Status, Amount, Effective Date etc) +and the other it shows if the payment has been applied (or matched) to an invoice or billing account etc. + +The following options are currently available from this screen: + +* Create New (Create a new payment) +* Status to 'Received' (Change the status of the current payment to 'Received. + + NOTE: This will create the relevant accounting transactions and post them to the general ledger) +* Status to 'Cancelled' (Change the status of the current payment to 'Cancelled') +* Status to 'Confirmed' (Change the status of the current invoice to 'Confirmed'. + + NOTE: This status option will not appear until the status has been changed to 'Received') + +NOTE: The general ledger transactions generated as a result of the payment are based on the GL Account Type defaults for Company + as follows: + + 1) Debit Entry (GL Account Type defaults) + + 2) Credit Entry (Payment Method Id / GL Account Id) diff --git a/applications/accounting/src/docs/asciidoc/accounting.adoc b/applications/accounting/src/docs/asciidoc/_include/acc-payments.adoc similarity index 50% copy from applications/accounting/src/docs/asciidoc/accounting.adoc copy to applications/accounting/src/docs/asciidoc/_include/acc-payments.adoc index 71b493b..d610575 100644 --- a/applications/accounting/src/docs/asciidoc/accounting.adoc +++ b/applications/accounting/src/docs/asciidoc/_include/acc-payments.adoc @@ -16,22 +16,25 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. //// -= Accounting += Payments. -The OFBiz accounting system is a core application component and has most of the -modern features you would expect in a general purpose double-entry accounting -system. However, OFBiz goes beyond that by and seamlessly integrates with other -OFBiz applications such as Inventory, Purchasing and Manufacturing to give your -business a complete ERP solution. This makes the system as a whole robust and -integrated to provide more value than a plain accounting system. +Payments are transactions that received by or generated by a business. +They can be incoming or outgoing. -include::_include/acc-intro.adoc[leveloffset=+1] +Incoming payments are normally from customers and outgoing ones to suppliers. -include::_include/acc-invoices.adoc[leveloffset=+1] +== Payments management in User Interface +include::HELP_findPayments.adoc[leveloffset=+2] -include::_include/acc-agreements.adoc[leveloffset=+1] +include::HELP_newPayment.adoc[leveloffset=+2] -include::_include/acc-financial-accounts.adoc[leveloffset=+1] +include::HELP_paymentOverview.adoc[leveloffset=+2] -include::_include/acc-global-settings.adoc[leveloffset=+1] +include::HELP_editPaymentApplications.adoc[leveloffset=+2] + +include::HELP_editPayment.adoc[leveloffset=+2] + +include::HELP_FindSalesInvoicesByDueDate.adoc[leveloffset=+2] + +include::HELP_FindPurchaseInvoicesByDueDate.adoc[leveloffset=+2] diff --git a/applications/accounting/src/docs/asciidoc/accounting.adoc b/applications/accounting/src/docs/asciidoc/accounting.adoc index 71b493b..433df93 100644 --- a/applications/accounting/src/docs/asciidoc/accounting.adoc +++ b/applications/accounting/src/docs/asciidoc/accounting.adoc @@ -30,6 +30,8 @@ include::_include/acc-intro.adoc[leveloffset=+1] include::_include/acc-invoices.adoc[leveloffset=+1] +include::_include/acc-payments.adoc[leveloffset=+1] + include::_include/acc-agreements.adoc[leveloffset=+1] include::_include/acc-financial-accounts.adoc[leveloffset=+1] |
|
|
In reply to this post by mbrohl
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit 63d1df79b8fb529c65d44c7ccac56632f2442287 Author: holivier <[hidden email]> AuthorDate: Wed Feb 12 17:51:56 2020 +0100 Documented: Payment-gateway Docbook files migration to asciidoc format (OFBIZ-10294) All the help files associated to it are called via include in the main document. Merge (and call included) all helps about payment-gatway-config and payment-gateway-transaction in this file --- .../HELP_ACCOUNTING_AuthorizeTransaction.xml | 102 --------------------- .../HELP_ACCOUNTING_CaptureTransaction.xml | 55 ----------- .../HELP_ACCOUNTING_EditPaymentGatewayConfig.xml | 42 --------- ...ELP_ACCOUNTING_EditPaymentGatewayConfigType.xml | 23 ----- .../HELP_ACCOUNTING_FindGatewayResponses.xml | 44 --------- .../HELP_ACCOUNTING_FindPaymentGatewayConfig.xml | 23 ----- ...LP_ACCOUNTING_FindPaymentGatewayConfigTypes.xml | 25 ----- .../helpdata/HELP_ACCOUNTING_ManualTransaction.xml | 74 --------------- .../HELP_ACCOUNTING_ViewGatewayResponse.xml | 26 ------ .../helpdata/HELP_ACCOUNTING_payment_gateway.xml | 35 ------- .../HELP_ACCOUNTING_payment_gateway_config.xml | 44 --------- .../_include/HELP_AuthorizeTransaction.adoc | 67 ++++++++++++++ .../asciidoc/_include/HELP_CaptureTransaction.adoc | 39 ++++++++ .../_include/HELP_EditPaymentGatewayConfig.adoc | 30 ++++++ .../_include/HELP_FindGatewayResponses.adoc | 31 +++++++ .../asciidoc/_include/HELP_ManualTransaction.adoc | 43 +++++++++ .../_include/HELP_ViewGatewayResponse.adoc | 26 ++++++ .../asciidoc/_include/acc-payment-gateway.adoc | 60 ++++++++++++ .../accounting/src/docs/asciidoc/accounting.adoc | 2 + 19 files changed, 298 insertions(+), 493 deletions(-) diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_AuthorizeTransaction.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_AuthorizeTransaction.xml deleted file mode 100644 index ca0f3d2..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_AuthorizeTransaction.xml +++ /dev/null @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Authorize Transaction help screen</title> - <para>An authorization is a temporary transaction that shows a commitment to take money from an - account.</para> - <para>The 'Authorize' process is the first step in allowing a sales transaction payment to be - accepted. In OFBiz a service would be defined to carry out the authorisation process each - time for example, a credit card is used. It will perform specific validation tests before - the payment can be classes as 'authorised'. </para> - <para>When a payment is authorised it means that it has been validated and that the credit card - or bank account has been checked to ensure that it has sufficient funds available to cover - the proposed transaction. A number or code may be issued as evidence of the - authorisation.</para> - <para>NOTE: In the 'Payment' settings for a store as part of the Product Payment setup the user - can specify various services that will process a payment transactions through to completion. - This includes the following:</para> - <para> - <itemizedlist> - <listitem> - <para>Payment Authorisation</para> - </listitem> - <listitem> - <para>Payment Capture</para> - </listitem> - <listitem> - <para>Payment Credit</para> - </listitem> - <listitem> - <para>Payment Authentication Verification</para> - </listitem> - <listitem> - <para>Payment Re-Authorisation</para> - </listitem> - <listitem> - <para>Payment Refund</para> - </listitem> - <listitem> - <para>Payment Release Authorisation </para> - </listitem> - </itemizedlist> - </para> - <para>This is used to provide verification and approval for the first step of the sales - transaction payment process.</para> - <para>An 'Authorize' button is also displayed on Sales Order detail screen if a Credit Card - payment was specified for a sales order. This is probably a more natural place for a payment - transaction to be authorised.</para> - <para>NOTE: Using OFBiz demo data if DemoCustomer uses their credit card for payment then an - transaction is created that is automatically authorised and can be viewed using the Gateway - Responses. </para> - <section> - <title>How do I create and authorise a transaction?</title> - <para> - <orderedlist> - <listitem> - <para>Enter the 'Order Id' of the sales order for which payment is being - made</para> - </listitem> - <listitem> - <para>Enter the 'Order Payment Preference Id' (NOTE: This is automatically - generated at sales order creation and may be difficult to find out...I found - it by initially doing an order and then paying by DemoCustomer's credit card - and checking Gateway Responses for what was displayed in that field for the - order)</para> - </listitem> - <listitem> - <para>Select the 'Payment Method Type' (NOTE TO CHECK: What happens if you use - other selections not just credit card?)</para> - </listitem> - <listitem> - <para>Enter the 'Amount'</para> - </listitem> - <listitem> - <para>Press the 'Authorize' button</para> - </listitem> - <listitem> - <para>A new transaction should be displayed with the status of authorised</para> - </listitem> - </orderedlist> - </para> - <para>NOTE: The demo data payment settings for the Payment authorisation Service is set to - always approve so no transactions will display here because of this. Need to test and - maybe try removing the 'always approve' to see if the transaction will be created as - 'unauthorised ' </para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_CaptureTransaction.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_CaptureTransaction.xml deleted file mode 100644 index bf78587..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_CaptureTransaction.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Capture Transaction help screen. </title> - <para>This screen is used to input or 'capture' a payment against a Sales Order. Unlike the - authorise, this function will actually deduct the amount from eg a credit card and apply the - payment to a specific order.</para> - <para>It is likely that the before the payment is 'captured' in this screen, it would have been - through an authorisation first.</para> - <para>NOTE TO CHECK: Investigate how this links in with the Payment Gateway Configurations - screens</para> - <section> - <title>How do I capture a transaction?</title> - <para> - <orderedlist> - <listitem> - <para>Enter the Order Id for the payment (eg Sales Order Id)</para> - </listitem> - <listitem> - <para>Enter Order Payment Preference Id (Unsure of what this is...a type of - unique identifier perhaps?)</para> - </listitem> - <listitem> - <para>Select the 'Payment Method Type'</para> - </listitem> - <listitem> - <para>Select the 'Payment Type'</para> - </listitem> - <listitem> - <para>Enter the 'Amount'</para> - </listitem> - <listitem> - <para>Press the 'Capture' button</para> - </listitem> - </orderedlist> - </para> - <para>A transaction will be created and can be viewed via the 'Gateway Responses' tab</para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentGatewayConfig.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentGatewayConfig.xml deleted file mode 100644 index eeed70a..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentGatewayConfig.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Payment Gateway Config help screen</title> - <para>This screen allows the user to update the payment gateway configuration.</para> - <para>A range of parameters need to be set before the payment gateway will work This includes - details of the username and password required for the validation of the external account - that will be using the gateway.</para> - <section> - <title>How do I update a Payment Gateway Configuration?</title> - <para> - <orderedlist> - <listitem> - <para>Select the gateway Find Payment Gateway Config screen</para> - </listitem> - <listitem> - <para>Enter the details required for the configuration type selected (NOTE: This - will be different for each individual configuration selected)</para> - </listitem> - <listitem> - <para>Press the 'Update' button</para> - </listitem> - </orderedlist> - </para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentGatewayConfigType.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentGatewayConfigType.xml deleted file mode 100644 index 0856374..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPaymentGatewayConfigType.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Payment Gateway Config Type help screen</title> - <para>This screen allows the update of an existing payment gateway configuration type.</para> - <para>NOTE: New Payment Gateway Configuration Types cannot be created via this screen.</para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGatewayResponses.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGatewayResponses.xml deleted file mode 100644 index 867b87a..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindGatewayResponses.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Find Gateway Responses help screen</title> - <para>This is the default screen for the 'Transactions' sub menu. Press the 'Lookup' button to - display details of all transactions that have been authorised, captured or manually - entered.</para> - <section> - <title>How do I view all Gateway response transactions?</title> - <para> - <orderedlist> - <listitem> - <para>Press the 'Lookup' button</para> - </listitem> - </orderedlist> - </para> - <para>A list of all transactions that have been authorised, captured or manually entered - will be displayed.</para> - </section> - <section> - <title>Transaction results (external link)</title> - <para> - <link xl:href="http://www.authorize.net/support/merchant/Transaction_Response/Transaction_Response.htm"> - List of all the transaction results - </link> - </para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPaymentGatewayConfig.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPaymentGatewayConfig.xml deleted file mode 100644 index eccc31e..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPaymentGatewayConfig.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Find Payment Gateway Config help screen</title> - <para>The default screen allows the user to search for any payment gateway configurations that are setup.</para> - <para>Press the 'Lookup' button to see a list of existing configurations.</para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPaymentGatewayConfigTypes.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPaymentGatewayConfigTypes.xml deleted file mode 100644 index fdf74aa..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindPaymentGatewayConfigTypes.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Find Payment Gateway Config Types help screen</title> - <para>This screen lists some of the most common payment gateway - configuration types that have been created as part of the seed or demo - data.</para> - <para>Press the 'Lookup' button to see a list of existing payment gateway configuration types.</para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ManualTransaction.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ManualTransaction.xml deleted file mode 100644 index bbb1a50..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ManualTransaction.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Manual Transaction help screen</title> - <para>The Manual Electronic Transaction screen allows the user to manually input and process - payment related transactions.</para> - <para>Options available include the following:</para> - <para> - <itemizedlist> - <listitem> - <para>Authorising payment transactions</para> - </listitem> - <listitem> - <para>Refunding payments</para> - </listitem> - <listitem> - <para>Payment Re-Authorisation</para> - </listitem> - <listitem> - <para>Payment Capture</para> - </listitem> - </itemizedlist> - </para> - <section> - <title>How do I create a manual electronic transaction?</title> - <para> - <orderedlist> - <listitem> - <para>Select the 'Payment Method Type' (eg Credit Card)</para> - </listitem> - <listitem> - <para>Select the 'Product Store'</para> - </listitem> - <listitem> - <para>Select the 'Transaction Type' (NOTE: This is the type of transaction that - needs to be created, eg authorisation, capture,refund etc)</para> - </listitem> - </orderedlist> - </para> - <para>Additional fields will be displayed </para> - <para> - <orderedlist> - <listitem> - <para>Enter the required details (eg name, credit card, billing address, amount - etc)</para> - </listitem> - <listitem> - <para>Press the 'Submit' button</para> - </listitem> - </orderedlist> - </para> - <para>A transsaction will be created that can be viewed via the Gateway Transactions - screen</para> - <para>NOTE TO CHECK: Possible bug as could not get this to work using 'Payment Authorisation - Service' and error message appeared regarding a missing parameter missing for Order - Preference Id but the Order Preference Id was not displayed on the screen</para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewGatewayResponse.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewGatewayResponse.xml deleted file mode 100644 index 585d6b8..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewGatewayResponse.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The View Gateway Response help screen</title> - <para>This screen shows details of an individual gateway transaction. - It displays specific information regarding the order and the payment. - The lower part of the screen shows the gateway response details - indicating the time and codes used to process the transaction through - the gateway.</para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway.xml deleted file mode 100644 index 00a1474..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - Licensed to the Apache Software Foundation (ASF) under one or - more contributor license agreements. See the NOTICE file - distributed with this work for additional information regarding - copyright ownership. The ASF licenses this file to you under the - Apache License, Version 2.0 (the "License"); you may not use - this file except in compliance with the License. You may obtain - a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 Unless required by - applicable law or agreed to in writing, software distributed - under the License is distributed on an "AS IS" BASIS, WITHOUT - WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions - and limitations under the License. - --> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>Payment Gateway Transactions.</title> - <para>The Payment Gateway is made up of a configurable interface - that - processes payments.</para> - <para>Payment transactions can be authorised, captured and processed - or - refunded via the selected mechanism. (eg Paypal, Authorise.net, etc) - </para> - <xi:include href="HELP_ACCOUNTING_FindGatewayResponses.xml" /> - <xi:include href="HELP_ACCOUNTING_AuthorizeTransaction.xml" /> - <xi:include href="HELP_ACCOUNTING_CaptureTransaction.xml" /> - <xi:include href="HELP_ACCOUNTING_ViewGatewayResponse.xml" /> - <xi:include href="HELP_ACCOUNTING_ManualTransaction.xml" /> - -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway_config.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway_config.xml deleted file mode 100644 index 6de03a5..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_payment_gateway_config.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>Payment Gateway Config.</title> - <para>Payment Gateway Configuration is used to setup the parameters required for the system to - accept payments via different or external applications</para> - <para>Examples of these include:</para> - <para> - <itemizedlist> - <listitem> - <para>Paypal</para> - </listitem> - <listitem> - <para>PayFlow</para> - </listitem> - <listitem> - <para>Authorise.net</para> - </listitem> - <listitem> - <para>Clear Commerce</para> - </listitem> - </itemizedlist> - </para> - <xi:include href="HELP_ACCOUNTING_FindPaymentGatewayConfig.xml"/> - <xi:include href="HELP_ACCOUNTING_EditPaymentGatewayConfig.xml"/> - <xi:include href="HELP_ACCOUNTING_FindPaymentGatewayConfigTypes.xml"/> - <xi:include href="HELP_ACCOUNTING_EditPaymentGatewayConfigType.xml"/> -</section> diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_AuthorizeTransaction.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_AuthorizeTransaction.adoc new file mode 100644 index 0000000..d90064d --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_AuthorizeTransaction.adoc @@ -0,0 +1,67 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for The Authorize Transaction +An authorization is a temporary transaction that shows a commitment to take money from an account. + +The 'Authorize' process is the first step in allowing a sales transaction payment to be accepted. + +In OFBiz a service would be defined to carry out the authorisation process each time for example, a credit card is used. +It will perform specific validation tests before the payment can be classes as 'authorised'. + +When a payment is authorised it means that it has been validated and that the credit card or bank account has been checked +to ensure that it has sufficient funds available to cover the proposed transaction. + +A number or code may be issued as evidence of the authorisation. + +NOTE: In the 'Payment' settings for a store as part of the Product Payment setup the user can specify various services that + will process a payment transactions through to completion. + +This includes the following: + +* Payment Authorisation +* Payment Capture +* Payment Credit +* Payment Authentication Verification +* Payment Re-Authorisation +* Payment Refund +* Payment Release Authorisation + +This is used to provide verification and approval for the first step of the sales transaction payment process. + +An 'Authorize' button is also displayed on Sales Order detail screen if a Credit Card payment was specified for a sales order. +This is probably a more natural place for a payment transaction to be authorised. + +NOTE: Using OFBiz demo data if DemoCustomer uses their credit card for payment then an transaction is created that is + automatically authorised and can be viewed using the Gateway Responses. + +== How do I create and authorise a transaction? +. Enter the 'Order Id' of the sales order for which payment is being made +. Enter the 'Order Payment Preference Id' + + (NOTE: This is automatically generated at sales order creation and may be difficult to find out... + + I found it by initially doing an order and then paying by DemoCustomer's credit card and checking Gateway Responses for what + was displayed in that field for the order) +. Select the 'Payment Method Type' + + (NOTE TO CHECK: What happens if you use other selections not just credit card?) +. Enter the 'Amount' +. Press the 'Authorize' button +. A new transaction should be displayed with the status of authorised + +NOTE: The demo data payment settings for the Payment authorisation Service is set to always approve so no transactions + will display here because of this. + + TO CHECK: Need to test and maybe try removing the 'always approve' to see if the transaction will be created + as 'unauthorised' + \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_CaptureTransaction.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_CaptureTransaction.adoc new file mode 100644 index 0000000..cc735ed --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_CaptureTransaction.adoc @@ -0,0 +1,39 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Capture Transaction +This screen is used to input or 'capture' a payment against a Sales Order. + +Unlike the authorise, this function will actually deduct the amount from eg a credit card and apply the payment +to a specific order. + +It is likely that the before the payment is 'captured' in this screen, it would have been through an authorisation first. + +NOTE: TO CHECK: Investigate how this links in with the Payment Gateway Configurations screens + +== How do I capture a transaction? +. Enter the Order Id for the payment (eg Sales Order Id) +. Enter Order Payment Preference Id + + (TO CHECK Unsure of what this is...a type of unique identifier perhaps?) +. Select the 'Payment Method Type' +. Select the 'Payment Type' +. Enter the 'Amount' +. Press the 'Capture' button + +A transaction will be created and can be viewed via the 'Gateway Responses' screen. \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditPaymentGatewayConfig.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditPaymentGatewayConfig.adoc new file mode 100644 index 0000000..0aa85bc --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditPaymentGatewayConfig.adoc @@ -0,0 +1,30 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Edit Payment Gateway Config +This screen allows the user to update the payment gateway configuration. + +A range of parameters need to be set before the payment gateway will work This includes details of the username and password +required for the validation of the external account that will be using the gateway. + +== How do I update a Payment Gateway Configuration? +. Select the gateway Find Payment Gateway Config screen +. Enter the details required for the configuration type selected + + (NOTE: This will be different for each individual configuration selected) +. Press the 'Update' button diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_FindGatewayResponses.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_FindGatewayResponses.adoc new file mode 100644 index 0000000..71f8e20 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_FindGatewayResponses.adoc @@ -0,0 +1,31 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Find Gateway Responses +This is the default screen for the 'Transactions' sub menu. + +Press the 'Lookup' button to display details of all transactions that have been authorised, captured or manually entered. + +== How do I view all Gateway response transactions? +. Press the 'Lookup' button + +A list of all transactions that have been authorised, captured or manually entered will be displayed. + +== Transaction results (external link) +http://www.authorize.net/support/merchant/Transaction_Response/Transaction_Response.htm + +can give the List of all the transaction results diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ManualTransaction.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ManualTransaction.adoc new file mode 100644 index 0000000..a97f878 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ManualTransaction.adoc @@ -0,0 +1,43 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Manual Transaction + +The Manual Electronic Transaction screen allows the user to manually input and process payment related transactions. + +Options available include the following: + +* Authorising payment transactions +* Refunding payments +* Payment Re-Authorisation +* Payment Capture + + +== How do I create a manual electronic transaction? +. Select the 'Payment Method Type' (eg Credit Card) +. Select the 'Product Store' +. Select the 'Transaction Type' + + (NOTE: This is the type of transaction that needs to be created, eg authorisation, capture,refund etc) + + Additional fields will be displayed +. Enter the required details (eg name, credit card, billing address, amount etc) +. Press the 'Submit' button + +A transsaction will be created that can be viewed via the Gateway Transactions screen + +NOTE: TO CHECK: Possible bug as could not get this to work using 'Payment Authorisation Service' and error message appeared + regarding a missing parameter missing for Order Preference Id but the Order Preference Id was not displayed on the screen diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ViewGatewayResponse.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ViewGatewayResponse.adoc new file mode 100644 index 0000000..7a3ce66 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ViewGatewayResponse.adoc @@ -0,0 +1,26 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for View Gateway Response + +This screen shows details of an individual gateway transaction. + +It displays specific information regarding the order and the payment. + +The lower part of the screen shows the gateway response details indicating the time and codes used to process the transaction +through the gateway. \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/acc-payment-gateway.adoc b/applications/accounting/src/docs/asciidoc/_include/acc-payment-gateway.adoc new file mode 100644 index 0000000..178d0a7 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/acc-payment-gateway.adoc @@ -0,0 +1,60 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Payment Gateway + +The Payment Gateway is made up of a configurable interface that processes payments. + +Before using using them, it's needed to config them. + +*Payment Gateway Configuration* is used to setup the parameters required for the system to accept payments via different or + external applications + +Examples of these include: + +* Paypal +* PayFlow +* Authorise.net +* Clear Commerce + +When config is done, *Payment transactions* can be authorised, captured and processed or refunded via the selected mechanism, +(eg Paypal, Authorise.net, etc) more details are explained in <<_payment_transaction_management_in_user_interface>> + +== Payment Gateway Config management in User Interface +include::HELP_EditPaymentGatewayConfig.adoc[leveloffset=+2] + +=== Help for Find Payment Gateway Config Types +This screen lists some of the most common payment gateway configuration types that have been created as part of + the seed or demo data. + +Press the 'Lookup' button to see a list of existing payment gateway configuration types. + +=== Help for Edit Payment Gateway Config Type +This screen allows the update of an existing payment gateway configuration type. + +NOTE: New Payment Gateway Configuration Types cannot be created via this screen. + +== Payment Transaction management in User Interface +include::HELP_FindGatewayResponses.adoc[leveloffset=+2] + +include::HELP_AuthorizeTransaction.adoc[leveloffset=+2] + +include::HELP_CaptureTransaction.adoc[leveloffset=+2] + +include::HELP_ViewGatewayResponse.adoc[leveloffset=+2] + +include::HELP_ManualTransaction.adoc[leveloffset=+2] diff --git a/applications/accounting/src/docs/asciidoc/accounting.adoc b/applications/accounting/src/docs/asciidoc/accounting.adoc index 433df93..b70966a 100644 --- a/applications/accounting/src/docs/asciidoc/accounting.adoc +++ b/applications/accounting/src/docs/asciidoc/accounting.adoc @@ -32,6 +32,8 @@ include::_include/acc-invoices.adoc[leveloffset=+1] include::_include/acc-payments.adoc[leveloffset=+1] +include::_include/acc-payments-gateway.adoc[leveloffset=+1] + include::_include/acc-agreements.adoc[leveloffset=+1] include::_include/acc-financial-accounts.adoc[leveloffset=+1] |
|
|
In reply to this post by mbrohl
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit 0f937ead194bf024379ade52b3af9c0b41c5e52c Author: holivier <[hidden email]> AuthorDate: Wed Feb 12 19:34:15 2020 +0100 Documented: Billing Account Docbook files migration to asciidoc format (OFBIZ-10293) All the help files associated to it are called via include in the main document --- .../HELP_ACCOUNTING_BillingAccountInvoices.xml | 95 ------------ .../HELP_ACCOUNTING_BillingAccountOrders.xml | 29 ---- .../HELP_ACCOUNTING_BillingAccountPayments.xml | 131 ----------------- .../HELP_ACCOUNTING_EditBillingAccount.xml | 159 --------------------- .../HELP_ACCOUNTING_EditBillingAccountRoles.xml | 98 ------------- .../HELP_ACCOUNTING_EditBillingAccountTerms.xml | 106 -------------- .../HELP_ACCOUNTING_FindBillingAccount.xml | 26 ---- .../helpdata/HELP_ACCOUNTING_billing_accounts.xml | 81 ----------- .../_include/HELP_BillingAccountInvoices.adoc | 63 ++++++++ .../_include/HELP_BillingAccountOrders.adoc | 26 ++++ .../_include/HELP_BillingAccountPayments.adoc | 78 ++++++++++ .../asciidoc/_include/HELP_EditBillingAccount.adoc | 88 ++++++++++++ .../_include/HELP_EditBillingAccountRoles.adoc | 55 +++++++ .../_include/HELP_EditBillingAccountTerms.adoc | 58 ++++++++ .../asciidoc/_include/HELP_FindBillingAccount.adoc | 25 ++++ .../asciidoc/_include/acc-billing-accounts.adoc | 64 +++++++++ .../accounting/src/docs/asciidoc/accounting.adoc | 2 + 17 files changed, 459 insertions(+), 725 deletions(-) diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_BillingAccountInvoices.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_BillingAccountInvoices.xml deleted file mode 100644 index 886a55f..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_BillingAccountInvoices.xml +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Billing Account Invoices help screen</title> - <para>The Billing Account Find Invoices screen displays by default a list of invoices that have - been charged to the billing account.</para> - <para>Any invoice displayed here means that its invoice amount has been deducted from the - billing account credit limit.For example: If the Billing Account Credit Limit is $100 and - the there are 2 invoices displayed with amounts $10 and $25 then the available credit for - the billing account will be $75.</para> - <para>The invoice can be at various statues and there is an option to locate an invoice by - status.</para> - <para>It is also used to apply any payments that have been made into the Billing Account to an - invoice. A 'Capture' button is displayed next to each invoice displayed that has an amount - outstanding.</para> - <para>Example:</para> - <para> - <itemizedlist> - <listitem> - <para>Two invoices are charged to a Billing Account (Invoice A $10 and Invoice B - $25)</para> - </listitem> - <listitem> - <para>A payment of $17 has been paid into the Billing Account</para> - </listitem> - <listitem> - <para>If the Capture button is pressed for the invoice A then $10 of the $17 payment - will be applied to this invoice and a new payment transaction of $7 will be - created and available to apply to a different invoice </para> - </listitem> - </itemizedlist> - </para> - <section> - <title>How do I locate an invoice by status?</title> - <para> - <orderedlist> - <listitem> - <para>Select the 'Invoices' sub menu</para> - </listitem> - <listitem> - <para>Use the drop down box to select the 'Status Id' for the invoice - required</para> - </listitem> - <listitem> - <para>Press the 'Submit' button</para> - </listitem> - </orderedlist> - </para> - <para>A list of invoices with the required status will be displayed </para> - </section> - <section> - <title>How do I capture a payment for an invoice?</title> - <para>IMPORTANT: In order for this to work a payment needs to have been made to the billing - account that has not been completely applied to any other invoices. Payments to a - billing account can be done via the 'Payments' sub menu for the billing account or by - using Accounting / Payments menu.</para> - <para> - <orderedlist> - <listitem> - <para>Select the 'Invoices' sub menu</para> - </listitem> - <listitem> - <para>Locate the invoice required (NOTE: The 'Amount to Apply' is the same as - the 'Total' column)</para> - </listitem> - <listitem> - <para>Press the 'Capture' button (NOTE: The 'Amount to Apply' is different to - the 'Total' column)</para> - </listitem> - </orderedlist> - </para> - <para>The 'Capture' button is no longer displayed next to the invoice and an additional - payments transaction will be created for any difference between the invoice total and - the amount paid (Eg Invoice Total $100, Payment Amount $125, the new payment transaction - amount will be $25)</para> - <para>NOTE: The above example assumes that the payment available will cover the total amount - outstanding for the invoice</para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_BillingAccountOrders.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_BillingAccountOrders.xml deleted file mode 100644 index 37091fc..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_BillingAccountOrders.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Billing Account Orders help screen</title> - <para>This sub menu lists the details of any Sales Orders that have - been charged to the billing account. A Sales Order is charged to a - billing account by selecting the billing account as the Payment - Method.</para> - <para>NOTE: The details displayed here in conjunction with the - 'Payments' sub menu could also be used to generate a customer - statement or account showing details of customer activity during a - specified time period.</para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_BillingAccountPayments.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_BillingAccountPayments.xml deleted file mode 100644 index 4e62b36..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_BillingAccountPayments.xml +++ /dev/null @@ -1,131 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Billing Account Payments help screen</title> - <para>This sub menu allows the creation of a payment that is automatically applied to the - billing account.</para> - <para>It is used when a payment has been received from a customer that is used to pay off the - balance (or part balance) of a billing account. </para> - <para>An example of how this works is similar to a credit card statement where a list of - transactions have been incurred over the previous month and one payment is used to settle - the outstanding balance.</para> - <section> - <title>How do I add a payment to a billing account?</title> - <para> - <orderedlist> - <listitem> - <para>Select the 'Payments' sub menu</para> - </listitem> - <listitem> - <para>The 'Create Payment' screen is displayed</para> - </listitem> - <listitem> - <para>Enter or use the lookup to enter the 'From Party Id' (NOTE: By default - this will be the Bill To Party of the Billing Account)</para> - </listitem> - <listitem> - <para>Select the 'Organisation Party Id' from the drop down box</para> - </listitem> - <listitem> - <para>Select the 'Payment Type Id' from the drop down box (NOTE: By default this - will be set to 'Customer Deposit')</para> - </listitem> - <listitem> - <para>Leave the 'Payment Method Type' as 'Billing Account' (NOTE TO CHECK: What - happens if you do change this....)</para> - </listitem> - <listitem> - <para>Enter the 'Amount' of the payment</para> - </listitem> - <listitem> - <para>Press the 'Create' button</para> - </listitem> - </orderedlist> - </para> - <para>The new entry is displayed at the bottom of the screen. </para> - <para>NOTE: The total amount of the payment will be applied to the Billing Account. This can - be verified by going to Accounting / Payments menu and locating the newly created - payment. The 'Amount to Apply' column will be zero.</para> - </section> - <section> - <title>How do I update a payment for a billing account?</title> - <para>A payment can be updated for a billing account by amending the amount of the payment - that has been applied to the billing account. For example if a payment of $100 has been - applied to a billing account it can be amended so that only $75 will be applied and $25 - will be available to be applied elsewhere.</para> - <para> - <orderedlist> - <listitem> - <para>Click on the 'Payment Id' of the payment that needs to be removed</para> - </listitem> - <listitem> - <para>The 'Payment Overview' screen is displayed</para> - </listitem> - <listitem> - <para>Press the 'Update' button in the 'Payments Applied' box</para> - </listitem> - <listitem> - <para>The 'Payment Applications' screen is displayed</para> - </listitem> - <listitem> - <para>Locate the 'Billing Account Id' and 'Amount Applied'</para> - </listitem> - <listitem> - <para>Amend the 'Amount Applied' for the billing account</para> - </listitem> - <listitem> - <para>Press the 'Update' button next to the entry that refers to the 'Billing - Account Id'</para> - </listitem> - </orderedlist> - </para> - <para>A message will be displayed saying that the payment has been removed from the billing - account</para> - </section> - <section> - <title>How do I delete a payment from a billing account?</title> - <para>A payment can be removed from billing account by removing the link that has applied - the payment to the billing account.</para> - <para> - <orderedlist> - <listitem> - <para>Click on the 'Payment Id' of the payment that needs to be removed</para> - </listitem> - <listitem> - <para>The 'Payment Overview' screen is displayed</para> - </listitem> - <listitem> - <para>Press the 'Update' button in the 'Payments Applied' box</para> - </listitem> - <listitem> - <para>The 'Payment Applications' screen is displayed</para> - </listitem> - <listitem> - <para>Press the 'Remove' button next to the entry that refers to the 'Billing - Account Id'</para> - </listitem> - </orderedlist> - </para> - <para>A message will be displayed saying that the payment has been removed from the billing - account</para> - <para>NOTE : The above example was done when the payment status was at 'Not Paid' - need to - test if it still works if the payment status is at 'Received' or 'Confirmed' too. - </para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditBillingAccount.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditBillingAccount.xml deleted file mode 100644 index bfa0299..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditBillingAccount.xml +++ /dev/null @@ -1,159 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Billing Account help screen</title> - <para>The 'Account' sub menu is used to enter the basic details required for setting up a new - billing account or editing an existing one.</para> - <para>It can be used to create or update the following details for a Billing Account:</para> - <para> - <itemizedlist> - <listitem> - <para>Billing Account Identification</para> - </listitem> - <listitem> - <para>Party to be Billed</para> - </listitem> - <listitem> - <para>Billing Account Limit (NOTE: This is how much credit the customer will be - given eg $5000)</para> - </listitem> - <listitem> - <para>Currency to be used for Billing Account</para> - </listitem> - <listitem> - <para>Start and End Dates </para> - </listitem> - </itemizedlist> - </para> - <para>NOTE: There are currently two ways to add a party to a billing account.</para> - <para> - <orderedlist> - <listitem> - <para>Enter a party id in the 'Party Billed To' field</para> - </listitem> - <listitem> - <para>Use the 'Roles' sub menu to add a party id with the role of 'Bill To - Customer'</para> - </listitem> - <listitem> - <para>If using the first method then when you press the update button this removes - the party id from this field and automatically creates the party under the Roles - sub menu with the role of 'Bill To Customer' </para> - </listitem> - </orderedlist> - </para> - <section> - <title>How do I create a new Billing Account?</title> - <para>NOTE TO CHECK: If the party doesnt have the role 'Bill To Customer' is it - automatically added when the billing account is created or will the creation - fail?..</para> - <para>Example: To create a new Billing Account</para> - <para> - <orderedlist> - <listitem> - <para>Press the 'New' button and the 'Edit Billing Account' screen is - displayed</para> - </listitem> - <listitem> - <para>Enter a code or number for the 'Billing Account Id' (NOTE: If this is left - blank a number will be automatically generated)</para> - </listitem> - <listitem> - <para>Enter a number for the 'Billing Account Limit' (eg 5000)</para> - </listitem> - <listitem> - <para>Leave the 'Account Currency UOM Id' as it is (NOTE: This should be the - default currency for Company...)</para> - </listitem> - <listitem> - <para>Enter a description that can be used to identify the Billing Account (eg - Joe Bloggs Builders Billing Account)</para> - </listitem> - <listitem> - <para>Leave the 'Contact Mech' field as it is (NOTE: This field cannot be filled - in until either the 'Party Billed To' has been filled in or a party with the - role of 'Bill To Customer' has been added under the 'Roles' sub menu</para> - </listitem> - <listitem> - <para>Enter the Billing Account start date in the 'From Date' field. (NOTE: If - left blank then this will default to the current date and time. NOTE TO - CHECK: Can this date be in the future.....?)</para> - </listitem> - <listitem> - <para>Leave the 'Thru date' field blank</para> - </listitem> - <listitem> - <para>Enter or use the lookup to select the 'Party Billed To'</para> - </listitem> - <listitem> - <para>Press the 'Update' button</para> - </listitem> - </orderedlist> - </para> - <para>After the 'Update' button has been pressed then the 'Contact Mech Id' field will - either be automatically filled in or will allow you to select a contact mech from a drop - down list </para> - </section> - <section> - <title>How do I update an existing Billing Account?</title> - <para>Billing Account details can be updated. A key field that may need to be updated is the - actual Billing Account Limit if a customer reduces or improves their credit - rating</para> - <para>Example: To Update a Billing Account</para> - <para> - <orderedlist> - <listitem> - <para>Click on the 'Billing Account Id' of the Billing Account to updated</para> - </listitem> - <listitem> - <para>The 'Edit Billing Account' screen is displayed</para> - </listitem> - <listitem> - <para>Enter the changes required</para> - </listitem> - <listitem> - <para>Press the 'Update' button</para> - </listitem> - </orderedlist> - </para> - </section> - <section> - <title>How do I delete a Billing Account?</title> - <para>Billing Accounts cannot be deleted. They can only be expired. This means that they - will no longer be able to be used to associate invoices or payments against.</para> - <para>Example: To Expire a Billing Account</para> - <para> - <orderedlist> - <listitem> - <para> Click on the 'Billing Account Id' of the Billing Account to be - expired</para> - </listitem> - <listitem> - <para>The 'Edit Billing Account' screen is displayed</para> - </listitem> - <listitem> - <para>Enter the current date in the 'Thru date' field</para> - </listitem> - <listitem> - <para>Press the 'Update' button </para> - </listitem> - </orderedlist> - </para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditBillingAccountRoles.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditBillingAccountRoles.xml deleted file mode 100644 index 8a515f0..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditBillingAccountRoles.xml +++ /dev/null @@ -1,98 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Billing Account Roles help screen</title> - <para>This sub menu allows parties with specific roles to be associated with to a Billing - Account. Roles allows you to specify a party role. </para> - <para> is used to specify which party should be billed for the billing account. It can be used - as follows:</para> - <para> - <itemizedlist> - <listitem> - <para>Simple billing account for a single party</para> - </listitem> - <listitem> - <para>More complex billing account where multiple parties (eg company subsidiaries) - charge invoices to the billing account but a different party (eg head office) - will pay the account </para> - </listitem> - </itemizedlist> - </para> - <section> - <title>How do I add a party role to a billing account?</title> - <para>Select the 'Roles' sub menu</para> - <orderedlist> - <listitem> - <para>Enter or use the lookup to select the 'Party Id'</para> - </listitem> - <listitem> - <para>Select the 'Role Type Id' from the drop down box (eg Bill To Customer)</para> - </listitem> - <listitem> - <para>Leave the 'From Date' blank (NOTE: If left blank it will default to the - current date and time)</para> - </listitem> - <listitem> - <para>Leave the 'Thru Date' blank</para> - </listitem> - <listitem> - <para>Press the 'Add' button</para> - </listitem> - </orderedlist> - <para>The new party role is displayed at the bottom of the screen </para> - </section> - <section> - <title>How do I update a party role for a billing account?</title> - <para>The only field that can be updated for a party role is the 'Thru Date'. If any other - details need to be amended then the entry will need to be deleted and then - recreated.</para> - <para> - <orderedlist> - <listitem> - <para>Select the 'Roles' sub menu</para> - </listitem> - <listitem> - <para>Locate the entry that needs to be amended</para> - </listitem> - <listitem> - <para>Enter or use the lookup to enter the 'Thru Date'</para> - </listitem> - <listitem> - <para>Press the 'Update' button for the entry </para> - </listitem> - </orderedlist> - </para> - </section> - <section> - <title>How do I delete a party role from a billing account?</title> - <para> - <orderedlist> - <listitem> - <para>Locate the entry that needs to be deleted</para> - </listitem> - <listitem> - <para>Press the 'Delete' button next to the entry</para> - </listitem> - <listitem> - <para>The entry will be removed from the bottom of the screen </para> - </listitem> - </orderedlist> - </para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditBillingAccountTerms.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditBillingAccountTerms.xml deleted file mode 100644 index 8a6dfbe..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditBillingAccountTerms.xml +++ /dev/null @@ -1,106 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Billing Account Terms help screen</title> - <para>This sub menu allows terms to be associated with a billing account. Currently these can be - the following:</para> - <para> - <itemizedlist> - <listitem> - <para>payment terms (discounted if paid within specified days)</para> - </listitem> - <listitem> - <para>payment terms (due on a specified day per month)</para> - </listitem> - <listitem> - <para>payment terms (net days)</para> - </listitem> - <listitem> - <para>penalty terms (late fee)</para> - </listitem> - <listitem> - <para>penalty terms (collection agency fee)</para> - </listitem> - <listitem> - <para>miscellaneous (non returnable sales item)</para> - </listitem> - </itemizedlist> - </para> - <para>>NOTE: There is an overlap here with the terms that can be specified in an agreement. - Would a billing account party also have an agreement for payment terms...? .</para> - <section> - <title>How do I add terms to a billing account?</title> - <para> - <orderedlist> - <listitem> - <para>Select the 'Terms' sub menu</para> - </listitem> - <listitem> - <para>Select a 'Term Type' from the drop down box (eg. Payment net days)</para> - </listitem> - <listitem> - <para>Leave the 'UOM' field blank</para> - </listitem> - <listitem> - <para>Enter a number in the 'Term Value' field (eg. 30 which would mean '30 - days' when related to 'Payment net days')</para> - </listitem> - <listitem> - <para>Press the 'Save' button</para> - </listitem> - </orderedlist> - </para> - <para>The term is displayed in the top part of the screen </para> - </section> - <section> - <title>How do I update terms for a billing account?</title> - <para>Select the 'Terms' sub menu</para> - <para> - <orderedlist> - <listitem> - <para>Press the 'Edit' button next to the entry that needs to be amended</para> - </listitem> - <listitem> - <para>The details are displayed in the 'Edit Billing Account Terms' box</para> - </listitem> - <listitem> - <para>Update the 'Term Type', 'UOM' or 'Term Value' as required</para> - </listitem> - <listitem> - <para>Press the 'Save' button</para> - </listitem> - </orderedlist> - </para> - <para>The updated term is displayed in the top part of the screen </para> - </section> - <section> - <title>How do I remove terms from a billing account?</title> - <para> - <orderedlist> - <listitem> - <para>Select the 'Terms' sub menu</para> - </listitem> - <listitem> - <para>Press the 'Delete' button next to the entry that needs to be removed - </para> - </listitem> - </orderedlist> - </para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindBillingAccount.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindBillingAccount.xml deleted file mode 100644 index 0b87aac..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindBillingAccount.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Find Billing Account help screen</title> - <para>The default screen is for the Billing Account tab is 'Find - Billing Account'. It is used to locate existing billing accounts that - have been created.</para> - <para>The user has the option to select an existing billing account or - create a new one by clicking on the 'New' button.</para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_billing_accounts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_billing_accounts.xml deleted file mode 100644 index abef500..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_billing_accounts.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>Billing Accounts.</title> - <para>A billing account is a way of allowing customers to consolidate several invoices into an - account that is paid off at a later date.Customers can be allocated a credit limit and - orders can be taken up to the value of the credit limit without any payment being made. - Statements to the customer can then be generated (eg monthly) and payment is made based on - the outstanding amount.</para> - <para>NOTE: A billing account does not change the flow of the normal Invoice and Payment - processes. It simply allows for a more structured organisation of Invoices and - Payments..</para> - <para>Billing Accounts can be used for the following:</para> - <para> - <itemizedlist> - <listitem> - <para>Setting credit limits for customers</para> - </listitem> - <listitem> - <para>Keeping track of credit available to customer for purchase on account</para> - </listitem> - <listitem> - <para>Keeping track of payments made in advance (NOTE TO CHECK: Could also use - Financial Account for advance payments but need to understand the differences in - functionality and process) </para> - </listitem> - <listitem> - <para>Keeping track of a subset of payments and invoices for a specific client, i.e. - allowing them to have multiple billing accounts (NOTE TO CHECK: This is from - David - does this mean having multiple accounts for one customer or does it mean - one billing account can track a hierarchy of invoices and payments.....)</para> - </listitem> - <listitem> - <para>Allow multiple authorised parties to bill against the same account which one - party is responsible for paying (e.g. different offices of the same organisation - may have one single account with a supplier to make use of order volume - discounts)</para> - </listitem> - <listitem> - <para>Managing and generating customer statements ??</para> - </listitem> - <listitem> - <para>Customer specific order tracking</para> - </listitem> - <listitem> - <para>Accounts Receivable / Debt Management</para> - </listitem> - <listitem> - <para>Analysis and monitoring customer spending (creditworthiness / discounts / - product popularity ???)</para> - </listitem> - </itemizedlist> - </para> - <para>NOTE: A payment that is applied (or matched) to a Billing Account it should still be - applied to an invoice. In the case where the payment arrives before the invoice has been - generated then once the invoice is generated it should be applied to the payment or - payments. </para> - <xi:include href="HELP_ACCOUNTING_FindBillingAccount.xml"/> - <xi:include href="HELP_ACCOUNTING_EditBillingAccount.xml"/> - <xi:include href="HELP_ACCOUNTING_EditBillingAccountRoles.xml"/> - <xi:include href="HELP_ACCOUNTING_EditBillingAccountTerms.xml"/> - <xi:include href="HELP_ACCOUNTING_BillingAccountInvoices.xml"/> - <xi:include href="HELP_ACCOUNTING_BillingAccountPayments.xml"/> - <xi:include href="HELP_ACCOUNTING_BillingAccountOrders.xml"/> -</section> diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_BillingAccountInvoices.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_BillingAccountInvoices.adoc new file mode 100644 index 0000000..7049196 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_BillingAccountInvoices.adoc @@ -0,0 +1,63 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Billing Account Invoices +The Billing Account Find Invoices screen displays by default a list of invoices that have been charged to the billing account. + +Any invoice displayed here means that its invoice amount has been deducted from the billing account credit limit. +For example: If the Billing Account Credit Limit is $100 and the there are 2 invoices displayed with amounts $10 and $25 then + the available credit for the billing account will be $75. + +The invoice can be at various statues and there is an option to locate an invoice by status. + +It is also used to apply any payments that have been made into the Billing Account to an invoice. +A 'Capture' button is displayed next to each invoice displayed that has an amount outstanding. + +Example: + +* Two invoices are charged to a Billing Account (Invoice A $10 and Invoice B $25) +* A payment of $17 has been paid into the Billing Account +* If the Capture button is pressed for the invoice A then $10 of the $17 payment will be applied to this invoice and + a new payment transaction of $7 will be created and available to apply to a different invoice + + +== How do I locate an invoice by status? +. Select the 'Invoices' sub menu +. Use the drop down box to select the 'Status Id' for the invoice required +. Press the 'Submit' button + +A list of invoices with the required status will be displayed + +== How do I capture a payment for an invoice? +IMPORTANT: In order for this to work a payment needs to have been made to the billing account that has not been completely applied + to any other invoices. + +Payments to a billing account can be done via the 'Payments' sub menu for the billing account or by using Accounting / Payments menu. + +. Select the 'Invoices' sub menu +. Locate the invoice required + + (NOTE: The 'Amount to Apply' is the same as the 'Total' column) +. Press the 'Capture' button + + (NOTE: The 'Amount to Apply' is different to the 'Total' column) + +The 'Capture' button is no longer displayed next to the invoice and an additional payments transaction will be created for + any difference between the invoice total and the amount paid (Eg Invoice Total $100, Payment Amount $125, + the new payment transaction amount will be $25) + +NOTE: The above example assumes that the payment available will cover the total amount outstanding for the invoice diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_BillingAccountOrders.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_BillingAccountOrders.adoc new file mode 100644 index 0000000..bac9775 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_BillingAccountOrders.adoc @@ -0,0 +1,26 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Billing Account Orders +This sub menu lists the details of any Sales Orders that have been charged to the billing account. + +A Sales Order is charged to a billing account by selecting the billing account as the Payment Method. + +NOTE: The details displayed here in conjunction with the 'Payments' sub menu could also be used to generate + a customer statement or account showing details of customer activity during a specified time period. \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_BillingAccountPayments.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_BillingAccountPayments.adoc new file mode 100644 index 0000000..07d44d6 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_BillingAccountPayments.adoc @@ -0,0 +1,78 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Billing Account Payments +This sub menu allows the creation of a payment that is automatically applied to the billing account. + +It is used when a payment has been received from a customer that is used to pay off the balance (or part balance) of + a billing account. + +An example of how this works is similar to a credit card statement where a list of transactions have been incurred + over the previous month and one payment is used to settle the outstanding balance. + +== How do I add a payment to a billing account? +. Select the 'Payments' sub menu +. The 'Create Payment' screen is displayed +. Enter or use the lookup to enter the 'From Party Id' + + (NOTE: By default this will be the Bill To Party of the Billing Account) +. Select the 'Organisation Party Id' from the drop down box +. Select the 'Payment Type Id' from the drop down box + + (NOTE: By default this will be set to 'Customer Deposit') +. Leave the 'Payment Method Type' as 'Billing Account' + + (NOTE TO CHECK: What happens if you do change this....) +. Enter the 'Amount' of the payment +. Press the 'Create' button + +The new entry is displayed at the bottom of the screen. + +NOTE: The total amount of the payment will be applied to the Billing Account. + + This can be verified by going to Accounting / Payments menu and locating the newly created payment. + + The 'Amount to Apply' column will be zero. + +== How do I update a payment for a billing account? +A payment can be updated for a billing account by amending the amount of the payment that has been applied + to the billing account. + +For example if a payment of $100 has been applied to a billing account it can be amended so that only $75 +will be applied and $25 will be available to be applied elsewhere. + +. Click on the 'Payment Id' of the payment that needs to be removed +. The 'Payment Overview' screen is displayed +. Press the 'Update' button in the 'Payments Applied' box +. The 'Payment Applications' screen is displayed +. Locate the 'Billing Account Id' and 'Amount Applied' +. Amend the 'Amount Applied' for the billing account +. Press the 'Update' button next to the entry that refers to the 'Billing Account Id' + +A message will be displayed saying that the payment has been removed from the billing account + +== How do I delete a payment from a billing account? +A payment can be removed from billing account by removing the link that has applied the payment to the billing account. + +. Click on the 'Payment Id' of the payment that needs to be removed +. The 'Payment Overview' screen is displayed +. Press the 'Update' button in the 'Payments Applied' box +. The 'Payment Applications' screen is displayed +. Press the 'Remove' button next to the entry that refers to the 'Billing Account Id' + +A message will be displayed saying that the payment has been removed from the billing account + +NOTE: The above example was done when the payment status was at 'Not Paid' + + TO CHECK: need to test if it still works if the payment status is at 'Received' or 'Confirmed' too. + \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditBillingAccount.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditBillingAccount.adoc new file mode 100644 index 0000000..d8fa1cb --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditBillingAccount.adoc @@ -0,0 +1,88 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Edit Billing Account +The 'Account' sub menu is used to enter the basic details required for setting up a new billing account or editing an existing one. + +It can be used to create or update the following details for a Billing Account: + +* Billing Account Identification +* Party to be Billed +* Billing Account Limit + + (NOTE: This is how much credit the customer will be given eg $5000) +* Currency to be used for Billing Account +* Start and End Dates + +NOTE: There are currently two ways to add a party to a billing account. + +. Enter a party id in the 'Party Billed To' field +. Use the 'Roles' sub menu to add a party id with the role of 'Bill To Customer' +. If using the first method then when you press the update button this removes the party id from this field and + automatically creates the party under the Roles sub menu with the role of 'Bill To Customer' + + +== How do I create a new Billing Account? + +NOTE: TO CHECK: If the party doesnt have the role 'Bill To Customer' is it automatically added when the billing account + is created or will the creation fail?.. + +Example: To create a new Billing Account + +. Press the 'New' button and the 'Edit Billing Account' screen is displayed +. Enter a code or number for the 'Billing Account Id' + + (NOTE: If this is left blank a number will be automatically generated) +. Enter a number for the 'Billing Account Limit' (eg 5000) +. Leave the 'Account Currency UOM Id' as it is + + (NOTE: This should be the default currency for Company...) +. Enter a description that can be used to identify the Billing Account (eg Joe Bloggs Builders Billing Account) +. Leave the 'Contact Mech' field as it is + + (NOTE: This field cannot be filled in until either the 'Party Billed To' has been filled in or a party with + the role of 'Bill To Customer' has been added under the 'Roles' sub menu) +. Enter the Billing Account start date in the 'From Date' field. + + (NOTE: If left blank then this will default to the current date and time. + + TO CHECK: Can this date be in the future.....?) +. Leave the 'Thru date' field blank +. Enter or use the lookup to select the 'Party Billed To' +. Press the 'Update' button + +After the 'Update' button has been pressed then the 'Contact Mech Id' field will either be automatically filled in + or will allow you to select a contact mech from a drop down list + +== How do I update an existing Billing Account? +Billing Account details can be updated. + +A key field that may need to be updated is the actual Billing Account Limit if a customer reduces or improves their credit rating + +Example: To Update a Billing Account + +. Click on the 'Billing Account Id' of the Billing Account to updated +. The 'Edit Billing Account' screen is displayed +. Enter the changes required +. Press the 'Update' button + + +== How do I delete a Billing Account? +Billing Accounts cannot be deleted. + +They can only be expired. + +This means that they will no longer be able to be used to associate invoices or payments against. + +Example: To Expire a Billing Account + +. Click on the 'Billing Account Id' of the Billing Account to be expired +. The 'Edit Billing Account' screen is displayed +. Enter the current date in the 'Thru date' field +. Press the 'Update' button diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditBillingAccountRoles.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditBillingAccountRoles.adoc new file mode 100644 index 0000000..5efcf21 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditBillingAccountRoles.adoc @@ -0,0 +1,55 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Help for Billing Account Roles +This sub menu allows parties with specific roles to be associated with to a Billing Account. + + +It is used to specify which party should be billed for the billing account. + +It can be used as follows: + +* Simple billing account for a single party +* More complex billing account where multiple parties (eg company subsidiaries) charge invoices to the billing account + but a different party (eg head office) will pay the account + +== How do I add a party role to a billing account? +Select the 'Roles' sub menu + +. Enter or use the lookup to select the 'Party Id' +. Select the 'Role Type Id' from the drop down box (eg Bill To Customer) +. Leave the 'From Date' blank + + (NOTE: If left blank it will default to the current date and time) +. Leave the 'Thru Date' blank +. Press the 'Add' button + +The new party role is displayed at the bottom of the screen + +== How do I update a party role for a billing account? +The only field that can be updated for a party role is the 'Thru Date'. If any other details need to be amended then +the entry will need to be deleted and then recreated. + +. Select the 'Roles' sub menu +. Locate the entry that needs to be amended +. Enter or use the lookup to enter the 'Thru Date' +. Press the 'Update' button for the entry + + +== How do I delete a party role from a billing account? +. Locate the entry that needs to be deleted +. Press the 'Delete' button next to the entry +. The entry will be removed from the bottom of the screen diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditBillingAccountTerms.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditBillingAccountTerms.adoc new file mode 100644 index 0000000..39c5b49 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditBillingAccountTerms.adoc @@ -0,0 +1,58 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Billing Account Terms +This sub menu allows terms to be associated with a billing account. + +Currently these can be the following: + +* payment terms (discounted if paid within specified days) +* payment terms (due on a specified day per month) +* payment terms (net days) +* penalty terms (late fee) +* penalty terms (collection agency fee) +* miscellaneous (non returnable sales item) + +NOTE: TO CHECK: There is an overlap here with the terms that can be specified in an agreement. + Would a billing account party also have an agreement for payment terms...? . + +== How do I add terms to a billing account? + +. Select the 'Terms' sub menu +. Select a 'Term Type' from the drop down box (eg. Payment net days) +. Leave the 'UOM' field blank +. Enter a number in the 'Term Value' field + + (eg. 30 which would mean '30 days' when related to 'Payment net days') +. Press the 'Save' button + +The term is displayed in the top part of the screen + +== How do I update terms for a billing account? +Select the 'Terms' sub menu + +. Press the 'Edit' button next to the entry that needs to be amended +. The details are displayed in the 'Edit Billing Account Terms' box +. Update the 'Term Type', 'UOM' or 'Term Value' as required +. Press the 'Save' button + +The updated term is displayed in the top part of the screen + +== How do I remove terms from a billing account? +. Select the 'Terms' sub menu +. Press the 'Delete' button next to the entry that needs to be removed diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_FindBillingAccount.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_FindBillingAccount.adoc new file mode 100644 index 0000000..a85b811 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_FindBillingAccount.adoc @@ -0,0 +1,25 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Find Billing Account + +The default screen is for the Billing Account tab is 'Find Billing Account'. +It is used to locate existing billing accounts that have been created. + +The user has the option to select an existing billing account or create a new one by clicking on the 'New' button. \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/acc-billing-accounts.adoc b/applications/accounting/src/docs/asciidoc/_include/acc-billing-accounts.adoc new file mode 100644 index 0000000..830e814 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/acc-billing-accounts.adoc @@ -0,0 +1,64 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Billing Accounts. + +A billing account is a way of allowing customers to consolidate several invoices into an account that is paid off +at a later date. Customers can be allocated a credit limit and orders can be taken up to the value of the credit limit without +any payment being made. +Statements to the customer can then be generated (eg monthly) and payment is made based on the outstanding amount. + +NOTE: A billing account does not change the flow of the normal Invoice and Payment processes. + It simply allows for a more structured organisation of Invoices and Payments.. + +Billing Accounts can be used for the following: + +* Setting credit limits for customers +* Keeping track of credit available to customer for purchase on account +* Keeping track of payments made in advance + + (NOTE TO CHECK: Could also use Financial Account for advance payments but need to understand the differences + in functionality and process) +* Keeping track of a subset of payments and invoices for a specific client, i.e. allowing them to have multiple billing accounts + + (NOTE TO CHECK: This is from David - does this mean having multiple accounts for one customer or does it mean one + billing account can track a hierarchy of invoices and payments.....) +* Allow multiple authorised parties to bill against the same account which one party is responsible for paying + + (e.g. different offices of the same organisation may have one single account with a supplier to make use of order volume discounts) +* Managing and generating customer statements ?? +* Customer specific order tracking +* Accounts Receivable / Debt Management +* Analysis and monitoring customer spending (creditworthiness / discounts / product popularity ???) + +NOTE: A payment that is applied (or matched) to a Billing Account it should still be applied to an invoice. + In the case where the payment arrives before the invoice has been generated then once the invoice is generated + it should be applied to the payment or payments. + +== Billing Account management in User Interface +include::HELP_FindBillingAccount.adoc[leveloffset=+2] + +include::HELP_EditBillingAccount.adoc[leveloffset=+2] + +include::HELP_EditBillingAccountRoles.adoc[leveloffset=+2] + +include::HELP_EditBillingAccountTerms.adoc[leveloffset=+2] + +include::HELP_BillingAccountInvoices.adoc[leveloffset=+2] + +include::HELP_BillingAccountPayments.adoc[leveloffset=+2] + +include::HELP_BillingAccountOrders.adoc[leveloffset=+2] diff --git a/applications/accounting/src/docs/asciidoc/accounting.adoc b/applications/accounting/src/docs/asciidoc/accounting.adoc index b70966a..f3d3d35 100644 --- a/applications/accounting/src/docs/asciidoc/accounting.adoc +++ b/applications/accounting/src/docs/asciidoc/accounting.adoc @@ -34,6 +34,8 @@ include::_include/acc-payments.adoc[leveloffset=+1] include::_include/acc-payments-gateway.adoc[leveloffset=+1] +include::_include/acc-billing-accounts.adoc[leveloffset=+1] + include::_include/acc-agreements.adoc[leveloffset=+1] include::_include/acc-financial-accounts.adoc[leveloffset=+1] |
|
|
In reply to this post by mbrohl
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit fad7ad0272690940695ee1f2ac00fee4d8ab7c54 Author: holivier <[hidden email]> AuthorDate: Thu Feb 13 13:55:09 2020 +0100 Documented: Tax-AUthorities Docbook files migration to asciidoc format (OFBIZ-10291) All the help files associated to it are called via include in the main document --- .../helpdata/HELP_ACCOUNTING_EditTaxAuthority.xml | 35 ------- .../HELP_ACCOUNTING_EditTaxAuthorityAssocs.xml | 81 --------------- .../HELP_ACCOUNTING_EditTaxAuthorityCategories.xml | 62 ------------ .../HELP_ACCOUNTING_EditTaxAuthorityGlAccounts.xml | 92 ----------------- .../HELP_ACCOUNTING_EditTaxAuthorityPartyInfo.xml | 32 ------ ...ELP_ACCOUNTING_EditTaxAuthorityRateProducts.xml | 109 --------------------- .../helpdata/HELP_ACCOUNTING_FindTaxAuthority.xml | 106 -------------------- .../HELP_ACCOUNTING_ListTaxAuthorityParties.xml | 87 ---------------- .../helpdata/HELP_ACCOUNTING_tax_authorities.xml | 56 ----------- .../asciidoc/_include/HELP_EditTaxAuthority.adoc | 31 ++++++ .../_include/HELP_EditTaxAuthorityAssocs.adoc | 42 ++++++++ .../_include/HELP_EditTaxAuthorityCategories.adoc | 40 ++++++++ .../_include/HELP_EditTaxAuthorityGlAccounts.adoc | 51 ++++++++++ .../_include/HELP_EditTaxAuthorityPartyInfo.adoc | 27 +++++ .../HELP_EditTaxAuthorityRateProducts.adoc | 57 +++++++++++ .../asciidoc/_include/HELP_FindTaxAuthority.adoc | 62 ++++++++++++ .../_include/HELP_ListTaxAuthorityParties.adoc | 49 +++++++++ .../asciidoc/_include/acc-tax-authorities.adoc | 55 +++++++++++ .../accounting/src/docs/asciidoc/accounting.adoc | 2 + 19 files changed, 416 insertions(+), 660 deletions(-) diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthority.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthority.xml deleted file mode 100644 index 558b67a..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthority.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Tax Authority screen.</title> - <para>The 'Edit Tax Authority' sub menu is the first of six sub menus used in the creation or update of a Tax Authority. On the creation or update of a Tax Authority it is the default screen that is displayed.</para> - <para>It can be used for updating the basic details of a Tax Authority such as:</para> - <orderedlist> - <listitem><para>Changing whether a tax id or code is required for an exemption</para></listitem> - <listitem><para>Modifying the tax id or code format</para></listitem> - <listitem><para>Updating where or not to include the tax calculation as part of the product price</para></listitem> - </orderedlist> - <para>NOTE: An example of the Tax Id is as follows:</para> - <para>\d{2}\-\d{7}|\d{3}\-\d{2}\-\d{4} which translates to 99-9999999 or 999-99-9999</para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityAssocs.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityAssocs.xml deleted file mode 100644 index 0eea0ff..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityAssocs.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Tax Authority Associations screen.</title> - <para>An association is a way of specifying how tax authorities can be - linked to each other.</para> - <para>It can be used in the situation where the tax structure is - hierarchical (eg city tax, plus county tax plus state tax).</para> - <para>Using associations allows tax rates from multiple authorities to - be applied to a particular order at once.</para> - <section> - <title>How do I add a new association for a Tax Authority?</title> - <orderedlist> - <listitem> - <para>Enter or use the lookup to find the 'To Tax Auth Geo Id' - </para> - </listitem> - <listitem> - <para>Enter of use the lookup to find the 'To Tax Auth Party Id' - </para> - </listitem> - <listitem> - <para>Leave the 'From Date' blank (NOTE: It will default to the - current date and time</para> - </listitem> - <listitem> - <para>Leave the 'Thru Date' blank</para> - </listitem> - <listitem> - <para>Select the 'Type' from the dropdown or leave blank</para> - </listitem> - <listitem> - <para>Press the 'Add' button</para> - </listitem> - <listitem> - <para>The new tax authority association is displayed at the bottom - of the screen.</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I update an association for a Tax Authority?</title> - <orderedlist> - <listitem> - <para>Only two fields are available for update, these are the 'Thru - Date' and 'Type'</para> - </listitem> - <listitem> - <para>Enter the changes required</para> - </listitem> - <listitem> - <para>Press the 'Update' button next to the entry updated</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I remove an association for a Tax Authority?</title> - <orderedlist> - <listitem> - <para>Press the 'Delete' button next to the entry that needs to be - deleted</para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityCategories.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityCategories.xml deleted file mode 100644 index 8df8b02..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityCategories.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Tax Authority Categories screen.</title> - <para>The Tax Authority Categories sub menu screen allows you link a - tax authority to a specific catalog or product category.</para> - <para>It can be used to add product categories to a tax authority. This - means that all products in this category will be taxed at the rate - specified for the tax authority.</para> - <para>An example of this could be separating products into categories - for export to different countries. A separate tax authority will be - associated with each category so that the specific tax rate for each - of them will be applied.</para> - <section> - <title>How do I add a new Tax Authority / Category mapping?</title> - <orderedlist> - <listitem> - <para>Enter or Lookup the 'Category Id' to be mapped</para> - </listitem> - <listitem> - <para>Press the 'Add' button</para> - </listitem> - <listitem> - <para>The new mapping will be displayed at the bottom of the screen - </para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I update a Tax Authority / Category mapping?</title> - <para>A Tax Authority / Category mapping cannot be updated. If it - needs to be changed then the entry must be deleted and then - re-entered.</para> - </section> - <section> - <title>How do I remove a Tax Authority / Category mapping?</title> - <orderedlist> - <listitem> - <para>Locate the entry that needs to be removed</para> - </listitem> - <listitem> - <para>Press the 'Delete' button next to the entry </para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityGlAccounts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityGlAccounts.xml deleted file mode 100644 index 5a6c8e3..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityGlAccounts.xml +++ /dev/null @@ -1,92 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Tax Authority GL Accounts screen.</title> - <para>The GL Accounts sub menu screen allows you specify which general - ledger account any tax calculated for this tax authority will be - posted. This is done at at organisation level so the minimum - requirement is that 'Company' is setup.</para> - <para>It is used to consolidate taxes for a specific tax authority into - one general ledger account. It can be very useful if you need to track - taxes for several tax authorities (eg different states or countries). - </para> - <section> - <title>How do I add a new general ledger account for a Tax Authority? - </title> - <orderedlist> - <listitem> - <para>Enter or use the lookup to select the 'Organisation Party Id' - (NOTE: Normally this would be 'Company')</para> - </listitem> - <listitem> - <para>Enter or use the lookup to select the 'GL Account'</para> - </listitem> - <listitem> - <para>Press the 'Add' button</para> - </listitem> - </orderedlist> - <para>NOTE: The GL account used must have already been created in the - Global GL Settings and linked to the chart of accounts for 'Company' - </para> - </section> - <section> - <title>How do I update a general ledger account for a Tax Authority? - </title> - <orderedlist> - <listitem> - <para>The general ledger account can be updated by simply adding a - new account to replace the existing entry.</para> - </listitem> - <listitem> - <para>Enter or use the lookup to select the 'Organisation Party Id' - (NOTE: Normally this would be 'Company')</para> - </listitem> - <listitem> - <para>Enter or use the lookup to select the updated 'GL Account' - </para> - </listitem> - <listitem> - <para>Press the 'Add' button</para> - </listitem> - <listitem> - <para>The existing entry will be replaced by the updated GL Account - </para> - </listitem> - </orderedlist> - <para>NOTE: Be careful when updating a general ledger account because - some transactions may have already been posted to the existing - account.</para> - </section> - <section> - <title>How do I delete a general ledger account for a Tax Authority? - </title> - <orderedlist> - <listitem> - <para>Locate the entry required</para> - </listitem> - <listitem> - <para>Press the 'Delete' button next to the entry that needs to be - deleted</para> - </listitem> - <listitem> - <para>The entry is removed </para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityPartyInfo.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityPartyInfo.xml deleted file mode 100644 index 9932a94..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityPartyInfo.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Tax Authority Party Info screen.</title> - <para>This screen is used to create or update details for a Tax Authority Party entry.</para> - <para>If a new entry is being created all fields are available to be entered. If an existing entry is being updated only limited fields are available to be amended.</para> - <section> - <title></title> - <para></para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityRateProducts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityRateProducts.xml deleted file mode 100644 index 73261ed..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditTaxAuthorityRateProducts.xml +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Tax Authority Product Rates screen.</title> - <para>This screen allows the setup of tax rates and types. The rates or - type can be assigned globally to a store (ie tax will be applied to - all products at the same rate) or category (ie limited to products in - a specific category).</para> - <para>Other parameters are available to allow the user to limit whether - the tax is to be applied to all purchases / sales or only those which - are above a certain threshold. </para> - <para>Tax associated with shipping charges or promotions can also be - configured here.</para> - <section> - <title>How do I add a new product tax rate?</title> - <orderedlist> - <listitem> - <para>Use the drop down box to select the tax 'Type' (eg Sales Tax) - </para> - </listitem> - <listitem> - <para>Use the lookup to select a 'Store Id' (or leave blank for all - Stores)</para> - </listitem> - <listitem> - <para>If a category has been setup it will be available for - selection in 'Category' field otherwise leave this blank</para> - </listitem> - <listitem> - <para>Leave 'Title Transfer' blank</para> - </listitem> - <listitem> - <para>Enter a value for the 'Minimum Price' for a product where the - tax is to be applied (NOTE: The Demo Data sets this as zero)</para> - </listitem> - <listitem> - <para>Enter a value for the 'Minimun Purchase' where the tax is to - be applied (NOTE: The Demo Data sets this as zero)</para> - </listitem> - <listitem> - <para>Use the drop down box to select whether 'Shipping Charges' - will be taxable</para> - </listitem> - <listitem> - <para>Enter the tax rate in the 'Tax Percentage' field (eg 12.5) - </para> - </listitem> - <listitem> - <para>Use the drop down box to select whether products on - 'Promotion' will be taxable</para> - </listitem> - <listitem> - <para>Leave the 'From Date' and 'Thru Date' blank</para> - </listitem> - <listitem> - <para>Enter the name of the tax in the 'Description' field (eg VAT) - as this will be displayed and printed on documents when the tax is - applied</para> - </listitem> - <listitem> - <para>Press the 'Add' button</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I update an existing product tax rate</title> - <orderedlist> - <listitem> - <para>Select the entry that needs to be updated</para> - </listitem> - <listitem> - <para>Make the changes required</para> - </listitem> - <listitem> - <para>Press the 'Update' button next to the entry that needs to be - updated</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I delete a product tax rate?</title> - <orderedlist> - <listitem> - <para>Press the 'Delete' button next to the entry that needs to be - removed</para> - </listitem> - </orderedlist> - <para>NOTE: The deletion of tax rates may cause audit problems - particularly if the rate has already been used as part of a - transaction. In this case it would be better to expire the old rate - using the 'Thru Date' field and then enter the new rate.</para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindTaxAuthority.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindTaxAuthority.xml deleted file mode 100644 index 14084f3..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_FindTaxAuthority.xml +++ /dev/null @@ -1,106 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Find Tax Authorities screen.</title> - <para>The default screen displays a list of Tax Authorities that have been setup.</para> - <para>IMPORTANT: You will need to create a party in Party Manager for the tax authority before - you can add a new tax authority in the accounting / tax authorities screen.</para> - <para>Steps to create the party to be used for the tax authority are as follows:</para> - <para> - <orderedlist> - <listitem> - <para>Create New Party Group</para> - </listitem> - <listitem> - <para>Fill in basic details (eg name, address etc)</para> - </listitem> - <listitem> - <para>Once the party record is created then add the role of 'Tax Authority' to the - party</para> - </listitem> - </orderedlist> - </para> - <para>Only when the tax authority party record is created can you continue.</para> - <section> - <title>How do I create a new tax authority?</title> - <para>Press the 'New Tax Authority' button</para> - <para> - <orderedlist> - <listitem> - <para>Select or enter the code for the country, state or region that is - applicable for the 'Geo' field</para> - </listitem> - <listitem> - <para>Select or enter the party id of the Tax Authority party that has been - created in Party Manager</para> - </listitem> - <listitem> - <para>Leave the 'Require Tax Id for Exemption' field at its default of 'Y'(NOTE: - This triggers tax not to be charged if a valid Tax Id is found!)</para> - </listitem> - <listitem> - <para>Leave 'Tax Id Format Pattern' blank (NOTE: This specifies the format of - the Tax Id so that it can be validated)</para> - </listitem> - <listitem> - <para>Fill in the 'Include Tax in the price' - the default is 'N'. (NOTE: If - prices need to include tax such as GST or VAT in the price then change this - to 'Y')</para> - </listitem> - <listitem> - <para>Press the 'Update' button</para> - </listitem> - </orderedlist> - </para> - <para>NOTE: The above process creates the basic tax authority detail but there are further - details that can be added via the other tax authority sub menus</para> - </section> - <section> - <title>How do I update a tax authority?</title> - <para> - <orderedlist> - <listitem> - <para>Select the 'Edit' button next to the tax authority that you wish to - update</para> - </listitem> - <listitem> - <para>The 'Edit Tax Authority' screen is displayed</para> - </listitem> - <listitem> - <para>Update the details of the tax authority as required including any - submenus</para> - </listitem> - <listitem> - <para>Press the 'Update' button</para> - </listitem> - </orderedlist> - </para> - </section> - <section> - <title>How do I delete / remove a tax authority?</title> - <para>Tax authorities cannot be deleted via the Tax Authority screens. If they need to be - removed then it can be done via the Webtools and Entity Data maintenance.</para> - <para>NOTE: Be very careful removing tax authorities records unless you are completely - certain that they have not been already used for transaction calculations. </para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListTaxAuthorityParties.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListTaxAuthorityParties.xml deleted file mode 100644 index 9ad43f7..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListTaxAuthorityParties.xml +++ /dev/null @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The List Tax Authority Parties screen.</title> - <para>This screen list any parties that have been associated with a tax - authority and tax rate. To have any tax calculated for Sales Orders or - Purchase Orders then an entry must exist for 'Company'.</para> - <para>Entries can also be created, updated or deleted.</para> - <section> - <title>How do I add a new Tax Authority Party Info?</title> - <orderedlist> - <listitem> - <para>Press the 'New Tax Authority Party Info' button</para> - </listitem> - <listitem> - <para>Enter or use the lookup to select the 'Party Id'</para> - </listitem> - <listitem> - <para>Leave the 'From Date' blank (NOTE: Default will be current - date and time)</para> - </listitem> - <listitem> - <para>Leave the 'Thru Date' blank</para> - </listitem> - <listitem> - <para>Enter the 'Party Tax Id' if required (NOTE: This can be VAT or - GST number)</para> - </listitem> - <listitem> - <para>Use the drop down box to select whether the party select is - 'Tax Exempt'</para> - </listitem> - <listitem> - <para>Use the drop down box to select whether the party selected is - 'Nexus' (See note below)</para> - </listitem> - <listitem> - <para>Press the 'Create' button</para> - </listitem> - </orderedlist> - <para>NOTE: 'Nexus' is a term that refers to an agreement for between - the tax authority and potential tax payer that the tax authority can - impose the tax. This is usually for Sales Tax. If you have a Sales - Tax that is uniformly applied to a product or range of products then - the 'Nexus' field can be set to 'Y'</para> - </section> - <section> - <title>How do I update a Tax Authority Party Info?</title> - <orderedlist> - <listitem> - <para>Press the 'Edit' button next to the entry that needs to be - amended</para> - </listitem> - <listitem> - <para>Update the fields as required</para> - </listitem> - <listitem> - <para>Press the 'Update' button</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I delete a Tax Authority Party Info?</title> - <orderedlist> - <listitem> - <para>Press the 'Delete' button next to the entry that needs to be - deleted</para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_tax_authorities.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_tax_authorities.xml deleted file mode 100644 index 020b61c..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_tax_authorities.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>Tax Authorities.</title> - <para>A tax authority is legal body usually the state (country) that imposes a financial levy on - business transactions.</para> - <para>In OFBiz tax authorities are used to calculate where business or related taxes are - due.</para> - <para>Tax setup is very important as it links into the calculated price that you can charge your - customers and also flows through into any related legal documents that are generated (eg - Sales Order, Sales Invoice, Purchase Order etc).</para> - <para>Each country or region will have specific rules regarding what should or should not be - taxed. There will also be very strict regulations on how taxable transactions should be - recorded and tracked in the general ledger or chart of accounts.</para> - <para>Tax authority setup allows configuration of the following :</para> - <para> - <itemizedlist> - <listitem> - <para>Income tax</para> - </listitem> - <listitem> - <para>Value Added Tax (VAT) / Goods and Services Tax (GST)</para> - </listitem> - <listitem> - <para>Import / Export tax /Custom and Excise Duty</para> - </listitem> - <listitem> - <para>State, City or County taxes </para> - </listitem> - </itemizedlist> - </para> - <xi:include href="HELP_ACCOUNTING_FindTaxAuthority.xml"/> - <xi:include href="HELP_ACCOUNTING_EditTaxAuthority.xml"/> - <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityCategories.xml"/> - <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityAssocs.xml"/> - <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityGlAccounts.xml"/> - <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityRateProducts.xml"/> - <xi:include href="HELP_ACCOUNTING_ListTaxAuthorityParties.xml"/> - <xi:include href="HELP_ACCOUNTING_EditTaxAuthorityPartyInfo.xml"/> -</section> diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthority.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthority.adoc new file mode 100644 index 0000000..3266e51 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthority.adoc @@ -0,0 +1,31 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Edit Tax Authority +The 'Edit Tax Authority' sub menu is the first of six sub menus used in the creation or update of a Tax Authority. +On the creation or update of a Tax Authority it is the default screen that is displayed. + +It can be used for updating the basic details of a Tax Authority such as: + +. Changing whether a tax id or code is required for an exemption +. Modifying the tax id or code format +. Updating where or not to include the tax calculation as part of the product price + +NOTE: An example of the Tax Id is as follows: + + \d{2}\-\d{7}|\d{3}\-\d{2}\-\d{4} which translates to 99-9999999 or 999-99-9999 \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityAssocs.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityAssocs.adoc new file mode 100644 index 0000000..a416f82 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityAssocs.adoc @@ -0,0 +1,42 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Edit Tax Authority Associations +An association is a way of specifying how tax authorities can be linked to each other. + +It can be used in the situation where the tax structure is hierarchical (eg city tax, plus county tax plus state tax). + +Using associations allows tax rates from multiple authorities to be applied to a particular order at once. + +== How do I add a new association for a Tax Authority? +. Enter or use the lookup to find the 'To Tax Auth Geo Id' +. Enter of use the lookup to find the 'To Tax Auth Party Id' +. Leave the 'From Date' blank (NOTE: It will default to the current date and time) +. Leave the 'Thru Date' blank +. Select the 'Type' from the dropdown or leave blank +. Press the 'Add' button +. The new tax authority association is displayed at the bottom of the screen. + +== How do I update an association for a Tax Authority? +. Only two fields are available for update, these are the 'Thru Date' and 'Type' +. Enter the changes required +. Press the 'Update' button next to the entry updated + +== How do I remove an association for a Tax Authority? +. Press the 'Delete' button next to the entry that needs to be deleted diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityCategories.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityCategories.adoc new file mode 100644 index 0000000..137728c --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityCategories.adoc @@ -0,0 +1,40 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Edit Tax Authority Categories +The Tax Authority Categories sub menu screen allows you link a tax authority to a specific catalog or product category. + +It can be used to add product categories to a tax authority. +This means that all products in this category will be taxed at the rate specified for the tax authority. + +An example of this could be separating products into categories for export to different countries. +A separate tax authority will be associated with each category so that the specific tax rate for each of them will be applied. + +== How do I add a new Tax Authority / Category mapping? +. Enter or Lookup the 'Category Id' to be mapped +. Press the 'Add' button +. The new mapping will be displayed at the bottom of the screen + +== How do I update a Tax Authority / Category mapping? +A Tax Authority / Category mapping cannot be updated. +If it needs to be changed then the entry must be deleted and then re-entered. + +== How do I remove a Tax Authority / Category mapping? +. Locate the entry that needs to be removed +. Press the 'Delete' button next to the entry diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityGlAccounts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityGlAccounts.adoc new file mode 100644 index 0000000..9f509f4 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityGlAccounts.adoc @@ -0,0 +1,51 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Edit Tax Authority GL Accounts +The GL Accounts sub menu screen allows you specify which general ledger account any tax calculated for this tax authority + will be posted. +This is done at at organisation level so the minimum requirement is that 'Company' is setup. + +It is used to consolidate taxes for a specific tax authority into one general ledger account. +It can be very useful if you need to track taxes for several tax authorities (eg different states or countries). + +== How do I add a new general ledger account for a Tax Authority? +. Enter or use the lookup to select the 'Organisation Party Id' + + (NOTE: Normally this would be 'Company') +. Enter or use the lookup to select the 'GL Account' +. Press the 'Add' button + +NOTE: The GL account used must have already been created in the Global GL Settings and linked to the chart of accounts + for 'Company' + +== How do I update a general ledger account for a Tax Authority? +. The general ledger account can be updated by simply adding a new account to replace the existing entry. +. Enter or use the lookup to select the 'Organisation Party Id' + + (NOTE: Normally this would be 'Company') +. Enter or use the lookup to select the updated 'GL Account' +. Press the 'Add' button +. The existing entry will be replaced by the updated GL Account + +NOTE: Be careful when updating a general ledger account because some transactions may have already been posted + to the existing account. + +== How do I delete a general ledger account for a Tax Authority? +. Locate the entry required +. Press the 'Delete' button next to the entry that needs to be deleted +. The entry is removed diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityPartyInfo.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityPartyInfo.adoc new file mode 100644 index 0000000..276381f --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityPartyInfo.adoc @@ -0,0 +1,27 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Edit Tax Authority Party Info +This screen is used to create or update details for a Tax Authority Party entry. + +If a new entry is being created all fields are available to be entered. + +If an existing entry is being updated only limited fields are available to be amended. + + diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityRateProducts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityRateProducts.adoc new file mode 100644 index 0000000..4678cb7 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditTaxAuthorityRateProducts.adoc @@ -0,0 +1,57 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Edit Tax Authority Product Rates +This screen allows the setup of tax rates and types. +The rates or type can be assigned globally to a store (ie tax will be applied to all products at the same rate) + or category (ie limited to products in a specific category). + +Other parameters are available to allow the user to limit whether the tax is to be applied to all purchases / sales or + only those which are above a certain threshold. + +Tax associated with shipping charges or promotions can also be configured here. + +== How do I add a new product tax rate? +. Use the drop down box to select the tax 'Type' (eg Sales Tax) +. Use the lookup to select a 'Store Id' (or leave blank for all Stores) +. If a category has been setup it will be available for selection in 'Category' field otherwise leave this blank +. Leave 'Title Transfer' blank +. Enter a value for the 'Minimum Price' for a product where the tax is to be applied + + (NOTE: The Demo Data sets this as zero) +. Enter a value for the 'Minimun Purchase' where the tax is to be applied + + (NOTE: The Demo Data sets this as zero) +. Use the drop down box to select whether 'Shipping Charges' will be taxable +. Enter the tax rate in the 'Tax Percentage' field (eg 12.5) +. Use the drop down box to select whether products on 'Promotion' will be taxable +. Leave the 'From Date' and 'Thru Date' blank +. Enter the name of the tax in the 'Description' field (eg VAT) as this will be displayed and printed on documents + when the tax is applied +. Press the 'Add' button + +== How do I update an existing product tax rate +. Select the entry that needs to be updated +. Make the changes required +. Press the 'Update' button next to the entry that needs to be updated + +== How do I delete a product tax rate? +. Press the 'Delete' button next to the entry that needs to be removed + +WARNING: The deletion of tax rates may cause audit problems particularly if the rate has already been used as part of + a transaction. + + In this case it would be better to expire the old rate using the 'Thru Date' field and then enter the new rate. diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_FindTaxAuthority.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_FindTaxAuthority.adoc new file mode 100644 index 0000000..2530695 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_FindTaxAuthority.adoc @@ -0,0 +1,62 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Find Tax Authorities +The default screen displays a list of Tax Authorities that have been setup. + +IMPORTANT: You will need to create a party in Party Manager for the tax authority before you can add a new tax authority + in the accounting / tax authorities screen. + +Steps to create the party to be used for the tax authority are as follows: + +. Create New Party Group +. Fill in basic details (eg name, address etc) +. Once the party record is created then add the role of 'Tax Authority' to the party + +Only when the tax authority party record is created can you continue. + +== How do I create a new tax authority? +Press the 'New Tax Authority' button + +. Select or enter the code for the country, state or region that is applicable for the 'Geo' field +. Select or enter the party id of the Tax Authority party that has been created in Party Manager +. Leave the 'Require Tax Id for Exemption' field at its default of 'Y' + + (NOTE: This triggers tax not to be charged if a valid Tax Id is found!) +. Leave 'Tax Id Format Pattern' blank + + (NOTE: This specifies the format of the Tax Id so that it can be validated) +. Fill in the 'Include Tax in the price' - the default is 'N'. + + (NOTE: If prices need to include tax such as GST or VAT in the price then change this to 'Y') +. Press the 'Update' button + +NOTE: The above process creates the basic tax authority detail but there are further details that can be added via the other + tax authority sub menus + +== How do I update a tax authority? +. Select the 'Edit' button next to the tax authority that you wish to update +. The 'Edit Tax Authority' screen is displayed +. Update the details of the tax authority as required including any submenus +. Press the 'Update' button + +== How do I delete / remove a tax authority? +Tax authorities cannot be deleted via the Tax Authority screens. +If they need to be removed then it can be done via the Webtools and Entity Data maintenance. + +WARNING: Be very careful removing tax authorities records unless you are completely certain that they have not been already used + for transaction calculations. + \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ListTaxAuthorityParties.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ListTaxAuthorityParties.adoc new file mode 100644 index 0000000..1ec30e2 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ListTaxAuthorityParties.adoc @@ -0,0 +1,49 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for List Tax Authority Parties +This screen list any parties that have been associated with a tax authority and tax rate. +To have any tax calculated for Sales Orders or Purchase Orders then an entry must exist for 'Company'. + +Entries can also be created, updated or deleted. + +== How do I add a new Tax Authority Party Info? +. Press the 'New Tax Authority Party Info' button +. Enter or use the lookup to select the 'Party Id' +. Leave the 'From Date' blank + + (NOTE: Default will be current date and time) +. Leave the 'Thru Date' blank +. Enter the 'Party Tax Id' if required + + (NOTE: This can be VAT or GST number) +. Use the drop down box to select whether the party select is 'Tax Exempt' +. Use the drop down box to select whether the party selected is 'Nexus' (See note below) +. Press the 'Create' button + +NOTE: 'Nexus' is a term that refers to an agreement for between the tax authority and potential tax payer that + the tax authority can impose the tax. This is usually for Sales Tax. + + If you have a Sales Tax that is uniformly applied to a product or range of products then + the 'Nexus' field can be set to 'Y' + +== How do I update a Tax Authority Party Info? +. Press the 'Edit' button next to the entry that needs to be amended +. Update the fields as required +. Press the 'Update' button + +== How do I delete a Tax Authority Party Info? +. Press the 'Delete' button next to the entry that needs to be deleted diff --git a/applications/accounting/src/docs/asciidoc/_include/acc-tax-authorities.adoc b/applications/accounting/src/docs/asciidoc/_include/acc-tax-authorities.adoc new file mode 100644 index 0000000..dac59a7 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/acc-tax-authorities.adoc @@ -0,0 +1,55 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Tax Authorities. + +A tax authority is legal body usually the state (country) that imposes a financial levy on business transactions. + +In OFBiz tax authorities are used to calculate where business or related taxes are due. + +Tax setup is very important as it links into the calculated price that you can charge your customers and also flows + through into any related legal documents that are generated (eg Sales Order, Sales Invoice, Purchase Order etc). + +Each country or region will have specific rules regarding what should or should not be taxed. +There will also be very strict regulations on how taxable transactions should be recorded and tracked in the general ledger + or chart of accounts. + +Tax authority setup allows configuration of the following : + +* Income tax +* Value Added Tax (VAT) / Goods and Services Tax (GST) +* Import / Export tax /Custom and Excise Duty +* State, City or County taxes + +== Tax Authorities management in User Interface +include::HELP_FindTaxAuthority.adoc[leveloffset=+2] + +include::HELP_EditTaxAuthority.adoc[leveloffset=+2] + +include::HELP_EditTaxAuthorityCategories.adoc[leveloffset=+2] + +include::HELP_EditTaxAuthorityAssocs.adoc[leveloffset=+2] + +include::HELP_EditTaxAuthorityGlAccounts.adoc[leveloffset=+2] + +include::HELP_EditTaxAuthorityRateProducts.adoc[leveloffset=+2] + +include::HELP_ListTaxAuthorityParties.adoc[leveloffset=+2] + +include::HELP_EditTaxAuthorityPartyInfo.adoc[leveloffset=+2] diff --git a/applications/accounting/src/docs/asciidoc/accounting.adoc b/applications/accounting/src/docs/asciidoc/accounting.adoc index f3d3d35..4988111 100644 --- a/applications/accounting/src/docs/asciidoc/accounting.adoc +++ b/applications/accounting/src/docs/asciidoc/accounting.adoc @@ -40,4 +40,6 @@ include::_include/acc-agreements.adoc[leveloffset=+1] include::_include/acc-financial-accounts.adoc[leveloffset=+1] +include::_include/acc-tax-authorities.adoc[leveloffset=+1] + include::_include/acc-global-settings.adoc[leveloffset=+1] |
|
|
In reply to this post by mbrohl
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit 3e2e71aced36be44cede2dcb57c6113870c05c7b Author: holivier <[hidden email]> AuthorDate: Thu Feb 13 17:55:14 2020 +0100 Documented: Organization-Gl-Settings Docbook files migration to asciidoc format (OFBIZ-11352) All the help files associated to it are called via include in the main document --- .../accounting/data/helpdata/HELP_ACCOUNTING.xml | 45 ------ ...ELP_ACCOUNTING_EditCreditCardTypeGlAccounts.xml | 101 ------------ ...TING_EditOrganizationTaxAuthorityGlAccounts.xml | 99 ------------ .../HELP_ACCOUNTING_EditPartyGlAccount.xml | 109 ------------- ...LP_ACCOUNTING_EditProductCategoryGlAccounts.xml | 110 ------------- .../HELP_ACCOUNTING_EditProductGlAccounts.xml | 113 ------------- ...ELP_ACCOUNTING_EditVarianceReasonGlAccounts.xml | 104 ------------ .../data/helpdata/HELP_ACCOUNTING_Features.xml | 31 ---- .../HELP_ACCOUNTING_GlAccountNrPaymentMethod.xml | 155 ------------------ .../HELP_ACCOUNTING_GlAccountPurInvoice.xml | 155 ------------------ .../HELP_ACCOUNTING_GlAccountSalInvoice.xml | 165 ------------------- .../HELP_ACCOUNTING_GlAccountTypeDefaults.xml | 158 ------------------ .../HELP_ACCOUNTING_GlAccountTypePaymentType.xml | 66 -------- .../helpdata/HELP_ACCOUNTING_ListCompanies.xml | 28 ---- .../HELP_ACCOUNTING_ListGlAccountOrganization.xml | 138 ---------------- .../HELP_ACCOUNTING_PartyAcctgPreference.xml | 136 ---------------- .../helpdata/HELP_ACCOUNTING_SetupGlJournals.xml | 86 ---------- .../data/helpdata/HELP_ACCOUNTING_TimePeriods.xml | 180 --------------------- .../HELP_ACCOUNTING_organization_gl_settings.xml | 38 ----- .../HELP_EditCreditCardTypeGlAccounts.adoc | 58 +++++++ ...ELP_EditOrganizationTaxAuthorityGlAccounts.adoc | 56 +++++++ .../asciidoc/_include/HELP_EditPartyGlAccount.adoc | 66 ++++++++ .../HELP_EditProductCategoryGlAccounts.adoc | 59 +++++++ .../_include/HELP_EditProductGlAccounts.adoc | 64 ++++++++ .../HELP_EditVarianceReasonGlAccounts.adoc | 53 ++++++ .../_include/HELP_GlAccountNrPaymentMethod.adoc | 74 +++++++++ .../_include/HELP_GlAccountPurInvoice.adoc | 89 ++++++++++ .../_include/HELP_GlAccountSalInvoice.adoc | 112 +++++++++++++ .../_include/HELP_GlAccountTypeDefaults.adoc | 92 +++++++++++ .../_include/HELP_GlAccountTypePaymentType.adoc | 66 ++++++++ .../_include/HELP_ListGlAccountOrganization.adoc | 94 +++++++++++ .../_include/HELP_PartyAcctgPreference.adoc | 81 ++++++++++ .../asciidoc/_include/HELP_SetupGlJournals.adoc | 49 ++++++ .../docs/asciidoc/_include/HELP_TimePeriods.adoc | 86 ++++++++++ .../_include/acc-organization-gl-settings.adoc | 61 +++++++ .../accounting/src/docs/asciidoc/accounting.adoc | 2 + 36 files changed, 1162 insertions(+), 2017 deletions(-) diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml deleted file mode 100644 index 14dccb7..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>Accounting Introduction</title> - <para> - The Accounting system is organized according to age old and generally accepted principles such as double-entry accounting, a General Ledger with hierarchical accounts, - journals and posting of transactions and corresponding entries. - </para> - <para> - The structure is primary based on the OMG GL standard and the work that was done on an - AR/AP extension of the OMG GL standard. This correlates well with other standards such as ebXML and OAGIS. - </para> - <para> - The Accounting entities are structured such that accounts for multiple organizations can be managed. The multiple organizations could be multiple companies, - or departments or other organizations within a company. Each Organization can have various GL Accounts associated with it so that it can operate - with its own subset of the Master Chart of Accounts. - </para> - <para> - Each Organization can also have its own set of Journals for flexibility, even though the - use of Journals should be as minimal as possible in favor of allowing the system to automatically create and post transactions based on business events - triggered by standard procedures and documents such as purchase and sales orders, invoices, inventory transfers, payments, receipts, and so forth. - </para> -</section> - diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCreditCardTypeGlAccounts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCreditCardTypeGlAccounts.xml deleted file mode 100644 index 999e548..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditCreditCardTypeGlAccounts.xml +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Credit Card Type GL Accounts help screen</title> - <para>The Credit Card Type / GL Account default is used to map - different types of credit card to different general ledger accounts. - </para> - <para>NOTE: This setup will affect one side of a journal entry only. - </para> - <para>This type of mapping is useful if you need to track the amounts - to be collected from different credit card agents. The OFBiz demo data - comes with some setup here (NOTE: The demo entries appear to be - duplicated...has something changed in ENUM for defining each credit - card type.....?????)</para> - <para>Examples are as follows:</para> - <itemizedlist> - <listitem> - <para>American Express</para> - </listitem> - <listitem> - <para>Visa</para> - </listitem> - <listitem> - <para>Mastercard</para> - </listitem> - <listitem> - <para>Diners Club </para> - </listitem> - </itemizedlist> - <section> - <title>How do I add a Credit Card Type GL Account mapping?</title> - <para>There are 10 mappings that come as part of the OFBiz demo data - but they do appear to be duplicated for some reason.</para> - <orderedlist> - <listitem> - <para>Select the 'Card Type' from the drop down list</para> - </listitem> - <listitem> - <para>Select the 'GL Account Id' to map it to from the drop down - list</para> - </listitem> - <listitem> - <para>Press the 'Add' button</para> - </listitem> - <listitem> - <para>The new 'Credit Card / GL Account Id' mapping is displayed in - the list at the bottom of the screen</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I update a Credit Card Type GL Account mapping?</title> - <orderedlist> - <listitem> - <para>Select the 'Card Type' from the drop down list</para> - </listitem> - <listitem> - <para>Select the updated 'GL Account Id' to map it to from the drop - down list</para> - </listitem> - <listitem> - <para>Press the 'Add' button</para> - </listitem> - <listitem> - <para>The updated 'Credit Card Type / GL Account' mapping is - displayed in the list at the bottom of the screen</para> - </listitem> - </orderedlist> - <para>NOTE: Used 'Visa' as an example to update and the 'CCT_VISA' was - updated but the 'Visa' one wasnt. This is probably related to the - duplication.</para> - </section> - <section> - <title>How do I remove a Credit Card Type GL Account mapping?</title> - <orderedlist> - <listitem> - <para>Press the 'Remove' button next to the entry that you want to - delete</para> - </listitem> - <listitem> - <para>The entry is removed from the list of entries displayed</para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditOrganizationTaxAuthorityGlAccounts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditOrganizationTaxAuthorityGlAccounts.xml deleted file mode 100644 index 7ecff4e..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditOrganizationTaxAuthorityGlAccounts.xml +++ /dev/null @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Tax Authority GL Accounts help screen</title> - <para>The Tax Authority / GL Account default is used to map different - tax authorities to different general ledger accounts. This setup will - affect one side of a journal entry only.</para> - <para>NOTE: A tax authority is legal body usually the state (country) - that imposes a financial levy on business transactions.</para> - <para>Normal business rules require you will to keep track amounts - collected or paid to different tax authorities separately. This - mapping ensures that money collected or paid to various tax - authorities (eg through Sales Orders, Purchase Orders etc) can be - separated into specific accounts</para> - <para>The OFBiz demo data comes with 9 entries to show an example of - how this can be setup using the some of the US states as separate tax - authorities.</para> - <section> - <title>How do I add a Tax Authority / GL Account mapping?</title> - <para>Unlike the other GL Account defaults you cannot add a Tax - Authority / GL mapping through these screens. It needs to be done via - the 'GL Accounts' sub menu under the 'Tax Authorities' menu. The - method of how to add a mapping using the 'Tax Authorities' is shown - below.</para> - <orderedlist> - <listitem> - <para>From the Accounting Manager / Tax Authorities Menu press the - 'Edit' button next to the Tax Authority required</para> - </listitem> - <listitem> - <para>Select the sub menu 'GL Accounts'</para> - </listitem> - <listitem> - <para>Enter or Lookup the party for the 'Organisation Party Id' - field (NOTE: Use 'Company' as default)</para> - </listitem> - <listitem> - <para>Enter or Lookup the GL Account to be mapped to</para> - </listitem> - <listitem> - <para>Press the 'Add' button</para> - </listitem> - <listitem> - <para>The mapping will be displayed at the bottom of the screen. - </para> - </listitem> - <listitem> - <para>Return to the Tax Authority / GL Account default and this new - mapping will be shown in the list </para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I update a Tax Authority / GL Account mapping?</title> - <para>Only the GL Account Id linked to the mapping can be updated. - </para> - <orderedlist> - <listitem> - <para>Locate the Tax Authority / GL Account entry that needs to be - updated</para> - </listitem> - <listitem> - <para>Select the new 'GL Account Id' from the drop down list next to - the entry </para> - </listitem> - <listitem> - <para>Press the 'Update' button next to the entry</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I remove a Tax Authority / GL Account mapping?</title> - <orderedlist> - <listitem> - <para>Locate the Tax Authority / GL Account entry that needs to be - removed</para> - </listitem> - <listitem> - <para>Press the 'Delete' button next to the entry </para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPartyGlAccount.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPartyGlAccount.xml deleted file mode 100644 index 3aa5e4c..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditPartyGlAccount.xml +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Party GL Account help screen</title> - <para>he Party / GL Account mapping allows the translation of different - account types (eg Accounts Receivable, Accounts Payable etc) for a - party to be mapped to a separate general ledger account. The party - role (eg Bill To Customer) is also used to define the mapping even - further. OFBiz demo data setup comes with no entries here.</para> - <para>It is used as a way of implementing subledger functionality in - OFBiz. Subledger functionality is where a higher level account can be - split into lower levels. In this case these lower levels can be by - party.</para> - <para>An example could be that a business may want to use the general - ledger to track the Accounts Receivable (AR) by customer so the chart - of account would be setup something like as follows:</para> - <para>120000 Accounts Receivable</para> - <itemizedlist> - <listitem> - <para>120010 Accounts Receivable - Customer A</para> - </listitem> - <listitem> - <para>120020 Accounts Receiviable - Customer B</para> - </listitem> - <listitem> - <para>120030 Accounts Receivalbe - Customer C</para> - </listitem> - </itemizedlist> - <para>This has the main AR account is at the top of the hierarchy and 3 - sub accounts below it. Entries for Customers A, B and C would be setup - with a role of 'Bill From Customer' as this is a role associated with - the customer when the Sales Invoice is generated.When a transaction - matching the criteria is processed in the system then these mappings - will control where it is posted to.In the case of Customer A any AR - transactions with role 'Bill To Customer' are posted to '120010' - instead of the standard '120000</para> - <section> - <title>How do I add a new Party / GL Account mapping?</title> - <orderedlist> - <listitem> - <para>Enter or Lookup the party for the 'Party Id' field</para> - </listitem> - <listitem> - <para>Select the 'Role Type Id' from the drop down list (NOTE: Be - careful that you select the correct role for the transactions you - want to track......)</para> - </listitem> - <listitem> - <para>Select the 'GL Account Type Id' from the drop down list</para> - </listitem> - <listitem> - <para>Select the 'GL Account Id' from the drop down list</para> - </listitem> - <listitem> - <para>Press the 'Add' button</para> - </listitem> - <listitem> - <para>The new entry will be displayed at the bottom of the screen - </para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I update a Party / GL Account mapping?</title> - <para>Only the GL Account Id linked to the mapping can be updated. - </para> - <orderedlist> - <listitem> - <para>Locate the Party / GL Account entry that needs to be updated - </para> - </listitem> - <listitem> - <para>Select the new 'GL Account Id' from the drop down list next to - the entry </para> - </listitem> - <listitem> - <para>Press the 'Update' button next to the entry</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I remove a Party / GL Account mapping?</title> - <orderedlist> - <listitem> - <para>Locate the Party / GL Account entry that needs to be removed - </para> - </listitem> - <listitem> - <para>Press the 'Delete' button next to the entry</para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditProductCategoryGlAccounts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditProductCategoryGlAccounts.xml deleted file mode 100644 index b96b9db..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditProductCategoryGlAccounts.xml +++ /dev/null @@ -1,110 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. - --> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Product Category GL Accounts help screen</title> - <para>The Product Category GL Account is used to specify the default - account to be used for a specific 'Product Category' and 'Account - Type' combination. This setup will translate to one side of the - journal entry only.</para> - <para>It is used for tracking product category transactions at a more - detailed level. Examples could be as follows:</para> - <itemizedlist> - <listitem> - <para>Tracking Accounts Receivable by Product Category in the General - Ledger</para> - </listitem> - <listitem> - <para>Tracking Cost of Goods by Product Category in the General - Ledger</para> - </listitem> - <listitem> - <para>Tracking Commissions paid by Product Category in the General - Ledger</para> - </listitem> - </itemizedlist> - <para>The demo data gives an idea of the use of product categories to - classify or separate different products streams. If specific - accounting or management reporting is required at this level then the - General Ledger can be setup to provide this detail. </para> - <section> - <title>How do I add a new Product Category / GL Account Type mapping? - </title> - <para>By default there are no Product Category / GL Account Type - mappings that are configured as part of the OFBiz demo data.</para> - <orderedlist> - <listitem> - <para>Select the 'Account Type' from the drop down list (NOTE: In - other screens this field is call the 'GL Account Type Id'.....) - </para> - </listitem> - <listitem> - <para>Select the ' GL Account' to map it to from the drop down list - </para> - </listitem> - <listitem> - <para>Enter or look up the 'Product Category Id' to be used</para> - </listitem> - <listitem> - <para>Press the 'Add' button</para> - </listitem> - <listitem> - <para>The new mapping will be displayed in the list at the bottom of - the screen</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I update a Product Category / GL Account type mapping? - </title> - <para>A Product Category / GL Account Type mapping can be updated by - modifying the GL Account only. If the product category or the Account - Type needs to be updated then the mapping will need to be deleted and - then re-entered using the new product category or Account Type. - </para> - <orderedlist> - <listitem> - <para>Locate the entry that needs to be updated in the list of - Product Category / GL Account Type mappings</para> - </listitem> - <listitem> - <para>Modify the 'GL Account 'by using the drop down list next to - the 'GL Account' field</para> - </listitem> - <listitem> - <para>Press the 'Update' button</para> - </listitem> - <listitem> - <para>The updated mapping will be displayed</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I remove a Product Category / GL Account Type mapping? - </title> - <orderedlist> - <listitem> - <para>Locate the entry that needs to be deleted in the list of - Product Category / GL Account Type mappings</para> - </listitem> - <listitem> - <para>Press the 'Remove' button next to the entry</para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditProductGlAccounts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditProductGlAccounts.xml deleted file mode 100644 index b617767..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditProductGlAccounts.xml +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. - --> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Product GL Accounts help screen</title> - <para>The Product GL Account is used to specify the default account to - be used for a specific Product' and 'Account Type' combination. This - setup will translate to one side of the journal entry only.</para> - <para>NOTE: Duplicate functionality .... This setup for the Product GL - Account can also be setup using the 'Accounts' sub menu for the - Product in Catalog Manager. Need to confirm whether this default work - like a hierarchy....eg Product GL Defaults will override General - Account defaults. </para> - <para>It is used for tracking product transactions at a more detailed - level. Examples could be as follows:</para> - <itemizedlist> - <listitem> - <para>Tracking Accounts Receivable by Product in the General Ledger - </para> - </listitem> - <listitem> - <para>Tracking Cost of Goods by product (or product variation) in the - General Ledger</para> - </listitem> - <listitem> - <para>Tracking Commissions paid by Product in the General Ledger - </para> - </listitem> - </itemizedlist> - <section> - <title>How do I add a new Product / GL Account Type mapping?</title> - <para>By default there are no Product / GL Account Type mappings that - are configured as part of the OFBiz demo data.</para> - <orderedlist> - <listitem> - <para>Select the 'Account Type' from the drop down list (NOTE: In - other screens this field is call the 'GL Account Type Id'.....) - </para> - </listitem> - <listitem> - <para>Select the ' GL Account' to map it to from the drop down list - </para> - </listitem> - <listitem> - <para>Enter or look up the 'Product Id' to be used</para> - </listitem> - <listitem> - <para>Press the 'Add' button</para> - </listitem> - <listitem> - <para>The new mapping will be displayed in the list at the bottom of - the screen</para> - </listitem> - </orderedlist> - <para>NOTE: This mapping can also be also be done via the 'Accounts' - sub menu for the Product. Any mapping created here will be displayed - under the Product 'Accounts' sub menu. Alternatively any mapping - created in the Product 'Accounts' sub menu will also be displayed - here.</para> - </section> - <section> - <title>How do I update a Product / GL Account Type mapping?</title> - <para>A Product / GL Account Type mapping can be updated by modifying - the GL Account only. If the product needs to be updated then the - mapping will need to be deleted and then re-entered using the new - product.</para> - <orderedlist> - <listitem> - <para>Locate the entry that needs to be updated in the list of - Product / GL Account Type mappings</para> - </listitem> - <listitem> - <para>Modify the 'GL Account 'by using the drop down list next to - the 'GL Account' field</para> - </listitem> - <listitem> - <para>Press the 'Update' button</para> - </listitem> - <listitem> - <para>The updated mapping will be displayed </para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I delete a Product / GL Account Type mapping?</title> - <orderedlist> - <listitem> - <para>Locate the entry that needs to be deleted in the list of - Product / GL Account Type mappings</para> - </listitem> - <listitem> - <para> 2. Press the 'Remove' button next to the entry</para> - </listitem> - </orderedlist> - <para>NOTE: This can also be done via the 'Accounts' sub menu for the - Product using the 'Delete Link' button.</para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditVarianceReasonGlAccounts.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditVarianceReasonGlAccounts.xml deleted file mode 100644 index 5a5cdde..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditVarianceReasonGlAccounts.xml +++ /dev/null @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Variance Reason GL Accounts help screen</title> - <para>The Variance Reason / GL Account default is used for mapping any - stock differences to a particular general ledger account. If there are - variances in the number of products that are in stock then this - affects the value of inventory in the general ledger. By using this GL - default you can offset any differences in stock to the relevant - general ledger account.</para> - <para>The number of products (or items) in stock can vary. These - differences can be caused by numerous reasons. Some of these could be - as follows:</para> - <itemizedlist> - <listitem> - <para>Products have been damaged</para> - </listitem> - <listitem> - <para>Products were lost or stolen</para> - </listitem> - <listitem> - <para>Products were found </para> - </listitem> - <listitem> - <para>Under or over supply of a Product from a Supplier (eg. You have - ordered 10 and 11 are delivered....) </para> - </listitem> - <listitem> - <para>Free samples or giveaways to potential clients</para> - </listitem> - </itemizedlist> - <para>NOTE: These mappings are used in Catalog Manager when a manual - inventory adjustment is done through the Inventory Item screens. - </para> - <section> - <title>How do I add a new Variance Reason / GL Account mapping? - </title> - <para>There are 6 mappings that come as part of the OFBiz demo data. - </para> - <orderedlist> - <listitem> - <para>Select the 'Variance Reason Id' from the drop down list</para> - </listitem> - <listitem> - <para>Select the 'GL Account Type Id' to map it to from the drop - down list</para> - </listitem> - <listitem> - <para>Press the 'Add' button</para> - </listitem> - <listitem> - <para>The new 'Variance Reason / GL Account Type' mapping is - displayed in the list at the bottom of the screen</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I update a Variance Reason / GL Account mapping?</title> - <orderedlist> - <listitem> - <para>Select the 'Variance Reason Id' from the drop down list</para> - </listitem> - <listitem> - <para>Select the updated 'GL Account Type Id' to map it to from the - drop down list</para> - </listitem> - <listitem> - <para>Press the 'Add' button</para> - </listitem> - <listitem> - <para>The updated 'Variance Reason / GL Account Type' mapping is - displayed in the list at the bottom of the screen</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I remove a Variance Reason / GL Account mapping?</title> - <orderedlist> - <listitem> - <para>Press the 'Remove' button next to the entry that you want to - delete</para> - </listitem> - <listitem> - <para>The entry is removed from the list of entries displayed</para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_Features.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_Features.xml deleted file mode 100644 index 5c8dc46..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_Features.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>Accounting Features</title> - <para> - <orderedlist> - <listitem> - <para>Invoices</para> - </listitem> - <listitem> - <para>Payments</para> - </listitem> - </orderedlist> - </para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountNrPaymentMethod.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountNrPaymentMethod.xml deleted file mode 100644 index e90e9b5..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountNrPaymentMethod.xml +++ /dev/null @@ -1,155 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Payment Method GL Account Type help screen</title> - <para>The Payment Method GL Account Type Id is used to map the - different payment methods (eg Cash, Cheque etc) to a specific GL - Account Type Id. This will translate to one side of a GL entry only. - </para> - <para>A Payment Method is just a way to define the ways in which - payments can be made. Each payment method can be linked to a different - account in the general ledger. A main GL account used would be the one - that represents the Company bank account. In the demo data mappings - Electronic Funds Transfer, Company Account, Financial Account are all - linked to the Company bank account GL account.</para> - <para>OFBiz demo data defines 15 different payment methods as follows: - </para> - <itemizedlist> - <listitem> - <para>Cash</para> - </listitem> - <listitem> - <para>Certified Cheque</para> - </listitem> - <listitem> - <para>Company Account</para> - </listitem> - <listitem> - <para>Company Cheque</para> - </listitem> - <listitem> - <para>Electronic Funds Transfer (NOTE TO CHECK: Problem with - definition or terminology - is this a Direct Debit.... ?? A direct - debit is controlled by the payee and an automatic payment via bank - account is controlled by the payer)</para> - </listitem> - <listitem> - <para>Billing Account</para> - </listitem> - <listitem> - <para>Cash on Delivery (COD)</para> - </listitem> - <listitem> - <para>eBay</para> - </listitem> - <listitem> - <para>Offline Payment (NOTE: Is this ambiguous - since COD is an - offline payment...)</para> - </listitem> - <listitem> - <para>PayPal</para> - </listitem> - <listitem> - <para>WorldPay</para> - </listitem> - <listitem> - <para>Financial Account</para> - </listitem> - <listitem> - <para>Gift Certificate</para> - </listitem> - <listitem> - <para>Money Order</para> - </listitem> - <listitem> - <para>Personal Cheque</para> - </listitem> - </itemizedlist> - <para>NOTE: A point to note is that these payment methods dont include - Credit Cards....(which I think is on purpose...). The majority of - these payment methods are linked to 'Undeposited Receipts' but an - additional accounting transaction may be needed once the funds have - cleared and are available in the Company bank account.</para> - <section> - <title>How do I add a new Payment Method Id / GL Account Id mapping? - </title> - <orderedlist> - <listitem> - <para>Select the 'Payment Method Type' from the drop down list - </para> - </listitem> - <listitem> - <para>Select the 'GL Account Id' to map it to from the drop down - list</para> - </listitem> - <listitem> - <para>Press the 'Save' button</para> - </listitem> - <listitem> - <para>The new Payment Method Type / GL Account Type mapping is - displayed in the list at the bottom of the screen</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I update a Payment Method Id / GL Account Id mapping? - </title> - <para>A Payment Method Type / GL Account Type mapping cannot be - updated directly but needs to be removed then re-created. If you try - to update an existing entry you will get an 'duplicate key' error - message</para> - <orderedlist> - <listitem> - <para>Press the 'Remove' button next to the entry that you want to - update</para> - </listitem> - <listitem> - <para>The entry is removed from the list of entries displayed</para> - </listitem> - <listitem> - <para>Select the 'Payment Method Type' from the drop down list - </para> - </listitem> - <listitem> - <para>Select the updated 'GL Account Type' to map it to from the - drop down list</para> - </listitem> - <listitem> - <para>Press the 'Save' button</para> - </listitem> - <listitem> - <para>The new Payment Method Type / GL Account Type mapping is - displayed in the list at the bottom of the screen</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I remove a Payment Method Id / Gl Account Id mapping? - </title> - <orderedlist> - <listitem> - <para>Press the 'Remove' button next to the entry that you want to - delete</para> - </listitem> - <listitem> - <para>The entry is removed from the list of entries displayed</para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountPurInvoice.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountPurInvoice.xml deleted file mode 100644 index 9e5f7fa..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountPurInvoice.xml +++ /dev/null @@ -1,155 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Purchase Invoice help screen</title> - <para>The Purchase Invoice sub menu is used to specify the default - account to be used for the individual line items that appear on a - Purchase Invoice. The items are identified by a line description which - can be mapped to a specific general ledger account. Purchase invoices - can be made up of a variety of items as well as the product that is - being bought (eg discounts, promotions, work effort or labour costs - etc). The majority of businesses will want to track these type of - items separately in the general ledger and this screen will allow this - type of setup.</para> - <para>This setup will translate to one side of the journal entry only. - </para> - <para>IMPORTANT: This screen is one of the screens where the default - entries that are displayed here are entered via the Global GL Settings - under the sub menu 'Invoice Item Type'. This screen allows users to - override the global settings for the Purchase Invoice item type. An - example of why this could be necessary could be that a company many - want to isolate the sales reporting of a specific department or - business unit separately (eg subledgers etc) but still have the option - of a 'catch all' global general ledger account.</para> - <para>VERY IMPORTANT NOTE: Need to do more investigation but the it - looks like these Purchase Invoice mappings dont work when used as part - of the Purchase Order to Purchase Invoice Process.(Have been doing - some tests to try and get it to post to a different account than - 'Uninvoiced Shipment Receipts' and 'Inventory' but hasnt worked so - far.) We need to be able to specify things such as Sales Tax, Freight - and any Purchase Order adjustments.</para> - <para>These override mappings do work if there is no Purchase Order - just a Purchase Invoice as shown in the simple process below. How the - Purchase Invoice mappings are used is best shown by an example. A very - simple description of a Purchase Invoice Process could be as follows: - </para> - <orderedlist> - <listitem> - <para>You have ordered something from a supplier (eg indirect - purchasing such as stationery etc via phone)</para> - </listitem> - <listitem> - <para>The Supplier ships the products to you (NOTE: as they are not - stored in the Warehouse but in your offices - so dont need an - Inventory Receive.....????)</para> - </listitem> - <listitem> - <para>You receive the product and an invoice from the Supplier - (Purchase Invoice)</para> - </listitem> - <listitem> - <para>You enter the Purchase Invoice pay the Supplier the amount - invoiced</para> - </listitem> - </orderedlist> - <para>Let's focus on step of 4 in more detail.</para> - <itemizedlist> - <listitem> - <para>You have received the product from the supplier with an invoice - </para> - </listitem> - <listitem> - <para>In OFBiz you enter the Purchase Invoice using 'Create New' in - the 'Invoices' menu of Accounting Manager</para> - </listitem> - <listitem> - <para>Using the 'Items' sub menu you can create individual items on - the Purchase Invoice (eg Paper, Pens, Sales Tax etc and they dont - need to have a Product Id associated with them)</para> - </listitem> - <listitem> - <para>When you add a new invoice item to the Purchase Invoice it is - the 'Invoice Item Type' that is affected by the Purchase Invoice - override mappings</para> - </listitem> - <listitem> - <para>The Purchase Invoice can then be moved to various statuses - (Approved, Received, Ready or Cancelled)</para> - </listitem> - <listitem> - <para>When the status is moved to 'Ready' this is a trigger for an - 'automatic' accounting transaction</para> - </listitem> - <listitem> - <para>The transaction type generated is called 'Purchase Invoice' and - it uses the Purchase Invoice override mappings</para> - </listitem> - </itemizedlist> - <para>Transaction Type: Purchase Invoice, DR 516100 Purchase Order - Adjustments , DR ????? Sales Tax, CR 210000 Accounts Payable </para> - <section> - <title>How do I add a new Purchase Invoice override mapping?</title> - <para>By default there are no Purchase Invoice override mappings that - are configured as part of the OFBiz demo data.</para> - <orderedlist> - <listitem> - <para>Select the 'Invoice Purchase Item Type' from the drop down - list</para> - </listitem> - <listitem> - <para>Select the ' Invoice Override Expense GL Account Id' to map it - to from the drop down list</para> - </listitem> - <listitem> - <para>Press the 'Save' button</para> - </listitem> - <listitem> - <para>The new mapping will be displayed in the 'Invoice Override - Expense GL Account' column in the list at the bottom of the screen - </para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I update a Purchase Invoice override mapping?</title> - <para>An existing Purchase Invoice override mapping cannot be updated - but needs to be removed and a new mapping added. If you try to add an - override to an item that already has an override you will get a - duplicate record error message.</para> - </section> - <section> - <title>How do I remove a Purchase Invoice override mapping?</title> - <para>NOTE: Only the override mapping can be deleted. The default - mapping record cannot be deleted here (even though the Remove button - is displayed next to it!)</para> - <orderedlist> - <listitem> - <para>Locate the entry that needs the override deleted in the list - of Purchase Invoice override mappings</para> - </listitem> - <listitem> - <para>Press the 'Remove' button next to the entry</para> - </listitem> - <listitem> - <para>The override mapping will be removed from the 'Invoice - Override Expense GL Account' column of the entry </para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountSalInvoice.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountSalInvoice.xml deleted file mode 100644 index ac574bb..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountSalInvoice.xml +++ /dev/null @@ -1,165 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Sales Invoice help screen</title> - <para>The Sales Invoice sub menu is used to specify the default account - to be used for the individual line items that appear on a Sales - Invoice. The items are identified by a line description which can be - mapped to a specific general ledger account. Sales invoices can be - made up of a variety of items as well as the product that is being - sold (eg discounts, promotions, work effort or labour costs etc). The - majority of businesses will want to track these type of items - separately in the general ledger and this screen will allow this type - of setup.</para> - <para>This setup will translate to one side of the journal entry only. - </para> - <para>A key mapping used is linked directly to the Product Type (eg - Invoice Digital Good Item, Invoice Finished Good Item, Invoice - Finished/Digital Good Item....). This controls where the sales revenue - received from the sale of the product is stored in the general ledger - </para> - <para>Only a limited number of general ledger accounts that are - available to be mapped. Currently this is 7 and limited to the - accounts that have been assigned to the organisation from the Global - Chart of Accounts that have a 'GL Account Class Id' = 'Revenue' (NOTE: - You will see that Discounts on Sales is not available to be selected - because it's GL Account Class Id = 'Cost of Goods Sold Expense'. It - appears as a default because it is setup in the Global GL settings - that doesnt seem to have any limitations of the account.)</para> - <para>IMPORTANT: This screen is one of the screens where the default - entries that are displayed here are entered via the Global GL Settings - under the sub menu 'Invoice Item Type'. This screen allows users to - override the global settings for the Sales Invoice item type. An - example of why this could be necessary could be that a company many - want to isolate the sales reporting of a specific department or - business unit separately (eg subledgers etc) but still have the option - of a 'catch all' global general ledger account.</para> - <para>If an override account is added it will appear in the Override GL - Account column on the screen.</para> - <para>The only mapping that seems a bit out of place here is Sales Tax. - It is blank because Sales Tax is setup using Tax Authorities so dont - know why you would want to override the Sales Tax account to a Sales - Revenue Account.</para> - <para>NOTE: Also need to highlight that in the Global Settings it uses - the ENUM description to select the item and there are duplicate - descriptions between the Sales Invoice and the Purchase Invoice. Not - too much of a problem here but it does cause problems in Agreements - when setting up things like Commissions based on line items as you - cant tell the difference between the description of a Sales Invoice - item called 'Invoice Adjustment' and a Purchase Invoice item called - 'Invoice Adjustment' ..... except by trial and error</para> - <para>How the Sales Invoice mappings are used is best shown by an - example. A very simple description of an online Sales Order Process - could be as follows:</para> - <orderedlist> - <listitem> - <para>Customer Orders a Product (and Creates a Sales Order)</para> - </listitem> - <listitem> - <para>Customer Pays for Product (via Credit Card, Internet Banking - etc)</para> - </listitem> - <listitem> - <para>Vendor confirms Payment and Dispatches the Product to the - Customer</para> - </listitem> - </orderedlist> - <para>Let's focus on the second part step of 3 in more detail.</para> - <itemizedlist> - <listitem> - <para>The vendor has verified that the customer payment has been - received</para> - </listitem> - <listitem> - <para>In OFBiz Order Manager they will then look up the relevant - Sales Order and then click the 'Quick Ship Entire Order' button to - log the dispatch of the order in the system</para> - </listitem> - <listitem> - <para>The 'Quick Ship Entire Order' button is a trigger for an - 'automatic' accounting transaction</para> - </listitem> - <listitem> - <para>The transaction type that is triggered is called 'Sales - Invoice' </para> - </listitem> - </itemizedlist> - <para>Transaction Type: Sales Invoice DR 120000 Accounts Receivable, DR - 410000 Discounts on Sales, DR 400000 Sales, CR 22????? Sales Tax - Collected </para> - <para>DR Sales is used for item promotions where product cost is simply - reversed. Only order promotions are coded to Discounts. The Sales Tax - account will be dependent on your sales tax setup. The demo data posts - to tax accounts by US state.</para> - <para>One of the CR (or Credit) entries for the Sales Invoice - transaction is created using the Sales mapping defined here in the - Sales Invoice (and the other is created another GL Account default for - 'Tax Authority GL Accounts')</para> - <para>All of the the DR (or Debit) entries for the Sales Invoice - transaction (except for Accounts Receivable which is comes from the GL - Account Type defaults) are created using the mappings defined here in - the Sales Invoice</para> - <section> - <title>How do I add a Sales Invoice override mapping?</title> - <para>By default there are no Sales Invoice override mappings that are - configured as part of the OFBiz demo data.</para> - <orderedlist> - <listitem> - <para>Select the 'Invoice Item Type' from the drop down list</para> - </listitem> - <listitem> - <para>Select the ' Override Revenue GL Account Id' to map it to from - the drop down list</para> - </listitem> - <listitem> - <para>Press the 'Save' button</para> - </listitem> - <listitem> - <para>The new mapping will be displayed in the 'Override GL Account' - column in the list at the bottom of the screen</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I update a Sales Invoice override mapping?</title> - <para>An existing Sales Invoice override mapping cannot be updated but - needs to be removed and a new mapping added. If you try to add an - override to an item that already has an override you will get a - duplicate record error message.</para> - </section> - <section> - <title>How do I remove a Sales Invoice override mapping?</title> - <para>NOTE: Only the override mapping can be deleted. The default - mapping record cannot be deleted here (even though the Remove button - is displayed next to it!)</para> - <orderedlist> - <listitem> - <para>Locate the entry that needs the override deleted in the list - of Sales Invoice override mappings</para> - </listitem> - <listitem> - <para>Press the 'Remove' button next to the entry</para> - </listitem> - <listitem> - <para>he override mapping will be removed from the 'Override GL - Account' column of the entry</para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountTypeDefaults.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountTypeDefaults.xml deleted file mode 100644 index 66a2b06..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountTypeDefaults.xml +++ /dev/null @@ -1,158 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. - --> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The GL Account Type Defaults help screen</title> - <para>The GL Account Defaults screens are are method to setup rules - that are used to translate business transactions into accounting - transactions. It currently is made up of 12 sub menus that can be used - to map various transaction type codes to a specific general ledger - account</para> - <para>Accounting transactions are made up of a Debit Entry and a Credit - Entry. The GL Account defaults screens help map which accounts are to - be used to generate a each part of the transaction. This means that - certain mappings will be used to generate the Debit (or DR) entry part - of the transaction and others used to generate the Credit (or CR) - entry part of the transaction.</para> - <para>NOTE: Many of the accounting transactions are generated - 'automatically' (or in the background) using the the accounting - services SECAS / EECAS. </para> - <para>The GL Account Type is used to specify the default account that - certain transactions (eg Accounts Payable, Accounts Receivable, etc) - are posted to. An accounting transaction (or journal entry) is made up - of two parts - a Debit Entry and a Credit Entry that balance each - other. The GL Account Type is used to translate one side of the - journal entry. </para> - <para>GL Account Types are stored in Entity GLAccountType which can be - viewed via Entity Data Maintenance in the Webtools menu. There are - currently 57 different GL Account Types that are part of the OFBiz - demo data but only 19 of these are setup as mappings</para> - <para>How the GL Account Type is used is best shown by an example. A - very simple description of an online Sales Order Process could be as - follows:</para> - <orderedlist> - <listitem> - <para>Customer Orders a Product (and Creates a Sales Order)</para> - </listitem> - <listitem> - <para>Customer Pays for Product (via Credit Card, Internet Banking - etc)</para> - </listitem> - <listitem> - <para>Vendor confirms Payment and Dispatches the Product to the - Customer</para> - </listitem> - </orderedlist> - <para>Let's focus on the first part step of 3 in more detail.</para> - <itemizedlist> - <listitem> - <para>The vendor has checked their bank statement and seen that the - customer has paid</para> - </listitem> - <listitem> - <para>In OFBiz Order Manager they will then look up the relevant - Sales Order and then click the 'Receive Payment' button to log the - payment in the system</para> - </listitem> - <listitem> - <para>The 'Receive Payment' button is a trigger for an 'automatic' - accounting transaction</para> - </listitem> - <listitem> - <para>The transaction type that is triggered is called 'Incoming - Payment'</para> - </listitem> - <listitem> - <para>The accounting entries generated are: DR 112000 Undeposited - Funds , CR 120000 Accounts Receivable </para> - </listitem> - </itemizedlist> - <para>The CR (or Credit) entry for the transaction is created by the GL - Acccount Type mapping for 'Accounts Receivable' (which by using the - demo data default will go the 120000 Accounts Receivable)</para> - <para>The DR (or Debit) entry for the transaction is created by a - different GL Account default, the Payment Method Id / GL Account Id - mapping (eg Cash is setup as 112000 Undeposited Receipts)</para> - <section> - <title>How do I create a new GL Account Type default mapping?</title> - <para>There are currently 57 different GL Account Types that come as - part of the demo data with OFBiz. This should be enough to manage the - vast majority of business transactions. These instructions show how - to add a mapping using the default data</para> - <orderedlist> - <listitem> - <para>Select the 'GL Account Type Id' from the drop down list</para> - </listitem> - <listitem> - <para>Select the 'GL Account' to map it to from the drop down list - </para> - </listitem> - <listitem> - <para>Press the 'Save' button</para> - </listitem> - <listitem> - <para>The new GL Account Type mapping is displayed in the list at - the bottom of the screen </para> - </listitem> - </orderedlist> - <para>NOTE: If none of the demo data GL Account Types are sufficient - then new ones can be added using Entity Data Maintenance and the - entity 'GLAccountType' in the Webtools menu.</para> - </section> - <section> - <title>How do I update a GL Account Type default mapping?</title> - <para>A GL Account Type mapping cannot be updated directly but needs - to be removed then re-created. If you try to update an existing entry - you will get an 'duplicate key' error message.</para> - <orderedlist> - <listitem> - <para>Press the 'Remove' button next to the entry that you want to - update</para> - </listitem> - <listitem> - <para>The entry is removed from the list of entries displayed</para> - </listitem> - <listitem> - <para>Select the 'GL Account Type Id' from the drop down list</para> - </listitem> - <listitem> - <para>Select the updated 'GL Account' to map it to from the drop - down list</para> - </listitem> - <listitem> - <para>Press the 'Save' button</para> - </listitem> - <listitem> - <para>The new GL Account mapping is displayed in the list at the - bottom of the screen</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I delete a GL Account Type default mapping?</title> - <orderedlist> - <listitem> - <para>Press the 'Remove' button next to the entry that you want to - delete</para> - </listitem> - <listitem> - <para>The entry is removed from the list of entries displayed</para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountTypePaymentType.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountTypePaymentType.xml deleted file mode 100644 index 0d70428..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_GlAccountTypePaymentType.xml +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Payment Type GL Account Type help screen</title> - <para>The Payment Type GL Account Type Id is used to translate (or map) the different payment types to a specific GL Account Type Id. The GL Account Type Id is then used via the 'GL Account Type Id' defaults to translate to one side of a journal entry.</para> - <para>NOTE: This GL Account default is used to link to another one of the GL Account defaults.</para> - <para>A Payment Type is just a way to categorize transactions. Examples of Payment Types could be as follows:</para> - <itemizedlist> - <listitem><para>Commission Payments</para></listitem> - <listitem><para>Customer Payments</para></listitem> - <listitem><para>Vendor (or Supplier) Payments</para></listitem> - <listitem><para>Customer Refunds</para></listitem> - <listitem><para>Customer Prepayments or Deposits</para></listitem> - </itemizedlist> - <para>These payment types can then be mapped to the required account type in the Chart of Account. Examples of these type of mappings could be as follows:</para> - <itemizedlist> - <listitem><para>Customer Payments are mapped to Account Receivable </para></listitem> - <listitem><para>Vendor (or Supplier) Payment are mapped to Account Payable</para></listitem> - <listitem><para>Customer Refunds are mapped to Customer Credits</para></listitem> - </itemizedlist> - <section> - <title>How do I add a Payment Type / GL Account Type Id mapping?</title> - <para>There are currently 14 different Payment Type / GL Account Types mappings that come as part of the demo data with OFBiz and should cover a good variety of payment related transactions.</para> - <orderedlist> - <listitem><para>Select the 'Payment Type Id' from the drop down list</para></listitem> - <listitem><para>Select the 'GL Account Type Id' to map it to from the drop down list</para></listitem> - <listitem><para>Press the 'Save' button</para></listitem> - <listitem><para>The new 'Payment Type / GL Account Type' mapping is displayed in the list at the bottom of the screen</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I update a Payment Type / GL Account Type Id mapping?</title> - <para>A Payment Type / GL Account Type mapping cannot be updated directly but needs to be removed then re-created. If you try to update an existing entry you will get an 'duplicate key' error message.</para> - <orderedlist> - <listitem><para>Press the 'Remove' button next to the entry that you want to update</para></listitem> - <listitem><para>The entry is removed from the list of entries displayed</para></listitem> - <listitem><para>Select the 'Payment Type Id' from the drop down list</para></listitem> - <listitem><para>Select the updated 'GL Account Type Id' to map it to from the drop down list</para></listitem> - <listitem><para>Press the 'Save' button</para></listitem> - <listitem><para>The new 'Payment Type / GL Account Type' mapping is displayed in the list at the bottom of the screen</para></listitem> - </orderedlist> - </section> - <section> - <title>How do I remove a Payment Type / GL Account Type Id mapping?</title> - <orderedlist> - <listitem><para>Press the 'Remove' button next to the entry that you want to delete</para></listitem> - <listitem><para>The entry is removed from the list of entries displayed</para></listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListCompanies.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListCompanies.xml deleted file mode 100644 index bf3ccc9..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListCompanies.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. - --> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Available Internal Organizations help screen</title> - <para>The default screen shows a list of Party Groups that have the - role of 'Internal Organization' associated with them. If you have - installed the demo data then the default company 'Company' as well as - departments / business units and regional subsidiaries will be - displayed.</para> - <para>For each 'Internal Organization' there is the ability to set the - currency, fiscal periods and invoice prefixes.</para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListGlAccountOrganization.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListGlAccountOrganization.xml deleted file mode 100644 index 6250e34..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_ListGlAccountOrganization.xml +++ /dev/null @@ -1,138 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. - --> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Chart of Accounts help screen</title> - <para>OFBiz comes with a master template for a very comprehensive chart - of accounts. This can be found in 'Global GL Defaults' under the - 'Accounting' tab.</para> - <para>A couple of points to note</para> - <itemizedlist> - <listitem> - <para>you do not need to use all the accounts defined in this master - template (but it may be simpler to look for the accounts that you - can use or rename)</para> - </listitem> - <listitem> - <para>you can create your own additional accounts if you dont want to - use the ones in the master template</para> - </listitem> - </itemizedlist> - <para>The chart of accounts for the default organisation (Company) is - built up by selecting the accounts that you want to use from the - global chart of accounts master template. This means that if you want - to create a new account then you need to create it first in the Global - Chart of Accounts and then link (or assign) it to the chart of - accounts for Company.</para> - <para>Details of the Chart of Accounts can be exported as a CSV file or - PDF using the buttons displayed.</para> - <para>IMPORTANT NOTE: You need to be careful if you do decide to create - your own accounts that they contain all the details required and that - they are linked into the relevant configuation for the setup of the GL - defaults. This means that if you change an account (eg Inventory) to - one of your own - you need to check the GL defaults setup and replace - any reference to the Inventory account to the one you have created. - </para> - <para>This Chart of Accounts screen is used to define the list of - accounts (or chart) that will be actively used by the company.For - example the Global chart of accounts may contain 100 different - accounts but only 20 need to be used for your specific business. This - means the you need only to create assignments to the accounts that you - actively want to use.</para> - <para>The Chart of Accounts is a mixture of business needs (ie being - able to track the information you need for your business) and tax - requirements (i.e. legal or government requirements necessary for - operating a business). The type of Chart that you setup will be - dependent of your business type.</para> - <section> - <title>How do I create a Chart of Accounts?</title> - <para>As mentioned above the chart of accounts for the default - organisation (Company) is built up by selecting the accounts that you - want to use from the global chart of accounts master template. This - means that if you want to create a new account then you need to - create it first in the Global Chart of Accounts and then link (or - assign) it to the chart of accounts for Company. By creating an - assignment to an account it is then added to the Chart of Accounts. - </para> - <orderedlist> - <listitem> - <para>Select the account Gl Account Id that you need from the drop - down box</para> - </listitem> - <listitem> - <para>Press the 'Create Assignment' button</para> - </listitem> - <listitem> - <para>The account is added to the Chart of Account</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I update a Chart of Accounts?</title> - <para>Updating the Chart of Accounts will involve either creating a - new assignment or removing an existing one. A new assignment is - created using the instructions above. The added complication may be - that the account that you need does not exist in the Global Chart of - Accounts. As mentioned above it will need to be created and then - linked.</para> - <para>See the instructions below to remove an existing account - assignment. </para> - <para>NOTE: If a completely new account is required that does not - already exist as part of the Global Chart of Accounts template then - it will need to be created as part of the Global template first - before it can be used as an assignment in the Organisation Chart of - Accounts.</para> - </section> - <section> - <title>How do I delete a Chart of Accounts?</title> - <para>Accounts are not deleted from the Chart of Accounts - they are - simply no longer selected to be used.</para> - <para>It is important that you do not remove accounts that are active - and have already been used for transactions. Even if the net balance - of the account is zero then from an audit perspective then you should - not be removing accounts.</para> - <para>You should only be looking to remove accounts that have not been - used. To un-link or un-assign accounts from the default company then - use the Entity Data Maintenance from the Webtools menu. Look for the - entity 'GlAccountOrganization' and delete the record to remove the - link.</para> - </section> - <section> - <title>How do I update the details for an account in the Chart of - Accounts?</title> - <para>Details of the accounts that make up the Chart of Accounts can - be accessed from this screen. </para> - <orderedlist> - <listitem> - <para>Click on the 'GL Account Id' of the account required</para> - </listitem> - <listitem> - <para>The 'Edit GL Account' screen is displayed showing the details - of the account selected (NOTE:This screen is also accessible via - 'Global GL Settings / Chart of Account / Navigate Accounts '</para> - </listitem> - <listitem> - <para>Amend the fields required (NOTE: The GL Account Id and Posted - Balance fields cannot be amended)</para> - </listitem> - <listitem> - <para>Press the 'Update' button </para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_PartyAcctgPreference.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_PartyAcctgPreference.xml deleted file mode 100644 index eafa3c6..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_PartyAcctgPreference.xml +++ /dev/null @@ -1,136 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. - --> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Accounting Preferences help screen</title> - <para>Accounting Preferences are a set of configuration details that - are related to a party. To appear on this screen the party must be - setup with the role of 'Internal Organisation'. This means that you - can add the internal organisation role to a party and they will be - added to this screen and then can be configured.</para> - <para>The master default party is 'Company' but preferences can also be - setup for internal departments. The demo data shows some examples of - this (eg Marketing, Accounting, Sales, Development etc). Unless - overridden then then all other parties appearing on this screen will - take their default setup from 'Company'</para> - <para>NOTE: The majority of the configuration information displayed in - Accounting Preferences are taken from the Enumeration entity.</para> - <para>It is used for setting specifying information related to the - accounting setup for a specific organisation or parties that exist - within an organisation such as business units, cost centres, - departments ,subsidiaries etc. Information that can be setup include - the following:</para> - <itemizedlist> - <listitem> - <para>The start date of the Time Periods and Fiscal or Accounting - Year (eg 1st April, 1st January, 1st June etc)</para> - </listitem> - <listitem> - <para>Tax Return Form (NOTE: Need to check how important this is and - where it is used.......possibly some kind of reporting???)</para> - </listitem> - <listitem> - <para>The method to be used for calculating Cost of Goods Sold (COGS) - </para> - </listitem> - <listitem> - <para>Base Currency - eg USD, GBP, EUR etc (NOTE: May have main - company in USD but a subsidiary in EUR etc)</para> - </listitem> - <listitem> - <para>Invoice prefix, numbering and sequencing (eg you may want each - business unit / subsidiary to have its own invoice numbering or - sequence etc)</para> - </listitem> - <listitem> - <para>Quote prefix, number and sequencing</para> - </listitem> - <listitem> - <para>Method to be used for refunds (eg cheque, direct bank credit, - voucher credit etc...)</para> - </listitem> - <listitem> - <para>Specify which journal will be used to store error transactions - </para> - </listitem> - </itemizedlist> - <para>NOTE: Key things that are usually need to be amended include the - base currency for the company, fiscal year information and invoice - numbering prefix or sequencing.</para> - <section> - <title>How do I create or setup a new Accounting Preference?</title> - <para>IMPORTANT NOTE: A party must be setup with the role of 'Internal - Organisation' before it will appear on the Accounting Preferences - screen so that it can be setup.</para> - <orderedlist> - <listitem> - <para>Select the 'Setup' button next to the party to be setup</para> - </listitem> - <listitem> - <para>The Accounting Preferences screen is displayed. (IMPORTANT: - The first time this screen is displayed all of the fields will be - modifiable. Once this has been saved only certain fields will be - modifiable!!)</para> - </listitem> - <listitem> - <para>The default entries will be based on (or inherited from) - 'Company'</para> - </listitem> - <listitem> - <para>Enter any changes that are required (eg Invoice Prefix, Error - Journal name - as you may want error transactions from separate - departments to be handled differently...)</para> - </listitem> - <listitem> - <para>Press the 'Add' button</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I update an Accounting Preference?</title> - <orderedlist> - <listitem> - <para>Select the 'Setup' button next to the party to be setup</para> - </listitem> - <listitem> - <para>The Accounting Preferences screen is displayed but only - certain fields will be modifiable</para> - </listitem> - <listitem> - <para>Enter any changes required</para> - </listitem> - <listitem> - <para>Press the 'Update' button</para> - </listitem> - </orderedlist> - <para>NOTE: If you need to change any of the fields that are not - modifiable then it can be done via the Entity Data Maintenance on - Webtools menu using the PartyAcctgPreference entity. You will need to - be careful in editing an existing preference especially if the - configuration already been used for transactions.</para> - </section> - <section> - <title>How to I delete an Accounting Preference?</title> - <para>There is currently no delete option via the user interface but - an Accounting Preference can be removed by deleting the role of - 'Internal Organisation' from the party record.</para> - <para>NOTE TO CHECK: Need to investigate the impact of using an - accounting preference then removing it. What happens to the - transactions in process etc......???</para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_SetupGlJournals.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_SetupGlJournals.xml deleted file mode 100644 index 49ddeb6..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_SetupGlJournals.xml +++ /dev/null @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. - --> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Journals help screen</title> - <para>A journal is a detailed accounting transaction that is recorded - (or posted) to the General Ledger. It is made up of a debit and a - credit component.(IMPORTANT NOTE TO CHECK: Is this screen really about - Journals or is it about Suspense Accounts.....??????)</para> - <para>NOTE: By default in OFBIZ a journal called 'ERROR_JOURNAL' is - created as part of the demo data installation.This 'ERROR_JOURNAL' is - referenced in the Accounting Preferences setup for 'Company'. The - 'ERROR_JOURNAL' is used to store details of any transaction that fails - and cannot be posted to a general ledger account. Transactions falling - into error can be as the result of incomplete setup or an invalid - transaction (eg a transaction that should never occur).</para> - <section> - <title>How do I create a journal?</title> - <orderedlist> - <listitem> - <para>Enter a journal name in the Gl Journal Name field (eg - MY_JOURNAL)</para> - </listitem> - <listitem> - <para>Press the 'Submit' button</para> - </listitem> - <listitem> - <para>The journal is created and will appear in the journal list at - the bottom of the screen (Note that the Journal ID is automatically - generated)</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I update a journal?</title> - <orderedlist> - <listitem> - <para>Select the journal to be updated from the list of journals at - the bottom of the screen</para> - </listitem> - <listitem> - <para>The journal details will be displayed on the screen</para> - </listitem> - <listitem> - <para>Update the Gl Journal Name (as this is currently the only - field that can be updated)</para> - </listitem> - <listitem> - <para>Press the 'Submit' button</para> - </listitem> - <listitem> - <para>The updated journal will appear in the journal list at the - bottom of the screen</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I delete a journal?</title> - <para>Be careful if you need to remove an existing journal as it may - have transactions associated with it.</para> - <orderedlist> - <listitem> - <para>Press the 'Remove' button next to the journal that you want to - delete</para> - </listitem> - <listitem> - <para>The journal is deleted and the screen is redisplayed</para> - </listitem> - </orderedlist> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_TimePeriods.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_TimePeriods.xml deleted file mode 100644 index 2fa0643..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_TimePeriods.xml +++ /dev/null @@ -1,180 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to you under the Apache License, Version - 2.0 (the "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 Unless required by - applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - CONDITIONS OF ANY KIND, either express or implied. See the License for - the specific language governing permissions and limitations under the - License. - --> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Time Periods help screen</title> - <para>Time periods are a defined period of time (usually a month, - quarter or year) that is used to group business transactions. It is a - key part of any general accounting setup.</para> - <para>Time periods can be used for the definition of :</para> - <itemizedlist> - <listitem> - <para>Company Financial Year</para> - </listitem> - <listitem> - <para>Fiscal / Tax Periods (weeks, months, quarters)</para> - </listitem> - <listitem> - <para>VAT / GST Periods</para> - </listitem> - <listitem> - <para>Sales Periods</para> - </listitem> - </itemizedlist> - <para>The screen is divided into 3 main areas. The first two show lists - of the open and closed time periods. The area at the bottom allows you - to define and enter a new time period.</para> - <section> - <title>How do I add a new Financial Year time period?</title> - <orderedlist> - <listitem> - <para>Using the area at the bottom of the screen labelled 'New' - </para> - </listitem> - <listitem> - <para>Leave the Parent Period Id field blank (NOTE: The financial - year will be the parent of other time periods eg fiscal months or - GST / VAT periods)</para> - </listitem> - <listitem> - <para>Select 'Fiscal Year' from the 'Period Type Id' drop down box - </para> - </listitem> - <listitem> - <para>Enter '13' in the Period Num field (NOTE: You can use any - number that does not conflict with the other time periods you want - to use. We plan to define 12 fiscal or tax months so will use 13 - for the year)</para> - </listitem> - <listitem> - <para>Enter 'FY 2010-2011' in the Period Name field (NOTE: You can - use any name you want but make sure it makes sense. This example is - an abbreviation for Fiscal Year 2010-2011)</para> - </listitem> - <listitem> - <para>Select '1st April 2010' using the calendar lookup in the 'From - Date' field</para> - </listitem> - <listitem> - <para>Select '1st April 2011' using the calendar lookup in the 'Thru - Date' field (NOTE: Even though we want our financial year to end on - 31st March 2011 the test used is based on less than not an equal - to)</para> - </listitem> - <listitem> - <para>Leave the 'Is Closed' field at its default of 'No'</para> - </listitem> - <listitem> - <para>Press the 'Create' button</para> - </listitem> - <listitem> - <para>The new time period will now be displayed in the list of open - time periods.</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I add a new GST/ VAT time period?</title> - <orderedlist> - <listitem> - <para>Using the area at the bottom of the screen labelled 'New' - </para> - </listitem> - <listitem> - <para>Select the previously created financial year 'FY 2010-2011' in - the Parent Period Id field</para> - </listitem> - <listitem> - <para>Select 'Fiscal Month' from the 'Period Type Id' drop down box - </para> - </listitem> - <listitem> - <para>Enter '1' in the Period Num field (NOTE: This is the first of - 12 periods that we want to define.) </para> - </listitem> - <listitem> - <para>Enter 'FM April 2010' in the Period Name field (NOTE: You can - use any name you want but make sure it makes sense. This example is - an abbreviation for Fiscal Month April 2010)</para> - </listitem> - <listitem> - <para>Select '1st April 2010' using the calendar lookup in the 'From - Date' field</para> - </listitem> - <listitem> - <para>Select '1st May 2010' using the calendar lookup in the 'Thru - Date' field (NOTE: Even though we want our fiscal month to end on - 30th April 2010 the test is used is based on less than not an equal - to)</para> - </listitem> - <listitem> - <para>Leave the Is Closed field at its default of 'No'</para> - </listitem> - <listitem> - <para>Press the 'Create' button</para> - </listitem> - <listitem> - <para>The new time period will now be displayed in the list of open - time periods.</para> - </listitem> - </orderedlist> - </section> - <section> - <title>How do I update a time period?</title> - <para>NOTE: Time periods cannot be updated via the current time - periods screen. If you need to amend time period details then it can - be done via Entity Data Maintenance in the Webtools menu.</para> - </section> - <section> - <title>How do I close a time period?</title> - <orderedlist> - <listitem> - <para>To close a time period select the 'Close' button next to the - time period.</para> - </listitem> - <listitem> - <para>The time period will be removed from the current open time - periods area and re-displayed in the closed time periods section of - the screen.</para> - </listitem> - </orderedlist> - <para>NOTE: Closing a time period is a trigger for an automatic - accounting transaction as follows:</para> - <itemizedlist> - <listitem> - <para>Transaction Type: Period Closing</para> - </listitem> - <listitem> - <para>DR ?????? (based on the GL account type mapping for Profit - Loss) </para> - </listitem> - <listitem> - <para>CR 336000 Retained Earnings (based on GL account type mapping - for Retained Earnings)</para> - </listitem> - </itemizedlist> - <para>NOTE: Both sides of this accounting transaction uses the same GL - account type default mapping. The account mapping for 'Profit Loss' - is not setup as part of the demo data so this transaction will not - automatically post to the general ledger but will instead be put in - the ERROR_JOURNAL as an unposted transaction. The transaction value - is zero for both sides of journal...Even if it does have a value do - we want to move it from P and L to Equity during the financial year? - Normally this is done once at the end of the financial year.</para> - </section> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_organization_gl_settings.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_organization_gl_settings.xml deleted file mode 100644 index 065ce5e..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_organization_gl_settings.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>Organization GL Settings.</title> - <xi:include href="HELP_ACCOUNTING_ListCompanies.xml"/> - <xi:include href="HELP_ACCOUNTING_PartyAcctgPreference.xml"/> - <xi:include href="HELP_ACCOUNTING_ListGlAccountOrganization.xml"/> - <xi:include href="HELP_ACCOUNTING_SetupGlJournals.xml"/> - <xi:include href="HELP_ACCOUNTING_GlAccountTypeDefaults.xml"/> - <xi:include href="HELP_ACCOUNTING_EditProductGlAccounts.xml"/> - <xi:include href="HELP_ACCOUNTING_EditProductCategoryGlAccounts.xml"/> - <xi:include href="HELP_ACCOUNTING_EditFinAccountTypeGlAccounts.xml"/> - <xi:include href="HELP_ACCOUNTING_GlAccountSalInvoice.xml"/> - <xi:include href="HELP_ACCOUNTING_GlAccountPurInvoice.xml"/> - <xi:include href="HELP_ACCOUNTING_GlAccountTypePaymentType.xml"/> - <xi:include href="HELP_ACCOUNTING_GlAccountNrPaymentMethod.xml"/> - <xi:include href="HELP_ACCOUNTING_EditVarianceReasonGlAccounts.xml"/> - <xi:include href="HELP_ACCOUNTING_EditCreditCardTypeGlAccounts.xml"/> - <xi:include href="HELP_ACCOUNTING_EditOrganizationTaxAuthorityGlAccounts.xml"/> - <xi:include href="HELP_ACCOUNTING_EditPartyGlAccount.xml"/> - <xi:include href="HELP_ACCOUNTING_TimePeriods.xml"/> -</section> diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditCreditCardTypeGlAccounts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditCreditCardTypeGlAccounts.adoc new file mode 100644 index 0000000..9ebd23a --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditCreditCardTypeGlAccounts.adoc @@ -0,0 +1,58 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Credit Card Type GL Accounts +The Credit Card Type / GL Account default is used to map different types of credit card to different general ledger accounts. + +NOTE: This setup will affect one side of a journal entry only. + +This type of mapping is useful if you need to track the amounts to be collected from different credit card agents. + +The OFBiz demo data comes with some setup here + +NOTE: TO CHECK The demo entries appear to be duplicated...has something changed in ENUM for defining + each credit card type.....?????) + +Examples are as follows: + +* American Express +* Visa +* Mastercard +* Diners Club + +== How do I add a Credit Card Type GL Account mapping? +There are 10 mappings that come as part of the OFBiz demo data but they do appear to be duplicated for some reason. + +. Select the 'Card Type' from the drop down list +. Select the 'GL Account Id' to map it to from the drop down list +. Press the 'Add' button +. The new 'Credit Card / GL Account Id' mapping is displayed in the list at the bottom of the screen + +== How do I update a Credit Card Type GL Account mapping? +. Select the 'Card Type' from the drop down list +. Select the updated 'GL Account Id' to map it to from the drop down list +. Press the 'Add' button +. The updated 'Credit Card Type / GL Account' mapping is displayed in the list at the bottom of the screen + +NOTE: TO CHECK Used 'Visa' as an example to update and the 'CCT_VISA' was updated but the 'Visa' one was'nt. + This is probably related to the duplication. + +== How do I remove a Credit Card Type GL Account mapping? +. Press the 'Remove' button next to the entry that you want to delete +. The entry is removed from the list of entries displayed diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditOrganizationTaxAuthorityGlAccounts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditOrganizationTaxAuthorityGlAccounts.adoc new file mode 100644 index 0000000..49b4ac2 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditOrganizationTaxAuthorityGlAccounts.adoc @@ -0,0 +1,56 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Tax Authority GL Accounts +The Tax Authority / GL Account default is used to map different tax authorities to different general ledger accounts. +This setup will affect one side of a journal entry only. + +NOTE: A tax authority is legal body usually the state (country) that imposes a financial levy on business transactions. + +Normal business rules require you will to keep track amounts collected or paid to different tax authorities separately. +This mapping ensures that money collected or paid to various tax authorities (eg through Sales Orders, Purchase Orders etc) + can be separated into specific accounts + +The OFBiz demo data comes with 9 entries to show an example of how this can be setup using the some of the US states + as separate tax authorities. + +== How do I add a Tax Authority / GL Account mapping? +Unlike the other GL Account defaults you cannot add a Tax Authority / GL mapping through these screens. +It needs to be done via the 'GL Accounts' sub menu under the 'Tax Authorities' menu. + +The method of how to add a mapping using the 'Tax Authorities' is shown below. + +. From the Accounting Manager / Tax Authorities Menu press the 'Edit' button next to the Tax Authority required +. Select the sub menu 'GL Accounts' +. Enter or Lookup the party for the 'Organisation Party Id' field (NOTE: Use 'Company' as default) +. Enter or Lookup the GL Account to be mapped to +. Press the 'Add' button +. The mapping will be displayed at the bottom of the screen. +. Return to the Tax Authority / GL Account default and this new mapping will be shown in the list + +== How do I update a Tax Authority / GL Account mapping? +Only the GL Account Id linked to the mapping can be updated. + +. Locate the Tax Authority / GL Account entry that needs to be updated +. Select the new 'GL Account Id' from the drop down list next to the entry +. Press the 'Update' button next to the entry + +== How do I remove a Tax Authority / GL Account mapping? +. Locate the Tax Authority / GL Account entry that needs to be removed +. Press the 'Delete' button next to the entry diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditPartyGlAccount.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditPartyGlAccount.adoc new file mode 100644 index 0000000..378e716 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditPartyGlAccount.adoc @@ -0,0 +1,66 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Party GL Account mapping +The Party / GL Account mapping allows the translation of different account types (eg Accounts Receivable, Accounts Payable etc) + for a party to be mapped to a separate general ledger account. + +The party role (eg Bill To Customer) is also used to define the mapping even further. + +OFBiz demo data setup comes with no entries here. + +It is used as a way of implementing subledger functionality in OFBiz. +Subledger functionality is where a higher level account can be split into lower levels. +In this case these lower levels can be by party. + +An example could be that a business may want to use the general ledger to track the Accounts Receivable (AR) by customer + so the chart of account would be setup something like as follows: + +120000 Accounts Receivable + +* 120010 Accounts Receivable - Customer A +* 120020 Accounts Receiviable - Customer B +* 120030 Accounts Receivalbe - Customer C + +This has the main AR account is at the top of the hierarchy and 3 sub accounts below it. + +Entries for Customers A, B and C would be setup with a role of 'Bill From Customer' as this is a role associated + with the customer when the Sales Invoice is generated.When a transaction matching the criteria is processed in the system + then these mappings will control where it is posted to.In the case of Customer A any AR transactions with + role 'Bill To Customer' are posted to '120010' instead of the standard '120000 + +== How do I add a new Party / GL Account mapping? +. Enter or Lookup the party for the 'Party Id' field +. Select the 'Role Type Id' from the drop down list + + (NOTE: Be careful that you select the correct role for the transactions you want to track......) +. Select the 'GL Account Type Id' from the drop down list +. Select the 'GL Account Id' from the drop down list +. Press the 'Add' button +. The new entry will be displayed at the bottom of the screen + +== How do I update a Party / GL Account mapping? +Only the GL Account Id linked to the mapping can be updated. + +. Locate the Party / GL Account entry that needs to be updated +. Select the new 'GL Account Id' from the drop down list next to the entry +. Press the 'Update' button next to the entry + +== How do I remove a Party / GL Account mapping? +. Locate the Party / GL Account entry that needs to be removed +. Press the 'Delete' button next to the entry diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditProductCategoryGlAccounts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditProductCategoryGlAccounts.adoc new file mode 100644 index 0000000..7399906 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditProductCategoryGlAccounts.adoc @@ -0,0 +1,59 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Product Category GL Accounts +The Product Category GL Account is used to specify the default account to be used for a specific 'Product Category' and + 'Account Type' combination. +This setup will translate to one side of the journal entry only. + +It is used for tracking product category transactions at a more detailed level. + +Examples could be as follows: + +* Tracking Accounts Receivable by Product Category in the General Ledger +* Tracking Cost of Goods by Product Category in the General Ledger +* Tracking Commissions paid by Product Category in the General Ledger + +The demo data gives an idea of the use of product categories to classify or separate different products streams. +If specific accounting or management reporting is required at this level then the General Ledger can be setup + to provide this detail. + +== How do I add a new Product Category / GL Account Type mapping? +By default there are no Product Category / GL Account Type mappings that are configured as part of the OFBiz demo data. + +. Select the 'Account Type' from the drop down list + + (NOTE: In other screens this field is call the 'GL Account Type Id'.....) +. Select the ' GL Account' to map it to from the drop down list +. Enter or look up the 'Product Category Id' to be used +. Press the 'Add' button +. The new mapping will be displayed in the list at the bottom of the screen + +== How do I update a Product Category / GL Account type mapping? +A Product Category / GL Account Type mapping can be updated by modifying the GL Account only. +If the product category or the Account Type needs to be updated then the mapping will need to be deleted and + then re-entered using the new product category or Account Type. + +. Locate the entry that needs to be updated in the list of Product Category / GL Account Type mappings +. Modify the 'GL Account 'by using the drop down list next to the 'GL Account' field +. Press the 'Update' button +. The updated mapping will be displayed + +== How do I remove a Product Category / GL Account Type mapping? +. Locate the entry that needs to be deleted in the list of Product Category / GL Account Type mappings +. Press the 'Remove' button next to the entry diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditProductGlAccounts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditProductGlAccounts.adoc new file mode 100644 index 0000000..fefc06f --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditProductGlAccounts.adoc @@ -0,0 +1,64 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Product GL Account +The Product GL Account is used to specify the default account to be used for a specific Product' and 'Account Type' combination. +This setup will translate to one side of the journal entry only. + +NOTE: Duplicate functionality .... This setup for the Product GL Account can also be setup using the 'Accounts' sub menu for + the Product in Catalog Manager. + + TO CHECK: Need to confirm whether this default work like a hierarchy....eg Product GL Defaults will override + General Account defaults. + +It is used for tracking product transactions at a more detailed level. + +Examples could be as follows: + +* Tracking Accounts Receivable by Product in the General Ledger +* Tracking Cost of Goods by product (or product variation) in the General Ledger +* Tracking Commissions paid by Product in the General Ledger + +== How do I add a new Product / GL Account Type mapping? +By default there are no Product / GL Account Type mappings that are configured as part of the OFBiz demo data. + +. Select the 'Account Type' from the drop down list + + (NOTE: In other screens this field is call the 'GL Account Type Id'.....) +. Select the ' GL Account' to map it to from the drop down list +. Enter or look up the 'Product Id' to be used +. Press the 'Add' button +. The new mapping will be displayed in the list at the bottom of the screen + +NOTE: This mapping can also be also be done via the 'Accounts' sub menu for the Product. + + Any mapping created here will be displayed under the Product 'Accounts' sub menu. + Alternatively any mapping created in the Product 'Accounts' sub menu will also be displayed here. + +== How do I update a Product / GL Account Type mapping? +A Product / GL Account Type mapping can be updated by modifying the GL Account only. +If the product needs to be updated then the mapping will need to be deleted and then re-entered using the new product. + +. Locate the entry that needs to be updated in the list of Product / GL Account Type mappings +. Modify the 'GL Account 'by using the drop down list next to the 'GL Account' field +. Press the 'Update' button +. The updated mapping will be displayed + +== How do I delete a Product / GL Account Type mapping? +. Locate the entry that needs to be deleted in the list of Product / GL Account Type mappings +. Press the 'Remove' button next to the entry + +NOTE: This can also be done via the 'Accounts' sub menu for the Product using the 'Delete Link' button. diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_EditVarianceReasonGlAccounts.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_EditVarianceReasonGlAccounts.adoc new file mode 100644 index 0000000..952901d --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_EditVarianceReasonGlAccounts.adoc @@ -0,0 +1,53 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Variance Reason GL Accounts +The Variance Reason / GL Account default is used for mapping any stock differences to a particular general ledger account. +If there are variances in the number of products that are in stock then this affects the value of inventory in the general ledger. +By using this GL default you can offset any differences in stock to the relevant general ledger account. + +The number of products (or items) in stock can vary. + +These differences can be caused by numerous reasons. + +Some of these could be as follows: + +* Products have been damaged +* Products were lost or stolen +* Products were found +* Under or over supply of a Product from a Supplier (eg. You have ordered 10 and 11 are delivered....) +* Free samples or giveaways to potential clients + +NOTE: These mappings are used in Catalog Manager when a manual inventory adjustment is done through the Inventory Item screens. + +== How do I add a new Variance Reason / GL Account mapping? +There are 6 mappings that come as part of the OFBiz demo data. + +. Select the 'Variance Reason Id' from the drop down list +. Select the 'GL Account Type Id' to map it to from the drop down list +. Press the 'Add' button +. The new 'Variance Reason / GL Account Type' mapping is displayed in the list at the bottom of the screen + +== How do I update a Variance Reason / GL Account mapping? +. Select the 'Variance Reason Id' from the drop down list +. Select the updated 'GL Account Type Id' to map it to from the drop down list +. Press the 'Add' button +. The updated 'Variance Reason / GL Account Type' mapping is displayed in the list at the bottom of the screen + +== How do I remove a Variance Reason / GL Account mapping? +. Press the 'Remove' button next to the entry that you want to delete +. The entry is removed from the list of entries displayed diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountNrPaymentMethod.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountNrPaymentMethod.adoc new file mode 100644 index 0000000..8854165 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountNrPaymentMethod.adoc @@ -0,0 +1,74 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Payment Method GL Account Type +The Payment Method GL Account Type Id is used to map the different payment methods (eg Cash, Cheque etc) + to a specific GL Account Type Id. This will translate to one side of a GL entry only. + +A Payment Method is just a way to define the ways in which payments can be made. + +Each payment method can be linked to a different account in the general ledger. + +A main GL account used would be the one that represents the Company bank account. + +In the demo data mappings Electronic Funds Transfer, Company Account, Financial Account are all linked + to the Company bank account GL account. + +OFBiz demo data defines 15 different payment methods as follows: + +* Cash +* Certified Cheque +* Company Account +* Company Cheque +* Electronic Funds Transfer + + (NOTE TO CHECK: Problem with definition or terminology - is this a Direct Debit.... ?? + A direct debit is controlled by the payee and an automatic payment via bank account is controlled by the payer) +* Billing Account +* Cash on Delivery (COD) +* eBay +* Offline Payment + + (NOTE: Is this ambiguous - since COD is an offline payment...) +* PayPal +* WorldPay +* Financial Account +* Gift Certificate +* Money Order +* Personal Cheque + +NOTE: A point to note is that these payment methods dont include Credit Cards....(which I think is on purpose...). + The majority of these payment methods are linked to 'Undeposited Receipts' but an additional accounting transaction + may be needed once the funds have cleared and are available in the Company bank account. + +== How do I add a new Payment Method Id / GL Account Id mapping? +. Select the 'Payment Method Type' from the drop down list +. Select the 'GL Account Id' to map it to from the drop down list +. Press the 'Save' button +. The new Payment Method Type / GL Account Type mapping is displayed in the list at the bottom of the screen + +== How do I update a Payment Method Id / GL Account Id mapping? +A Payment Method Type / GL Account Type mapping cannot be updated directly but needs to be removed then re-created. +If you try to update an existing entry you will get an 'duplicate key' error message + +. Press the 'Remove' button next to the entry that you want to update +. The entry is removed from the list of entries displayed +. Select the 'Payment Method Type' from the drop down list +. Select the updated 'GL Account Type' to map it to from the drop down list +. Press the 'Save' button +. The new Payment Method Type / GL Account Type mapping is displayed in the list at the bottom of the screen + +== How do I remove a Payment Method Id / Gl Account Id mapping? +. Press the 'Remove' button next to the entry that you want to delete +. The entry is removed from the list of entries displayed diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountPurInvoice.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountPurInvoice.adoc new file mode 100644 index 0000000..bacb83a --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountPurInvoice.adoc @@ -0,0 +1,89 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Purchase Invoice default account +The Purchase Invoice sub menu is used to specify the default account to be used for the individual line items that appear + on a Purchase Invoice. + +The items are identified by a line description which can be mapped to a specific general ledger account. + +Purchase invoices can be made up of a variety of items as well as the product that is being bought +(eg discounts, promotions, work effort or labour costs etc). The majority of businesses will want to track these type of items +separately in the general ledger and this screen will allow this type of setup. + +This setup will translate to one side of the journal entry only. + +IMPORTANT: This screen is one of the screens where the default entries that are displayed here are entered via + the Global GL Settings under the sub menu 'Invoice Item Type'. + This screen allows users to override the global settings for the Purchase Invoice item type. + + An example of why this could be necessary could be that a company many want to isolate the sales reporting of + a specific department or business unit separately (eg subledgers etc) but still have the option of a 'catch all' + global general ledger account. + +IMPORTANT: TO CHECK: Need to do more investigation but the it looks like these Purchase Invoice mappings dont work when + used as part of the Purchase Order to Purchase Invoice Process. + (Have been doing some tests to try and get it to post to a different account than 'Uninvoiced Shipment Receipts' + and 'Inventory' but hasnt worked so far.) We need to be able to specify things such as Sales Tax, Freight and + any Purchase Order adjustments. + +These override mappings do work if there is no Purchase Order just a Purchase Invoice as shown in the simple process below. + +How the Purchase Invoice mappings are used is best shown by an example. + +A very simple description of a Purchase Invoice Process could be as follows: + +. You have ordered something from a supplier (eg indirect purchasing such as stationery etc via phone) +. The Supplier ships the products to you + + (NOTE: as they are not stored in the Warehouse but in your offices - so dont need an Inventory Receive.....????) +. You receive the product and an invoice from the Supplier (Purchase Invoice) +. You enter the Purchase Invoice pay the Supplier the amount invoiced + +Let's focus on step of 4 in more detail. + +* You have received the product from the supplier with an invoice +* In OFBiz you enter the Purchase Invoice using 'Create New' in the 'Invoices' menu of Accounting Manager +* Using the 'Items' sub menu you can create individual items on the Purchase Invoice + (eg Paper, Pens, Sales Tax etc and they dont need to have a Product Id associated with them) +* When you add a new invoice item to the Purchase Invoice it is the 'Invoice Item Type' that is affected + by the Purchase Invoice override mappings +* The Purchase Invoice can then be moved to various statuses (Approved, Received, Ready or Cancelled) +* When the status is moved to 'Ready' this is a trigger for an 'automatic' accounting transaction +* The transaction type generated is called 'Purchase Invoice' and it uses the Purchase Invoice override mappings + +Transaction Type: Purchase Invoice, DR 516100 Purchase Order Adjustments , DR ????? Sales Tax, CR 210000 Accounts Payable + +== How do I add a new Purchase Invoice override mapping? +By default there are no Purchase Invoice override mappings that are configured as part of the OFBiz demo data. + +. Select the 'Invoice Purchase Item Type' from the drop down list +. Select the ' Invoice Override Expense GL Account Id' to map it to from the drop down list +. Press the 'Save' button +. The new mapping will be displayed in the 'Invoice Override Expense GL Account' column in the list at the bottom of the screen + +== How do I update a Purchase Invoice override mapping? +An existing Purchase Invoice override mapping cannot be updated but needs to be removed and a new mapping added. +If you try to add an override to an item that already has an override you will get a duplicate record error message. + +== How do I remove a Purchase Invoice override mapping? +NOTE: Only the override mapping can be deleted. + The default mapping record cannot be deleted here (even though the Remove button is displayed next to it!) + +. Locate the entry that needs the override deleted in the list of Purchase Invoice override mappings +. Press the 'Remove' button next to the entry +. The override mapping will be removed from the 'Invoice Override Expense GL Account' column of the entry diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountSalInvoice.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountSalInvoice.adoc new file mode 100644 index 0000000..ac36d9a --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountSalInvoice.adoc @@ -0,0 +1,112 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Sales Invoice default account +The Sales Invoice sub menu is used to specify the default account to be used for the individual line items that appear + on a Sales Invoice. + +The items are identified by a line description which can be mapped to a specific general ledger account. + +Sales invoices can be made up of a variety of items as well as the product that is being sold +(eg discounts, promotions, work effort or labour costs etc). +The majority of businesses will want to track these type of items separately in the general ledger and this screen will allow + this type of setup. + +This setup will translate to one side of the journal entry only. + +A key mapping used is linked directly to the Product Type (eg Invoice Digital Good Item, Invoice Finished Good Item, + Invoice Finished/Digital Good Item....). This controls where the sales revenue received from the sale of the product is stored + in the general ledger + +Only a limited number of general ledger accounts that are available to be mapped. +Currently this is 7 and limited to the accounts that have been assigned to the organisation from the Global Chart of Accounts that + have a 'GL Account Class Id' = 'Revenue' + +(NOTE: You will see that Discounts on Sales is not available to be selected because it's + GL Account Class Id = 'Cost of Goods Sold Expense'. + It appears as a default because it is setup in the Global GL settings that doesnt seem to have any limitations of the account.) + +IMPORTANT: This screen is one of the screens where the default entries that are displayed here are entered via + the Global GL Settings under the sub menu 'Invoice Item Type'. + + This screen allows users to override the global settings for the Sales Invoice item type. + + An example of why this could be necessary could be that a company many want to isolate the sales reporting of a + specific department or business unit separately (eg subledgers etc) but still have the option of a 'catch all' + global general ledger account. + +If an override account is added it will appear in the Override GL Account column on the screen. + +The only mapping that seems a bit out of place here is Sales Tax. +It is blank because Sales Tax is setup using Tax Authorities so dont know why you would want to override the Sales Tax account + to a Sales Revenue Account. + +NOTE: Also need to highlight that in the Global Settings it uses the ENUM description to select the item and + there are duplicate descriptions between the Sales Invoice and the Purchase Invoice. + + Not too much of a problem here but it does cause problems in Agreements when setting up things like Commissions based on + line items as you cant tell the difference between the description of a Sales Invoice item called 'Invoice Adjustment' + and a Purchase Invoice item called 'Invoice Adjustment' ..... except by trial and error + +How the Sales Invoice mappings are used is best shown by an example. + +A very simple description of an online Sales Order Process could be as follows: + +. Customer Orders a Product (and Creates a Sales Order) +. Customer Pays for Product (via Credit Card, Internet Banking etc) +. Vendor confirms Payment and Dispatches the Product to the Customer + +Let's focus on the second part step of 3 in more detail. + +* The vendor has verified that the customer payment has been received +* In OFBiz Order Manager they will then look up the relevant Sales Order and then click the 'Quick Ship Entire Order' button + to log the dispatch of the order in the system +* The 'Quick Ship Entire Order' button is a trigger for an 'automatic' accounting transaction +* The transaction type that is triggered is called 'Sales Invoice' + +Transaction Type: Sales Invoice DR 120000 Accounts Receivable, DR 410000 Discounts on Sales, DR 400000 Sales, + CR 22????? Sales Tax Collected + +DR Sales is used for item promotions where product cost is simply reversed. + +Only order promotions are coded to Discounts. + +The Sales Tax account will be dependent on your sales tax setup. + +The demo data posts to tax accounts by US state. + +One of the CR (or Credit) entries for the Sales Invoice transaction is created using the Sales mapping defined here + in the Sales Invoice (and the other is created another GL Account default for 'Tax Authority GL Accounts') + +All of the the DR (or Debit) entries for the Sales Invoice transaction +(except for Accounts Receivable which is comes from the GL Account Type defaults) are created using the mappings +defined here in the Sales Invoice + +== How do I add a Sales Invoice override mapping? +By default there are no Sales Invoice override mappings that are configured as part of the OFBiz demo data. + +. Select the 'Invoice Item Type' from the drop down list +. Select the ' Override Revenue GL Account Id' to map it to from the drop down list +. Press the 'Save' button +. The new mapping will be displayed in the 'Override GL Account' column in the list at the bottom of the screen + +== How do I update a Sales Invoice override mapping? +An existing Sales Invoice override mapping cannot be updated but needs to be removed and a new mapping added. +If you try to add an override to an item that already has an override you will get a duplicate record error message. + +== How do I remove a Sales Invoice override mapping? +NOTE: Only the override mapping can be deleted. + The default mapping record cannot be deleted here (even though the Remove button is displayed next to it!) + +. Locate the entry that needs the override deleted in the list of Sales Invoice override mappings +. Press the 'Remove' button next to the entry +. he override mapping will be removed from the 'Override GL Account' column of the entry diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountTypeDefaults.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountTypeDefaults.adoc new file mode 100644 index 0000000..33e5122 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountTypeDefaults.adoc @@ -0,0 +1,92 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for GL Account Type Defaults +The GL Account Defaults screens are are method to setup rules that are used to translate business transactions + into accounting transactions. +It currently is made up of 12 sub menus that can be used to map various transaction type codes to a specific general ledger account + +Accounting transactions are made up of a Debit Entry and a Credit Entry. +The GL Account defaults screens help map which accounts are to be used to generate a each part of the transaction. +This means that certain mappings will be used to generate the Debit (or DR) entry part of the transaction and others used + to generate the Credit (or CR) entry part of the transaction. + +NOTE: Many of the accounting transactions are generated 'automatically' (or in the background) + using the the accounting services SECAS / EECAS. + +The GL Account Type is used to specify the default account that certain transactions +(eg Accounts Payable, Accounts Receivable, etc) are posted to. + +An accounting transaction (or journal entry) is made up of two parts - a Debit Entry and a Credit Entry that balance each other. +The GL Account Type is used to translate one side of the journal entry. + +GL Account Types are stored in Entity GLAccountType which can be viewed via Entity Data Maintenance in the Webtools menu. +There are currently 57 different GL Account Types that are part of the OFBiz demo data but only 19 of these are setup as mappings + +How the GL Account Type is used is best shown by an example. + +A very simple description of an online Sales Order Process could be as follows: + +. Customer Orders a Product (and Creates a Sales Order) +. Customer Pays for Product (via Credit Card, Internet Banking etc) +. Vendor confirms Payment and Dispatches the Product to the Customer + +Let's focus on the first part step of 3 in more detail. + +* The vendor has checked their bank statement and seen that the customer has paid +* In OFBiz Order Manager they will then look up the relevant Sales Order and + then click the 'Receive Payment' button to log the payment in the system +* The 'Receive Payment' button is a trigger for an 'automatic' accounting transaction +* The transaction type that is triggered is called 'Incoming Payment' +* The accounting entries generated are: DR 112000 Undeposited Funds , CR 120000 Accounts Receivable + +The CR (or Credit) entry for the transaction is created by the GL Acccount Type mapping for 'Accounts Receivable' + (which by using the demo data default will go the 120000 Accounts Receivable) + +The DR (or Debit) entry for the transaction is created by a different GL Account default, + the Payment Method Id / GL Account Id mapping (eg Cash is setup as 112000 Undeposited Receipts) + +== How do I create a new GL Account Type default mapping? +There are currently 57 different GL Account Types that come as part of the demo data with OFBiz. +This should be enough to manage the vast majority of business transactions. + +These instructions show how to add a mapping using the default data + +. Select the 'GL Account Type Id' from the drop down list +. Select the 'GL Account' to map it to from the drop down list +. Press the 'Save' button +. The new GL Account Type mapping is displayed in the list at the bottom of the screen + +NOTE: If none of the demo data GL Account Types are sufficient then new ones can be added using + Entity Data Maintenance and the entity 'GLAccountType' in the Webtools menu. + +== How do I update a GL Account Type default mapping? +A GL Account Type mapping cannot be updated directly but needs to be removed then re-created. +If you try to update an existing entry you will get an 'duplicate key' error message. + +. Press the 'Remove' button next to the entry that you want to update +. The entry is removed from the list of entries displayed +. Select the 'GL Account Type Id' from the drop down list +. Select the updated 'GL Account' to map it to from the drop down list +. Press the 'Save' button +. The new GL Account mapping is displayed in the list at the bottom of the screen + +== How do I delete a GL Account Type default mapping? +. Press the 'Remove' button next to the entry that you want to delete +. The entry is removed from the list of entries displayed diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountTypePaymentType.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountTypePaymentType.adoc new file mode 100644 index 0000000..adc08ab --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountTypePaymentType.adoc @@ -0,0 +1,66 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Payment Type GL Account Type +The Payment Type GL Account Type Id is used to translate (or map) the different payment types to a specific GL Account Type Id. +The GL Account Type Id is then used via the 'GL Account Type Id' defaults to translate to one side of a journal entry. + +NOTE: This GL Account default is used to link to another one of the GL Account defaults. + +A Payment Type is just a way to categorize transactions. + +Examples of Payment Types could be as follows: + +* Commission Payments +* Customer Payments +* Vendor (or Supplier) Payments +* Customer Refunds +* Customer Prepayments or Deposits + +These payment types can then be mapped to the required account type in the Chart of Account. + +Examples of these type of mappings could be as follows: + +* Customer Payments are mapped to Account Receivable +* Vendor (or Supplier) Payment are mapped to Account Payable +* Customer Refunds are mapped to Customer Credits + +== How do I add a Payment Type / GL Account Type Id mapping? +There are currently 14 different Payment Type / GL Account Types mappings that come as part of the demo data with OFBiz + and should cover a good variety of payment related transactions. + +. Select the 'Payment Type Id' from the drop down list +. Select the 'GL Account Type Id' to map it to from the drop down list +. Press the 'Save' button +. The new 'Payment Type / GL Account Type' mapping is displayed in the list at the bottom of the screen + +== How do I update a Payment Type / GL Account Type Id mapping? +A Payment Type / GL Account Type mapping cannot be updated directly but needs to be removed then re-created. +If you try to update an existing entry you will get an 'duplicate key' error message. + +. Press the 'Remove' button next to the entry that you want to update +. The entry is removed from the list of entries displayed +. Select the 'Payment Type Id' from the drop down list +. Select the updated 'GL Account Type Id' to map it to from the drop down list +. Press the 'Save' button +. The new 'Payment Type / GL Account Type' mapping is displayed in the list at the bottom of the screen + +== How do I remove a Payment Type / GL Account Type Id mapping? +. Press the 'Remove' button next to the entry that you want to delete +. The entry is removed from the list of entries displayed diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_ListGlAccountOrganization.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_ListGlAccountOrganization.adoc new file mode 100644 index 0000000..0e17345 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_ListGlAccountOrganization.adoc @@ -0,0 +1,94 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Chart of Accounts +OFBiz comes with a master template for a very comprehensive chart of accounts. +This can be found in 'Global GL Defaults' under the 'Accounting' tab. + +A couple of points to note + +* you do not need to use all the accounts defined in this master template + (but it may be simpler to look for the accounts that you can use or rename) +* you can create your own additional accounts if you dont want to use the ones in the master template + +The chart of accounts for the default organisation (Company) is built up by selecting the accounts that you want to use + from the global chart of accounts master template. + +This means that if you want to create a new account then you need to create it first in the Global Chart of Accounts and + then link (or assign) it to the chart of accounts for Company. + +Details of the Chart of Accounts can be exported as a CSV file or PDF using the buttons displayed. + +IMPORTANT: You need to be careful if you do decide to create your own accounts that they contain all the details required and + that they are linked into the relevant configuation for the setup of the GL defaults. + + This means that if you change an account (eg Inventory) to one of your own, you need to check the GL defaults setup + and replace any reference to the Inventory account to the one you have created. + +This Chart of Accounts screen is used to define the list of accounts (or chart) that will be actively used by the company. +For example the Global chart of accounts may contain 100 different accounts but only 20 need to be used for your specific business. +This means you need only to create assignments to the accounts that you actively want to use. + +The Chart of Accounts is a mixture of business needs (ie being able to track the information you need for your business) and + tax requirements (i.e. legal or government requirements necessary for operating a business). + The type of Chart that you setup will be dependent of your business type. + +== How do I create a Chart of Accounts? +As mentioned above the chart of accounts for the default organisation (Company) is built up by selecting the accounts that + you want to use from the global chart of accounts master template. + +This means that if you want to create a new account then you need to create it first in the Global Chart of Accounts and + then link (or assign) it to the chart of accounts for Company. + +By creating an assignment to an account it is then added to the Chart of Accounts. + +. Select the account Gl Account Id that you need from the drop down box +. Press the 'Create Assignment' button +. The account is added to the Chart of Account + +== How do I update a Chart of Accounts? +Updating the Chart of Accounts will involve either creating a new assignment or removing an existing one. + +A new assignment is created using the instructions above. + +The added complication may be that the account that you need does not exist in the Global Chart of Accounts. +As mentioned above it will need to be created and then linked. + +See the instructions below to remove an existing account assignment. + +NOTE: If a completely new account is required that does not already exist as part of the Global Chart of Accounts template + then it will need to be created as part of the Global template first before it can be used as an assignment in + the Organisation Chart of Accounts. + +== How do I delete a Chart of Accounts? +Accounts are not deleted from the Chart of Accounts - they are simply no longer selected to be used. + +It is important that you do not remove accounts that are active and have already been used for transactions. +Even if the net balance of the account is zero then from an audit perspective then you should not be removing accounts. + +You should only be looking to remove accounts that have not been used. +To un-link or un-assign accounts from the default company then use the Entity Data Maintenance from the Webtools menu. +Look for the entity 'GlAccountOrganization' and delete the record to remove the link. + +== How do I update the details for an account in the Chart ofAccounts? +Details of the accounts that make up the Chart of Accounts can be accessed from this screen. + +. Click on the 'GL Account Id' of the account required +. The 'Edit GL Account' screen is displayed showing the details of the account selected + + (NOTE:This screen is also accessible via 'Global GL Settings / Chart of Account / Navigate Accounts ' +. Amend the fields required + + (NOTE: The GL Account Id and Posted Balance fields cannot be amended) +. Press the 'Update' button diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_PartyAcctgPreference.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_PartyAcctgPreference.adoc new file mode 100644 index 0000000..68eabb1 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_PartyAcctgPreference.adoc @@ -0,0 +1,81 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Accounting Preferences +Accounting Preferences are a set of configuration details that are related to a party. +To appear on this screen the party must be setup with the role of 'Internal Organisation'. +This means that you can add the internal organisation role to a party and they will be added to this screen and + then can be configured. + +The master default party is 'Company' but preferences can also be setup for internal departments. +The demo data shows some examples of this (eg Marketing, Accounting, Sales, Development etc). +Unless overridden then then all other parties appearing on this screen will take their default setup from 'Company' + +NOTE: The majority of the configuration information displayed in Accounting Preferences are taken from the Enumeration entity. + +It is used for setting specifying information related to the accounting setup for a specific organisation or parties that + exist within an organisation such as business units, cost centres, departments ,subsidiaries etc. + +Information that can be setup include the following: + +* The start date of the Time Periods and Fiscal or Accounting Year (eg 1st April, 1st January, 1st June etc) +* Tax Return Form + + (NOTE: Need TO CHECK how important this is and where it is used.......possibly some kind of reporting???) +* The method to be used for calculating Cost of Goods Sold (COGS) +* Base Currency - eg USD, GBP, EUR etc + + (NOTE: May have main company in USD but a subsidiary in EUR etc) +* Invoice prefix, numbering and sequencing + (eg you may want each business unit / subsidiary to have its own invoice numbering or sequence etc) +* Quote prefix, number and sequencing +* Method to be used for refunds (eg cheque, direct bank credit, voucher credit etc...) +* Specify which journal will be used to store error transactions + +NOTE: Key things that are usually need to be amended include the base currency for the company, fiscal year information and + invoice numbering prefix or sequencing. + +== How do I create or setup a new Accounting Preference? +IMPORTANT: A party must be setup with the role of 'Internal Organisation' before it will appear on + the Accounting Preferences screen so that it can be setup. + +. Select the 'Setup' button next to the party to be setup +. The Accounting Preferences screen is displayed. + + (IMPORTANT: The first time this screen is displayed all of the fields will be modifiable. + Once this has been saved only certain fields will be modifiable!!) +. The default entries will be based on (or inherited from) 'Company' +. Enter any changes that are required (eg Invoice Prefix, Error Journal name; + as you may want error transactions from separate departments to be handled differently...) +. Press the 'Add' button + +== How do I update an Accounting Preference? +. Select the 'Setup' button next to the party to be setup +. The Accounting Preferences screen is displayed but only certain fields will be modifiable +. Enter any changes required +. Press the 'Update' button + +NOTE: If you need to change any of the fields that are not modifiable then it can be done + via the Entity Data Maintenance on Webtools menu using the PartyAcctgPreference entity. + + You will need to be careful in editing an existing preference especially if the configuration already been used + for transactions. + +== How to I delete an Accounting Preference? +There is currently no delete option via the user interface but an Accounting Preference can be removed by deleting the role of + 'Internal Organisation' from the party record. + +NOTE: TO CHECK: Need to investigate the impact of using an accounting preference then removing it. + + What happens to the transactions in process etc......??? diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_SetupGlJournals.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_SetupGlJournals.adoc new file mode 100644 index 0000000..6fcfcc4 --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_SetupGlJournals.adoc @@ -0,0 +1,49 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Journals +A journal is a detailed accounting transaction that is recorded (or posted) to the General Ledger. +It is made up of a debit and a credit component. + +NOTE: TO CHECK: Is this screen really about Journals or is it about Suspense Accounts.....??????) + +NOTE: By default in OFBIZ a journal called 'ERROR_JOURNAL' is created as part of the demo data installation. + + This 'ERROR_JOURNAL' is referenced in the Accounting Preferences setup for 'Company'. + + The 'ERROR_JOURNAL' is used to store details of any transaction that fails and cannot be posted to a general ledger account. + + Transactions falling into error can be as the result of incomplete setup or an invalid transaction + (eg a transaction that should never occur). + +== How do I create a journal? +. Enter a journal name in the Gl Journal Name field (eg MY_JOURNAL) +. Press the 'Submit' button +. The journal is created and will appear in the journal list at the bottom of the screen + + (Note that the Journal ID is automatically generated) + +== How do I update a journal? +. Select the journal to be updated from the list of journals at the bottom of the screen +. The journal details will be displayed on the screen +. Update the Gl Journal Name (as this is currently the only field that can be updated) +. Press the 'Submit' button +. The updated journal will appear in the journal list at the bottom of the screen + +== How do I delete a journal? +Be careful if you need to remove an existing journal as it may have transactions associated with it. + +. Press the 'Remove' button next to the journal that you want to delete +. The journal is deleted and the screen is redisplayed diff --git a/applications/accounting/src/docs/asciidoc/_include/HELP_TimePeriods.adoc b/applications/accounting/src/docs/asciidoc/_include/HELP_TimePeriods.adoc new file mode 100644 index 0000000..5b1758a --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/HELP_TimePeriods.adoc @@ -0,0 +1,86 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// + += Help for Time Periods +Time periods are a defined period of time (usually a month, quarter or year) that is used to group business transactions. +It is a key part of any general accounting setup. + +Time periods can be used for the definition of : + +* Company Financial Year +* Fiscal / Tax Periods (weeks, months, quarters) +* VAT / GST Periods +* Sales Periods + +The screen is divided into 3 main areas. +The first two show lists of the open and closed time periods. +The area at the bottom allows you to define and enter a new time period. + +== How do I add a new Financial Year time period? +. Using the area at the bottom of the screen labelled 'New' +. Leave the Parent Period Id field blank + + (NOTE: The financial year will be the parent of other time periods eg fiscal months or GST / VAT periods) +. Select 'Fiscal Year' from the 'Period Type Id' drop down box +. Enter '13' in the Period Num field + + (NOTE: You can use any number that does not conflict with the other time periods you want to use. + We plan to define 12 fiscal or tax months so will use 13 for the year) +. Enter 'FY 2010-2011' in the Period Name field + + (NOTE: You can use any name you want but make sure it makes sense. This example is an abbreviation for Fiscal Year 2010-2011) +. Select '1st April 2010' using the calendar lookup in the 'From Date' field +. Select '1st April 2011' using the calendar lookup in the 'Thru Date' field + + (NOTE: Even though we want our financial year to end on 31st March 2011 the test used is based on less than not an equal to) +. Leave the 'Is Closed' field at its default of 'No' +. Press the 'Create' button +. The new time period will now be displayed in the list of open time periods. + +== How do I add a new GST/ VAT time period? +. Using the area at the bottom of the screen labelled 'New' +. Select the previously created financial year 'FY 2010-2011' in the Parent Period Id field +. Select 'Fiscal Month' from the 'Period Type Id' drop down box +. Enter '1' in the Period Num field + + (NOTE: This is the first of 12 periods that we want to define.) +. Enter 'FM April 2010' in the Period Name field + + (NOTE: You can use any name you want but make sure it makes sense. This example is an abbreviation for Fiscal Month April 2010) +. Select '1st April 2010' using the calendar lookup in the 'From Date' field +. Select '1st May 2010' using the calendar lookup in the 'Thru Date' field + + (NOTE: Even though we want our fiscal month to end on 30th April 2010 the test is used is based on less than not an equal to) +. Leave the Is Closed field at its default of 'No' +. Press the 'Create' button +. The new time period will now be displayed in the list of open time periods. + +== How do I update a time period? +NOTE: Time periods cannot be updated via the current time periods screen. + If you need to amend time period details then it can be done via Entity Data Maintenance in the Webtools menu. + +== How do I close a time period? +. To close a time period select the 'Close' button next to the time period. +. The time period will be removed from the current open time periods area and re-displayed in + the closed time periods section of the screen. + +Closing a time period is a trigger for an automatic accounting transaction as follows: + +* Transaction Type: Period Closing +* DR ?????? (based on the GL account type mapping for Profit Loss) +* CR 336000 Retained Earnings (based on GL account type mapping for Retained Earnings) + +IMPORTANT: Both sides of this accounting transaction uses the same GL account type default mapping. + + The account mapping for 'Profit Loss' is not setup as part of the demo data so this transaction will not automatically + post to the general ledger but will instead be put in the ERROR_JOURNAL as an unposted transaction. + + The transaction value is zero for both sides of journal...Even if it does have a value do we want to move it from + P&L to Equity during the financial year? Normally this is done once at the end of the financial year. diff --git a/applications/accounting/src/docs/asciidoc/_include/acc-organization-gl-settings.adoc b/applications/accounting/src/docs/asciidoc/_include/acc-organization-gl-settings.adoc new file mode 100644 index 0000000..b62786d --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/acc-organization-gl-settings.adoc @@ -0,0 +1,61 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Organization GL Settings. + +== Help for setting by domain + +=== Help for Available Internal Organizations +The default screen shows a list of Party Groups that have the role of 'Internal Organization' associated with them. + +If you have installed the demo data then the default company 'Company' as well as departments / business units and + regional subsidiaries will be displayed. + +For each 'Internal Organization' there is the ability to set the currency, fiscal periods and invoice prefixes. + +include::HELP_PartyAcctgPreference.adoc[leveloffset=+2] + +include::HELP_ListGlAccountOrganization.adoc[leveloffset=+2] + +include::HELP_SetupGlJournals.adoc[leveloffset=+2] + +include::HELP_GlAccountTypeDefaults.adoc[leveloffset=+2] + +include::HELP_EditProductGlAccounts.adoc[leveloffset=+2] + +include::HELP_EditProductCategoryGlAccounts.adoc[leveloffset=+2] + +include::HELP_EditFinAccountTypeGlAccounts.adoc[leveloffset=+2] + +include::HELP_GlAccountSalInvoice.adoc[leveloffset=+2] + +include::HELP_GlAccountPurInvoice.adoc[leveloffset=+2] + +include::HELP_GlAccountTypePaymentType.adoc[leveloffset=+2] + +include::HELP_GlAccountNrPaymentMethod.adoc[leveloffset=+2] + +include::HELP_EditVarianceReasonGlAccounts.adoc[leveloffset=+2] + +include::HELP_EditCreditCardTypeGlAccounts.adoc[leveloffset=+2] + +include::HELP_EditOrganizationTaxAuthorityGlAccounts.adoc[leveloffset=+2] + +include::HELP_EditPartyGlAccount.adoc[leveloffset=+2] + +include::HELP_TimePeriods.adoc[leveloffset=+2] diff --git a/applications/accounting/src/docs/asciidoc/accounting.adoc b/applications/accounting/src/docs/asciidoc/accounting.adoc index 4988111..593648f 100644 --- a/applications/accounting/src/docs/asciidoc/accounting.adoc +++ b/applications/accounting/src/docs/asciidoc/accounting.adoc @@ -43,3 +43,5 @@ include::_include/acc-financial-accounts.adoc[leveloffset=+1] include::_include/acc-tax-authorities.adoc[leveloffset=+1] include::_include/acc-global-settings.adoc[leveloffset=+1] + +include::_include/acc-organization-gl-settings.adoc[leveloffset=+1] |
|
|
In reply to this post by mbrohl
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit 7e3268e849b48fe7de559ad98d769d4f2eb6a043 Author: holivier <[hidden email]> AuthorDate: Thu Feb 13 18:01:17 2020 +0100 Documented: Add help for main accounting screen at the end of intro (OFBIZ-10289) --- .../data/helpdata/HELP_ACCOUNTING_main.xml | 31 ---------------------- .../src/docs/asciidoc/_include/acc-intro.adoc | 23 ++++++++++------ 2 files changed, 15 insertions(+), 39 deletions(-) diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml deleted file mode 100644 index ad83ee7..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_main.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Accounting Main screen.</title> - <para> - This is the default tab for the Accounting Manager application. The screen currently shows links that will display more detailed screens - related to Agreements, Billing Accounts, Invoices and Payments. - </para> -</section> - diff --git a/applications/accounting/src/docs/asciidoc/_include/acc-intro.adoc b/applications/accounting/src/docs/asciidoc/_include/acc-intro.adoc index 0d93c60..95f9816 100644 --- a/applications/accounting/src/docs/asciidoc/_include/acc-intro.adoc +++ b/applications/accounting/src/docs/asciidoc/_include/acc-intro.adoc @@ -19,23 +19,23 @@ under the License. = About Accounting The Accounting system is organised according to generally accepted principles -such as double-entry accounting, a General Ledger with hierarchical accounts, +such as double-entry accounting, a General Ledger with hierarchical accounts, journals and posting of transactions and corresponding entries. -The structure is primary based on the OMG GL standard and the work that was done +The structure is primary based on the OMG GL standard and the work that was done on an AR/AP extension of the OMG GL standard. This correlates well with other standards such as ebXML and OAGIS. The Accounting entities are structured such that accounts for multiple -organisations can be managed. The multiple organisations could be multiple +organisations can be managed. The multiple organisations could be multiple companies, or departments or other organisations within a company. Each organisation can have various GL Accounts associated with it so that it can operate with its own subset of the Master Chart of Accounts. Each organisation can also have its own set of Journals for flexibility, even -though the use of Journals should be as minimal as possible in favour of allowing -the system to automatically create and post transactions based on business events -triggered by standard procedures and documents such as purchase and sales orders, +though the use of Journals should be as minimal as possible in favour of allowing +the system to automatically create and post transactions based on business events +triggered by standard procedures and documents such as purchase and sales orders, invoices, inventory transfers, payments, receipts, and so on. == Accounting Features @@ -43,10 +43,17 @@ invoices, inventory transfers, payments, receipts, and so on. * General Ledger * Accounts Receivable * Accounts Payable - * Agreements + * Agreements * Multi-currency Support * Billing Accounts * Fixed Asset Accounting -OFBiz accounting can be configured to handle multiple organisations including +OFBiz accounting can be configured to handle multiple organisations including an unlimited number of companies, subsidiaries and departments. + +=== Help for Accounting Main screen +This is the default tab for the Accounting Manager application. +The screen currently shows links that will display more detailed screens +related to Agreements, Billing Accounts, Invoices and Payments. + +With accounting application mmenu, it's possible to have a lot of more details |
|
|
In reply to this post by mbrohl
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit 615f9c9fba5a2d2060edafb764427ed88ae91f61 Author: holivier <[hidden email]> AuthorDate: Thu Feb 13 18:03:54 2020 +0100 Documented: remove empty help files in Accounting (OFBIZ-10288) --- .../HELP_ACCOUNTING_PartyAccountsSummary.xml | 22 --------------- .../helpdata/HELP_ACCOUNTING_PaymentMethodType.xml | 22 --------------- .../data/helpdata/HELP_PORTLET_ListBankAccount.xml | 31 ---------------------- 3 files changed, 75 deletions(-) diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_PartyAccountsSummary.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_PartyAccountsSummary.xml deleted file mode 100644 index 0d2863d..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_PartyAccountsSummary.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Party Accounts Summary help screen</title> - <para></para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_ACCOUNTING_PaymentMethodType.xml b/applications/accounting/data/helpdata/HELP_ACCOUNTING_PaymentMethodType.xml deleted file mode 100644 index d1ba35f..0000000 --- a/applications/accounting/data/helpdata/HELP_ACCOUNTING_PaymentMethodType.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to you under the Apache License, Version -2.0 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 Unless required by -applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for -the specific language governing permissions and limitations under the -License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Edit Payment Method Type help screen</title> - <para></para> -</section> diff --git a/applications/accounting/data/helpdata/HELP_PORTLET_ListBankAccount.xml b/applications/accounting/data/helpdata/HELP_PORTLET_ListBankAccount.xml deleted file mode 100644 index 27ce030..0000000 --- a/applications/accounting/data/helpdata/HELP_PORTLET_ListBankAccount.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The List Bank Accounts Portlet</title> - <para>The default display is a list of financial accounts that have the type 'bank account'.</para> - <para>A company will have at least one main bank account that will be used to accept payments from customers or to generate payments to suppliers. The financial account will mirror the transactions appearing on a bank statement so that they can be reconciled with the true bank statement when it arrives.</para> - <para>Click on the bank account to display further information.</para> - <section> - <title>How do I remove a bank account?</title> - <para>Press the 'Delete' button next to the account that needs to be deleted.</para> - </section> -</section> |
|
|
In reply to this post by mbrohl
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit 42df37be00ce077080a4d9bf903cf70cc268184e Author: holivier <[hidden email]> AuthorDate: Mon Feb 17 18:07:05 2020 +0100 Documented: Add Accounting Glossary in Accounting documentation (OFBIZ-10626) Thank to Vaibhav Jain for this added --- .../src/docs/asciidoc/_include/acc-glossary.adoc | 193 +++++++++++++++++++++ .../accounting/src/docs/asciidoc/accounting.adoc | 2 + 2 files changed, 195 insertions(+) diff --git a/applications/accounting/src/docs/asciidoc/_include/acc-glossary.adoc b/applications/accounting/src/docs/asciidoc/_include/acc-glossary.adoc new file mode 100644 index 0000000..9c9f68e --- /dev/null +++ b/applications/accounting/src/docs/asciidoc/_include/acc-glossary.adoc @@ -0,0 +1,193 @@ +//// +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +//// += Accounting Glossary + +[#ANNUAL_REVENUE] +Annual Revenue:: +Annual revenue is the amount of revenue for a group that is reported in the Party +Group Information screenlet of the groups profile (visit Party Profile screen). + +[#ACCOUNTS PAYABLE] +Accounts Payable:: +The debts owed by a business, usually in relation to goods or services, inventory, or supplies. +It is also called 'A/P' for short or 'Creditors'. + +[#ACCOUNT PAYABLE INVOICE] +Accounts Payable Invoice:: +AP invoice is a document raised by the customer and sent to the company with the details of the items sent, qty sent, price and other details. +The company will enter this invoice details in the Payable module and then pay the customer according to the credit terms. +This invoice may come along with the consignment or may be sent to the company separately. + +[#ACCOUNTS RECEIVABLE] +Accounts Receivable:: +The money owed to a business by its customers for products and services delivered to a customer. +It is also called 'A/R' for short or Debtors. + +[#ACCOUNT RECEIVABLE INVOICE] +Accounts Receivable Invoice:: +AR Invoice is a document raised by the company and sent to the customer with the details of items sold, qty sold, price, tax and other details. +Based on this invoice, the customer will send the payment in case of credit sales. + +[#ACCOUNT TYPE] +Account Type:: +A key that specifies the accounting area to which an account belongs. +The account type is required in addition to the account number to identify an account, because the same account number can be used for each account type. + +[#ACQUISITION] +Acquisition:: +The process of identifying the requirement for a certain good or material item, ordering it, and paying for it. + +[ACCURAL BASED ACCOUNTING] +Accrual Based Accounting:: +This is a method where you record the income when the sale occurs and not necessarily when you receive the payment. +Also you record an expense when you receive goods or services, even though you may not pay for them until later. + +[#BALANCE SHEET] +Balance Sheet:: +This is like a financial snapshot of your business at a certain point in time. +It lists your assets, liabilities and the difference between the two which is the net worth (or equity) of the business. +The balance sheet is also called the 'Statement of Financial Position' + +[#CASH BASED ACCOUNTING] +Cash Based Accounting:: +This method is when you record income only when you receive the cash from your customers. +You also only record an expense when you actually pay your suppliers + +[#CHART OF ACCOUNTS] +Chart of Account:: +This is a list or hierarchy of account descriptions that you use to keep the accounting records for your business + +[#CLOSING BALANCE] +Closing balance:: +At the end of a financial period, the balance on all entries posted to an account. + +[#CREDIT ACCOUNT] +Credit account:: +An account that allows buyers to obtain goods or services without paying for them until a later date. + +[#CREDITOR] +Creditor:: +This is a company or an individual that you owe money to. + +[#CREDITS] +Credits:: +One component of every accounting transaction (journal entry) is a credit. +Credits increase liabilities and equity but decrease assets + +[#COST OF GOODS SOLD] +Cost of Goods Sold:: +This is the amount it costs you to provide your product or services sold to your customers. +It is often called and abbreviated to 'COGS' + +[#CREDIT AMOUNT] +Credit amount:: +An amount of money in someone's favor. + +[#DOUBLE ENTRY ACCOUNTING] +Double Entry Accounting:: +In this method every transaction has two entries: a debit and a credit (also called a journal entry). +Debits must always equal credits. Most if not all accounting software use double entry accounting. + +[#DEPRECIATION] +Depreciation:: +This is a write-off of a portion of the cost of fixed assets, such as vehicles and equipment. +It is usually done annually but can be done more frequently. +Depreciation is also listed as part of the expenses on the 'Profit & Loss' or 'Income Statement' + +[DEBITS] +Debits:: +One component of every accounting transaction (journal entry) is a debit. +Debits increase assets but decrease liabilities and equity. + +[#DEBTOR] +Debtor:: +This is a company or an individual that owes you money. + +[#GENERAL LEDGER] +General Ledger:: +This is a collection of different types of accounts (balance sheet, income, expense) that are used to keep the accounting records of a business. +A general ledger works with double entry accounting and journal entries for each transaction. + +[#GROSS PRICE] +Gross price:: +The price of one unit of an item, or a service, including tax. + +[#GROSS PROFIT] +Gross Profit:: +The positive difference between sales revenues and the costs of goods sold. + +[#INCOME ACCOUNTS] +Income Accounts:: +These are the accounts that are used to keep track of your sources of income. +Examaple: Sales, Consulting Income or Interest. + +[#INCOME STATEMENT] +Income Statement:: +This is also called a Profit and Loss Statement' or a 'P&L'. +It lists the income, expenses, and net profit (or loss) for the business. +The net profit (or loss) is equal to the total income minus the total expenses. + +[#INTANGIBLE ASSET] +Intangible Asset:: +This is something of value that is owned by the business that cannot be touched physically. + +[#INVENTORY AUDIT REPORT] +Inventory Audit Report:: +An audit trail for the posted inventory transactions in the Chart of Accounts. This report compares the accounting view (inventory balance accounts) and the logistics view (inventory value displayed by the audit report). + +[#OUTSTANDING AMOUNT] +Outstanding Amount:: +The amount of money that is owed by a debtor and has not yet been paid. + +[#OUTSTANDING PAYMENT] +Outstanding Payment:: +The remaining amount of money that is due for goods or services. + +[#PASSIVE ACCOUNT] +Passive Account:: +A bank account in which no transactions have taken place, neither deposits nor withdrawals, for a specified period of time (normally six months). + +[#PAYABLES] +Payables:: +The total amount due to creditors. This information includes the type, the amount, and the due date of the debts. Payables may include amounts payable to banks and suppliers, as well as customer down payments. + +[#PAYMENT METHOD] +Payment Method:: +A set of parameters and other details that determine how invoices are cleared when the Payment Wizard is used. It is possible to create as many payment methods as required. In addition, you can link specific payment methods to relevant business partners. + +[#PAYMENT PERIOD] +Payment Period:: +The period of time in which an outstanding debt has to be paid, for example a range of days or a certain month. + +[#PAYMENT RUN] +Payment Run:: +A process that clears A/R and A/P invoices, by generating the payments, posting the transactions and updating the system (by creating the bank transfer files). + +[#PAYMENT TERMS] +Payment Terms:: +The conditions of payment agreed to between business partners with respect to goods supplied or services provided. + +[#PROFIT AND LOSS STATEMENT] +Profit and Loss Statement:: +A comparison of revenue and expense within a certain period. The purpose of the profit and loss statement is the establishing of profit made by an organization and the sources thereof. It is a compulsory part of year-end closing. + +[#TRIAL BALANCE] +Trial Balance:: +This is a list of the general ledger accounts showing the debits in one column and the credits in another. The main objective of a trial balance is to ensure that the total credits and total debits balance (eg. total debits = total credits). +It also validates that the double entry accounting is working correctly. \ No newline at end of file diff --git a/applications/accounting/src/docs/asciidoc/accounting.adoc b/applications/accounting/src/docs/asciidoc/accounting.adoc index 593648f..931f5e9 100644 --- a/applications/accounting/src/docs/asciidoc/accounting.adoc +++ b/applications/accounting/src/docs/asciidoc/accounting.adoc @@ -45,3 +45,5 @@ include::_include/acc-tax-authorities.adoc[leveloffset=+1] include::_include/acc-global-settings.adoc[leveloffset=+1] include::_include/acc-organization-gl-settings.adoc[leveloffset=+1] + +include::_include/acc-glossary.adoc[leveloffset=+1] |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |