diff --git a/modules/account_stock_anglo_saxon/CHANGELOG b/modules/account_stock_anglo_saxon/CHANGELOG index a1b82288c4..58cc58f7b3 100644 --- a/modules/account_stock_anglo_saxon/CHANGELOG +++ b/modules/account_stock_anglo_saxon/CHANGELOG @@ -21,82 +21,105 @@ Version 6.6.0 - 2022-10-31 * Bug fixes (see mercurial logs for details) Version 6.4.0 - 2022-05-02 +-------------------------- * Bug fixes (see mercurial logs for details) * Add support for Python 3.10 * Remove support for Python 3.6 Version 6.2.0 - 2021-11-01 +-------------------------- * Bug fixes (see mercurial logs for details) Version 6.0.0 - 2021-05-03 +-------------------------- * Bug fixes (see mercurial logs for details) Version 5.8.0 - 2020-11-02 +-------------------------- * Bug fixes (see mercurial logs for details) * Remove support for Python 3.5 Version 5.6.0 - 2020-05-04 +-------------------------- * Bug fixes (see mercurial logs for details) Version 5.4.0 - 2019-11-04 +-------------------------- * Bug fixes (see mercurial logs for details) Version 5.2.0 - 2019-05-06 +-------------------------- * Bug fixes (see mercurial logs for details) * Enforce expense type for COGS account Version 5.0.0 - 2018-10-01 +-------------------------- * Bug fixes (see mercurial logs for details) * Remove support for Python 2.7 Version 4.8.0 - 2018-04-23 +-------------------------- * Bug fixes (see mercurial logs for details) Version 4.6.0 - 2017-10-30 +-------------------------- * Bug fixes (see mercurial logs for details) * Add warning about different product between invoice line and stock move Version 4.4.0 - 2017-05-01 +-------------------------- * Bug fixes (see mercurial logs for details) * Use stock_moves from account_invoice_stock Version 4.2.0 - 2016-11-28 +-------------------------- * Bug fixes (see mercurial logs for details) Version 4.0.0 - 2016-05-02 +-------------------------- * Bug fixes (see mercurial logs for details) * Add Python3 support Version 3.8.0 - 2015-11-02 +-------------------------- * Bug fixes (see mercurial logs for details) Version 3.6.0 - 2015-04-20 +-------------------------- * Bug fixes (see mercurial logs for details) * Add support for PyPy * Allow to override the stock moves used to compute the account move Version 3.4.0 - 2014-10-20 +-------------------------- * Bug fixes (see mercurial logs for details) * Add account stock method on fiscal year Version 3.2.0 - 2014-04-21 +-------------------------- * Bug fixes (see mercurial logs for details) Version 3.0.0 - 2013-10-21 +-------------------------- * Bug fixes (see mercurial logs for details) Version 2.8.0 - 2013-04-22 +-------------------------- * Bug fixes (see mercurial logs for details) Version 2.6.0 - 2012-10-22 +-------------------------- * Bug fixes (see mercurial logs for details) Version 2.4.0 - 2012-04-23 +-------------------------- * Bug fixes (see mercurial logs for details) * Use cost price instead of unit price when cost method is "fixed" Version 2.2.0 - 2011-10-24 +-------------------------- * Bug fixes (see mercurial logs for details) Version 2.0.0 - 2011-04-27 +-------------------------- * Initial release diff --git a/modules/account_stock_anglo_saxon/doc/design.rst b/modules/account_stock_anglo_saxon/doc/design.rst new file mode 100644 index 0000000000..4dd963c7ee --- /dev/null +++ b/modules/account_stock_anglo_saxon/doc/design.rst @@ -0,0 +1,62 @@ +****** +Design +****** + +The *Account Stock Anglo-Saxon Module* extends the following concepts: + +.. _model-product.category: + +Product Category +================ + +When *Account Stock Anglo-Saxon Module* is activated, the *Product Categories* +marked as accounting categories gain a new property for the :abbr:`COGS (Cost +Of Goods Sold)` `Account `. + +.. seealso:: + + The accounting `Product Category ` + concept is introduced by the :doc:`Account Product Module + `. + +.. _model-account.fiscalyear: + +Fiscal Year +=========== + +The *Account Stock Anglo-Saxon Module* adds a new :guilabel:`Anglo-Saxon` +option to the *Fiscal Year's* :guilabel:`Account Stock Method`. + +.. seealso:: + + The Account Stock Method for the `Fiscal Year + ` is introduced by the + :doc:`Account Stock Continental Module `. + +.. _model-account.invoice: + +Invoice +======= + +When the :guilabel:`Account Stock Method` is set to :guilabel:`Anglo-Saxon` for +the *Invoice's* `Fiscal Year `, its `Move +` is setup as follows. + +For supplier invoices, the cost of the `Product +`, when it was received, is debited to the +:guilabel:`Account Stock IN` and any difference between that and the amount on +the invoice is debited to the :guilabel:`Account Expense`. +If the product has not been received yet, the amount from the invoice is used +as the cost. +The reverse operation is performed for supplier credit notes. + +For customer invoices, the cost of the *Product* at the time of delivery is +credited to the :guilabel:`Account Stock OUT` and is debited to the +:guilabel:`Account Cost of Goods Sold`. +If the delivery has not yet taken place, the current cost is used. +The reverse operation is performed for customer credit notes. + +.. seealso:: + + The `Invoice ` concept is introduced + by the :doc:`Account Invoice Module `. diff --git a/modules/account_stock_anglo_saxon/doc/index.rst b/modules/account_stock_anglo_saxon/doc/index.rst index 02c2b779b7..574f65fe3c 100644 --- a/modules/account_stock_anglo_saxon/doc/index.rst +++ b/modules/account_stock_anglo_saxon/doc/index.rst @@ -1,24 +1,12 @@ +################################ Account Stock Anglo-Saxon Module ################################ -The account_stock_anglo_saxon module adds anglo-saxon accounting model for -stock valuation. +The *Account Stock Anglo-Saxon Module* adds the ability to use the anglo-saxon +accounting method for stock valuation. -A new field is added to Accounting categories: +.. toctree:: + :maxdepth: 2 -- Account Cost of Goods Sold: The account which is used to record cost of goods - sold. - -The Account Moves of Invoices are modified for fiscal year with the account -stock method set. - -On Supplier Invoice, the cost of the Product at reception is debited on the -Account Stock IN and only the difference is debited to the Account -Expense. -If the reception is not yet done then the cost is the amount on the invoice. -The opposite is done on Supplier Credit Note. - -On Invoice, the cost of the Product at delivery is credited from the Account -Stock OUT and is debited to the Account Cost of Goods Sold. -If the delivery is not yet done then the current cost is used. -The opposite is done on Credit Note. + design + releases diff --git a/modules/account_stock_anglo_saxon/doc/releases.rst b/modules/account_stock_anglo_saxon/doc/releases.rst new file mode 100644 index 0000000000..21b13c4745 --- /dev/null +++ b/modules/account_stock_anglo_saxon/doc/releases.rst @@ -0,0 +1,7 @@ +.. _releases-index: + +============= +Release notes +============= + +.. include:: ../CHANGELOG diff --git a/modules/account_stock_anglo_saxon/setup.py b/modules/account_stock_anglo_saxon/setup.py index 0bd5720183..5189775fc8 100755 --- a/modules/account_stock_anglo_saxon/setup.py +++ b/modules/account_stock_anglo_saxon/setup.py @@ -11,9 +11,12 @@ from setuptools import find_packages, setup def read(fname): - return io.open( + content = io.open( os.path.join(os.path.dirname(__file__), fname), 'r', encoding='utf-8').read() + content = re.sub( + r'(?m)^\.\. toctree::\r?\n((^$|^\s.*$)\r?\n)*', '', content) + return content def get_require_version(name): @@ -62,7 +65,9 @@ setup(name=name, download_url=download_url, project_urls={ "Bug Tracker": 'https://bugs.tryton.org/', - "Documentation": 'https://docs.tryton.org/', + "Documentation": ( + 'https://docs.tryton.org/latest/' + 'modules-account-stock-anglo-saxon'), "Forum": 'https://www.tryton.org/forum', "Source Code": 'https://code.tryton.org/tryton', },