8000 [FIX] mementoes: Fix some terms/computation/links · Ark74/documentation-user@febd07c · GitHub
[go: up one dir, main page]
8000 Skip to content

Commit febd07c

Browse files
tivissetivisse
committed
[FIX] mementoes: Fix some terms/computation/links
1 parent ffde28a commit febd07c

File tree

7 files changed

+25
-23
lines changed

7 files changed

+25
-23
lines changed

‎_static/chart-of-accounts.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222
{account: EQUITY.CAPITAL.code, credit: constant(1000)}
223223
]
224224
}, {
225-
label: "Customer Invoice ($100 + 9% tax)",
225+
label: "Customer Invoice ($100 + 9% tax) & Shipping of the Goods",
226226
operations: [
227227
{account: ASSETS.ACCOUNTS_RECEIVABLE.code, debit: constant(total)},
228228
{account: EXPENSES.GOODS_SOLD.code, debit: constant(cor)},
@@ -265,28 +265,28 @@
265265
}}
266266
]
267267
}, {
268-
label: "Supplier Good 8000 s Received (Purchase Order: $50)",
268+
label: "Vendor Goods Received (Purchase Order: $50)",
269269
operations: [
270270
{account: LIABILITIES.STOCK_IN.code, credit: constant(cor)},
271271
{account: ASSETS.STOCK.code, debit: constant(cor)},
272272
]
273273
}, {
274-
label: "Supplier Bill (Invoice: $50)",
274+
label: "Vendor Bill (Invoice: $50)",
275275
operations: [
276276
{account: LIABILITIES.STOCK_IN.code, debit: constant(cor)},
277277
{account: ASSETS.TAXES_PAID.code, debit: constant(cor_tax)},
278278
{account: LIABILITIES.ACCOUNTS_PAYABLE.code, credit: constant(cor + cor_tax)},
279279
]
280280
}, {
281-
label: "Supplier Bill (Invoice: $52 but PO $50)",
281+
label: "Vendor Bill (Invoice: $52 but PO $50)",
282282
operations: [
283283
{account: EXPENSES.PRICE_DIFFERENCE.code, debit: constant(purchase-cor)},
284284
{account: LIABILITIES.STOCK_IN.code, debit: constant(cor)},
285285
{account: ASSETS.TAXES_PAID.code, debit: constant(purchase_tax)},
286286
{account: LIABILITIES.ACCOUNTS_PAYABLE.code, credit: constant(purchase + purchase_tax)},
287287
]
288288
}, {
289-
label: "Supplier Bill Paid ($52 + 9% tax)",
289+
label: "Vendor Bill Paid ($52 + 9% tax)",
290290
operations: [
291291
{account: LIABILITIES.ACCOUNTS_PAYABLE.code, debit: constant(purchase + purchase_tax)},
292292
{account: ASSETS.BANK.code, credit: constant(purchase + purchase_tax)}

‎_static/coa-valuation-anglo-saxon.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
purchase = 52,
212212
purchase_tax = 52 * 0.09;
213213
var operations = Immutable.fromJS([{
214-
label: "Supplier Invoice (PO $50, Invoice $40)",
214+
label: "Vendor Bill (PO $50, Invoice $50)",
215215
operations: [
216216
{account: LIABILITIES.STOCK_IN.code, debit: constant(50)},
217217
{account: ASSETS.TAXES_PAID.code, debit: constant(50 * 0.09)},
@@ -224,7 +224,7 @@
224224
{account: ASSETS.STOCK.code, debit: constant(50)},
225225
]
226226
}, {
227-
label: "Supplier Invoice (PO $48, Invoice $50)",
227+
label: "Vendor Bill (PO $48, Invoice $50)",
228228
operations: [
229229
{account: EXPENSES.PRICE_DIFFERENCE.code, debit: constant(2)},
230230
{account: LIABILITIES.STOCK_IN.code, debit: constant(48)},

‎_static/coa-valuation-continental.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,7 @@
239239
label: "Customer Invoice (€100 + 9% tax)",
240240
operations: [
241241
{account: ASSETS.ACCOUNTS_RECEIVABLE.code, debit: constant(total)},
242-
{account: EXPENSES.PURCHASED_GOODS.code, debit: constant(cor)},
243242
{account: REVENUE.SALES.code, credit: constant(sale)},
244-
{account: EXPENSES.INVENTORY_VARIATIONS.code, credit: constant(cor)},
245243
{account: LIABILITIES.TAXES_PAYABLE.code, credit: constant(tax)}
246244
]
247245
}, {

‎_static/coa-valuation.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,28 +211,28 @@
211211
purchase = 52,
212212
purchase_tax = 52 * 0.09;
213213
var operations = Immutable.fromJS([{
214-
label: "Supplier Invoice (PO $50, Invoice $40)",
214+
label: "Vendor Bill (PO $50, Invoice $40)",
215215
operations: [
216216
{account: LIABILITIES.STOCK_IN.code, debit: constant(50)},
217217
{account: ASSETS.TAXES_PAID.code, debit: constant(50 * 0.09)},
218218
{account: LIABILITIES.ACCOUNTS_PAYABLE.code, credit: constant(50 * 1.09)},
219219
]
220220
}, {
221-
label: "Supplier Goods Reception (PO $50, Invoice $50)",
221+
label: "Vendor Goods Reception (PO $50, Invoice $50)",
222222
operations: [
223223
{account: LIABILITIES.STOCK_IN.code, credit: constant(50)},
224224
{account: ASSETS.STOCK.code, debit: constant(50)},
225225
]
226226
}, {
227-
label: "Supplier Invoice (PO $48, Invoice $50)",
227+
label: "Vendor Bill (PO $48, Invoice $50)",
228228
operations: [
229229
{account: EXPENSES.PRICE_DIFFERENCE.code, debit: constant(2)},
230230
{account: LIABILITIES.STOCK_IN.code, debit: constant(48)},
231231
{account: ASSETS.TAXES_PAID.code, debit: constant(50 * 0.09)},
232232
{account: LIABILITIES.ACCOUNTS_PAYABLE.code, credit: constant(50 * 1.09)},
233233
]
234234
}, {
235-
label: "Supplier Goods Reception (PO $48, Invoice $50)",
235+
label: "Vendor Goods Reception (PO $48, Invoice $50)",
236236
operations: [
237237
{account: LIABILITIES.STOCK_IN.code, credit: constant(48)},
238238
{account: ASSETS.STOCK.code, debit: constant(48)},

‎business.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Business Mementoes
33
==================
44

55
.. toctree::
6-
7-
Accounting Memento (US GAAP) <https://odoo.com/documentation/functional/accounting.html>
8-
Double-Entry Inventory <https://odoo.com/documentation/functional/double-entry.html>
9-
Inventory Valuations <https://odoo.com/documentation/functional/valuation.html>
6+
Accounting Memento (US GAAP) <https://odoo.com/documentation/user/accounting/overview/main_concepts/memento.html>
7+
Double-Entry Inventory <https://odoo.com/documentation/user/inventory/overview/concepts/double-entry.html>
8+
Inventory Valuation (Continental Accounting) <https://odoo.com/documentation/user/inventory/management/reporting/valuation_methods_continental.html>
9+
Inventory Valuation (Anglo-Saxon Accounting) <https://odoo.com/documentation/user/inventory/management/reporting/valuation_methods_anglo_saxon.html>

‎conf.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,10 @@
288288
#texinfo_no_detailmenu = False
289289

290290
odoo_cover_external = {
291-
'https://odoo.com/documentation/functional/accounting.html' : 'banners/m_accounting.jpg',
292-
'https://odoo.com/documentation/functional/double-entry.html' : 'banners/m_1.jpg',
293-
'https://odoo.com/documentation/functional/valuation.html' : 'banners/m_2.jpg',
291+
'https://odoo.com/documentation/user/accounting/overview/main_concepts/memento.html' : 'banners/m_accounting.jpg',
292+
'https://odoo.com/documentation/user/inventory/overview/concepts/double-entry.html' : 'banners/m_1.jpg',
293+
'https://odoo.com/documentation/user/inventory/management/reporting/valuation_methods_continental.html' : 'banners/m_2.jpg',
294+
'https://odoo.com/documentation/user/inventory/management/reporting/valuation_methods_anglo_saxon.html' : 'banners/m_2.jpg',
294295
}
295296

296297
github_user = 'odoo'

‎inventory/management/reporting/valuation_methods_anglo_saxon.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,9 +344,12 @@ Let's take the case of a reseller.
344344
- Deferred Tax Assets/Liabilities: defined on the tax used on the
345345
invoice line
346346

347-
- Revenues/Expenses: defined by default on product's internal category
348-
and can be set in product form (Accounting tab) as a specific replacement
349-
value
347+
- Revenues: defined on the product category as a default, or specifically
348+
to a specific product.
349+
350+
- Expenses: this is where you should set the "Cost of Goods Sold" account.
351+
Defined on the product category as a default value, or specifically on
352+
the product form.
350353

351354
- Goods Received Not Purchased: to set as Stock Input Account in product's
352355
internal category

0 commit comments

Comments
 (0)
0