changeset 4a654af45cbe in modules/purchase_shipment_cost:default
details:
https://hg.tryton.org/modules/purchase_shipment_cost?cmd=changeset;node=4a654af45cbe
description:
Use only 3 stock accounts
This simplify the configuration and allow to update cost price without
asking
for accounting information.
issue7273
review262541002
diffstat:
stock.py | 2
+-
tests/scenario_purchase_shipment_cost_with_account_stock.rst | 20
+++-----
tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst | 24
++++-----
3 files changed, 19 insertions(+), 27 deletions(-)
diffs (119 lines):
diff -r c9495b137702 -r 4a654af45cbe stock.py
--- a/stock.py Wed Dec 04 11:09:36 2019 +0100
+++ b/stock.py Wed Jan 08 14:36:45 2020 +0100
@@ -158,7 +158,7 @@
self.company.currency)
shipment_cost_account = \
self.shipment.carrier.carrier_product.account_expense_used
- account = self.product.account_stock_supplier_used
+ account = self.product.account_stock_in_used
for move_line in move_lines:
if move_line.account == account:
move_line.credit -= shipment_cost
diff -r c9495b137702 -r 4a654af45cbe
tests/scenario_purchase_shipment_cost_with_account_stock.rst
--- a/tests/scenario_purchase_shipment_cost_with_account_stock.rst Wed Dec
04 11:09:36 2019 +0100
+++ b/tests/scenario_purchase_shipment_cost_with_account_stock.rst Wed Jan
08 14:36:45 2020 +0100
@@ -45,10 +45,8 @@
>>> revenue = accounts['revenue']
>>> expense = accounts['expense']
>>> stock = accounts['stock']
- >>> stock_customer = accounts['stock_customer']
- >>> stock_lost_found = accounts['stock_lost_found']
- >>> stock_production = accounts['stock_production']
- >>> stock_supplier = accounts['stock_supplier']
+ >>> stock_in = accounts['stock_expense']
+ >>> stock_out, = stock_in.duplicate()
>>> AccountJournal = Model.get('account.journal')
>>> stock_journal, = AccountJournal.find([('code', '=', 'STO')])
@@ -67,10 +65,8 @@
>>> account_category.account_expense = expense
>>> account_category.account_revenue = revenue
>>> account_category.account_stock = stock
- >>> account_category.account_stock_supplier = stock_supplier
- >>> account_category.account_stock_customer = stock_customer
- >>> account_category.account_stock_production = stock_production
- >>> account_category.account_stock_lost_found = stock_lost_found
+ >>> account_category.account_stock_in = stock_in
+ >>> account_category.account_stock_out = stock_out
>>> account_category.save()
Create products::
@@ -152,8 +148,8 @@
Decimal('8.0600')
>>> move_average.unit_price
Decimal('8.0600')
- >>> stock_supplier.reload()
- >>> (stock_supplier.debit, stock_supplier.credit) == \
+ >>> stock_in.reload()
+ >>> (stock_in.debit, stock_in.credit) == \
... (Decimal('0.00'), Decimal('398.20'))
True
>>> expense.reload()
@@ -186,8 +182,8 @@
>>> [move.unit_price for move in shipment.incoming_moves] == \
... [Decimal('8.3333'), Decimal('8.3333'), Decimal('8.3334')]
True
- >>> stock_supplier.reload()
- >>> (stock_supplier.debit, stock_supplier.credit) == \
+ >>> stock_in.reload()
+ >>> (stock_in.debit, stock_in.credit) == \
... (Decimal('0.00'), Decimal('467.20'))
True
>>> expense.reload()
diff -r c9495b137702 -r 4a654af45cbe
tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
--- a/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
Wed Dec 04 11:09:36 2019 +0100
+++ b/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
Wed Jan 08 14:36:45 2020 +0100
@@ -51,10 +51,8 @@
>>> revenue = accounts['revenue']
>>> expense = accounts['expense']
>>> stock = accounts['stock']
- >>> stock_customer = accounts['stock_customer']
- >>> stock_lost_found = accounts['stock_lost_found']
- >>> stock_production = accounts['stock_production']
- >>> stock_supplier = accounts['stock_supplier']
+ >>> stock_in = accounts['stock_expense']
+ >>> stock_out, = stock_in.duplicate()
>>> cogs = accounts['cogs']
>>> AccountJournal = Model.get('account.journal')
@@ -75,10 +73,8 @@
>>> account_category.account_revenue = revenue
>>> account_category.account_stock = stock
>>> account_category.account_cogs = cogs
- >>> account_category.account_stock_supplier = stock_supplier
- >>> account_category.account_stock_customer = stock_customer
- >>> account_category.account_stock_production = stock_production
- >>> account_category.account_stock_lost_found = stock_lost_found
+ >>> account_category.account_stock_in = stock_in
+ >>> account_category.account_stock_out = stock_out
>>> account_category.save()
Create product::
@@ -166,11 +162,11 @@
>>> shipment.click('done')
>>> shipment.state
'done'
- >>> stock_supplier.reload()
+ >>> stock_in.reload()
>>> stock.reload()
- >>> stock_supplier.debit
+ >>> stock_in.debit
Decimal('0.00')
- >>> stock_supplier.credit
+ >>> stock_in.credit
Decimal('20.00')
>>> stock.reload()
>>> stock.debit
@@ -203,8 +199,8 @@
Decimal('20.00')
>>> expense.credit
Decimal('23.00')
- >>> stock_supplier.reload()
- >>> stock_supplier.debit
+ >>> stock_in.reload()
+ >>> stock_in.debit
Decimal('20.00')
- >>> stock_supplier.credit
+ >>> stock_in.credit
Decimal('20.00')
