[tryton-debian-vcs] tryton-modules-account-stock-anglo-saxon branch debian updated. debian/3.6.1-1-3-g9c0056f
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 11 11:21:04 UTC 2015
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-stock-anglo-saxon.git;a=commitdiff;h=debian/3.6.1-1-3-g9c0056f
commit 9c0056fe1fa10e4dc1e59eb5c978a94cf87774d8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 11 12:11:04 2015 +0100
Merging upstream version 3.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index fe5ddc2..5aabf50 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 3.6.1 - 2015-05-22
+Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
Version 3.6.0 - 2015-04-20
diff --git a/PKG-INFO b/PKG-INFO
index 7feef54..6232dd5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_stock_anglo_saxon
-Version: 3.6.1
+Version: 3.8.0
Summary: Tryton module for anglo-saxon real-time stock valuation
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.6/
+Download-URL: http://downloads.tryton.org/3.8/
Description: trytond_account_stock_anglo_saxon
=================================
@@ -58,6 +58,9 @@ Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Hungarian
+Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
diff --git a/account.xml b/account.xml
index a2934c2..0a7e965 100644
--- a/account.xml
+++ b/account.xml
@@ -4,15 +4,6 @@ this repository contains the full copyright notices and license terms. -->
<tryton>
<data>
- <record model="account.account.template" id="account_template_cogs">
- <field name="name">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>
-
<!-- Read access to compute anglo saxon account.move lines -->
<record model="ir.model.access" id="access_purchase_line_account">
<field name="model" search="[('model', '=', 'purchase.line')]"/>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index c1f64c1..ae46f30 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -35,10 +35,6 @@ msgctxt "help:product.template,account_cogs:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Ще се използва тази сметка вместо тази зададена за категорията"
-msgctxt "model:account.account.template,name:account_template_cogs"
-msgid "COGS"
-msgstr ""
-
msgctxt "selection:account.fiscalyear,account_stock_method:"
msgid "Anglo-Saxon"
msgstr ""
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 815bb76..3f641fb 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -24,20 +24,16 @@ msgstr "Compte cost béns venuts usada"
msgctxt "field:stock.move,in_anglo_saxon_quantity:"
msgid "Input Anglo-Saxon Quantity"
-msgstr ""
+msgstr "Quantitat anglosaxona d'entrada"
msgctxt "field:stock.move,out_anglo_saxon_quantity:"
msgid "Output Anglo-Saxon Quantity"
-msgstr ""
+msgstr "Quantitat anglosaxona de sortida"
msgctxt "help:product.template,account_cogs:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Aquest compte s'usarà en lloc del definit a la categoria."
-msgctxt "model:account.account.template,name:account_template_cogs"
-msgid "COGS"
-msgstr "COGS"
-
msgctxt "selection:account.fiscalyear,account_stock_method:"
msgid "Anglo-Saxon"
-msgstr ""
+msgstr "Anglosaxó"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 3ec9dd8..2b3b167 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -34,10 +34,6 @@ msgctxt "help:product.template,account_cogs:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
-msgctxt "model:account.account.template,name:account_template_cogs"
-msgid "COGS"
-msgstr ""
-
msgctxt "selection:account.fiscalyear,account_stock_method:"
msgid "Anglo-Saxon"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 394dde8..adac61d 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -36,7 +36,7 @@ msgstr ""
"Dieses Konto wird benutzt anstelle des Kontos, welches in der Kategorie "
"eingestellt ist."
-msgctxt "model:account.account.template,name:account_template_cogs"
+msgctxt "model:account.account.template,name:"
msgid "COGS"
msgstr "Kosten der verkauften Waren (COGS)"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 173f801..7b33d78 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -34,10 +34,6 @@ msgctxt "help:product.template,account_cogs:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Se usará esta cuenta en lugar de la definida en la categoría."
-msgctxt "model:account.account.template,name:account_template_cogs"
-msgid "COGS"
-msgstr "CMV"
-
msgctxt "selection:account.fiscalyear,account_stock_method:"
msgid "Anglo-Saxon"
msgstr "Anglo-sajón"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index cf02ecf..6bea97c 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -35,10 +35,6 @@ msgctxt "help:product.template,account_cogs:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Esta cuenta se usará en lugar de la definida en la categoría."
-msgctxt "model:account.account.template,name:account_template_cogs"
-msgid "COGS"
-msgstr "Costos de Ventas"
-
msgctxt "selection:account.fiscalyear,account_stock_method:"
msgid "Anglo-Saxon"
msgstr "Anglosajon"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 17ea147..ff3b31d 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -34,10 +34,6 @@ msgctxt "help:product.template,account_cogs:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Se utilizará esta cuenta en lugar de la definida en la categoría."
-msgctxt "model:account.account.template,name:account_template_cogs"
-msgid "COGS"
-msgstr "CDMV"
-
msgctxt "selection:account.fiscalyear,account_stock_method:"
msgid "Anglo-Saxon"
msgstr "Anglosajón"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 545400f..a913209 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -34,10 +34,6 @@ msgctxt "help:product.template,account_cogs:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Se usará esta cuenta en lugar de la definida en la categoría."
-msgctxt "model:account.account.template,name:account_template_cogs"
-msgid "COGS"
-msgstr "CMV"
-
msgctxt "selection:account.fiscalyear,account_stock_method:"
msgid "Anglo-Saxon"
msgstr "Anglosajón"
diff --git a/locale/es_ES.po b/locale/es_MX.po
similarity index 80%
copy from locale/es_ES.po
copy to locale/es_MX.po
index 545400f..f8beb4d 100644
--- a/locale/es_ES.po
+++ b/locale/es_MX.po
@@ -8,19 +8,19 @@ msgstr "La cantidad anglosajona no puede ser mayor que la cantidad."
msgctxt "field:product.category,account_cogs:"
msgid "Account Cost of Goods Sold"
-msgstr "Cuenta coste de bienes vendidos"
+msgstr "Cuenta de costos de mercancías vendidas (CMV)"
msgctxt "field:product.category,account_cogs_used:"
msgid "Account Cost of Goods Sold Used"
-msgstr "Cuenta coste de bienes vendidos usada"
+msgstr "Cuenta de costos de mercancías vendidas (CMV) usada"
msgctxt "field:product.template,account_cogs:"
msgid "Account Cost of Goods Sold"
-msgstr "Cuenta coste de bienes vendidos"
+msgstr "Cuenta de costos de mercancías vendidas (CMV)"
msgctxt "field:product.template,account_cogs_used:"
msgid "Account Cost of Goods Sold Used"
-msgstr "Cuenta coste de bienes vendidos usada"
+msgstr "Cuenta de costos de mercancías vendidas (CMV) usada"
msgctxt "field:stock.move,in_anglo_saxon_quantity:"
msgid "Input Anglo-Saxon Quantity"
@@ -34,10 +34,6 @@ msgctxt "help:product.template,account_cogs:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Se usará esta cuenta en lugar de la definida en la categoría."
-msgctxt "model:account.account.template,name:account_template_cogs"
-msgid "COGS"
-msgstr "CMV"
-
msgctxt "selection:account.fiscalyear,account_stock_method:"
msgid "Anglo-Saxon"
msgstr "Anglosajón"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 5804f59..c3bcae6 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -34,10 +34,6 @@ msgctxt "help:product.template,account_cogs:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Ce compte sera utilisé au lieu de celui défini sur la catégorie."
-msgctxt "model:account.account.template,name:account_template_cogs"
-msgid "COGS"
-msgstr "Prix du bien vendu"
-
msgctxt "selection:account.fiscalyear,account_stock_method:"
msgid "Anglo-Saxon"
msgstr "Anglo-Saxonne"
diff --git a/locale/cs_CZ.po b/locale/hu_HU.po
similarity index 91%
copy from locale/cs_CZ.po
copy to locale/hu_HU.po
index 3ec9dd8..2b3b167 100644
--- a/locale/cs_CZ.po
+++ b/locale/hu_HU.po
@@ -34,10 +34,6 @@ msgctxt "help:product.template,account_cogs:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
-msgctxt "model:account.account.template,name:account_template_cogs"
-msgid "COGS"
-msgstr ""
-
msgctxt "selection:account.fiscalyear,account_stock_method:"
msgid "Anglo-Saxon"
msgstr ""
diff --git a/locale/cs_CZ.po b/locale/it_IT.po
similarity index 91%
copy from locale/cs_CZ.po
copy to locale/it_IT.po
index 3ec9dd8..2b3b167 100644
--- a/locale/cs_CZ.po
+++ b/locale/it_IT.po
@@ -34,10 +34,6 @@ msgctxt "help:product.template,account_cogs:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
-msgctxt "model:account.account.template,name:account_template_cogs"
-msgid "COGS"
-msgstr ""
-
msgctxt "selection:account.fiscalyear,account_stock_method:"
msgid "Anglo-Saxon"
msgstr ""
diff --git a/locale/cs_CZ.po b/locale/ja_JP.po
similarity index 91%
copy from locale/cs_CZ.po
copy to locale/ja_JP.po
index 3ec9dd8..2b3b167 100644
--- a/locale/cs_CZ.po
+++ b/locale/ja_JP.po
@@ -34,10 +34,6 @@ msgctxt "help:product.template,account_cogs:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
-msgctxt "model:account.account.template,name:account_template_cogs"
-msgid "COGS"
-msgstr ""
-
msgctxt "selection:account.fiscalyear,account_stock_method:"
msgid "Anglo-Saxon"
msgstr ""
diff --git a/locale/cs_CZ.po b/locale/lt_LT.po
similarity index 91%
copy from locale/cs_CZ.po
copy to locale/lt_LT.po
index 3ec9dd8..2b3b167 100644
--- a/locale/cs_CZ.po
+++ b/locale/lt_LT.po
@@ -34,10 +34,6 @@ msgctxt "help:product.template,account_cogs:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
-msgctxt "model:account.account.template,name:account_template_cogs"
-msgid "COGS"
-msgstr ""
-
msgctxt "selection:account.fiscalyear,account_stock_method:"
msgid "Anglo-Saxon"
msgstr ""
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 6bd3e29..c9e0dad 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -36,10 +36,6 @@ msgid "This account will be used instead of the one defined on the category."
msgstr ""
"Deze rekening zal gebruikt worden in de plaats van die van de categorie."
-msgctxt "model:account.account.template,name:account_template_cogs"
-msgid "COGS"
-msgstr ""
-
msgctxt "selection:account.fiscalyear,account_stock_method:"
msgid "Anglo-Saxon"
msgstr ""
diff --git a/locale/nl_NL.po b/locale/pt_BR.po
similarity index 65%
copy from locale/nl_NL.po
copy to locale/pt_BR.po
index 6bd3e29..29160aa 100644
--- a/locale/nl_NL.po
+++ b/locale/pt_BR.po
@@ -4,42 +4,36 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
msgid "Anglo-Saxon quantity can not be greater than quantity."
-msgstr ""
+msgstr "A quantidade anglo-saxã não pode ser maior do que a quantidade."
msgctxt "field:product.category,account_cogs:"
msgid "Account Cost of Goods Sold"
-msgstr ""
+msgstr "Conta de Custo de Mercadorias Vendidas"
msgctxt "field:product.category,account_cogs_used:"
msgid "Account Cost of Goods Sold Used"
-msgstr ""
+msgstr "Conta de Custo de Mercadorias Vendidas Utilizada"
msgctxt "field:product.template,account_cogs:"
msgid "Account Cost of Goods Sold"
-msgstr ""
+msgstr "Conta de Custo de Mercadorias Vendidas"
msgctxt "field:product.template,account_cogs_used:"
msgid "Account Cost of Goods Sold Used"
-msgstr ""
+msgstr "Conta de Custo de Mercadorias Vendidas Utilizada"
msgctxt "field:stock.move,in_anglo_saxon_quantity:"
msgid "Input Anglo-Saxon Quantity"
-msgstr ""
+msgstr "Quantidade Anglo-Saxã de Entrada"
msgctxt "field:stock.move,out_anglo_saxon_quantity:"
msgid "Output Anglo-Saxon Quantity"
-msgstr ""
+msgstr "Quantidade Anglo-Saxã de Saída"
-#, fuzzy
msgctxt "help:product.template,account_cogs:"
msgid "This account will be used instead of the one defined on the category."
-msgstr ""
-"Deze rekening zal gebruikt worden in de plaats van die van de categorie."
-
-msgctxt "model:account.account.template,name:account_template_cogs"
-msgid "COGS"
-msgstr ""
+msgstr "Esta conta será utilizada no lugar daquela definida na categoria."
msgctxt "selection:account.fiscalyear,account_stock_method:"
msgid "Anglo-Saxon"
-msgstr ""
+msgstr "Anglo-Saxão"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 184d3b1..53972f5 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -35,10 +35,6 @@ msgctxt "help:product.template,account_cogs:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Этот счет будет использован вместо указанного в категории."
-msgctxt "model:account.account.template,name:account_template_cogs"
-msgid "COGS"
-msgstr ""
-
msgctxt "selection:account.fiscalyear,account_stock_method:"
msgid "Anglo-Saxon"
msgstr ""
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 4863fdb..648305a 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -34,7 +34,7 @@ msgctxt "help:product.template,account_cogs:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Namesto konta v kategoriji se bo uporabil ta konto prihodkov."
-msgctxt "model:account.account.template,name:account_template_cogs"
+msgctxt "model:account.account.template,name:"
msgid "COGS"
msgstr "COGS"
diff --git a/minimal_chart.xml b/minimal_chart.xml
new file mode 100644
index 0000000..0445d46
--- /dev/null
+++ b/minimal_chart.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+
+ <record model="account.account.template" id="account_template_cogs">
+ <field name="name" lang="en">COGS</field>
+ <field name="name" lang="bg">COGS</field>
+ <field name="name" lang="ca">COGS</field>
+ <field name="name" lang="de">Kosten der verkauften Waren (COGS)</field>
+ <field name="name" lang="es">CMV</field>
+ <field name="name" lang="fr">Prix du bien vendu</field>
+ <field name="name" lang="nl">COGS</field>
+ <field name="name" lang="ru">COGS</field>
+ <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>
+</tryton>
+
diff --git a/minimal_chart_bg.xml b/minimal_chart_bg.xml
new file mode 100644
index 0000000..bc7345d
--- /dev/null
+++ b/minimal_chart_bg.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+
+ <record id="account_template_cogs_bg" model="account.account.template">
+
+ <field name="name">COGS</field>
+
+
+
+
+
+
+
+ <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>
+</tryton>
diff --git a/minimal_chart_ca.xml b/minimal_chart_ca.xml
new file mode 100644
index 0000000..fde2a48
--- /dev/null
+++ b/minimal_chart_ca.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+
+ <record id="account_template_cogs_ca" model="account.account.template">
+
+
+ <field name="name">COGS</field>
+
+
+
+
+
+
+ <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>
+</tryton>
diff --git a/minimal_chart_de.xml b/minimal_chart_de.xml
new file mode 100644
index 0000000..45e792f
--- /dev/null
+++ b/minimal_chart_de.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+
+ <record id="account_template_cogs_de" model="account.account.template">
+
+
+
+ <field name="name">Kosten der verkauften Waren (COGS)</field>
+
+
+
+
+
+ <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>
+</tryton>
diff --git a/minimal_chart_en.xml b/minimal_chart_en.xml
new file mode 100644
index 0000000..22a22d8
--- /dev/null
+++ b/minimal_chart_en.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+
+ <record id="account_template_cogs_en" model="account.account.template">
+ <field name="name">COGS</field>
+
+
+
+
+
+
+
+
+ <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>
+</tryton>
diff --git a/minimal_chart_es.xml b/minimal_chart_es.xml
new file mode 100644
index 0000000..304dff1
--- /dev/null
+++ b/minimal_chart_es.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+
+ <record id="account_template_cogs_es" model="account.account.template">
+
+
+
+
+ <field name="name">CMV</field>
+
+
+
+
+ <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>
+</tryton>
diff --git a/minimal_chart_fr.xml b/minimal_chart_fr.xml
new file mode 100644
index 0000000..dd7f638
--- /dev/null
+++ b/minimal_chart_fr.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+
+ <record id="account_template_cogs_fr" model="account.account.template">
+
+
+
+
+
+ <field name="name">Prix du bien vendu</field>
+
+
+
+ <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>
+</tryton>
diff --git a/minimal_chart_nl.xml b/minimal_chart_nl.xml
new file mode 100644
index 0000000..e419652
--- /dev/null
+++ b/minimal_chart_nl.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+
+ <record id="account_template_cogs_nl" model="account.account.template">
+
+
+
+
+
+
+ <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>
+</tryton>
diff --git a/minimal_chart_ru.xml b/minimal_chart_ru.xml
new file mode 100644
index 0000000..69c64d8
--- /dev/null
+++ b/minimal_chart_ru.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+
+ <record id="account_template_cogs_ru" model="account.account.template">
+
+
+
+
+
+
+
+ <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>
+</tryton>
diff --git a/minimal_chart_sl.xml b/minimal_chart_sl.xml
new file mode 100644
index 0000000..e42268e
--- /dev/null
+++ b/minimal_chart_sl.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+
+ <record id="account_template_cogs_sl" model="account.account.template">
+
+
+
+
+
+
+
+
+ <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>
+</tryton>
diff --git a/setup.py b/setup.py
index 84cea2b..2b1bb5d 100644
--- a/setup.py
+++ b/setup.py
@@ -88,6 +88,9 @@ setup(name=name,
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Hungarian',
+ 'Natural Language :: Italian',
+ 'Natural Language :: Portuguese (Brazilian)',
'Natural Language :: Russian',
'Natural Language :: Slovenian',
'Natural Language :: Spanish',
diff --git a/stock.py b/stock.py
index fb52aec..97c7542 100644
--- a/stock.py
+++ b/stock.py
@@ -1,8 +1,7 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
from decimal import Decimal
-from trytond.model import fields
-from trytond.pyson import Eval
+from trytond.model import fields, Check
from trytond.pool import Pool, PoolMeta
from trytond.transaction import Transaction
from trytond import backend
@@ -21,23 +20,23 @@ def _get_field(type_):
class Move:
__name__ = 'stock.move'
in_anglo_saxon_quantity = fields.Float('Input Anglo-Saxon Quantity',
- required=True, digits=(16, Eval('unit_digits', 2)),
- depends=['unit_digits'])
+ required=True)
out_anglo_saxon_quantity = fields.Float('Output Anglo-Saxon Quantity',
- required=True, digits=(16, Eval('unit_digits', 2)),
- depends=['unit_digits'])
+ required=True)
@classmethod
def __setup__(cls):
super(Move, cls).__setup__()
cls._allow_modify_closed_period.update(['in_anglo_saxon_quantity',
'out_anglo_saxon_quantity'])
+
+ t = cls.__table__()
cls._sql_constraints += [
('check_in_anglo_saxon_quantity',
- 'CHECK(quantity >= in_anglo_saxon_quantity)',
+ Check(t, t.quantity >= t.in_anglo_saxon_quantity),
'Anglo-Saxon quantity can not be greater than quantity.'),
('check_out_anglo_saxon_quantity',
- 'CHECK(quantity >= out_anglo_saxon_quantity)',
+ Check(t, t.quantity >= t.out_anglo_saxon_quantity),
'Anglo-Saxon quantity can not be greater than quantity.'),
]
diff --git a/tests/scenario_account_stock_anglo_saxon.rst b/tests/scenario_account_stock_anglo_saxon.rst
index 63e8b1e..74d99ba 100644
--- a/tests/scenario_account_stock_anglo_saxon.rst
+++ b/tests/scenario_account_stock_anglo_saxon.rst
@@ -27,14 +27,14 @@ Create database::
Install account_stock_continental, sale and purchase::
- >>> Module = Model.get('ir.module.module')
+ >>> Module = Model.get('ir.module')
>>> modules = Module.find([
... ('name', 'in', ('account_stock_anglo_saxon',
... 'sale', 'purchase')),
... ])
>>> for module in modules:
... module.click('install')
- >>> Wizard('ir.module.module.install_upgrade').execute('upgrade')
+ >>> Wizard('ir.module.install_upgrade').execute('upgrade')
Create company::
@@ -191,10 +191,12 @@ Receive 9 products::
>>> ShipmentIn = Model.get('stock.shipment.in')
>>> Move = Model.get('stock.move')
>>> shipment = ShipmentIn(supplier=supplier)
- >>> move = Move(purchase.moves[0].id)
+ >>> move, = [m for m in purchase.moves if m.product == product]
+ >>> move = Move(move.id)
>>> shipment.incoming_moves.append(move)
>>> move.quantity = 4.0
- >>> move = Move(purchase.moves[1].id)
+ >>> move, = [m for m in purchase.moves if m.product == product_average]
+ >>> move = Move(move.id)
>>> shipment.incoming_moves.append(move)
>>> move.quantity = 5.0
>>> shipment.click('receive')
@@ -223,9 +225,10 @@ Open supplier invoice::
>>> Invoice = Model.get('account.invoice')
>>> purchase.reload()
>>> invoice, = purchase.invoices
- >>> invoice_line = invoice.lines[0]
+ >>> invoice_line, = [l for l in invoice.lines if l.product == product]
>>> invoice_line.unit_price = Decimal('6')
- >>> invoice_line = invoice.lines[1]
+ >>> invoice_line, = [l for l in invoice.lines
+ ... if l.product == product_average]
>>> invoice_line.unit_price = Decimal('4')
>>> invoice.invoice_date = today
>>> invoice.click('post')
@@ -349,6 +352,7 @@ Create customer invoice with negative quantity::
>>> invoice_line = invoice.lines.new()
>>> invoice_line.product = product
>>> invoice_line.quantity = -1
+ >>> invoice_line.unit_price = Decimal('10')
>>> invoice.click('post')
>>> invoice.state
u'posted'
diff --git a/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst b/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst
index ddc0574..7486136 100644
--- a/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst
+++ b/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst
@@ -27,14 +27,14 @@ Create database::
Install sale_supply, sale, purchase::
- >>> Module = Model.get('ir.module.module')
+ >>> Module = Model.get('ir.module')
>>> modules = Module.find([
... ('name', 'in', ('account_stock_anglo_saxon',
... 'sale_supply_drop_shipment', 'sale', 'purchase')),
... ])
>>> for module in modules:
... module.click('install')
- >>> Wizard('ir.module.module.install_upgrade').execute('upgrade')
+ >>> Wizard('ir.module.install_upgrade').execute('upgrade')
Create company::
@@ -211,6 +211,7 @@ Create Purchase from Request::
Receive 50 products::
>>> config.user = stock_user.id
+ >>> shipment.click('ship')
>>> shipment.click('done')
>>> shipment.state
u'done'
@@ -226,9 +227,9 @@ Receive 50 products::
Decimal('0.00')
>>> stock.reload()
>>> stock.debit
- Decimal('0.00')
+ Decimal('150.00')
>>> stock.credit
- Decimal('0.00')
+ Decimal('150.00')
Open supplier invoice::
diff --git a/tests/test_account_stock_anglo_saxon.py b/tests/test_account_stock_anglo_saxon.py
index 73b20ab..7fb2a76 100644
--- a/tests/test_account_stock_anglo_saxon.py
+++ b/tests/test_account_stock_anglo_saxon.py
@@ -35,8 +35,10 @@ class AccountStockAngloSaxonTestCase(ModuleTestCase):
return move
with patch.object(Uom, 'compute_qty') as compute_qty, \
+ patch.object(Uom, 'compute_price') as compute_price, \
patch.object(Currency, 'compute') as compute:
compute_qty.side_effect = lambda *args, **kwargs: args[1]
+ compute_price.side_effect = lambda *args, **kwargs: args[1]
compute.side_effect = lambda *args, **kwargs: args[1]
moves = [move(1, 3), move(2, 2)]
diff --git a/tryton.cfg b/tryton.cfg
index c001809..3da6cc9 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.1
+version=3.8.0
depends:
account
account_invoice
@@ -12,3 +12,12 @@ depends:
xml:
product.xml
account.xml
+ minimal_chart_bg.xml
+ minimal_chart_ca.xml
+ minimal_chart_de.xml
+ minimal_chart_en.xml
+ minimal_chart_es.xml
+ minimal_chart_fr.xml
+ minimal_chart_nl.xml
+ minimal_chart_ru.xml
+ minimal_chart_sl.xml
diff --git a/trytond_account_stock_anglo_saxon.egg-info/PKG-INFO b/trytond_account_stock_anglo_saxon.egg-info/PKG-INFO
index 00b1497..8417020 100644
--- a/trytond_account_stock_anglo_saxon.egg-info/PKG-INFO
+++ b/trytond_account_stock_anglo_saxon.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-stock-anglo-saxon
-Version: 3.6.1
+Version: 3.8.0
Summary: Tryton module for anglo-saxon real-time stock valuation
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.6/
+Download-URL: http://downloads.tryton.org/3.8/
Description: trytond_account_stock_anglo_saxon
=================================
@@ -58,6 +58,9 @@ Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Hungarian
+Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
diff --git a/trytond_account_stock_anglo_saxon.egg-info/SOURCES.txt b/trytond_account_stock_anglo_saxon.egg-info/SOURCES.txt
index ec56e82..83bc51d 100644
--- a/trytond_account_stock_anglo_saxon.egg-info/SOURCES.txt
+++ b/trytond_account_stock_anglo_saxon.egg-info/SOURCES.txt
@@ -5,6 +5,16 @@ LICENSE
MANIFEST.in
README
account.xml
+minimal_chart.xml
+minimal_chart_bg.xml
+minimal_chart_ca.xml
+minimal_chart_de.xml
+minimal_chart_en.xml
+minimal_chart_es.xml
+minimal_chart_fr.xml
+minimal_chart_nl.xml
+minimal_chart_ru.xml
+minimal_chart_sl.xml
product.xml
setup.py
tryton.cfg
@@ -12,6 +22,15 @@ tryton.cfg
./account.py
./account.xml
./invoice.py
+./minimal_chart_bg.xml
+./minimal_chart_ca.xml
+./minimal_chart_de.xml
+./minimal_chart_en.xml
+./minimal_chart_es.xml
+./minimal_chart_fr.xml
+./minimal_chart_nl.xml
+./minimal_chart_ru.xml
+./minimal_chart_sl.xml
./product.py
./product.xml
./stock.py
@@ -24,8 +43,14 @@ tryton.cfg
./locale/es_CO.po
./locale/es_EC.po
./locale/es_ES.po
+./locale/es_MX.po
./locale/fr_FR.po
+./locale/hu_HU.po
+./locale/it_IT.po
+./locale/ja_JP.po
+./locale/lt_LT.po
./locale/nl_NL.po
+./locale/pt_BR.po
./locale/ru_RU.po
./locale/sl_SI.po
./tests/__init__.py
@@ -44,8 +69,14 @@ locale/es_AR.po
locale/es_CO.po
locale/es_EC.po
locale/es_ES.po
+locale/es_MX.po
locale/fr_FR.po
+locale/hu_HU.po
+locale/it_IT.po
+locale/ja_JP.po
+locale/lt_LT.po
locale/nl_NL.po
+locale/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
tests/scenario_account_stock_anglo_saxon.rst
diff --git a/trytond_account_stock_anglo_saxon.egg-info/requires.txt b/trytond_account_stock_anglo_saxon.egg-info/requires.txt
index 12c90e9..6be4a23 100644
--- a/trytond_account_stock_anglo_saxon.egg-info/requires.txt
+++ b/trytond_account_stock_anglo_saxon.egg-info/requires.txt
@@ -1,7 +1,7 @@
-trytond_account >= 3.6, < 3.7
-trytond_account_invoice >= 3.6, < 3.7
-trytond_account_product >= 3.6, < 3.7
-trytond_account_stock_continental >= 3.6, < 3.7
-trytond_purchase >= 3.6, < 3.7
-trytond_sale >= 3.6, < 3.7
-trytond >= 3.6, < 3.7
\ No newline at end of file
+trytond_account >= 3.8, < 3.9
+trytond_account_invoice >= 3.8, < 3.9
+trytond_account_product >= 3.8, < 3.9
+trytond_account_stock_continental >= 3.8, < 3.9
+trytond_purchase >= 3.8, < 3.9
+trytond_sale >= 3.8, < 3.9
+trytond >= 3.8, < 3.9
\ No newline at end of file
--
tryton-modules-account-stock-anglo-saxon
More information about the tryton-debian-vcs
mailing list