diff --git a/demo/account.py b/demo/account.py index 0d82ae5a28..fef5f9042e 100644 --- a/demo/account.py +++ b/demo/account.py @@ -19,7 +19,7 @@ def setup(config, modules, company): root_template, = AccountTemplate.find([ ('parent', '=', None), - ('name', '=', 'Minimal Account Chart'), + ('name', '=', 'Universal Chart of Accounts'), ]) create_chart_account = Wizard('account.create_chart') create_chart_account.execute('account') @@ -28,12 +28,12 @@ def setup(config, modules, company): create_chart_account.execute('create_account') receivable, = Account.find([ - ('type.receivable', '=', True), ('company', '=', company.id), + ('code', '=', '1.2.1'), ]) payable, = Account.find([ - ('type.payable', '=', True), ('company', '=', company.id), + ('code', '=', '2.1.1'), ]) create_chart_account.form.account_receivable = receivable diff --git a/demo/account_statement.py b/demo/account_statement.py index 414d824eed..2855ae4be9 100644 --- a/demo/account_statement.py +++ b/demo/account_statement.py @@ -25,8 +25,8 @@ def setup(config, modules, company): sequence.save() cash, = Account.find([ - ('name', '=', 'Main Cash'), ('company', '=', company.id), + ('code', '=', '1.1.1'), ]) account_journal = AccountJournal(name='Bank', diff --git a/demo/product.py b/demo/product.py index e841f3ef2c..53a1c5eb5f 100644 --- a/demo/product.py +++ b/demo/product.py @@ -14,12 +14,12 @@ def setup(config, modules, company=None): if 'account_product' in modules: Account = Model.get('account.account') expense, = Account.find([ - ('type.expense', '=', True), ('company', '=', company.id), + ('code', '=', '5.1.1'), ]) revenue, = Account.find([ - ('type.revenue', '=', True), ('company', '=', company.id), + ('code', '=', '4.1.1'), ]) account_category = Category(name="Papers", accounting=True) account_category.account_expense = expense diff --git a/demo/production.py b/demo/production.py index 14c96eddac..5595be7848 100644 --- a/demo/production.py +++ b/demo/production.py @@ -22,12 +22,12 @@ def setup(config, activated, company): if 'account_product' in activated: Account = Model.get('account.account') expense, = Account.find([ - ('type.expense', '=', True), ('company', '=', company.id), + ('code', '=', '5.1.1'), ]) revenue, = Account.find([ - ('type.revenue', '=', True), ('company', '=', company.id), + ('code', '=', '4.1.1'), ]) account_category = Category(name="Computers", accounting=True) account_category.account_expense = expense diff --git a/modules/account/CHANGELOG b/modules/account/CHANGELOG index 5b8c7a5e44..184410cbb0 100644 --- a/modules/account/CHANGELOG +++ b/modules/account/CHANGELOG @@ -1,3 +1,4 @@ +* Replace minimal by universal chart of account * Allow copying move from closed period * Replace Accounting Party by Accounting group diff --git a/modules/account/account_chart.xml b/modules/account/account_chart.xml new file mode 100644 index 0000000000..859b52b42a --- /dev/null +++ b/modules/account/account_chart.xml @@ -0,0 +1,1306 @@ + + + + + + Universal Chart of Account Types + + + + + + Assets + + + balance + + + + Current Assets + + + balance + + + + Accounts receivable + + + balance + + + + + + Cash and Cash Equivalents + + + balance + + + + Inventories + + + balance + + + + + Cash at bank, Petty Cash, Cash On Hand + + + balance + + + + Prepaid expenses for future services that will be used within a year + + + balance + + + + + Revenue Earned In Arrears (Accrued Revenue) for services done but not yet received for the year + + + balance + + + + Loan To (Less than one financial period) + + + balance + + + + Non-current Assets + + + balance + + + + + Property, Plant and Equipment + + + balance + + + + + Investment property, such as real estate held for investment purposes + + + balance + + + + + Intangible assets, such as patents, copyrights and goodwill + + + balance + + + + + Financial assets (excluding investments accounted for using the equity method, accounts receivables, and cash and cash equivalents), such as notes receivables + + + balance + + + + + Investments accounted for using the equity method + + + balance + + + + + Biological assets, which are living plants or animals. + + + balance + + + + + Loan To (More than one financial period) + + + balance + + + + + Liabilities + + + balance + + + + Accounts payable + + + balance + + + + + Provisions for warranties or court decisions (contingent liabilities that are both probable and measurable) + + + balance + + + + Financial liabilities (excluding provisions and accounts payables), such as promissory notes and corporate bonds + + + balance + + + + Liabilities and assets for current tax + + + balance + + + + Deferred tax liabilities and deferred tax assets + + + balance + + + + Unearned revenue for services paid for by customers but not yet provided + + + balance + + + + Interests on loan stock + + + balance + + + + Creditors' equity + + + balance + + + + Equity / capital + + + balance + + + + Issued capital and reserves attributable to equity holders of the parent company (controlling interest) + + + balance + + + + Non-controlling interest in equity + + + balance + + + + Current Period Profit or Lost + + + income + + + + Operating section + + + income + + + + Revenue + + + income + + + + + Expenses + + + income + + + + + Cost of Sales + + + income + + + + + Selling, General and Administrative expenses + + + income + + + + + Depreciation / amortisation + + + income + + + + Research & Development expenses + + + income + + + + Non-operating section + + + income + + + + Other revenues or gains + + + income + + + + Other expenses or losses + + + income + + + + Finance costs + + + income + + + + Income tax expense + + + income + + + + Irregular items + + + income + + + + Discontinued operations + + + income + + + + Off-Balance + + + off-balance + + + + + Universal Chart of Accounts + + + + + + + 1.0.0 + Assets + + + + + 2.0.0 + Liabilities + + + + + 3.0.0 + Equity + + + + + 4.0.0 + Revenue + + + + + 5.0.0 + Expenses + + + + + 6.0.0 + Other (Non-Operating) Income And Expenses + + + + + + 1.1.0 + Cash And Financial Assets + + + + + 1.2.0 + Receivables And Contracts + + + + + 1.3.0 + Inventory + + + + + 1.4.0 + Accruals And Additional Assets + + + + + 1.5.0 + Property, Plant And Equipment + + + + + + + 1.6.0 + Property, Plant And Equipment Accumulated Depreciation And Depletion + + + + + + + 1.7.0 + Intangible Assets (Excluding Goodwill) + + + + + + + 1.8.0 + Intangible Assets Accumulated Amortization + + + + + + + 1.9.0 + Goodwill + + + + + + + 2.1.0 + Payables + + + + + + + 2.2.0 + Accruals And Other Liabilities + + + + + 2.3.0 + Financial Liabilities + + + + + + + 2.4.0 + Provisions (Contingencies) + + + + + + + 3.1.0 + Owners Equity (Attributable To Owners Of Parent) + + + + + + + 3.2.0 + Retained Earnings + + + + + + + 3.3.0 + Accumulated Other Comprehensive Income + + + + + + + 3.4.0 + Other Equity Items + + + + + + + 3.5.0 + Noncontrolling (Minority) Interest + + + + + + + 4.1.0 + Recognized Point Of Time + + + + + + + 4.2.0 + Recognized Over Time + + + + + + + 4.3.0 + Adjustments + + + + + + + 5.1.0 + Expenses Classified By Nature + + + + + 5.2.0 + Expenses Classified By Function + + + + + 6.1.0 + Other Revenue And Expenses + + + + + 6.2.0 + Gains And Losses + + + + + + + 6.3.0 + Taxes (Other Than Income And Payroll) And Fees + + + + + + + 6.4.0 + Income Tax Expense (Benefit) + + + + + + + 1.1.1 + Cash and Cash Equivalents + + + + + + 1.1.2 + Financial Assets (Investments) + + + + + + 1.1.3 + Restricted Cash and Financial Assets + + + + + + 1.1.4 + Additional Financial Assets and Investments + + + + + + 1.2.1 + Accounts, Notes And Loans Receivable + + + + + + + + 1.2.2 + Contracts + + + + + + + + 1.2.3 + Nontrade And Other Receivables + + + + + + + + 1.3.1 + Merchandise + + + + + + 1.3.2 + Raw Material, Parts And Supplies + + + + + + 1.3.3 + Work In Process + + + + + + 1.3.4 + Finished Goods + + + + + + 1.3.5 + Other Inventory + + + + + + 1.4.1 + Prepaid Expense + + + + + + 1.4.2 + Accrued Income + + + + + + 1.4.3 + Additional Assets + + + + + 1.5.1 + Land And Land Improvements + + + + + + 1.5.2 + Buildings, Structures And Improvements + + + + + + 1.5.3 + Machinery And Equipment + + + + + + 1.5.4 + Furniture And Fixtures + + + + + + 1.5.5 + Right Of Use Assets (Classified As PP&E) + + + + + + 1.5.6 + Other Property, Plant And Equipment + + + + + + 1.5.7 + Construction In Progress + + + + + + 1.6.1 + Accumulated Depletion + + + + + + 1.6.2 + Accumulated Depreciation + + + + + + 1.7.1 + Intellectual Property + + + + + + 1.7.2 + Computer Software + + + + + + 1.7.3 + Trade And Distribution Assets + + + + + + 1.7.4 + Contracts And Rights + + + + + + 1.7.5 + Right Of Use Assets + + + + + + 1.7.6 + Crypto Assets + + + + + + 1.7.7 + Other Intangible Assets + + + + + + 1.7.8 + Acquisition In Progress + + + + + + 2.1.1 + Trade Payables + + + + + + + + 2.1.2 + Dividends Payable + + + + + + + + 2.1.3 + Interest Payable + + + + + + + 2.1.4 + Other Payables + + + + + + + + 2.2.1 + Accrued Expenses (Including Payroll) + + + + + + 2.2.2 + Deferred Income (Unearned Revenue) + + + + + + 2.2.3 + Accrued Taxes (Other Than Payroll) + + + + + + 2.2.4 + Other (Non-Financial) Liabilities + + + + + + 2.3.1 + Notes Payable + + + + + + 2.3.2 + Loans Payable + + + + + + 2.3.3 + Bonds (Debentures) + + + + + + 2.3.4 + Other Debts And Borrowings + + + + + + 2.3.5 + Lease Obligations + + + + + + 2.3.6 + Derivative Financial Liabilities + + + + + + 2.3.7 + Other Financial Liabilities + + + + + + 2.4.1 + Customer Related Provisions + + + + + + 2.4.2 + Ligation And Regulatory Provisions + + + + + + 2.4.3 + Other Provisions + + + + + + 3.1.1 + Equity At par (Issued Capital) + + + + + + 3.1.2 + Additional Paid-in Capital + + + + + + 3.2.1 + Appropriated + + + + + + 3.2.3 + Deficit + + + + + + 3.2.4 + In Suspense Zero + + + + + + 3.3.1 + Exchange Differences On Translation + + + + + + 3.3.2 + Cash Flow Hedges + + + + + + 3.3.3 + Gains And Losses On Remeasuring Available-For-Sale Investments + + + + + + 3.3.4 + Remeasurements Of Defined Benefit Plans + + + + + + 3.3.5 + Revaluation Surplus (IFRS only) + + + + + + 3.4.1 + ESOP Related Items + + + + + + 3.4.2 + Subscribed Stock Receivables + + + + + + 3.4.3 + Treasury Stock (Not Extinguished) + + + + + + 3.4.4 + Miscellaneous Equity + + + + + + 4.1.1 + Goods + + + + + + 4.1.2 + Services + + + + + + 4.2.1 + Products + + + + + + 4.2.2 + Services + + + + + + 4.3.1 + Variable Consideration + + + + + + 4.3.2 + Consideration Paid (Payable) To Customers + + + + + + 4.3.3 + Other Adjustments + + + + + + 5.1.1 + Merchandise, Material, Parts And Supplies + + + + + + 5.1.2 + Employee Benefits + + + + + 5.1.3 + Services + + + + + + 5.1.4 + Rent, Depreciation, Amortization And Depletion + + + + + + 5.1.5 + Increase (Decrease) In Inventories Of Finished Goods And Work In Progress + + + + + + 5.1.6 + Other Work Performed By Entity And Capitalized + + + + + 5.2.1 + Cost Of Sales + + + + + + 5.2.2 + Selling, General And Administrative + + + + + + 5.2.3 + Credit Loss (Reversal) On Receivables + + + + + + 6.1.1 + Other Revenue + + + + + + 6.1.2 + Other Expenses + + + + + + 6.2.1 + Foreign Currency Transaction Gain (Loss) + + + + + + 6.2.2 + Gain (Loss) On Investments + + + + + + 6.2.3 + Gain (Loss) On Derivatives + + + + + + 6.2.4 + Crypto Asset Gain (Loss) + + + + + + 6.2.5 + Gain (Loss) On Disposal Of Assets + + + + + + 6.2.6 + Debt Related Gain (Loss) + + + + + + 6.2.7 + Impairment Loss + + + + + + 6.2.8 + Other Gains And Losses + + + + + + 6.3.1 + Real Estate Taxes And Insurance + + + + + + 6.3.2 + Highway (Road) Taxes And Tolls + + + + + + 6.3.3 + Direct Tax And License Fees + + + + + + 6.3.4 + Excise And Sales Taxes + + + + + + 6.3.5 + Customs Fees And Duties (Not Classified As Sales Or Excise) + + + + + + 6.3.6 + Non-Deductible VAT (GST) + + + + + + 6.3.7 + General Insurance Expense + + + + + + 6.3.8 + Administrative Fees (Revenue Stamps) + + + + + + 6.3.9 + Fines And Penalties + + + + + + 6.3.10 + Miscellaneous Taxes + + + + + + 6.3.11 + Other Taxes And Fees + + + + + diff --git a/modules/account/account_chart_en.xml b/modules/account/account_chart_en.xml new file mode 100644 index 0000000000..3c05f5b844 --- /dev/null +++ b/modules/account/account_chart_en.xml @@ -0,0 +1,1306 @@ + + + + + + Universal Chart of Account Types + + + + + + Assets + + + balance + + + + Current Assets + + + balance + + + + Accounts receivable + + + balance + + + + + + Cash and Cash Equivalents + + + balance + + + + Inventories + + + balance + + + + + Cash at bank, Petty Cash, Cash On Hand + + + balance + + + + Prepaid expenses for future services that will be used within a year + + + balance + + + + + Revenue Earned In Arrears (Accrued Revenue) for services done but not yet received for the year + + + balance + + + + Loan To (Less than one financial period) + + + balance + + + + Non-current Assets + + + balance + + + + + Property, Plant and Equipment + + + balance + + + + + Investment property, such as real estate held for investment purposes + + + balance + + + + + Intangible assets, such as patents, copyrights and goodwill + + + balance + + + + + Financial assets (excluding investments accounted for using the equity method, accounts receivables, and cash and cash equivalents), such as notes receivables + + + balance + + + + + Investments accounted for using the equity method + + + balance + + + + + Biological assets, which are living plants or animals. + + + balance + + + + + Loan To (More than one financial period) + + + balance + + + + + Liabilities + + + balance + + + + Accounts payable + + + balance + + + + + Provisions for warranties or court decisions (contingent liabilities that are both probable and measurable) + + + balance + + + + Financial liabilities (excluding provisions and accounts payables), such as promissory notes and corporate bonds + + + balance + + + + Liabilities and assets for current tax + + + balance + + + + Deferred tax liabilities and deferred tax assets + + + balance + + + + Unearned revenue for services paid for by customers but not yet provided + + + balance + + + + Interests on loan stock + + + balance + + + + Creditors' equity + + + balance + + + + Equity / capital + + + balance + + + + Issued capital and reserves attributable to equity holders of the parent company (controlling interest) + + + balance + + + + Non-controlling interest in equity + + + balance + + + + Current Period Profit or Lost + + + income + + + + Operating section + + + income + + + + Revenue + + + income + + + + + Expenses + + + income + + + + + Cost of Sales + + + income + + + + + Selling, General and Administrative expenses + + + income + + + + + Depreciation / amortisation + + + income + + + + Research & Development expenses + + + income + + + + Non-operating section + + + income + + + + Other revenues or gains + + + income + + + + Other expenses or losses + + + income + + + + Finance costs + + + income + + + + Income tax expense + + + income + + + + Irregular items + + + income + + + + Discontinued operations + + + income + + + + Off-Balance + + + off-balance + + + + + Universal Chart of Accounts + + + + + + + 1.0.0 + Assets + + + + + 2.0.0 + Liabilities + + + + + 3.0.0 + Equity + + + + + 4.0.0 + Revenue + + + + + 5.0.0 + Expenses + + + + + 6.0.0 + Other (Non-Operating) Income And Expenses + + + + + + 1.1.0 + Cash And Financial Assets + + + + + 1.2.0 + Receivables And Contracts + + + + + 1.3.0 + Inventory + + + + + 1.4.0 + Accruals And Additional Assets + + + + + 1.5.0 + Property, Plant And Equipment + + + + + + + 1.6.0 + Property, Plant And Equipment Accumulated Depreciation And Depletion + + + + + + + 1.7.0 + Intangible Assets (Excluding Goodwill) + + + + + + + 1.8.0 + Intangible Assets Accumulated Amortization + + + + + + + 1.9.0 + Goodwill + + + + + + + 2.1.0 + Payables + + + + + + + 2.2.0 + Accruals And Other Liabilities + + + + + 2.3.0 + Financial Liabilities + + + + + + + 2.4.0 + Provisions (Contingencies) + + + + + + + 3.1.0 + Owners Equity (Attributable To Owners Of Parent) + + + + + + + 3.2.0 + Retained Earnings + + + + + + + 3.3.0 + Accumulated Other Comprehensive Income + + + + + + + 3.4.0 + Other Equity Items + + + + + + + 3.5.0 + Noncontrolling (Minority) Interest + + + + + + + 4.1.0 + Recognized Point Of Time + + + + + + + 4.2.0 + Recognized Over Time + + + + + + + 4.3.0 + Adjustments + + + + + + + 5.1.0 + Expenses Classified By Nature + + + + + 5.2.0 + Expenses Classified By Function + + + + + 6.1.0 + Other Revenue And Expenses + + + + + 6.2.0 + Gains And Losses + + + + + + + 6.3.0 + Taxes (Other Than Income And Payroll) And Fees + + + + + + + 6.4.0 + Income Tax Expense (Benefit) + + + + + + + 1.1.1 + Cash and Cash Equivalents + + + + + + 1.1.2 + Financial Assets (Investments) + + + + + + 1.1.3 + Restricted Cash and Financial Assets + + + + + + 1.1.4 + Additional Financial Assets and Investments + + + + + + 1.2.1 + Accounts, Notes And Loans Receivable + + + + + + + + 1.2.2 + Contracts + + + + + + + + 1.2.3 + Nontrade And Other Receivables + + + + + + + + 1.3.1 + Merchandise + + + + + + 1.3.2 + Raw Material, Parts And Supplies + + + + + + 1.3.3 + Work In Process + + + + + + 1.3.4 + Finished Goods + + + + + + 1.3.5 + Other Inventory + + + + + + 1.4.1 + Prepaid Expense + + + + + + 1.4.2 + Accrued Income + + + + + + 1.4.3 + Additional Assets + + + + + 1.5.1 + Land And Land Improvements + + + + + + 1.5.2 + Buildings, Structures And Improvements + + + + + + 1.5.3 + Machinery And Equipment + + + + + + 1.5.4 + Furniture And Fixtures + + + + + + 1.5.5 + Right Of Use Assets (Classified As PP&E) + + + + + + 1.5.6 + Other Property, Plant And Equipment + + + + + + 1.5.7 + Construction In Progress + + + + + + 1.6.1 + Accumulated Depletion + + + + + + 1.6.2 + Accumulated Depreciation + + + + + + 1.7.1 + Intellectual Property + + + + + + 1.7.2 + Computer Software + + + + + + 1.7.3 + Trade And Distribution Assets + + + + + + 1.7.4 + Contracts And Rights + + + + + + 1.7.5 + Right Of Use Assets + + + + + + 1.7.6 + Crypto Assets + + + + + + 1.7.7 + Other Intangible Assets + + + + + + 1.7.8 + Acquisition In Progress + + + + + + 2.1.1 + Trade Payables + + + + + + + + 2.1.2 + Dividends Payable + + + + + + + + 2.1.3 + Interest Payable + + + + + + + 2.1.4 + Other Payables + + + + + + + + 2.2.1 + Accrued Expenses (Including Payroll) + + + + + + 2.2.2 + Deferred Income (Unearned Revenue) + + + + + + 2.2.3 + Accrued Taxes (Other Than Payroll) + + + + + + 2.2.4 + Other (Non-Financial) Liabilities + + + + + + 2.3.1 + Notes Payable + + + + + + 2.3.2 + Loans Payable + + + + + + 2.3.3 + Bonds (Debentures) + + + + + + 2.3.4 + Other Debts And Borrowings + + + + + + 2.3.5 + Lease Obligations + + + + + + 2.3.6 + Derivative Financial Liabilities + + + + + + 2.3.7 + Other Financial Liabilities + + + + + + 2.4.1 + Customer Related Provisions + + + + + + 2.4.2 + Ligation And Regulatory Provisions + + + + + + 2.4.3 + Other Provisions + + + + + + 3.1.1 + Equity At par (Issued Capital) + + + + + + 3.1.2 + Additional Paid-in Capital + + + + + + 3.2.1 + Appropriated + + + + + + 3.2.3 + Deficit + + + + + + 3.2.4 + In Suspense Zero + + + + + + 3.3.1 + Exchange Differences On Translation + + + + + + 3.3.2 + Cash Flow Hedges + + + + + + 3.3.3 + Gains And Losses On Remeasuring Available-For-Sale Investments + + + + + + 3.3.4 + Remeasurements Of Defined Benefit Plans + + + + + + 3.3.5 + Revaluation Surplus (IFRS only) + + + + + + 3.4.1 + ESOP Related Items + + + + + + 3.4.2 + Subscribed Stock Receivables + + + + + + 3.4.3 + Treasury Stock (Not Extinguished) + + + + + + 3.4.4 + Miscellaneous Equity + + + + + + 4.1.1 + Goods + + + + + + 4.1.2 + Services + + + + + + 4.2.1 + Products + + + + + + 4.2.2 + Services + + + + + + 4.3.1 + Variable Consideration + + + + + + 4.3.2 + Consideration Paid (Payable) To Customers + + + + + + 4.3.3 + Other Adjustments + + + + + + 5.1.1 + Merchandise, Material, Parts And Supplies + + + + + + 5.1.2 + Employee Benefits + + + + + 5.1.3 + Services + + + + + + 5.1.4 + Rent, Depreciation, Amortization And Depletion + + + + + + 5.1.5 + Increase (Decrease) In Inventories Of Finished Goods And Work In Progress + + + + + + 5.1.6 + Other Work Performed By Entity And Capitalized + + + + + 5.2.1 + Cost Of Sales + + + + + + 5.2.2 + Selling, General And Administrative + + + + + + 5.2.3 + Credit Loss (Reversal) On Receivables + + + + + + 6.1.1 + Other Revenue + + + + + + 6.1.2 + Other Expenses + + + + + + 6.2.1 + Foreign Currency Transaction Gain (Loss) + + + + + + 6.2.2 + Gain (Loss) On Investments + + + + + + 6.2.3 + Gain (Loss) On Derivatives + + + + + + 6.2.4 + Crypto Asset Gain (Loss) + + + + + + 6.2.5 + Gain (Loss) On Disposal Of Assets + + + + + + 6.2.6 + Debt Related Gain (Loss) + + + + + + 6.2.7 + Impairment Loss + + + + + + 6.2.8 + Other Gains And Losses + + + + + + 6.3.1 + Real Estate Taxes And Insurance + + + + + + 6.3.2 + Highway (Road) Taxes And Tolls + + + + + + 6.3.3 + Direct Tax And License Fees + + + + + + 6.3.4 + Excise And Sales Taxes + + + + + + 6.3.5 + Customs Fees And Duties (Not Classified As Sales Or Excise) + + + + + + 6.3.6 + Non-Deductible VAT (GST) + + + + + + 6.3.7 + General Insurance Expense + + + + + + 6.3.8 + Administrative Fees (Revenue Stamps) + + + + + + 6.3.9 + Fines And Penalties + + + + + + 6.3.10 + Miscellaneous Taxes + + + + + + 6.3.11 + Other Taxes And Fees + + + + + diff --git a/modules/account/doc/index.rst b/modules/account/doc/index.rst index 9be51dc67b..1f3289b470 100644 --- a/modules/account/doc/index.rst +++ b/modules/account/doc/index.rst @@ -4,8 +4,9 @@ Account Module The *Account Module* defines the fundamentals needed for basic double entry accounting. -It also includes templates for a basic chart of accounts, balance sheet and -income statement. +It also includes templates for the `basic universal chart of accounts +`_, balance sheet and income +statement. .. toctree:: :maxdepth: 2 diff --git a/modules/account/doc/reference.rst b/modules/account/doc/reference.rst index 6cca8b35cb..1b30c0d5e9 100644 --- a/modules/account/doc/reference.rst +++ b/modules/account/doc/reference.rst @@ -35,7 +35,8 @@ Taxation Development Reference ********************* -The *Account Module* includes minimal charts of accounts for many languages. +The *Account Module* includes the `basic universal charts of accounts`_ for +many languages. The :abbr:`XML (eXtensible Markup Language)` files that contain the localised charts of account are all generated from the same source XML file. The :file:`localize.xsl` :abbr:`XSLT (XML Stylesheet Language Transform)` file @@ -46,4 +47,6 @@ To output a localised chart of accounts for language ```` run: .. code-block:: bash - xsltproc --stringparam lang localize.xsl minimal_chart.xml + xsltproc --stringparam lang localize.xsl account_chart.xml + +.. _basic universal charts of accounts: https://www.ifrs-gaap.com/basic-universal-coa diff --git a/modules/account/minimal_chart.xml b/modules/account/minimal_chart.xml deleted file mode 100644 index 0577c33d09..0000000000 --- a/modules/account/minimal_chart.xml +++ /dev/null @@ -1,374 +0,0 @@ - - - - - - Minimal Account Type Chart - Минимален сметкоплан - Pla de tipus de compte mínim - Minimaler Kontentypenplan - Tipo de cuenta de plan mínimo - Plan de type de compte minimal - Basaal rekeningschematype - Plano de tipos de conta mínimo - Минимальная схема типов счетов - Minimalni kontni načrt - - - - - Asset - Притежание - Actiu - Aktiva - Activo - Actif - Activa - Ativo - Активы - Sredstvo - - - balance - - - - Current - Текущ - Banc - Umlaufvermögen - Banco - Courant - Actueel - Circulante - Текущие - Kratkoročno - - balance - - - - - Cash - В брой - Banc - Barvermögen - Efectivo - Cash - Kas - Caixa - Наличные - Denar - - balance - - - - - Receivable - В брой - Banc - Barvermögen - Efectivo - Recevable - Kas - A Receber - Наличные - Denar - - balance - - - - - - Long-term - Дългосрочен - A llarg termini - Anlagevermögen - A largo plazo - Long terme - Langlopend - Longo Prazo - Долгосрочные - Dolgoročno - - balance - - - - - Liability - Дълг - Passiu - Verbindlichkeiten - Pasivo - Passif - Verplichting - Passivo - Пассивы - Obveznosti - - - balance - - - Current - Текущ - Banc - Umlaufvermögen - Banco - Courant - Actueel - Circulante - Текущие - Kratkoročno - - balance - - - - Payable - Разходен - A pagar - Verbindlichkeiten - A pagar - À payer - Te betalen - A Pagar - Подлежащие уплате - Obveznosti - - balance - - - - - Tax - Данък - Impost - Steuer - Impuesto - Taxe - Belasting - Tributos - Налоги - Davek - - balance - - - - Long-term - Дългосрочен - A llarg termini - Anlagevermögen - A largo plazo - Long terme - Langlopend - Longo Prazo - Долгосрочные - Dolgoročno - - balance - - - - Equity - Капитал - Patrimoni - Kapital - Patrimonio - Capitaux propres - Eigen vermogen - Patrimônio Líquido - Собственные средства - Kapital - - - balance - - - Income - Приход - Benefici - Erträge - Beneficio - Revenu - Inkomsten - Resultados - Поступления - Prihodki - - income - - - - Revenue - Приход - Ingressos - Ertrag - Ingresos - Produit - Opbrengst - Receitas - Доходы - Prihodki - - income - - - - - Expense - Разход - Despesa - Aufwand - Gastos - Charge - Kosten - Despesas - Расходы - Odhodki - - income - - - - - Off-Balance - Неутрално салдо - Fora de balanç - Bilanzneutral - Fuera de balance - Hors bilan - Buiten balans - Fora do Balanço - Внебалансовые - Zunaj bilance - - - off-balance - - - - Minimal Account Chart - Минимална графика на сметката - Pla de comptes mínim - Minimaler Kontenplan - Plan de cuentas mínimo - Plan comptable minimal - Basaal rekeningschema - Plano de Contas Mínimo - Минимальная схема счетов - Minimalni kontni načrt - - - - - Main Receivable - Основна приходна сметка - A cobrar principal - Forderungen - A cobrar principal - Compte client - Basisrekening ontvangen - Clientes Principal - Основной Подлежащий получению - Glavne terjatve - - - - - - - Main Payable - Основна разходна сметка - A pagar principal - Verbindlichkeiten - A pagar principal - Compte fournisseur - Basisrekening betalen - Fornecedores Principal - Основной Подлежащий уплате - Glavne obveznosti - - - - - - - Main Revenue - Основна приходи - Ingrés principal - Ertrag - Ingresos principal - Compte de produits - Basis opbrengstrekening - Receitas Principal - Основной Доходы - Glavni prihodki - - - - - Main Expense - Основена разходи - Despesa principal - Aufwand - Gastos principal - Compte de charges - Basis kostenrekening - Despesas Principal - Основной Расходы - Glavni odhodki - - - - - Main Cash - Основна наличност - Efectiu principal - Barvermögen - Efectivo principal - Compte de liquidité - Basis kasrekening - Caixa Principal - Основной Наличные - Glavna denarna sredstva - - - - - Main Tax - Основна данъци - Impost principal - Steuern - Impuestos principal - Compte de taxes - Basis belastingrekening - Tributos Principal - Основной Налоги - Glavni davki - - - - - diff --git a/modules/account/minimal_chart_bg.xml b/modules/account/minimal_chart_bg.xml deleted file mode 100644 index b09cfea085..0000000000 --- a/modules/account/minimal_chart_bg.xml +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - Минимален сметкоплан - - - - - - - - - - - - - - Притежание - - - - - - - - - - - balance - - - - - Текущ - - - - - - - - - - balance - - - - - - В брой - - - - - - - - - - balance - - - - - - В брой - - - - - - - - - - balance - - - - - - - Дългосрочен - - - - - - - - - - balance - - - - - - Дълг - - - - - - - - - - - balance - - - - Текущ - - - - - - - - - - balance - - - - - Разходен - - - - - - - - - - balance - - - - - - Данък - - - - - - - - - - balance - - - - - Дългосрочен - - - - - - - - - - balance - - - - - Капитал - - - - - - - - - - - balance - - - - Приход - - - - - - - - - - income - - - - - Приход - - - - - - - - - - income - - - - - - Разход - - - - - - - - - - income - - - - - - Неутрално салдо - - - - - - - - - - - off-balance - - - - - Минимална графика на сметката - - - - - - - - - - - - - - Основна приходна сметка - - - - - - - - - - - - - - - - Основна разходна сметка - - - - - - - - - - - - - - - - Основна приходи - - - - - - - - - - - - - - Основена разходи - - - - - - - - - - - - - - Основна наличност - - - - - - - - - - - - - - Основна данъци - - - - - - - - - - - - - diff --git a/modules/account/minimal_chart_ca.xml b/modules/account/minimal_chart_ca.xml deleted file mode 100644 index e224117ba4..0000000000 --- a/modules/account/minimal_chart_ca.xml +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - - Pla de tipus de compte mínim - - - - - - - - - - - - - - Actiu - - - - - - - - - - balance - - - - - - Banc - - - - - - - - - balance - - - - - - - Banc - - - - - - - - - balance - - - - - - - Banc - - - - - - - - - balance - - - - - - - - A llarg termini - - - - - - - - - balance - - - - - - - Passiu - - - - - - - - - - balance - - - - - Banc - - - - - - - - - balance - - - - - - A pagar - - - - - - - - - balance - - - - - - - Impost - - - - - - - - - balance - - - - - - A llarg termini - - - - - - - - - balance - - - - - - Patrimoni - - - - - - - - - - balance - - - - - Benefici - - - - - - - - - income - - - - - - Ingressos - - - - - - - - - income - - - - - - - Despesa - - - - - - - - - income - - - - - - - Fora de balanç - - - - - - - - - - off-balance - - - - - - Pla de comptes mínim - - - - - - - - - - - - - - A cobrar principal - - - - - - - - - - - - - - - - A pagar principal - - - - - - - - - - - - - - - - Ingrés principal - - - - - - - - - - - - - - Despesa principal - - - - - - - - - - - - - - Efectiu principal - - - - - - - - - - - - - - Impost principal - - - - - - - - - - - - diff --git a/modules/account/minimal_chart_de.xml b/modules/account/minimal_chart_de.xml deleted file mode 100644 index 95ce9bd401..0000000000 --- a/modules/account/minimal_chart_de.xml +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - - - Minimaler Kontentypenplan - - - - - - - - - - - - - - Aktiva - - - - - - - - - balance - - - - - - - Umlaufvermögen - - - - - - - - balance - - - - - - - - Barvermögen - - - - - - - - balance - - - - - - - - Barvermögen - - - - - - - - balance - - - - - - - - - Anlagevermögen - - - - - - - - balance - - - - - - - - Verbindlichkeiten - - - - - - - - - balance - - - - - - Umlaufvermögen - - - - - - - - balance - - - - - - - Verbindlichkeiten - - - - - - - - balance - - - - - - - - Steuer - - - - - - - - balance - - - - - - - Anlagevermögen - - - - - - - - balance - - - - - - - Kapital - - - - - - - - - balance - - - - - - Erträge - - - - - - - - income - - - - - - - Ertrag - - - - - - - - income - - - - - - - - Aufwand - - - - - - - - income - - - - - - - - Bilanzneutral - - - - - - - - - off-balance - - - - - - - Minimaler Kontenplan - - - - - - - - - - - - - - Forderungen - - - - - - - - - - - - - - - - Verbindlichkeiten - - - - - - - - - - - - - - - - Ertrag - - - - - - - - - - - - - - Aufwand - - - - - - - - - - - - - - Barvermögen - - - - - - - - - - - - - - Steuern - - - - - - - - - - - diff --git a/modules/account/minimal_chart_en.xml b/modules/account/minimal_chart_en.xml deleted file mode 100644 index 88cfc1b76e..0000000000 --- a/modules/account/minimal_chart_en.xml +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - Minimal Account Type Chart - - - - - - - - - - - - - - Asset - - - - - - - - - - - - balance - - - - Current - - - - - - - - - - - balance - - - - - Cash - - - - - - - - - - - balance - - - - - Receivable - - - - - - - - - - - balance - - - - - - Long-term - - - - - - - - - - - balance - - - - - Liability - - - - - - - - - - - - balance - - - Current - - - - - - - - - - - balance - - - - Payable - - - - - - - - - - - balance - - - - - Tax - - - - - - - - - - - balance - - - - Long-term - - - - - - - - - - - balance - - - - Equity - - - - - - - - - - - - balance - - - Income - - - - - - - - - - - income - - - - Revenue - - - - - - - - - - - income - - - - - Expense - - - - - - - - - - - income - - - - - Off-Balance - - - - - - - - - - - - off-balance - - - - Minimal Account Chart - - - - - - - - - - - - - - Main Receivable - - - - - - - - - - - - - - - - Main Payable - - - - - - - - - - - - - - - - Main Revenue - - - - - - - - - - - - - - Main Expense - - - - - - - - - - - - - - Main Cash - - - - - - - - - - - - - - Main Tax - - - - - - - - - - - - - - diff --git a/modules/account/minimal_chart_es.xml b/modules/account/minimal_chart_es.xml deleted file mode 100644 index e40707fbe7..0000000000 --- a/modules/account/minimal_chart_es.xml +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - - - - Tipo de cuenta de plan mínimo - - - - - - - - - - - - - - Activo - - - - - - - - balance - - - - - - - - Banco - - - - - - - balance - - - - - - - - - Efectivo - - - - - - - balance - - - - - - - - - Efectivo - - - - - - - balance - - - - - - - - - - A largo plazo - - - - - - - balance - - - - - - - - - Pasivo - - - - - - - - balance - - - - - - - Banco - - - - - - - balance - - - - - - - - A pagar - - - - - - - balance - - - - - - - - - Impuesto - - - - - - - balance - - - - - - - - A largo plazo - - - - - - - balance - - - - - - - - Patrimonio - - - - - - - - balance - - - - - - - Beneficio - - - - - - - income - - - - - - - - Ingresos - - - - - - - income - - - - - - - - - Gastos - - - - - - - income - - - - - - - - - Fuera de balance - - - - - - - - off-balance - - - - - - - - Plan de cuentas mínimo - - - - - - - - - - - - - - A cobrar principal - - - - - - - - - - - - - - - - A pagar principal - - - - - - - - - - - - - - - - Ingresos principal - - - - - - - - - - - - - - Gastos principal - - - - - - - - - - - - - - Efectivo principal - - - - - - - - - - - - - - Impuestos principal - - - - - - - - - - diff --git a/modules/account/minimal_chart_fr.xml b/modules/account/minimal_chart_fr.xml deleted file mode 100644 index 37b8f3ffed..0000000000 --- a/modules/account/minimal_chart_fr.xml +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - - - - - Plan de type de compte minimal - - - - - - - - - - - - - - Actif - - - - - - - balance - - - - - - - - - Courant - - - - - - balance - - - - - - - - - - Cash - - - - - - balance - - - - - - - - - - Recevable - - - - - - balance - - - - - - - - - - - Long terme - - - - - - balance - - - - - - - - - - Passif - - - - - - - balance - - - - - - - - Courant - - - - - - balance - - - - - - - - - À payer - - - - - - balance - - - - - - - - - - Taxe - - - - - - balance - - - - - - - - - Long terme - - - - - - balance - - - - - - - - - Capitaux propres - - - - - - - balance - - - - - - - - Revenu - - - - - - income - - - - - - - - - Produit - - - - - - income - - - - - - - - - - Charge - - - - - - income - - - - - - - - - - Hors bilan - - - - - - - off-balance - - - - - - - - - Plan comptable minimal - - - - - - - - - - - - - - Compte client - - - - - - - - - - - - - - - - Compte fournisseur - - - - - - - - - - - - - - - - Compte de produits - - - - - - - - - - - - - - Compte de charges - - - - - - - - - - - - - - Compte de liquidité - - - - - - - - - - - - - - Compte de taxes - - - - - - - - - diff --git a/modules/account/minimal_chart_nl.xml b/modules/account/minimal_chart_nl.xml deleted file mode 100644 index a085d183c1..0000000000 --- a/modules/account/minimal_chart_nl.xml +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - - - - - - Basaal rekeningschematype - - - - - - - - - - - - - - Activa - - - - - - balance - - - - - - - - - - Actueel - - - - - balance - - - - - - - - - - - Kas - - - - - balance - - - - - - - - - - - Kas - - - - - balance - - - - - - - - - - - - Langlopend - - - - - balance - - - - - - - - - - - Verplichting - - - - - - balance - - - - - - - - - Actueel - - - - - balance - - - - - - - - - - Te betalen - - - - - balance - - - - - - - - - - - Belasting - - - - - balance - - - - - - - - - - Langlopend - - - - - balance - - - - - - - - - - Eigen vermogen - - - - - - balance - - - - - - - - - Inkomsten - - - - - income - - - - - - - - - - Opbrengst - - - - - income - - - - - - - - - - - Kosten - - - - - income - - - - - - - - - - - Buiten balans - - - - - - off-balance - - - - - - - - - - Basaal rekeningschema - - - - - - - - - - - - - - Basisrekening ontvangen - - - - - - - - - - - - - - - - Basisrekening betalen - - - - - - - - - - - - - - - - Basis opbrengstrekening - - - - - - - - - - - - - - Basis kostenrekening - - - - - - - - - - - - - - Basis kasrekening - - - - - - - - - - - - - - Basis belastingrekening - - - - - - - - diff --git a/modules/account/minimal_chart_pt.xml b/modules/account/minimal_chart_pt.xml deleted file mode 100644 index ba7e0b2503..0000000000 --- a/modules/account/minimal_chart_pt.xml +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - - - - - - - Plano de tipos de conta mínimo - - - - - - - - - - - - - - Ativo - - - - - balance - - - - - - - - - - - Circulante - - - - balance - - - - - - - - - - - - Caixa - - - - balance - - - - - - - - - - - - A Receber - - - - balance - - - - - - - - - - - - - Longo Prazo - - - - balance - - - - - - - - - - - - Passivo - - - - - balance - - - - - - - - - - Circulante - - - - balance - - - - - - - - - - - A Pagar - - - - balance - - - - - - - - - - - - Tributos - - - - balance - - - - - - - - - - - Longo Prazo - - - - balance - - - - - - - - - - - Patrimônio Líquido - - - - - balance - - - - - - - - - - Resultados - - - - income - - - - - - - - - - - Receitas - - - - income - - - - - - - - - - - - Despesas - - - - income - - - - - - - - - - - - Fora do Balanço - - - - - off-balance - - - - - - - - - - - Plano de Contas Mínimo - - - - - - - - - - - - - - Clientes Principal - - - - - - - - - - - - - - - - Fornecedores Principal - - - - - - - - - - - - - - - - Receitas Principal - - - - - - - - - - - - - - Despesas Principal - - - - - - - - - - - - - - Caixa Principal - - - - - - - - - - - - - - Tributos Principal - - - - - - - diff --git a/modules/account/minimal_chart_ru.xml b/modules/account/minimal_chart_ru.xml deleted file mode 100644 index e4c913037c..0000000000 --- a/modules/account/minimal_chart_ru.xml +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - - - - - - - - Минимальная схема типов счетов - - - - - - - - - - - - - - Активы - - - - balance - - - - - - - - - - - - Текущие - - - balance - - - - - - - - - - - - - Наличные - - - balance - - - - - - - - - - - - - Наличные - - - balance - - - - - - - - - - - - - - Долгосрочные - - - balance - - - - - - - - - - - - - Пассивы - - - - balance - - - - - - - - - - - Текущие - - - balance - - - - - - - - - - - - Подлежащие уплате - - - balance - - - - - - - - - - - - - Налоги - - - balance - - - - - - - - - - - - Долгосрочные - - - balance - - - - - - - - - - - - Собственные средства - - - - balance - - - - - - - - - - - Поступления - - - income - - - - - - - - - - - - Доходы - - - income - - - - - - - - - - - - - Расходы - - - income - - - - - - - - - - - - - Внебалансовые - - - - off-balance - - - - - - - - - - - - Минимальная схема счетов - - - - - - - - - - - - - - Основной Подлежащий получению - - - - - - - - - - - - - - - - Основной Подлежащий уплате - - - - - - - - - - - - - - - - Основной Доходы - - - - - - - - - - - - - - Основной Расходы - - - - - - - - - - - - - - Основной Наличные - - - - - - - - - - - - - - Основной Налоги - - - - - - diff --git a/modules/account/minimal_chart_sl.xml b/modules/account/minimal_chart_sl.xml deleted file mode 100644 index 9458e584d1..0000000000 --- a/modules/account/minimal_chart_sl.xml +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - - - - - - - - - Minimalni kontni načrt - - - - - - - - - - - - - - Sredstvo - - - balance - - - - - - - - - - - - - Kratkoročno - - balance - - - - - - - - - - - - - - Denar - - balance - - - - - - - - - - - - - - Denar - - balance - - - - - - - - - - - - - - - Dolgoročno - - balance - - - - - - - - - - - - - - Obveznosti - - - balance - - - - - - - - - - - - Kratkoročno - - balance - - - - - - - - - - - - - Obveznosti - - balance - - - - - - - - - - - - - - Davek - - balance - - - - - - - - - - - - - Dolgoročno - - balance - - - - - - - - - - - - - Kapital - - - balance - - - - - - - - - - - - Prihodki - - income - - - - - - - - - - - - - Prihodki - - income - - - - - - - - - - - - - - Odhodki - - income - - - - - - - - - - - - - - Zunaj bilance - - - off-balance - - - - - - - - - - - - - Minimalni kontni načrt - - - - - - - - - - - - - - Glavne terjatve - - - - - - - - - - - - - - - - Glavne obveznosti - - - - - - - - - - - - - - - - Glavni prihodki - - - - - - - - - - - - - - Glavni odhodki - - - - - - - - - - - - - - Glavna denarna sredstva - - - - - - - - - - - - - - Glavni davki - - - - - diff --git a/modules/account/tests/scenario_close_fiscalyear.rst b/modules/account/tests/scenario_close_fiscalyear.rst index bdd2da0aac..2d9f314f9a 100644 --- a/modules/account/tests/scenario_close_fiscalyear.rst +++ b/modules/account/tests/scenario_close_fiscalyear.rst @@ -59,13 +59,8 @@ Prepare the closing settings for fiscalyear close:: >>> period_closing.fiscalyear = fiscalyear >>> period_closing.type = 'adjustment' >>> period_closing.save() - >>> type_equity, = AccountType.find([('name', '=', "Equity")]) - >>> account_pl = Account() - >>> account_pl.name = 'P&L' - >>> account_pl.type = type_equity - >>> account_pl.parent = accounts['revenue'].parent - >>> account_pl.save() + >>> account_pl, = Account.find([('code', '=', '3.2.1')]) Create children accounts:: diff --git a/modules/account/tests/test_module.py b/modules/account/tests/test_module.py index 785a66bfc8..7998a1a778 100644 --- a/modules/account/tests/test_module.py +++ b/modules/account/tests/test_module.py @@ -31,7 +31,7 @@ def create_chart(company, tax=False, chart='account.account_template_root_en'): template = AccountTemplate(ModelData.get_id(module, xml_id)) if tax: tax_account = AccountTemplate(ModelData.get_id( - 'account', 'account_template_tax_en')) + 'account', 'account_template_6_3_4_en')) with Transaction().set_user(0): tax = TaxTemplate() tax.name = tax.description = '20% VAT' @@ -123,7 +123,6 @@ def close_fiscalyear(fiscalyear): Sequence = pool.get('ir.sequence') Journal = pool.get('account.journal') Period = pool.get('account.period') - AccountType = pool.get('account.account.type') Account = pool.get('account.account') Move = pool.get('account.move') FiscalYear = pool.get('account.fiscalyear') @@ -147,17 +146,9 @@ def close_fiscalyear(fiscalyear): 'fiscalyear': fiscalyear.id, 'type': 'adjustment', }]) - type_equity, = AccountType.search([ - ('name', '=', 'Equity'), + account_pl, = Account.search([ + ('code', '=', '3.2.1'), ]) - revenue, = Account.search([ - ('type.revenue', '=', True), - ]) - account_pl, = Account.create([{ - 'name': 'P&L', - 'type': type_equity.id, - 'parent': revenue.parent.id, - }]) session_id = BalanceNonDeferral.create()[0] balance_non_deferral = BalanceNonDeferral(session_id) @@ -201,7 +192,7 @@ class AccountTestCase( # Create an account and tax without template - cash, = Account.search([('name', '=', 'Main Cash')]) + cash, = Account.search([('code', '=', '1.1.1')]) Account.copy([cash.id]) tax, = Tax.search([]) @@ -402,18 +393,22 @@ class AccountTestCase( ]) revenue, = Account.search([ ('type.revenue', '=', True), - ]) + ('closed', '=', False), + ], limit=1) receivable, = Account.search([ ('type.receivable', '=', True), - ]) + ('closed', '=', False), + ], limit=1) expense, = Account.search([ ('type.expense', '=', True), - ]) + ('closed', '=', False), + ], limit=1) payable, = Account.search([ ('type.payable', '=', True), - ]) + ('closed', '=', False), + ], limit=1) cash, = Account.search([ - ('name', '=', 'Main Cash'), + ('code', '=', '1.1.1'), ]) cash_cur, = Account.copy([cash], default={ 'second_currency': sec_cur.id, @@ -604,10 +599,12 @@ class AccountTestCase( ]) revenue, = Account.search([ ('type.revenue', '=', True), - ]) + ('closed', '=', False), + ], limit=1) receivable, = Account.search([ ('type.receivable', '=', True), - ]) + ('closed', '=', False), + ], limit=1) Move.create([{ 'period': period.id, @@ -697,10 +694,12 @@ class AccountTestCase( ]) revenue, = Account.search([ ('type.revenue', '=', True), - ]) + ('closed', '=', False), + ], limit=1) receivable, = Account.search([ ('type.receivable', '=', True), - ]) + ('closed', '=', False), + ], limit=1) move = Move() move.period = period @@ -849,7 +848,7 @@ class AccountTestCase( create_chart(company) tax_account, = Account.search([ - ('name', '=', 'Main Tax'), + ('code', '=', '6.3.6'), ]) tax = Tax() tax.name = tax.description = 'Test' @@ -1036,7 +1035,7 @@ class AccountTestCase( create_chart(company) tax_account, = Account.search([ - ('name', '=', 'Main Tax'), + ('code', '=', '6.3.6'), ]) ecotax1 = Tax() ecotax1.name = ecotax1.description = 'EcoTax 1' @@ -1316,7 +1315,7 @@ class AccountTestCase( config.save() tax_account, = Account.search([ - ('name', '=', 'Main Tax'), + ('code', '=', '6.3.6'), ]) tax1 = Tax() @@ -1365,7 +1364,7 @@ class AccountTestCase( config.save() tax_account, = Account.search([ - ('name', '=', 'Main Tax'), + ('code', '=', '6.3.6'), ]) tax0 = Tax() @@ -1423,7 +1422,7 @@ class AccountTestCase( config.save() tax_account, = Account.search([ - ('name', '=', 'Main Tax'), + ('code', '=', '6.3.6'), ]) tax1 = Tax() @@ -1472,7 +1471,7 @@ class AccountTestCase( create_chart(company) tax_account, = Account.search([ - ('name', '=', 'Main Tax'), + ('code', '=', '6.3.6'), ]) tax1 = Tax() @@ -1539,16 +1538,20 @@ class AccountTestCase( ]) revenue, = Account.search([ ('type.revenue', '=', True), - ]) + ('closed', '=', False), + ], limit=1) receivable, = Account.search([ ('type.receivable', '=', True), - ]) + ('closed', '=', False), + ], limit=1) expense, = Account.search([ ('type.expense', '=', True), - ]) + ('closed', '=', False), + ], limit=1) payable, = Account.search([ ('type.payable', '=', True), - ]) + ('closed', '=', False), + ], limit=1) party, = Party.create([{ 'name': 'Receivable/Payable party', }]) @@ -1650,10 +1653,12 @@ class AccountTestCase( create_chart(company) receivable, = Account.search([ ('type.receivable', '=', True), - ]) + ('closed', '=', False), + ], limit=1) payable, = Account.search([ ('type.payable', '=', True), - ]) + ('closed', '=', False), + ], limit=1) party = Party(party.id) @@ -1801,7 +1806,9 @@ class AccountTestCase( for account in Account.search([]): self.assertEqual(account.name, account.template.name) self.assertEqual(account.code, account.template.code) - self.assertEqual(account.type.template, account.template.type) + self.assertEqual( + account.type.template if account.type else None, + account.template.type) self.assertEqual(account.reconcile, account.template.reconcile) self.assertEqual( account.start_date, account.template.start_date) @@ -1857,16 +1864,16 @@ class AccountTestCase( create_chart(company, True) with inactive_records(): - self.assertEqual(Type.search([], count=True), 16) - self.assertEqual(Account.search([], count=True), 7) + self.assertEqual(Type.search([], count=True), 46) + self.assertEqual(Account.search([], count=True), 135) self.assertEqual(Tax.search([], count=True), 1) check() with Transaction().set_user(0): root_type = TypeTemplate(ModelData.get_id( - 'account', 'account_type_template_minimal_en')) - root_type.name = 'Updated Minimal Chart' + 'account', 'account_type_template_root_en')) + root_type.name = "Updated " + root_type.name root_type.save() chart = AccountTemplate(ModelData.get_id( 'account', 'account_template_root_en')) @@ -1876,7 +1883,7 @@ class AccountTestCase( new_type.statement = 'balance' new_type.save() updated_tax_type, = TypeTemplate.search([ - ('name', '=', "Tax"), + ('name', '=', "Liabilities and assets for current tax"), ]) updated_tax_type.parent = updated_tax_type.parent.parent updated_tax_type.save() @@ -1889,18 +1896,19 @@ class AccountTestCase( updated_tax.name = 'VAT' updated_tax.invoice_account = new_account updated_tax.save() + # Can only change type which is compatible with previous parent updated_account = AccountTemplate(ModelData.get_id( - 'account', 'account_template_revenue_en')) + 'account', 'account_template_1_1_1_en')) updated_account.code = 'REV' updated_account.name = 'Updated Account' updated_account.parent = new_account - updated_account.type = new_account.type + updated_account.type = new_type updated_account.reconcile = True updated_account.end_date = datetime.date.today() updated_account.taxes = [updated_tax] updated_account.save() inactive_account = AccountTemplate(ModelData.get_id( - 'account', 'account_template_expense_en')) + 'account', 'account_template_5_1_1_en')) inactive_account.end_date = datetime.date.min inactive_account.replaced_by = new_account inactive_account.save() @@ -1929,8 +1937,8 @@ class AccountTestCase( update_chart.transition_update() with inactive_records(): - self.assertEqual(Type.search([], count=True), 17) - self.assertEqual(Account.search([], count=True), 8) + self.assertEqual(Type.search([], count=True), 47) + self.assertEqual(Account.search([], count=True), 136) self.assertEqual(Tax.search([], count=True), 2) check() @@ -2040,7 +2048,7 @@ class AccountTestCase( create_chart(company, tax=True) root, = Account.search([('parent', '=', None)]) - cash, = Account.search([('name', '=', 'Main Cash')]) + cash, = Account.search([('code', '=', '1.1.1')]) cash.template_override = True cash.end_date = datetime.date.min cash.save() @@ -2053,7 +2061,7 @@ class AccountTestCase( with inactive_records(): self.assertEqual( - Account.search([('name', '=', 'Main Cash')], count=True), + Account.search([('code', '=', '1.1.1')], count=True), 1) @with_transaction() @@ -2073,7 +2081,7 @@ class AccountTestCase( with Transaction().set_user(0): root_type_template = TypeTemplate(ModelData.get_id( - 'account', 'account_type_template_minimal_en')) + 'account', 'account_type_template_root_en')) type_template, = TypeTemplate.search([ ('parent', '!=', None), diff --git a/modules/account/tests/tools.py b/modules/account/tests/tools.py index a050a9d2c2..4d9b47ff56 100644 --- a/modules/account/tests/tools.py +++ b/modules/account/tests/tools.py @@ -76,6 +76,10 @@ def create_chart( create_chart.form.account_receivable = accounts['receivable'] if accounts['payable'].party_required: create_chart.form.account_payable = accounts['payable'] + if hasattr(create_chart.form, 'category_account_expense'): + create_chart.form.category_account_expense = accounts['expense'] + if hasattr(create_chart.form, 'category_account_revenue'): + create_chart.form.category_account_revenue = accounts['revenue'] create_chart.execute('create_properties') return create_chart @@ -100,16 +104,14 @@ def get_accounts(company=None, config=None): try: accounts['cash'], = Account.find([ ('company', '=', company.id), - ('name', '=', 'Main Cash'), - ('closed', '!=', True), + ('code', '=', '1.1.1'), ], limit=1) except ValueError: pass try: accounts['tax'], = Account.find([ ('company', '=', company.id), - ('name', '=', 'Main Tax'), - ('closed', '!=', True), + ('code', '=', '6.3.6'), ], limit=1) except ValueError: pass diff --git a/modules/account/tryton.cfg b/modules/account/tryton.cfg index 3bc9fc1df4..11bb5593a4 100644 --- a/modules/account/tryton.cfg +++ b/modules/account/tryton.cfg @@ -17,14 +17,5 @@ xml: move_template.xml tax.xml party.xml - minimal_chart_bg.xml - minimal_chart_ca.xml - minimal_chart_de.xml - minimal_chart_en.xml - minimal_chart_es.xml - minimal_chart_fr.xml - minimal_chart_nl.xml - minimal_chart_pt.xml - minimal_chart_ru.xml - minimal_chart_sl.xml + account_chart_en.xml message.xml diff --git a/modules/account_asset/account_chart.xml b/modules/account_asset/account_chart.xml new file mode 100644 index 0000000000..8e796abf0e --- /dev/null +++ b/modules/account_asset/account_chart.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/modules/account_asset/account_chart_en.xml b/modules/account_asset/account_chart_en.xml new file mode 100644 index 0000000000..660857a7b0 --- /dev/null +++ b/modules/account_asset/account_chart_en.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/modules/account_asset/minimal_chart.xml b/modules/account_asset/minimal_chart.xml deleted file mode 100644 index aab4d92cb9..0000000000 --- a/modules/account_asset/minimal_chart.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - Fixed Assets - дълготрайни активи - Actius fixos - Anlagevermögen - Activos fijos - Immobilisations - Vaste activa - Ativo permanente - Основные средства - Osnovna sredstva - - balance - - - - - - - Assets - Assets - Actius - Anlagen - Activos - Actifs - Assets - Ativos - Assets - Sredstva - - - - - - - Depreciation - Depreciation - Amortització - Abschreibung - Amortización - Amortissement - Depreciation - Depreciação - Depreciation - Amortizacija - - - - - - - diff --git a/modules/account_asset/minimal_chart_bg.xml b/modules/account_asset/minimal_chart_bg.xml deleted file mode 100644 index 2588903fa3..0000000000 --- a/modules/account_asset/minimal_chart_bg.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - дълготрайни активи - - - - - - - - - - balance - - - - - - - - Assets - - - - - - - - - - - - - - - - Depreciation - - - - - - - - - - - - - - - diff --git a/modules/account_asset/minimal_chart_ca.xml b/modules/account_asset/minimal_chart_ca.xml deleted file mode 100644 index 2607f90783..0000000000 --- a/modules/account_asset/minimal_chart_ca.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - Actius fixos - - - - - - - - - balance - - - - - - - - - Actius - - - - - - - - - - - - - - - - Amortització - - - - - - - - - - - - - - diff --git a/modules/account_asset/minimal_chart_de.xml b/modules/account_asset/minimal_chart_de.xml deleted file mode 100644 index dd4fcb67a4..0000000000 --- a/modules/account_asset/minimal_chart_de.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - Anlagevermögen - - - - - - - - balance - - - - - - - - - - Anlagen - - - - - - - - - - - - - - - - Abschreibung - - - - - - - - - - - - - diff --git a/modules/account_asset/minimal_chart_en.xml b/modules/account_asset/minimal_chart_en.xml deleted file mode 100644 index fd1bb56f84..0000000000 --- a/modules/account_asset/minimal_chart_en.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - Fixed Assets - - - - - - - - - - - balance - - - - - - - Assets - - - - - - - - - - - - - - - - Depreciation - - - - - - - - - - - - - - - - diff --git a/modules/account_asset/minimal_chart_es.xml b/modules/account_asset/minimal_chart_es.xml deleted file mode 100644 index 443264348f..0000000000 --- a/modules/account_asset/minimal_chart_es.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - Activos fijos - - - - - - - balance - - - - - - - - - - - Activos - - - - - - - - - - - - - - - - Amortización - - - - - - - - - - - - diff --git a/modules/account_asset/minimal_chart_fr.xml b/modules/account_asset/minimal_chart_fr.xml deleted file mode 100644 index 16a0273442..0000000000 --- a/modules/account_asset/minimal_chart_fr.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - Immobilisations - - - - - - balance - - - - - - - - - - - - Actifs - - - - - - - - - - - - - - - - Amortissement - - - - - - - - - - - diff --git a/modules/account_asset/minimal_chart_nl.xml b/modules/account_asset/minimal_chart_nl.xml deleted file mode 100644 index e0726d64a5..0000000000 --- a/modules/account_asset/minimal_chart_nl.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - Vaste activa - - - - - balance - - - - - - - - - - - - - Assets - - - - - - - - - - - - - - - - Depreciation - - - - - - - - - - diff --git a/modules/account_asset/minimal_chart_pt.xml b/modules/account_asset/minimal_chart_pt.xml deleted file mode 100644 index d8441281a5..0000000000 --- a/modules/account_asset/minimal_chart_pt.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - Ativo permanente - - - - balance - - - - - - - - - - - - - - Ativos - - - - - - - - - - - - - - - - Depreciação - - - - - - - - - diff --git a/modules/account_asset/minimal_chart_ru.xml b/modules/account_asset/minimal_chart_ru.xml deleted file mode 100644 index 3b9c2fcbad..0000000000 --- a/modules/account_asset/minimal_chart_ru.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - Основные средства - - - balance - - - - - - - - - - - - - - - Assets - - - - - - - - - - - - - - - - Depreciation - - - - - - - - diff --git a/modules/account_asset/minimal_chart_sl.xml b/modules/account_asset/minimal_chart_sl.xml deleted file mode 100644 index 77884a462d..0000000000 --- a/modules/account_asset/minimal_chart_sl.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - Osnovna sredstva - - balance - - - - - - - - - - - - - - - - Sredstva - - - - - - - - - - - - - - - - Amortizacija - - - - - - - diff --git a/modules/account_asset/tests/tools.py b/modules/account_asset/tests/tools.py index 649abbc95b..3e9bd63006 100644 --- a/modules/account_asset/tests/tools.py +++ b/modules/account_asset/tests/tools.py @@ -12,13 +12,11 @@ def add_asset_accounts(accounts, company=None, config=None): company = get_company(config=config) accounts['asset'], = Account.find([ - ('type.fixed_asset', '=', True), - ('name', '=', "Assets"), ('company', '=', company.id), + ('code', '=', '1.5.3'), ], limit=1) accounts['depreciation'], = Account.find([ - ('type.fixed_asset', '=', True), - ('name', '=', "Depreciation"), ('company', '=', company.id), + ('code', '=', '1.4.1'), ], limit=1) return accounts diff --git a/modules/account_asset/tryton.cfg b/modules/account_asset/tryton.cfg index 8d3a223b0f..9df9ce0bd3 100644 --- a/modules/account_asset/tryton.cfg +++ b/modules/account_asset/tryton.cfg @@ -14,14 +14,5 @@ xml: product.xml invoice.xml account.xml - minimal_chart_bg.xml - minimal_chart_ca.xml - minimal_chart_de.xml - minimal_chart_en.xml - minimal_chart_es.xml - minimal_chart_fr.xml - minimal_chart_nl.xml - minimal_chart_pt.xml - minimal_chart_ru.xml - minimal_chart_sl.xml + account_chart_en.xml message.xml diff --git a/modules/account_deposit/minimal_chart_sl.xml b/modules/account_deposit/account_chart.xml similarity index 54% rename from modules/account_deposit/minimal_chart_sl.xml rename to modules/account_deposit/account_chart.xml index 2d7d49d4b1..40c98d209e 100644 --- a/modules/account_deposit/minimal_chart_sl.xml +++ b/modules/account_deposit/account_chart.xml @@ -2,38 +2,20 @@ - - - - - - - - - - - - Polog - + + + Deposit + off-balance - - - - - - - - - - - Polog - + + Deposit + - + diff --git a/modules/account_deposit/minimal_chart_en.xml b/modules/account_deposit/account_chart_en.xml similarity index 81% rename from modules/account_deposit/minimal_chart_en.xml rename to modules/account_deposit/account_chart_en.xml index 02f4cb2a3f..ebee1f16c0 100644 --- a/modules/account_deposit/minimal_chart_en.xml +++ b/modules/account_deposit/account_chart_en.xml @@ -5,15 +5,6 @@ this repository contains the full copyright notices and license terms. --> Deposit - - - - - - - - - off-balance @@ -22,15 +13,6 @@ this repository contains the full copyright notices and license terms. --> Deposit - - - - - - - - - diff --git a/modules/account_deposit/minimal_chart.xml b/modules/account_deposit/minimal_chart.xml deleted file mode 100644 index 97648796df..0000000000 --- a/modules/account_deposit/minimal_chart.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - Deposit - депозит - Dipòsit - Anzahlung - Depósito - Dépôt - Afzetting - Depositar - депозит - Polog - - off-balance - - - - - - Deposit - депозит - Dipòsit - Anzahlung - Depósito - Dépôt - Afzetting - Depositar - депозит - Polog - - - - - - - diff --git a/modules/account_deposit/minimal_chart_bg.xml b/modules/account_deposit/minimal_chart_bg.xml deleted file mode 100644 index 04df67b806..0000000000 --- a/modules/account_deposit/minimal_chart_bg.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - депозит - - - - - - - - - - off-balance - - - - - - - депозит - - - - - - - - - - - - - - - diff --git a/modules/account_deposit/minimal_chart_ca.xml b/modules/account_deposit/minimal_chart_ca.xml deleted file mode 100644 index 983f95dddf..0000000000 --- a/modules/account_deposit/minimal_chart_ca.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - Dipòsit - - - - - - - - - off-balance - - - - - - - - Dipòsit - - - - - - - - - - - - - - diff --git a/modules/account_deposit/minimal_chart_de.xml b/modules/account_deposit/minimal_chart_de.xml deleted file mode 100644 index dec25afe21..0000000000 --- a/modules/account_deposit/minimal_chart_de.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - Anzahlung - - - - - - - - off-balance - - - - - - - - - Anzahlung - - - - - - - - - - - - - diff --git a/modules/account_deposit/minimal_chart_es.xml b/modules/account_deposit/minimal_chart_es.xml deleted file mode 100644 index fb870fd05a..0000000000 --- a/modules/account_deposit/minimal_chart_es.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - Depósito - - - - - - - off-balance - - - - - - - - - - Depósito - - - - - - - - - - - - diff --git a/modules/account_deposit/minimal_chart_fr.xml b/modules/account_deposit/minimal_chart_fr.xml deleted file mode 100644 index b2b683273e..0000000000 --- a/modules/account_deposit/minimal_chart_fr.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - Dépôt - - - - - - off-balance - - - - - - - - - - - Dépôt - - - - - - - - - - - diff --git a/modules/account_deposit/minimal_chart_nl.xml b/modules/account_deposit/minimal_chart_nl.xml deleted file mode 100644 index 5987886cce..0000000000 --- a/modules/account_deposit/minimal_chart_nl.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - Afzetting - - - - - off-balance - - - - - - - - - - - - Afzetting - - - - - - - - - - diff --git a/modules/account_deposit/minimal_chart_pt.xml b/modules/account_deposit/minimal_chart_pt.xml deleted file mode 100644 index d1567100bd..0000000000 --- a/modules/account_deposit/minimal_chart_pt.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - Depositar - - - - off-balance - - - - - - - - - - - - - Depositar - - - - - - - - - diff --git a/modules/account_deposit/minimal_chart_ru.xml b/modules/account_deposit/minimal_chart_ru.xml deleted file mode 100644 index 9592f4468d..0000000000 --- a/modules/account_deposit/minimal_chart_ru.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - депозит - - - off-balance - - - - - - - - - - - - - - депозит - - - - - - - - diff --git a/modules/account_deposit/tryton.cfg b/modules/account_deposit/tryton.cfg index 817bdb7b8a..122b773ab4 100644 --- a/modules/account_deposit/tryton.cfg +++ b/modules/account_deposit/tryton.cfg @@ -13,14 +13,5 @@ xml: account.xml invoice.xml party.xml - minimal_chart_bg.xml - minimal_chart_ca.xml - minimal_chart_de.xml - minimal_chart_en.xml - minimal_chart_es.xml - minimal_chart_fr.xml - minimal_chart_nl.xml - minimal_chart_pt.xml - minimal_chart_ru.xml - minimal_chart_sl.xml + account_chart_en.xml message.xml diff --git a/modules/account_invoice_defer/tests/tools.py b/modules/account_invoice_defer/tests/tools.py index 836b40f7dd..b531ce5026 100644 --- a/modules/account_invoice_defer/tests/tools.py +++ b/modules/account_invoice_defer/tests/tools.py @@ -19,12 +19,12 @@ def add_deferred_accounts(accounts, company=None, config=None): root, = Account.find([('parent', '=', None)], limit=1) asset_type, = AccountType.find([ ('statement', '=', 'balance'), - ('name', '=', "Asset"), + ('name', '=', "Current Assets"), ('company', '=', company.id), ], limit=1) liability_type, = AccountType.find([ ('statement', '=', 'balance'), - ('name', '=', "Liability"), + ('name', '=', "Liabilities"), ('company', '=', company.id), ], limit=1) diff --git a/modules/account_stock_anglo_saxon/minimal_chart.xml b/modules/account_stock_anglo_saxon/minimal_chart.xml deleted file mode 100644 index df51e6b23c..0000000000 --- a/modules/account_stock_anglo_saxon/minimal_chart.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - COGS - COGS - COGS - Kosten der verkauften Waren (COGS) - CMV - Prix du bien vendu - COGS - Custo das Mercadorias Vendidas (CMV) - COGS - COGS - - - - - - - - diff --git a/modules/account_stock_anglo_saxon/minimal_chart_bg.xml b/modules/account_stock_anglo_saxon/minimal_chart_bg.xml deleted file mode 100644 index 8404c0dd18..0000000000 --- a/modules/account_stock_anglo_saxon/minimal_chart_bg.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - COGS - - - - - - - - - - - - - - - diff --git a/modules/account_stock_anglo_saxon/minimal_chart_ca.xml b/modules/account_stock_anglo_saxon/minimal_chart_ca.xml deleted file mode 100644 index e7d9c85c50..0000000000 --- a/modules/account_stock_anglo_saxon/minimal_chart_ca.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - COGS - - - - - - - - - - - - - - diff --git a/modules/account_stock_anglo_saxon/minimal_chart_de.xml b/modules/account_stock_anglo_saxon/minimal_chart_de.xml deleted file mode 100644 index 916f188181..0000000000 --- a/modules/account_stock_anglo_saxon/minimal_chart_de.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - Kosten der verkauften Waren (COGS) - - - - - - - - - - - - - diff --git a/modules/account_stock_anglo_saxon/minimal_chart_en.xml b/modules/account_stock_anglo_saxon/minimal_chart_en.xml deleted file mode 100644 index 07a996bbd2..0000000000 --- a/modules/account_stock_anglo_saxon/minimal_chart_en.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - COGS - - - - - - - - - - - - - - - - diff --git a/modules/account_stock_anglo_saxon/minimal_chart_es.xml b/modules/account_stock_anglo_saxon/minimal_chart_es.xml deleted file mode 100644 index 61d68e25f5..0000000000 --- a/modules/account_stock_anglo_saxon/minimal_chart_es.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - CMV - - - - - - - - - - - - diff --git a/modules/account_stock_anglo_saxon/minimal_chart_fr.xml b/modules/account_stock_anglo_saxon/minimal_chart_fr.xml deleted file mode 100644 index 89dbf70ce1..0000000000 --- a/modules/account_stock_anglo_saxon/minimal_chart_fr.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - Prix du bien vendu - - - - - - - - - - - diff --git a/modules/account_stock_anglo_saxon/minimal_chart_nl.xml b/modules/account_stock_anglo_saxon/minimal_chart_nl.xml deleted file mode 100644 index f44c724274..0000000000 --- a/modules/account_stock_anglo_saxon/minimal_chart_nl.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - COGS - - - - - - - - - - diff --git a/modules/account_stock_anglo_saxon/minimal_chart_pt.xml b/modules/account_stock_anglo_saxon/minimal_chart_pt.xml deleted file mode 100644 index 35256315f0..0000000000 --- a/modules/account_stock_anglo_saxon/minimal_chart_pt.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - Custo das Mercadorias Vendidas (CMV) - - - - - - - - - diff --git a/modules/account_stock_anglo_saxon/minimal_chart_ru.xml b/modules/account_stock_anglo_saxon/minimal_chart_ru.xml deleted file mode 100644 index eb9a0f74b5..0000000000 --- a/modules/account_stock_anglo_saxon/minimal_chart_ru.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - COGS - - - - - - - - diff --git a/modules/account_stock_anglo_saxon/minimal_chart_sl.xml b/modules/account_stock_anglo_saxon/minimal_chart_sl.xml deleted file mode 100644 index 374c987fe3..0000000000 --- a/modules/account_stock_anglo_saxon/minimal_chart_sl.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - COGS - - - - - - - diff --git a/modules/account_stock_anglo_saxon/tests/tools.py b/modules/account_stock_anglo_saxon/tests/tools.py index 8df79f6bbe..3398fb6ea3 100644 --- a/modules/account_stock_anglo_saxon/tests/tools.py +++ b/modules/account_stock_anglo_saxon/tests/tools.py @@ -12,8 +12,7 @@ def add_cogs_accounts(accounts, company=None, config=None): company = get_company(config=config) accounts['cogs'], = Account.find([ - ('type.expense', '=', True), - ('id', '!=', accounts['expense'].id), ('company', '=', company.id), + ('code', '=', '5.1.1'), ]) return accounts diff --git a/modules/account_stock_anglo_saxon/tryton.cfg b/modules/account_stock_anglo_saxon/tryton.cfg index ad543654ac..c243fb808e 100644 --- a/modules/account_stock_anglo_saxon/tryton.cfg +++ b/modules/account_stock_anglo_saxon/tryton.cfg @@ -10,14 +10,4 @@ depends: res xml: product.xml - minimal_chart_bg.xml - minimal_chart_ca.xml - minimal_chart_de.xml - minimal_chart_en.xml - minimal_chart_es.xml - minimal_chart_fr.xml - minimal_chart_nl.xml - minimal_chart_pt.xml - minimal_chart_ru.xml - minimal_chart_sl.xml message.xml diff --git a/modules/account_stock_continental/minimal_chart.xml b/modules/account_stock_continental/minimal_chart.xml deleted file mode 100644 index c9de0e7321..0000000000 --- a/modules/account_stock_continental/minimal_chart.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - Inventories - Инвентаризации - Inventaris - Bestandskorrekturen - Inventarios - Inventaires - Inventories - Inventários - Инвентаризация - Popisi - - balance - - - - - - Stock - Наличност - Estoc - Lager - Existencias - Stock - Voorraad - Estoque - Хранилище - Zaloga - - - - - - Stock Expense - Разход на акции - Despeses de valors - Lagerkosten - Gastos de Stock - Variation des stocks - Voorraad - Despesa de estoque - Расходы на акции - Stroški zalog - - income - - - - - - Stock Expense - Разход на акции - Despeses d'existències - Lagerkosten - Gastos de existencias - Variation des stocks - Voorraad - Despesa de estoque - Расходы на акции - Stroški zalog - - - - - diff --git a/modules/account_stock_continental/minimal_chart_bg.xml b/modules/account_stock_continental/minimal_chart_bg.xml deleted file mode 100644 index 73ebf677f2..0000000000 --- a/modules/account_stock_continental/minimal_chart_bg.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - Инвентаризации - - - - - - - - - - balance - - - - - - - Наличност - - - - - - - - - - - - - - - Разход на акции - - - - - - - - - - income - - - - - - - Разход на акции - - - - - - - - - - - - - diff --git a/modules/account_stock_continental/minimal_chart_ca.xml b/modules/account_stock_continental/minimal_chart_ca.xml deleted file mode 100644 index 2062bc02e1..0000000000 --- a/modules/account_stock_continental/minimal_chart_ca.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - Inventaris - - - - - - - - - balance - - - - - - - - Estoc - - - - - - - - - - - - - - - Despeses de valors - - - - - - - - - income - - - - - - - - Despeses d'existències - - - - - - - - - - - - diff --git a/modules/account_stock_continental/minimal_chart_de.xml b/modules/account_stock_continental/minimal_chart_de.xml deleted file mode 100644 index 17a7ad987f..0000000000 --- a/modules/account_stock_continental/minimal_chart_de.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - Bestandskorrekturen - - - - - - - - balance - - - - - - - - - Lager - - - - - - - - - - - - - - - Lagerkosten - - - - - - - - income - - - - - - - - - Lagerkosten - - - - - - - - - - - diff --git a/modules/account_stock_continental/minimal_chart_en.xml b/modules/account_stock_continental/minimal_chart_en.xml deleted file mode 100644 index d25f595bcf..0000000000 --- a/modules/account_stock_continental/minimal_chart_en.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - Inventories - - - - - - - - - - - balance - - - - - - Stock - - - - - - - - - - - - - - - Stock Expense - - - - - - - - - - - income - - - - - - Stock Expense - - - - - - - - - - - - - - diff --git a/modules/account_stock_continental/minimal_chart_es.xml b/modules/account_stock_continental/minimal_chart_es.xml deleted file mode 100644 index 6481e98a34..0000000000 --- a/modules/account_stock_continental/minimal_chart_es.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - Inventarios - - - - - - - balance - - - - - - - - - - Existencias - - - - - - - - - - - - - - - Gastos de Stock - - - - - - - income - - - - - - - - - - Gastos de existencias - - - - - - - - - - diff --git a/modules/account_stock_continental/minimal_chart_fr.xml b/modules/account_stock_continental/minimal_chart_fr.xml deleted file mode 100644 index 3a95fb6a71..0000000000 --- a/modules/account_stock_continental/minimal_chart_fr.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - Inventaires - - - - - - balance - - - - - - - - - - - Stock - - - - - - - - - - - - - - - Variation des stocks - - - - - - income - - - - - - - - - - - Variation des stocks - - - - - - - - - diff --git a/modules/account_stock_continental/minimal_chart_nl.xml b/modules/account_stock_continental/minimal_chart_nl.xml deleted file mode 100644 index cdcc011eb9..0000000000 --- a/modules/account_stock_continental/minimal_chart_nl.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - Inventories - - - - - balance - - - - - - - - - - - - Voorraad - - - - - - - - - - - - - - - Voorraad - - - - - income - - - - - - - - - - - - Voorraad - - - - - - - - diff --git a/modules/account_stock_continental/minimal_chart_pt.xml b/modules/account_stock_continental/minimal_chart_pt.xml deleted file mode 100644 index 7b9ccd009c..0000000000 --- a/modules/account_stock_continental/minimal_chart_pt.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - Inventários - - - - balance - - - - - - - - - - - - - Estoque - - - - - - - - - - - - - - - Despesa de estoque - - - - income - - - - - - - - - - - - - Despesa de estoque - - - - - - - diff --git a/modules/account_stock_continental/minimal_chart_ru.xml b/modules/account_stock_continental/minimal_chart_ru.xml deleted file mode 100644 index cf06babcd9..0000000000 --- a/modules/account_stock_continental/minimal_chart_ru.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - Инвентаризация - - - balance - - - - - - - - - - - - - - Хранилище - - - - - - - - - - - - - - - Расходы на акции - - - income - - - - - - - - - - - - - - Расходы на акции - - - - - - diff --git a/modules/account_stock_continental/minimal_chart_sl.xml b/modules/account_stock_continental/minimal_chart_sl.xml deleted file mode 100644 index be30f7ff12..0000000000 --- a/modules/account_stock_continental/minimal_chart_sl.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - Popisi - - balance - - - - - - - - - - - - - - - Zaloga - - - - - - - - - - - - - - - Stroški zalog - - income - - - - - - - - - - - - - - - Stroški zalog - - - - - diff --git a/modules/account_stock_continental/tests/tools.py b/modules/account_stock_continental/tests/tools.py index c2aacc29e2..f918211e16 100644 --- a/modules/account_stock_continental/tests/tools.py +++ b/modules/account_stock_continental/tests/tools.py @@ -11,11 +11,12 @@ def add_stock_accounts(accounts, company=None, config=None): if not company: company = get_company(config=config) - stock_accounts = Account.find([ - ('type.stock', '=', True), + accounts['stock'], = Account.find([ ('company', '=', company.id), + ('code', '=', '1.3.1'), + ]) + accounts['stock_expense'], = Account.find([ + ('company', '=', company.id), + ('code', '=', '5.1.5'), ]) - for account in stock_accounts: - name = account.name.lower().replace(' and ', '_').replace(' ', '_') - accounts[name] = account return accounts diff --git a/modules/account_stock_continental/tryton.cfg b/modules/account_stock_continental/tryton.cfg index 143260ca65..fbbabb3b9f 100644 --- a/modules/account_stock_continental/tryton.cfg +++ b/modules/account_stock_continental/tryton.cfg @@ -9,13 +9,3 @@ depends: xml: product.xml account.xml - minimal_chart_bg.xml - minimal_chart_ca.xml - minimal_chart_de.xml - minimal_chart_en.xml - minimal_chart_es.xml - minimal_chart_fr.xml - minimal_chart_nl.xml - minimal_chart_pt.xml - minimal_chart_ru.xml - minimal_chart_sl.xml diff --git a/modules/purchase/tests/test_module.py b/modules/purchase/tests/test_module.py index 6d0c6d75c7..80dbcb4302 100644 --- a/modules/purchase/tests/test_module.py +++ b/modules/purchase/tests/test_module.py @@ -34,13 +34,17 @@ class PurchaseTestCase( create_chart(company) receivable, = Account.search([ + ('closed', '!=', True), ('type.receivable', '=', True), + ('party_required', '=', True), ('company', '=', company.id), - ]) + ], limit=1) payable, = Account.search([ + ('closed', '!=', True), ('type.payable', '=', True), + ('party_required', '=', True), ('company', '=', company.id), - ]) + ], limit=1) kg, = Uom.search([('name', '=', 'Kilogram')]) g, = Uom.search([('name', '=', 'Gram')]) diff --git a/modules/sale/tests/test_module.py b/modules/sale/tests/test_module.py index c057c003dc..631757fe75 100644 --- a/modules/sale/tests/test_module.py +++ b/modules/sale/tests/test_module.py @@ -29,13 +29,17 @@ class SaleTestCase( create_chart(company) receivable, = Account.search([ + ('closed', '!=', True), ('type.receivable', '=', True), + ('party_required', '=', True), ('company', '=', company.id), - ]) + ], limit=1) payable, = Account.search([ + ('closed', '!=', True), ('type.payable', '=', True), + ('party_required', '=', True), ('company', '=', company.id), - ]) + ], limit=1) kg, = Uom.search([('name', '=', 'Kilogram')]) g, = Uom.search([('name', '=', 'Gram')]) diff --git a/modules/sale_advance_payment/account_chart.xml b/modules/sale_advance_payment/account_chart.xml new file mode 100644 index 0000000000..51be5cacf1 --- /dev/null +++ b/modules/sale_advance_payment/account_chart.xml @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/modules/sale_advance_payment/account_chart_en.xml b/modules/sale_advance_payment/account_chart_en.xml new file mode 100644 index 0000000000..5662d27f05 --- /dev/null +++ b/modules/sale_advance_payment/account_chart_en.xml @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/modules/sale_advance_payment/minimal_chart.xml b/modules/sale_advance_payment/minimal_chart.xml deleted file mode 100644 index af96040b3f..0000000000 --- a/modules/sale_advance_payment/minimal_chart.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - Unearned Revenue - Неотработен доход - Ingressos no consumits - Nicht verdiente Einnahmen - Ingresos no ganados - Produits constatés d'avance - Onverdiende inkomsten - Receita não recebida - Нетрудовые доходы - Nezasluženi prihodki - - balance - - - - - - Advance Payment - Авансово плащане - Pagament avançat - Vorauszahlung - Pago por adelantado - Acompte - Vooruitbetaling - Pagamento adiantado - Предоплата - Plačilo vnaprej - - - - - diff --git a/modules/sale_advance_payment/minimal_chart_bg.xml b/modules/sale_advance_payment/minimal_chart_bg.xml deleted file mode 100644 index 9b2908f057..0000000000 --- a/modules/sale_advance_payment/minimal_chart_bg.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - Неотработен доход - - - - - - - - - - balance - - - - - - - Авансово плащане - - - - - - - - - - - - - diff --git a/modules/sale_advance_payment/minimal_chart_ca.xml b/modules/sale_advance_payment/minimal_chart_ca.xml deleted file mode 100644 index e878493edf..0000000000 --- a/modules/sale_advance_payment/minimal_chart_ca.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - Ingressos no consumits - - - - - - - - - balance - - - - - - - - Pagament avançat - - - - - - - - - - - - diff --git a/modules/sale_advance_payment/minimal_chart_de.xml b/modules/sale_advance_payment/minimal_chart_de.xml deleted file mode 100644 index d9ac56c9e2..0000000000 --- a/modules/sale_advance_payment/minimal_chart_de.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - Nicht verdiente Einnahmen - - - - - - - - balance - - - - - - - - - Vorauszahlung - - - - - - - - - - - diff --git a/modules/sale_advance_payment/minimal_chart_en.xml b/modules/sale_advance_payment/minimal_chart_en.xml deleted file mode 100644 index 682c4512bf..0000000000 --- a/modules/sale_advance_payment/minimal_chart_en.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - Unearned Revenue - - - - - - - - - - - balance - - - - - - Advance Payment - - - - - - - - - - - - - - diff --git a/modules/sale_advance_payment/minimal_chart_es.xml b/modules/sale_advance_payment/minimal_chart_es.xml deleted file mode 100644 index 21cd81973d..0000000000 --- a/modules/sale_advance_payment/minimal_chart_es.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - Ingresos no ganados - - - - - - - balance - - - - - - - - - - Pago por adelantado - - - - - - - - - - diff --git a/modules/sale_advance_payment/minimal_chart_fr.xml b/modules/sale_advance_payment/minimal_chart_fr.xml deleted file mode 100644 index 844e775da9..0000000000 --- a/modules/sale_advance_payment/minimal_chart_fr.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - Produits constatés d'avance - - - - - - balance - - - - - - - - - - - Acompte - - - - - - - - - diff --git a/modules/sale_advance_payment/minimal_chart_nl.xml b/modules/sale_advance_payment/minimal_chart_nl.xml deleted file mode 100644 index 536658f6d2..0000000000 --- a/modules/sale_advance_payment/minimal_chart_nl.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - Onverdiende inkomsten - - - - - balance - - - - - - - - - - - - Vooruitbetaling - - - - - - - - diff --git a/modules/sale_advance_payment/minimal_chart_pt.xml b/modules/sale_advance_payment/minimal_chart_pt.xml deleted file mode 100644 index 92c6ff7f68..0000000000 --- a/modules/sale_advance_payment/minimal_chart_pt.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - Receita não recebida - - - - balance - - - - - - - - - - - - - Pagamento adiantado - - - - - - - diff --git a/modules/sale_advance_payment/minimal_chart_ru.xml b/modules/sale_advance_payment/minimal_chart_ru.xml deleted file mode 100644 index de79c15807..0000000000 --- a/modules/sale_advance_payment/minimal_chart_ru.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - Нетрудовые доходы - - - balance - - - - - - - - - - - - - - Предоплата - - - - - - diff --git a/modules/sale_advance_payment/minimal_chart_sl.xml b/modules/sale_advance_payment/minimal_chart_sl.xml deleted file mode 100644 index 7aba54481c..0000000000 --- a/modules/sale_advance_payment/minimal_chart_sl.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - Nezasluženi prihodki - - balance - - - - - - - - - - - - - - - Plačilo vnaprej - - - - - diff --git a/modules/sale_advance_payment/tests/tools.py b/modules/sale_advance_payment/tests/tools.py index 2707c5d81f..9ba1782cd5 100644 --- a/modules/sale_advance_payment/tests/tools.py +++ b/modules/sale_advance_payment/tests/tools.py @@ -32,7 +32,7 @@ def add_advance_payment_accounts(accounts, company=None, config=None): company = get_company(config=config) accounts['advance_payment'], = Account.find([ - ('type.unearned_revenue', '=', True), ('company', '=', company.id), - ], limit=1) + ('code', '=', '2.2.2'), + ]) return accounts diff --git a/modules/sale_advance_payment/tryton.cfg b/modules/sale_advance_payment/tryton.cfg index 21e523c0eb..98befc505d 100644 --- a/modules/sale_advance_payment/tryton.cfg +++ b/modules/sale_advance_payment/tryton.cfg @@ -12,14 +12,5 @@ extras_depend: xml: sale.xml account.xml - minimal_chart_bg.xml - minimal_chart_ca.xml - minimal_chart_de.xml - minimal_chart_en.xml - minimal_chart_es.xml - minimal_chart_fr.xml - minimal_chart_nl.xml - minimal_chart_pt.xml - minimal_chart_ru.xml - minimal_chart_sl.xml + account_chart_en.xml message.xml diff --git a/modules/sale_credit_limit/tests/test_module.py b/modules/sale_credit_limit/tests/test_module.py index aa4ecef8aa..947b240550 100644 --- a/modules/sale_credit_limit/tests/test_module.py +++ b/modules/sale_credit_limit/tests/test_module.py @@ -39,11 +39,16 @@ class SaleCreditLimitTestCase(CompanyTestMixin, ModuleTestCase): period = fiscalyear.periods[0] receivable, = Account.search([ + ('closed', '!=', True), ('type.receivable', '=', True), - ]) + ('party_required', '=', True), + ('company', '=', company.id), + ], limit=1) revenue, = Account.search([ + ('closed', '!=', True), ('type.revenue', '=', True), - ]) + ('company', '=', company.id), + ], limit=1) journal, = Journal.search([], limit=1) party, = Party.create([{ 'name': 'Party', diff --git a/modules/stock_supply/tests/test_module.py b/modules/stock_supply/tests/test_module.py index 4767ed27a1..7c7d6955b3 100644 --- a/modules/stock_supply/tests/test_module.py +++ b/modules/stock_supply/tests/test_module.py @@ -93,13 +93,17 @@ class StockSupplyTestCase(CompanyTestMixin, ModuleTestCase): with set_company(company): create_chart(company) receivable, = Account.search([ + ('closed', '!=', True), ('type.receivable', '=', True), + ('party_required', '=', True), ('company', '=', company.id), - ]) + ], limit=1) payable, = Account.search([ + ('closed', '!=', True), ('type.payable', '=', True), + ('party_required', '=', True), ('company', '=', company.id), - ]) + ], limit=1) supplier, = Party.create([{ 'name': 'supplier', 'account_receivable': receivable.id, diff --git a/modules/stock_supply_day/tests/test_module.py b/modules/stock_supply_day/tests/test_module.py index 7bd8742014..2b2d007d37 100644 --- a/modules/stock_supply_day/tests/test_module.py +++ b/modules/stock_supply_day/tests/test_module.py @@ -124,13 +124,17 @@ class StockSupplyDayTestCase(CompanyTestMixin, ModuleTestCase): with set_company(company): create_chart(company) receivable, = Account.search([ + ('closed', '!=', True), ('type.receivable', '=', True), + ('party_required', '=', True), ('company', '=', company.id), - ]) + ], limit=1) payable, = Account.search([ + ('closed', '!=', True), ('type.payable', '=', True), + ('party_required', '=', True), ('company', '=', company.id), - ]) + ], limit=1) supplier, = Party.create([{ 'name': 'supplier', 'account_receivable': receivable.id, diff --git a/modules/web_shop_product_data_feed/tests/test_module.py b/modules/web_shop_product_data_feed/tests/test_module.py index 8809cbb5c3..9d685f5624 100644 --- a/modules/web_shop_product_data_feed/tests/test_module.py +++ b/modules/web_shop_product_data_feed/tests/test_module.py @@ -54,7 +54,7 @@ class WebShopProductDataFeedTestCase(ModuleTestCase): create_chart(company) tax_account, = Account.search([ - ('name', '=', 'Main Tax'), + ('code', '=', '6.3.4'), ]) tax = Tax()