changeset 7add6271d38e in modules/account_stock_continental:default
details:
https://hg.tryton.org/modules/account_stock_continental?cmd=changeset;node=7add6271d38e
description:
Merge account kind and account type
issue4990
review68401002
diffstat:
CHANGELOG | 2 ++
minimal_chart.xml | 44 +++++++++++++++++++++++---------------------
minimal_chart_bg.xml | 47 +++++++++++++++++++++++++++++------------------
minimal_chart_ca.xml | 47 +++++++++++++++++++++++++++++------------------
minimal_chart_de.xml | 47 +++++++++++++++++++++++++++++------------------
minimal_chart_en.xml | 47 +++++++++++++++++++++++++++++------------------
minimal_chart_es.xml | 47 +++++++++++++++++++++++++++++------------------
minimal_chart_fr.xml | 47 +++++++++++++++++++++++++++++------------------
minimal_chart_nl.xml | 47 +++++++++++++++++++++++++++++------------------
minimal_chart_pt.xml | 41 +++++++++++++++++++++++------------------
minimal_chart_ru.xml | 47 +++++++++++++++++++++++++++++------------------
minimal_chart_sl.xml | 47 +++++++++++++++++++++++++++++------------------
product.py | 26 ++++++++++++++++----------
tests/tools.py | 2 +-
14 files changed, 326 insertions(+), 212 deletions(-)
diffs (1228 lines):
diff -r 625db692ba5c -r 7add6271d38e 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 balance and income statement on stock accounts
+
Version 5.0.0 - 2018-10-01
* Bug fixes (see mercurial logs for details)
* Remove support for Python 2.7
diff -r 625db692ba5c -r 7add6271d38e 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
@@ -18,6 +18,8 @@
<field name="name" lang="sl">Popisi</field>
<field name="parent"
ref="account.account_type_template_asset_current"/>
+ <field name="statement">balance</field>
+ <field name="stock" eval="True"/>
<field name="sequence" eval="20"/>
</record>
@@ -34,10 +36,24 @@
<field name="name" lang="sl">Zaloga</field>
<field name="type"
ref="account_type_template_asset_current_inventories"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root"/>
- <field name="kind">stock</field>
+ </record>
+
+ <record model="account.account.type.template"
id="account_type_template_stock_expense">
+ <field name="name" lang="en">Stock Expense</field>
+ <field name="name" lang="bg">Разход на акции</field>
+ <field name="name" lang="ca">Despeses de valors</field>
+ <field name="name" lang="de">Lagerkosten</field>
+ <field name="name" lang="es">Gastos de Stock</field>
+ <field name="name" lang="fr">Variation des stocks</field>
+ <field name="name" lang="nl">Voorraad</field>
+ <field name="name" lang="pt">Despesa de estoque</field>
+ <field name="name" lang="ru">Расходы на акции</field>
+ <field name="name" lang="sl">Stroški zalog</field>
+ <field name="parent" ref="account.account_type_template_expense"/>
+ <field name="statement">income</field>
+ <field name="sequence" eval="30"/>
+ <field name="stock" eval="True"/>
</record>
<record model="account.account.template"
@@ -52,12 +68,9 @@
<field name="name" lang="pt">Estoque do Fornecedor</field>
<field name="name" lang="ru">Stock Supplier</field>
<field name="name" lang="sl">Zaloga dobavitelja</field>
- <field name="type"
- ref="account_type_template_asset_current_inventories"/>
+ <field name="type" ref="account_type_template_stock_expense"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root"/>
- <field name="kind">stock</field>
</record>
<record model="account.account.template"
id="account_template_stock_customer">
@@ -71,12 +84,8 @@
<field name="name" lang="pt">Estoque do Cliente</field>
<field name="name" lang="ru">Stock Customer</field>
<field name="name" lang="sl">Zaloga kupca</field>
- <field name="type"
- ref="account_type_template_asset_current_inventories"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+ <field name="type" ref="account_type_template_stock_expense"/>
<field name="parent" ref="account.account_template_root"/>
- <field name="kind">stock</field>
</record>
<record model="account.account.template"
@@ -91,11 +100,8 @@
<field name="name" lang="pt">Estoque da Produção</field>
<field name="name" lang="ru">Stock Production</field>
<field name="name" lang="sl">Zaloga proizvodnje</field>
- <field name="type"
ref="account_type_template_asset_current_inventories"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+ <field name="type" ref="account_type_template_stock_expense"/>
<field name="parent" ref="account.account_template_root"/>
- <field name="kind">stock</field>
</record>
<record model="account.account.template"
@@ -110,12 +116,8 @@
<field name="name" lang="pt">Estoque de Achados e Perdidos</field>
<field name="name" lang="ru">Stock Lost and Found</field>
<field name="name" lang="sl">Zaloga izgubljeno/najdeno</field>
- <field name="type"
- ref="account_type_template_asset_current_inventories"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+ <field name="type" ref="account_type_template_stock_expense"/>
<field name="parent" ref="account.account_template_root"/>
- <field name="kind">stock</field>
</record>
</data>
</tryton>
diff -r 625db692ba5c -r 7add6271d38e 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,7 +14,10 @@
+
<field name="parent"
ref="account.account_type_template_asset_current_bg"/>
+ <field name="statement">balance</field>
+ <field name="stock" eval="True"/>
<field name="sequence" eval="20"/>
</record>
@@ -28,11 +31,26 @@
+
<field name="type"
ref="account_type_template_asset_current_inventories_bg"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_bg"/>
- <field name="kind">stock</field>
+ </record>
+
+ <record id="account_type_template_stock_expense_bg"
model="account.account.type.template">
+
+ <field name="name">Разход на акции</field>
+
+
+
+
+
+
+
+
+ <field name="parent"
ref="account.account_type_template_expense_bg"/>
+ <field name="statement">income</field>
+ <field name="sequence" eval="30"/>
+ <field name="stock" eval="True"/>
</record>
<record id="account_template_stock_supplier_bg"
model="account.account.template">
@@ -45,11 +63,10 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_bg"/>
+
+ <field name="type" ref="account_type_template_stock_expense_bg"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_bg"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_customer_bg"
model="account.account.template">
@@ -61,11 +78,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_bg"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_bg"/>
<field name="parent" ref="account.account_template_root_bg"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_production_bg"
model="account.account.template">
@@ -78,11 +93,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_bg"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_bg"/>
<field name="parent" ref="account.account_template_root_bg"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_lost_found_bg"
model="account.account.template">
@@ -95,11 +108,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_bg"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_bg"/>
<field name="parent" ref="account.account_template_root_bg"/>
- <field name="kind">stock</field>
</record>
</data>
</tryton>
diff -r 625db692ba5c -r 7add6271d38e 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,7 +14,10 @@
+
<field name="parent"
ref="account.account_type_template_asset_current_ca"/>
+ <field name="statement">balance</field>
+ <field name="stock" eval="True"/>
<field name="sequence" eval="20"/>
</record>
@@ -28,11 +31,26 @@
+
<field name="type"
ref="account_type_template_asset_current_inventories_ca"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_ca"/>
- <field name="kind">stock</field>
+ </record>
+
+ <record id="account_type_template_stock_expense_ca"
model="account.account.type.template">
+
+
+ <field name="name">Despeses de valors</field>
+
+
+
+
+
+
+
+ <field name="parent"
ref="account.account_type_template_expense_ca"/>
+ <field name="statement">income</field>
+ <field name="sequence" eval="30"/>
+ <field name="stock" eval="True"/>
</record>
<record id="account_template_stock_supplier_ca"
model="account.account.template">
@@ -45,11 +63,10 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_ca"/>
+
+ <field name="type" ref="account_type_template_stock_expense_ca"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_ca"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_customer_ca"
model="account.account.template">
@@ -61,11 +78,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_ca"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_ca"/>
<field name="parent" ref="account.account_template_root_ca"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_production_ca"
model="account.account.template">
@@ -78,11 +93,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_ca"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_ca"/>
<field name="parent" ref="account.account_template_root_ca"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_lost_found_ca"
model="account.account.template">
@@ -95,11 +108,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_ca"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_ca"/>
<field name="parent" ref="account.account_template_root_ca"/>
- <field name="kind">stock</field>
</record>
</data>
</tryton>
diff -r 625db692ba5c -r 7add6271d38e 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,7 +14,10 @@
+
<field name="parent"
ref="account.account_type_template_asset_current_de"/>
+ <field name="statement">balance</field>
+ <field name="stock" eval="True"/>
<field name="sequence" eval="20"/>
</record>
@@ -28,11 +31,26 @@
+
<field name="type"
ref="account_type_template_asset_current_inventories_de"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_de"/>
- <field name="kind">stock</field>
+ </record>
+
+ <record id="account_type_template_stock_expense_de"
model="account.account.type.template">
+
+
+
+ <field name="name">Lagerkosten</field>
+
+
+
+
+
+
+ <field name="parent"
ref="account.account_type_template_expense_de"/>
+ <field name="statement">income</field>
+ <field name="sequence" eval="30"/>
+ <field name="stock" eval="True"/>
</record>
<record id="account_template_stock_supplier_de"
model="account.account.template">
@@ -45,11 +63,10 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_de"/>
+
+ <field name="type" ref="account_type_template_stock_expense_de"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_de"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_customer_de"
model="account.account.template">
@@ -61,11 +78,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_de"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_de"/>
<field name="parent" ref="account.account_template_root_de"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_production_de"
model="account.account.template">
@@ -78,11 +93,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_de"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_de"/>
<field name="parent" ref="account.account_template_root_de"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_lost_found_de"
model="account.account.template">
@@ -95,11 +108,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_de"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_de"/>
<field name="parent" ref="account.account_template_root_de"/>
- <field name="kind">stock</field>
</record>
</data>
</tryton>
diff -r 625db692ba5c -r 7add6271d38e 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,7 +14,10 @@
+
<field name="parent"
ref="account.account_type_template_asset_current_en"/>
+ <field name="statement">balance</field>
+ <field name="stock" eval="True"/>
<field name="sequence" eval="20"/>
</record>
@@ -28,11 +31,26 @@
+
<field name="type"
ref="account_type_template_asset_current_inventories_en"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_en"/>
- <field name="kind">stock</field>
+ </record>
+
+ <record id="account_type_template_stock_expense_en"
model="account.account.type.template">
+ <field name="name">Stock Expense</field>
+
+
+
+
+
+
+
+
+
+ <field name="parent"
ref="account.account_type_template_expense_en"/>
+ <field name="statement">income</field>
+ <field name="sequence" eval="30"/>
+ <field name="stock" eval="True"/>
</record>
<record id="account_template_stock_supplier_en"
model="account.account.template">
@@ -45,11 +63,10 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_en"/>
+
+ <field name="type" ref="account_type_template_stock_expense_en"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_en"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_customer_en"
model="account.account.template">
<field name="name">Stock Customer</field>
@@ -61,11 +78,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_en"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_en"/>
<field name="parent" ref="account.account_template_root_en"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_production_en"
model="account.account.template">
@@ -78,11 +93,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_en"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_en"/>
<field name="parent" ref="account.account_template_root_en"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_lost_found_en"
model="account.account.template">
@@ -95,11 +108,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_en"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_en"/>
<field name="parent" ref="account.account_template_root_en"/>
- <field name="kind">stock</field>
</record>
</data>
</tryton>
diff -r 625db692ba5c -r 7add6271d38e 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,7 +14,10 @@
+
<field name="parent"
ref="account.account_type_template_asset_current_es"/>
+ <field name="statement">balance</field>
+ <field name="stock" eval="True"/>
<field name="sequence" eval="20"/>
</record>
@@ -28,11 +31,26 @@
+
<field name="type"
ref="account_type_template_asset_current_inventories_es"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_es"/>
- <field name="kind">stock</field>
+ </record>
+
+ <record id="account_type_template_stock_expense_es"
model="account.account.type.template">
+
+
+
+
+ <field name="name">Gastos de Stock</field>
+
+
+
+
+
+ <field name="parent"
ref="account.account_type_template_expense_es"/>
+ <field name="statement">income</field>
+ <field name="sequence" eval="30"/>
+ <field name="stock" eval="True"/>
</record>
<record id="account_template_stock_supplier_es"
model="account.account.template">
@@ -45,11 +63,10 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_es"/>
+
+ <field name="type" ref="account_type_template_stock_expense_es"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_es"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_customer_es"
model="account.account.template">
@@ -61,11 +78,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_es"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_es"/>
<field name="parent" ref="account.account_template_root_es"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_production_es"
model="account.account.template">
@@ -78,11 +93,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_es"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_es"/>
<field name="parent" ref="account.account_template_root_es"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_lost_found_es"
model="account.account.template">
@@ -95,11 +108,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_es"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_es"/>
<field name="parent" ref="account.account_template_root_es"/>
- <field name="kind">stock</field>
</record>
</data>
</tryton>
diff -r 625db692ba5c -r 7add6271d38e 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,7 +14,10 @@
+
<field name="parent"
ref="account.account_type_template_asset_current_fr"/>
+ <field name="statement">balance</field>
+ <field name="stock" eval="True"/>
<field name="sequence" eval="20"/>
</record>
@@ -28,11 +31,26 @@
+
<field name="type"
ref="account_type_template_asset_current_inventories_fr"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_fr"/>
- <field name="kind">stock</field>
+ </record>
+
+ <record id="account_type_template_stock_expense_fr"
model="account.account.type.template">
+
+
+
+
+
+ <field name="name">Variation des stocks</field>
+
+
+
+
+ <field name="parent"
ref="account.account_type_template_expense_fr"/>
+ <field name="statement">income</field>
+ <field name="sequence" eval="30"/>
+ <field name="stock" eval="True"/>
</record>
<record id="account_template_stock_supplier_fr"
model="account.account.template">
@@ -45,11 +63,10 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_fr"/>
+
+ <field name="type" ref="account_type_template_stock_expense_fr"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_fr"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_customer_fr"
model="account.account.template">
@@ -61,11 +78,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_fr"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_fr"/>
<field name="parent" ref="account.account_template_root_fr"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_production_fr"
model="account.account.template">
@@ -78,11 +93,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_fr"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_fr"/>
<field name="parent" ref="account.account_template_root_fr"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_lost_found_fr"
model="account.account.template">
@@ -95,11 +108,9 @@
- <field name="type"
ref="account_type_template_asset_current_inventories_fr"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_fr"/>
<field name="parent" ref="account.account_template_root_fr"/>
- <field name="kind">stock</field>
</record>
</data>
</tryton>
diff -r 625db692ba5c -r 7add6271d38e 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,7 +14,10 @@
<field name="name">Inventories</field>
+
<field name="parent"
ref="account.account_type_template_asset_current_nl"/>
+ <field name="statement">balance</field>
+ <field name="stock" eval="True"/>
<field name="sequence" eval="20"/>
</record>
@@ -28,11 +31,26 @@
<field name="name">Voorraad</field>
+
<field name="type"
ref="account_type_template_asset_current_inventories_nl"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_nl"/>
- <field name="kind">stock</field>
+ </record>
+
+ <record id="account_type_template_stock_expense_nl"
model="account.account.type.template">
+
+
+
+
+
+
+ <field name="name">Voorraad</field>
+
+
+
+ <field name="parent"
ref="account.account_type_template_expense_nl"/>
+ <field name="statement">income</field>
+ <field name="sequence" eval="30"/>
+ <field name="stock" eval="True"/>
</record>
<record id="account_template_stock_supplier_nl"
model="account.account.template">
@@ -45,11 +63,10 @@
<field name="name">Stock Supplier</field>
- <field name="type"
ref="account_type_template_asset_current_inventories_nl"/>
+
+ <field name="type" ref="account_type_template_stock_expense_nl"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_nl"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_customer_nl"
model="account.account.template">
@@ -61,11 +78,9 @@
<field name="name">Stock Customer</field>
- <field name="type"
ref="account_type_template_asset_current_inventories_nl"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_nl"/>
<field name="parent" ref="account.account_template_root_nl"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_production_nl"
model="account.account.template">
@@ -78,11 +93,9 @@
<field name="name">Stock Production</field>
- <field name="type"
ref="account_type_template_asset_current_inventories_nl"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_nl"/>
<field name="parent" ref="account.account_template_root_nl"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_lost_found_nl"
model="account.account.template">
@@ -95,11 +108,9 @@
<field name="name">Stock Lost and Found</field>
- <field name="type"
ref="account_type_template_asset_current_inventories_nl"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+
+ <field name="type" ref="account_type_template_stock_expense_nl"/>
<field name="parent" ref="account.account_template_root_nl"/>
- <field name="kind">stock</field>
</record>
</data>
</tryton>
diff -r 625db692ba5c -r 7add6271d38e 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
@@ -16,6 +16,8 @@
<field name="parent"
ref="account.account_type_template_asset_current_pt"/>
+ <field name="statement">balance</field>
+ <field name="stock" eval="True"/>
<field name="sequence" eval="20"/>
</record>
@@ -31,10 +33,24 @@
<field name="type"
ref="account_type_template_asset_current_inventories_pt"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_pt"/>
- <field name="kind">stock</field>
+ </record>
+
+ <record id="account_type_template_stock_expense_pt"
model="account.account.type.template">
+
+
+
+
+
+
+
+ <field name="name">Despesa de estoque</field>
+
+
+ <field name="parent"
ref="account.account_type_template_expense_pt"/>
+ <field name="statement">income</field>
+ <field name="sequence" eval="30"/>
+ <field name="stock" eval="True"/>
</record>
<record id="account_template_stock_supplier_pt"
model="account.account.template">
@@ -48,11 +64,9 @@
<field name="name">Estoque do Fornecedor</field>
- <field name="type"
ref="account_type_template_asset_current_inventories_pt"/>
+ <field name="type" ref="account_type_template_stock_expense_pt"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_pt"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_customer_pt"
model="account.account.template">
@@ -65,11 +79,8 @@
<field name="name">Estoque do Cliente</field>
- <field name="type"
ref="account_type_template_asset_current_inventories_pt"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+ <field name="type" ref="account_type_template_stock_expense_pt"/>
<field name="parent" ref="account.account_template_root_pt"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_production_pt"
model="account.account.template">
@@ -83,11 +94,8 @@
<field name="name">Estoque da Produção</field>
- <field name="type"
ref="account_type_template_asset_current_inventories_pt"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+ <field name="type" ref="account_type_template_stock_expense_pt"/>
<field name="parent" ref="account.account_template_root_pt"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_lost_found_pt"
model="account.account.template">
@@ -101,11 +109,8 @@
<field name="name">Estoque de Achados e Perdidos</field>
- <field name="type"
ref="account_type_template_asset_current_inventories_pt"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+ <field name="type" ref="account_type_template_stock_expense_pt"/>
<field name="parent" ref="account.account_template_root_pt"/>
- <field name="kind">stock</field>
</record>
</data>
</tryton>
diff -r 625db692ba5c -r 7add6271d38e 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,9 +12,12 @@
+
<field name="name">Инвентаризация</field>
<field name="parent"
ref="account.account_type_template_asset_current_ru"/>
+ <field name="statement">balance</field>
+ <field name="stock" eval="True"/>
<field name="sequence" eval="20"/>
</record>
@@ -26,13 +29,28 @@
+
<field name="name">Хранилище</field>
<field name="type"
ref="account_type_template_asset_current_inventories_ru"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_ru"/>
- <field name="kind">stock</field>
+ </record>
+
+ <record id="account_type_template_stock_expense_ru"
model="account.account.type.template">
+
+
+
+
+
+
+
+
+ <field name="name">Расходы на акции</field>
+
+ <field name="parent"
ref="account.account_type_template_expense_ru"/>
+ <field name="statement">income</field>
+ <field name="sequence" eval="30"/>
+ <field name="stock" eval="True"/>
</record>
<record id="account_template_stock_supplier_ru"
model="account.account.template">
@@ -43,13 +61,12 @@
+
<field name="name">Stock Supplier</field>
- <field name="type"
ref="account_type_template_asset_current_inventories_ru"/>
+ <field name="type" ref="account_type_template_stock_expense_ru"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_ru"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_customer_ru"
model="account.account.template">
@@ -59,13 +76,11 @@
+
<field name="name">Stock Customer</field>
- <field name="type"
ref="account_type_template_asset_current_inventories_ru"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+ <field name="type" ref="account_type_template_stock_expense_ru"/>
<field name="parent" ref="account.account_template_root_ru"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_production_ru"
model="account.account.template">
@@ -76,13 +91,11 @@
+
<field name="name">Stock Production</field>
- <field name="type"
ref="account_type_template_asset_current_inventories_ru"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+ <field name="type" ref="account_type_template_stock_expense_ru"/>
<field name="parent" ref="account.account_template_root_ru"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_lost_found_ru"
model="account.account.template">
@@ -93,13 +106,11 @@
+
<field name="name">Stock Lost and Found</field>
- <field name="type"
ref="account_type_template_asset_current_inventories_ru"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+ <field name="type" ref="account_type_template_stock_expense_ru"/>
<field name="parent" ref="account.account_template_root_ru"/>
- <field name="kind">stock</field>
</record>
</data>
</tryton>
diff -r 625db692ba5c -r 7add6271d38e 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,8 +13,11 @@
+
<field name="name">Popisi</field>
<field name="parent"
ref="account.account_type_template_asset_current_sl"/>
+ <field name="statement">balance</field>
+ <field name="stock" eval="True"/>
<field name="sequence" eval="20"/>
</record>
@@ -27,12 +30,27 @@
+
<field name="name">Zaloga</field>
<field name="type"
ref="account_type_template_asset_current_inventories_sl"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_sl"/>
- <field name="kind">stock</field>
+ </record>
+
+ <record id="account_type_template_stock_expense_sl"
model="account.account.type.template">
+
+
+
+
+
+
+
+
+
+ <field name="name">Stroški zalog</field>
+ <field name="parent"
ref="account.account_type_template_expense_sl"/>
+ <field name="statement">income</field>
+ <field name="sequence" eval="30"/>
+ <field name="stock" eval="True"/>
</record>
<record id="account_template_stock_supplier_sl"
model="account.account.template">
@@ -44,12 +62,11 @@
+
<field name="name">Zaloga dobavitelja</field>
- <field name="type"
ref="account_type_template_asset_current_inventories_sl"/>
+ <field name="type" ref="account_type_template_stock_expense_sl"/>
<field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
<field name="parent" ref="account.account_template_root_sl"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_customer_sl"
model="account.account.template">
@@ -60,12 +77,10 @@
+
<field name="name">Zaloga kupca</field>
- <field name="type"
ref="account_type_template_asset_current_inventories_sl"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+ <field name="type" ref="account_type_template_stock_expense_sl"/>
<field name="parent" ref="account.account_template_root_sl"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_production_sl"
model="account.account.template">
@@ -77,12 +92,10 @@
+
<field name="name">Zaloga proizvodnje</field>
- <field name="type"
ref="account_type_template_asset_current_inventories_sl"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+ <field name="type" ref="account_type_template_stock_expense_sl"/>
<field name="parent" ref="account.account_template_root_sl"/>
- <field name="kind">stock</field>
</record>
<record id="account_template_stock_lost_found_sl"
model="account.account.template">
@@ -94,12 +107,10 @@
+
<field name="name">Zaloga izgubljeno/najdeno</field>
- <field name="type"
ref="account_type_template_asset_current_inventories_sl"/>
- <field name="reconcile" eval="True"/>
- <field name="deferral" eval="True"/>
+ <field name="type" ref="account_type_template_stock_expense_sl"/>
<field name="parent" ref="account.account_template_root_sl"/>
- <field name="kind">stock</field>
</record>
</data>
</tryton>
diff -r 625db692ba5c -r 7add6271d38e product.py
--- a/product.py Fri Mar 22 15:33:43 2019 +0100
+++ b/product.py Sun Mar 24 18:00:01 2019 +0100
@@ -28,7 +28,7 @@
account_stock = fields.MultiValue(fields.Many2One(
'account.account', "Account Stock",
domain=[
- ('kind', '=', 'stock'),
+ ('type.stock', '=', True),
('company', '=', Eval('context', {}).get('company', -1)),
],
states={
@@ -40,7 +40,7 @@
account_stock_supplier = fields.MultiValue(fields.Many2One(
'account.account', "Account Stock Supplier",
domain=[
- ('kind', '=', 'stock'),
+ ('type.stock', '=', True),
('company', '=', Eval('context', {}).get('company', -1)),
],
states={
@@ -52,7 +52,7 @@
account_stock_customer = fields.MultiValue(fields.Many2One(
'account.account', "Account Stock Customer",
domain=[
- ('kind', '=', 'stock'),
+ ('type.stock', '=', True),
('company', '=', Eval('context', {}).get('company', -1)),
],
states={
@@ -64,7 +64,7 @@
account_stock_production = fields.MultiValue(fields.Many2One(
'account.account', "Account Stock Production",
domain=[
- ('kind', '=', 'stock'),
+ ('type.stock', '=', True),
('company', '=', Eval('context', {}).get('company', -1)),
],
states={
@@ -76,7 +76,7 @@
account_stock_lost_found = fields.MultiValue(fields.Many2One(
'account.account', "Account Stock Lost and Found",
domain=[
- ('kind', '=', 'stock'),
+ ('type.stock', '=', True),
('company', '=', Eval('context', {}).get('company', -1)),
],
states={
@@ -124,35 +124,40 @@
account_stock = fields.Many2One(
'account.account', "Account Stock",
domain=[
- ('kind', '=', 'stock'),
+ ('type.stock', '=', True),
+ ('type.statement', '=', 'balance'),
('company', '=', Eval('company', -1)),
],
depends=['company'])
account_stock_supplier = fields.Many2One(
'account.account', "Account Stock Supplier",
domain=[
- ('kind', '=', 'stock'),
+ ('type.stock', '=', True),
+ ('type.statement', '=', 'income'),
('company', '=', Eval('company', -1)),
],
depends=['company'])
account_stock_customer = fields.Many2One(
'account.account', "Account Stock Customer",
domain=[
- ('kind', '=', 'stock'),
+ ('type.stock', '=', True),
+ ('type.statement', '=', 'income'),
('company', '=', Eval('company', -1)),
],
depends=['company'])
account_stock_production = fields.Many2One(
'account.account', "Account Stock Production",
domain=[
- ('kind', '=', 'stock'),
+ ('type.stock', '=', True),
+ ('type.statement', '=', 'income'),
('company', '=', Eval('company', -1)),
],
depends=['company'])
account_stock_lost_found = fields.Many2One(
'account.account', "Account Stock Lost and Found",
domain=[
- ('kind', '=', 'stock'),
+ ('type.stock', '=', True),
+ ('type.statement', '=', 'income'),
('company', '=', Eval('company', -1)),
],
depends=['company'])
@@ -259,6 +264,7 @@
('company', 'in',
[Eval('context', {}).get('company', -1), None]),
('id', '!=', Eval('stock_account')),
+ ('type.stock', '=', True),
],
depends=['stock_account'], required=True)
description = fields.Char('Description')
diff -r 625db692ba5c -r 7add6271d38e 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,7 +13,7 @@
company = get_company()
stock_accounts = Account.find([
- ('kind', '=', 'stock'),
+ ('type.stock', '=', True),
('company', '=', company.id),
])
for account in stock_accounts:
