diff --git a/_static/chart-of-accounts.js b/_static/chart-of-accounts.js index b4a42dd2e..c29ba430d 100644 --- a/_static/chart-of-accounts.js +++ b/_static/chart-of-accounts.js @@ -222,7 +222,7 @@ {account: EQUITY.CAPITAL.code, credit: constant(1000)} ] }, { - label: "Customer Invoice ($100 + 9% tax)", + label: "Customer Invoice ($100 + 9% tax) & Shipping of the Goods", operations: [ {account: ASSETS.ACCOUNTS_RECEIVABLE.code, debit: constant(total)}, {account: EXPENSES.GOODS_SOLD.code, debit: constant(cor)}, @@ -265,20 +265,20 @@ }} ] }, { - label: "Supplier Goods Received (Purchase Order: $50)", + label: "Vendor Goods Received (Purchase Order: $50)", operations: [ {account: LIABILITIES.STOCK_IN.code, credit: constant(cor)}, {account: ASSETS.STOCK.code, debit: constant(cor)}, ] }, { - label: "Supplier Bill (Invoice: $50)", + label: "Vendor Bill (Invoice: $50)", operations: [ {account: LIABILITIES.STOCK_IN.code, debit: constant(cor)}, {account: ASSETS.TAXES_PAID.code, debit: constant(cor_tax)}, {account: LIABILITIES.ACCOUNTS_PAYABLE.code, credit: constant(cor + cor_tax)}, ] }, { - label: "Supplier Bill (Invoice: $52 but PO $50)", + label: "Vendor Bill (Invoice: $52 but PO $50)", operations: [ {account: EXPENSES.PRICE_DIFFERENCE.code, debit: constant(purchase-cor)}, {account: LIABILITIES.STOCK_IN.code, debit: constant(cor)}, @@ -286,7 +286,7 @@ {account: LIABILITIES.ACCOUNTS_PAYABLE.code, credit: constant(purchase + purchase_tax)}, ] }, { - label: "Supplier Bill Paid ($52 + 9% tax)", + label: "Vendor Bill Paid ($52 + 9% tax)", operations: [ {account: LIABILITIES.ACCOUNTS_PAYABLE.code, debit: constant(purchase + purchase_tax)}, {account: ASSETS.BANK.code, credit: constant(purchase + purchase_tax)} diff --git a/_static/coa-valuation-anglo-saxon.js b/_static/coa-valuation-anglo-saxon.js index 7d086b66c..bf781f3c9 100644 --- a/_static/coa-valuation-anglo-saxon.js +++ b/_static/coa-valuation-anglo-saxon.js @@ -211,7 +211,7 @@ purchase = 52, purchase_tax = 52 * 0.09; var operations = Immutable.fromJS([{ - label: "Supplier Invoice (PO $50, Invoice $40)", + label: "Vendor Bill (PO $50, Invoice $50)", operations: [ {account: LIABILITIES.STOCK_IN.code, debit: constant(50)}, {account: ASSETS.TAXES_PAID.code, debit: constant(50 * 0.09)}, @@ -224,7 +224,7 @@ {account: ASSETS.STOCK.code, debit: constant(50)}, ] }, { - label: "Supplier Invoice (PO $48, Invoice $50)", + label: "Vendor Bill (PO $48, Invoice $50)", operations: [ {account: EXPENSES.PRICE_DIFFERENCE.code, debit: constant(2)}, {account: LIABILITIES.STOCK_IN.code, debit: constant(48)}, diff --git a/_static/coa-valuation-continental.js b/_static/coa-valuation-continental.js index 7f1cd4343..6fc66f09f 100644 --- a/_static/coa-valuation-continental.js +++ b/_static/coa-valuation-continental.js @@ -239,9 +239,7 @@ label: "Customer Invoice (€100 + 9% tax)", operations: [ {account: ASSETS.ACCOUNTS_RECEIVABLE.code, debit: constant(total)}, - {account: EXPENSES.PURCHASED_GOODS.code, debit: constant(cor)}, {account: REVENUE.SALES.code, credit: constant(sale)}, - {account: EXPENSES.INVENTORY_VARIATIONS.code, credit: constant(cor)}, {account: LIABILITIES.TAXES_PAYABLE.code, credit: constant(tax)} ] }, { diff --git a/_static/coa-valuation.js b/_static/coa-valuation.js index ad523f9b8..1413b4af0 100644 --- a/_static/coa-valuation.js +++ b/_static/coa-valuation.js @@ -211,20 +211,20 @@ purchase = 52, purchase_tax = 52 * 0.09; var operations = Immutable.fromJS([{ - label: "Supplier Invoice (PO $50, Invoice $40)", + label: "Vendor Bill (PO $50, Invoice $40)", operations: [ {account: LIABILITIES.STOCK_IN.code, debit: constant(50)}, {account: ASSETS.TAXES_PAID.code, debit: constant(50 * 0.09)}, {account: LIABILITIES.ACCOUNTS_PAYABLE.code, credit: constant(50 * 1.09)}, ] }, { - label: "Supplier Goods Reception (PO $50, Invoice $50)", + label: "Vendor Goods Reception (PO $50, Invoice $50)", operations: [ {account: LIABILITIES.STOCK_IN.code, credit: constant(50)}, {account: ASSETS.STOCK.code, debit: constant(50)}, ] }, { - label: "Supplier Invoice (PO $48, Invoice $50)", + label: "Vendor Bill (PO $48, Invoice $50)", operations: [ {account: EXPENSES.PRICE_DIFFERENCE.code, debit: constant(2)}, {account: LIABILITIES.STOCK_IN.code, debit: constant(48)}, @@ -232,7 +232,7 @@ {account: LIABILITIES.ACCOUNTS_PAYABLE.code, credit: constant(50 * 1.09)}, ] }, { - label: "Supplier Goods Reception (PO $48, Invoice $50)", + label: "Vendor Goods Reception (PO $48, Invoice $50)", operations: [ {account: LIABILITIES.STOCK_IN.code, credit: constant(48)}, {account: ASSETS.STOCK.code, debit: constant(48)}, diff --git a/business.rst b/business.rst index 4847aa345..8d8205c41 100644 --- a/business.rst +++ b/business.rst @@ -3,7 +3,7 @@ Business Mementoes ================== .. toctree:: - - Accounting Memento (US GAAP) - Double-Entry Inventory - Inventory Valuations + Accounting Memento (US GAAP) + Double-Entry Inventory + Inventory Valuation (Continental Accounting) + Inventory Valuation (Anglo-Saxon Accounting) diff --git a/conf.py b/conf.py index 3387b2494..39a7ee556 100644 --- a/conf.py +++ b/conf.py @@ -288,9 +288,10 @@ texinfo_documents = [ #texinfo_no_detailmenu = False odoo_cover_external = { - 'https://odoo.com/documentation/functional/accounting.html' : 'banners/m_accounting.jpg', - 'https://odoo.com/documentation/functional/double-entry.html' : 'banners/m_1.jpg', - 'https://odoo.com/documentation/functional/valuation.html' : 'banners/m_2.jpg', + 'https://odoo.com/documentation/user/accounting/overview/main_concepts/memento.html' : 'banners/m_accounting.jpg', + 'https://odoo.com/documentation/user/inventory/overview/concepts/double-entry.html' : 'banners/m_1.jpg', + 'https://odoo.com/documentation/user/inventory/management/reporting/valuation_methods_continental.html' : 'banners/m_2.jpg', + 'https://odoo.com/documentation/user/inventory/management/reporting/valuation_methods_anglo_saxon.html' : 'banners/m_2.jpg', } github_user = 'odoo' diff --git a/inventory/management/reporting/valuation_methods_anglo_saxon.rst b/inventory/management/reporting/valuation_methods_anglo_saxon.rst index 6a1f25b63..90f4735ed 100644 --- a/inventory/management/reporting/valuation_methods_anglo_saxon.rst +++ b/inventory/management/reporting/valuation_methods_anglo_saxon.rst @@ -344,9 +344,12 @@ Let's take the case of a reseller. - Deferred Tax Assets/Liabilities: defined on the tax used on the invoice line - - Revenues/Expenses: defined by default on product's internal category - and can be set in product form (Accounting tab) as a specific replacement - value + - Revenues: defined on the product category as a default, or specifically + to a specific product. + + - Expenses: this is where you should set the "Cost of Goods Sold" account. + Defined on the product category as a default value, or specifically on + the product form. - Goods Received Not Purchased: to set as Stock Input Account in product's internal category