changeset 30279fbb27c4 in modules/account_stock_anglo_saxon:default
details:
https://hg.tryton.org/modules/account_stock_anglo_saxon?cmd=changeset;node=30279fbb27c4
description:
Merge account kind and account type
issue4990
review68401002
diffstat:
CHANGELOG | 2 ++
minimal_chart.xml | 2 --
minimal_chart_bg.xml | 3 +--
minimal_chart_ca.xml | 3 +--
minimal_chart_de.xml | 3 +--
minimal_chart_en.xml | 3 +--
minimal_chart_es.xml | 3 +--
minimal_chart_fr.xml | 3 +--
minimal_chart_nl.xml | 3 +--
minimal_chart_pt.xml | 2 --
minimal_chart_ru.xml | 3 +--
minimal_chart_sl.xml | 3 +--
product.py | 4 ++--
tests/tools.py | 4 ++--
14 files changed, 15 insertions(+), 26 deletions(-)
diffs (217 lines):
diff -r 62adcea3a4d9 -r 30279fbb27c4 CHANGELOG
--- a/CHANGELOG Fri Mar 22 15:33:43 2019 +0100
+++ b/CHANGELOG Sun Mar 24 18:00:01 2019 +0100
@@ -1,3 +1,5 @@
+* 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
diff -r 62adcea3a4d9 -r 30279fbb27c4 minimal_chart.xml
--- a/minimal_chart.xml Fri Mar 22 15:33:43 2019 +0100
+++ b/minimal_chart.xml Sun Mar 24 18:00:01 2019 +0100
@@ -17,9 +17,7 @@
<field name="name" lang="sl">COGS</field>
<field name="type" ref="account.account_type_template_expense"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root"/>
- <field name="kind">other</field>
</record>
</data>
diff -r 62adcea3a4d9 -r 30279fbb27c4 minimal_chart_bg.xml
--- a/minimal_chart_bg.xml Fri Mar 22 15:33:43 2019 +0100
+++ b/minimal_chart_bg.xml Sun Mar 24 18:00:01 2019 +0100
@@ -14,11 +14,10 @@
+
<field name="type" ref="account.account_type_template_expense_bg"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_bg"/>
- <field name="kind">other</field>
</record>
</data>
diff -r 62adcea3a4d9 -r 30279fbb27c4 minimal_chart_ca.xml
--- a/minimal_chart_ca.xml Fri Mar 22 15:33:43 2019 +0100
+++ b/minimal_chart_ca.xml Sun Mar 24 18:00:01 2019 +0100
@@ -14,11 +14,10 @@
+
<field name="type" ref="account.account_type_template_expense_ca"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_ca"/>
- <field name="kind">other</field>
</record>
</data>
diff -r 62adcea3a4d9 -r 30279fbb27c4 minimal_chart_de.xml
--- a/minimal_chart_de.xml Fri Mar 22 15:33:43 2019 +0100
+++ b/minimal_chart_de.xml Sun Mar 24 18:00:01 2019 +0100
@@ -14,11 +14,10 @@
+
<field name="type" ref="account.account_type_template_expense_de"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_de"/>
- <field name="kind">other</field>
</record>
</data>
diff -r 62adcea3a4d9 -r 30279fbb27c4 minimal_chart_en.xml
--- a/minimal_chart_en.xml Fri Mar 22 15:33:43 2019 +0100
+++ b/minimal_chart_en.xml Sun Mar 24 18:00:01 2019 +0100
@@ -14,11 +14,10 @@
+
<field name="type" ref="account.account_type_template_expense_en"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_en"/>
- <field name="kind">other</field>
</record>
</data>
diff -r 62adcea3a4d9 -r 30279fbb27c4 minimal_chart_es.xml
--- a/minimal_chart_es.xml Fri Mar 22 15:33:43 2019 +0100
+++ b/minimal_chart_es.xml Sun Mar 24 18:00:01 2019 +0100
@@ -14,11 +14,10 @@
+
<field name="type" ref="account.account_type_template_expense_es"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_es"/>
- <field name="kind">other</field>
</record>
</data>
diff -r 62adcea3a4d9 -r 30279fbb27c4 minimal_chart_fr.xml
--- a/minimal_chart_fr.xml Fri Mar 22 15:33:43 2019 +0100
+++ b/minimal_chart_fr.xml Sun Mar 24 18:00:01 2019 +0100
@@ -14,11 +14,10 @@
+
<field name="type" ref="account.account_type_template_expense_fr"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_fr"/>
- <field name="kind">other</field>
</record>
</data>
diff -r 62adcea3a4d9 -r 30279fbb27c4 minimal_chart_nl.xml
--- a/minimal_chart_nl.xml Fri Mar 22 15:33:43 2019 +0100
+++ b/minimal_chart_nl.xml Sun Mar 24 18:00:01 2019 +0100
@@ -14,11 +14,10 @@
<field name="name">COGS</field>
+
<field name="type" ref="account.account_type_template_expense_nl"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_nl"/>
- <field name="kind">other</field>
</record>
</data>
diff -r 62adcea3a4d9 -r 30279fbb27c4 minimal_chart_pt.xml
--- a/minimal_chart_pt.xml Fri Mar 22 15:33:43 2019 +0100
+++ b/minimal_chart_pt.xml Sun Mar 24 18:00:01 2019 +0100
@@ -17,9 +17,7 @@
<field name="type" ref="account.account_type_template_expense_pt"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_pt"/>
- <field name="kind">other</field>
</record>
</data>
diff -r 62adcea3a4d9 -r 30279fbb27c4 minimal_chart_ru.xml
--- a/minimal_chart_ru.xml Fri Mar 22 15:33:43 2019 +0100
+++ b/minimal_chart_ru.xml Sun Mar 24 18:00:01 2019 +0100
@@ -12,13 +12,12 @@
+
<field name="name">COGS</field>
<field name="type" ref="account.account_type_template_expense_ru"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_ru"/>
- <field name="kind">other</field>
</record>
</data>
diff -r 62adcea3a4d9 -r 30279fbb27c4 minimal_chart_sl.xml
--- a/minimal_chart_sl.xml Fri Mar 22 15:33:43 2019 +0100
+++ b/minimal_chart_sl.xml Sun Mar 24 18:00:01 2019 +0100
@@ -13,12 +13,11 @@
+
<field name="name">COGS</field>
<field name="type" ref="account.account_type_template_expense_sl"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_sl"/>
- <field name="kind">other</field>
</record>
</data>
diff -r 62adcea3a4d9 -r 30279fbb27c4 product.py
--- a/product.py Fri Mar 22 15:33:43 2019 +0100
+++ b/product.py Sun Mar 24 18:00:01 2019 +0100
@@ -15,7 +15,7 @@
__name__ = 'product.category'
account_cogs = fields.MultiValue(fields.Many2One('account.account',
'Account Cost of Goods Sold', domain=[
- ('kind', '!=', 'view'),
+ ('type.expense', '=', True),
('company', '=', Eval('context', {}).get('company', -1)),
],
states={
@@ -43,7 +43,7 @@
account_cogs = fields.Many2One(
'account.account', "Account Cost of Goods Sold",
domain=[
- ('kind', '!=', 'view'),
+ ('type.expense', '=', True),
('company', '=', Eval('company', -1)),
],
depends=['company'])
diff -r 62adcea3a4d9 -r 30279fbb27c4 tests/tools.py
--- a/tests/tools.py Fri Mar 22 15:33:43 2019 +0100
+++ b/tests/tools.py Sun Mar 24 18:00:01 2019 +0100
@@ -13,8 +13,8 @@
company = get_company()
accounts['cogs'], = Account.find([
- ('kind', '=', 'other'),
+ ('type.expense', '=', True),
+ ('id', '!=', accounts['expense'].id),
('company', '=', company.id),
- ('name', '=', 'COGS'),
])
return accounts
