[tryton-debian-vcs] tryton-modules-account-product branch debian updated. debian/3.8.0-2-5-g60ebdfe
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:08:10 UTC 2016
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-product.git;a=commitdiff;h=debian/3.8.0-2-5-g60ebdfe
commit 60ebdfeb24644f20a88e3d94b7eeaf742ac9f841
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:47:15 2016 +0200
Releasing debian version 4.0.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 9695b02..0f90618 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-account-product (4.0.1-1) unstable; urgency=medium
+
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 4.0.0.
+ * Merging upstream version 4.0.1.
+ * Updating the copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 30 May 2016 19:27:31 +0200
+
tryton-modules-account-product (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit d70fe7bf51e049a5350e95263233e6227d1cdcfb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 19:01:03 2016 +0200
Updating the copyright file.
diff --git a/debian/copyright b/debian/copyright
index f8372ae..cf371c6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,15 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2015 Cédric Krier
+Copyright: 2008-2016 Cédric Krier
2008-2013 Bertrand Chenal
- 2008-2015 B2CK SPRL
+ 2008-2016 B2CK SPRL
2004-2008 Tiny SPRL
License: GPL-3+
Files: debian/*
Copyright: 2009-2012 Daniel Baumann <daniel at debian.org>
- 2012-2015 Mathias Behrle <mathiasb at m9s.biz>
+ 2012-2016 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 60d8a05682691ff0c51ff085149d966a7b0a3772
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:10 2016 +0200
Merging upstream version 4.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index 01b7c50..9cc48d4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.1 - 2016-05-11
+* Bug fixes (see mercurial logs for details)
+
Version 4.0.0 - 2016-05-02
* Bug fixes (see mercurial logs for details)
* Move category into account_category
diff --git a/PKG-INFO b/PKG-INFO
index 396ec13..0f8265d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_product
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to add accounting on product
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 201ca12..a23fe36 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -46,7 +46,6 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Compte d'ingressos usada"
-#, fuzzy
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr "Comptabilitat"
@@ -137,69 +136,59 @@ msgstr "Usuari modificació"
msgctxt "field:product.configuration,default_accounts_category:"
msgid "Use Category's accounts by default"
-msgstr ""
+msgstr "Usa comptes de la categoria per defecte"
msgctxt "field:product.configuration,default_taxes_category:"
msgid "Use Category' taxes by default"
-msgstr ""
+msgstr "Usa impostos de la categoria per defecte"
msgctxt "field:product.product,account_category:"
msgid "Account Category"
-msgstr ""
+msgstr "Categoria comptable"
-#, fuzzy
msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr "Compte de despeses"
-#, fuzzy
msgctxt "field:product.product,account_expense_used:"
msgid "Account Expense Used"
msgstr "Compte de despeses usada"
-#, fuzzy
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Compte d'ingressos"
-#, fuzzy
msgctxt "field:product.product,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Compte d'ingressos usada"
-#, fuzzy
msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Usa comptes de la categoria"
-#, fuzzy
msgctxt "field:product.product,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impostos de client"
-#, fuzzy
msgctxt "field:product.product,customer_taxes_used:"
msgid "Customer Taxes Used"
msgstr "Impostos de client usats"
-#, fuzzy
msgctxt "field:product.product,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Impostos de proveïdor"
-#, fuzzy
msgctxt "field:product.product,supplier_taxes_used:"
msgid "Supplier Taxes Used"
msgstr "Impostos de proveïdor usats"
-#, fuzzy
msgctxt "field:product.product,taxes_category:"
msgid "Use Category's Taxes"
msgstr "Usa impostos de la categoria"
msgctxt "field:product.template,account_category:"
msgid "Account Category"
-msgstr ""
+msgstr "Categoria comptable"
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
@@ -217,7 +206,6 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Compte d'ingressos usada"
-#, fuzzy
msgctxt "field:product.template,accounts_category:"
msgid "Use Category's accounts"
msgstr "Usa comptes de la categoria"
@@ -314,22 +302,18 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Utilitza els impostos definits en la categoria pare."
-#, fuzzy
msgctxt "help:product.product,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
-#, fuzzy
msgctxt "help:product.product,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
-#, fuzzy
msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Utilitza els comptes definits en la categoria."
-#, fuzzy
msgctxt "help:product.product,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Utilitza els impostos definits en la categoria."
@@ -342,7 +326,6 @@ msgctxt "help:product.template,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
-#, fuzzy
msgctxt "help:product.template,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Utilitza els comptes definits en la categoria."
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 5833299..3124d6d 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -46,7 +46,6 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Verwendetes Ertragskonto"
-#, fuzzy
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr "Buchhaltung"
@@ -137,69 +136,59 @@ msgstr "Letzte Änderung durch"
msgctxt "field:product.configuration,default_accounts_category:"
msgid "Use Category's accounts by default"
-msgstr ""
+msgstr "Konten der Kategorie als Standard anwenden"
msgctxt "field:product.configuration,default_taxes_category:"
msgid "Use Category' taxes by default"
-msgstr ""
+msgstr "Steuern der Kategorie als Standard anwenden"
msgctxt "field:product.product,account_category:"
msgid "Account Category"
-msgstr ""
+msgstr "Buchhaltungskategorie"
-#, fuzzy
msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr "Aufwandskonto"
-#, fuzzy
msgctxt "field:product.product,account_expense_used:"
msgid "Account Expense Used"
msgstr "Verwendetes Aufwandskonto"
-#, fuzzy
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Ertragskonto"
-#, fuzzy
msgctxt "field:product.product,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Verwendetes Ertragskonto"
-#, fuzzy
msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Konten der Kategorie anwenden"
-#, fuzzy
msgctxt "field:product.product,customer_taxes:"
msgid "Customer Taxes"
msgstr "Steuern Kunde"
-#, fuzzy
msgctxt "field:product.product,customer_taxes_used:"
msgid "Customer Taxes Used"
msgstr "Für Kunden verwendete Steuern"
-#, fuzzy
msgctxt "field:product.product,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Steuern Lieferant"
-#, fuzzy
msgctxt "field:product.product,supplier_taxes_used:"
msgid "Supplier Taxes Used"
msgstr "Für Lieferanten verwendete Steuern"
-#, fuzzy
msgctxt "field:product.product,taxes_category:"
msgid "Use Category's Taxes"
msgstr "Steuern der Kategorie anwenden"
msgctxt "field:product.template,account_category:"
msgid "Account Category"
-msgstr ""
+msgstr "Buchhaltungskategorie"
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
@@ -217,7 +206,6 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Verwendetes Ertragskonto"
-#, fuzzy
msgctxt "field:product.template,accounts_category:"
msgid "Use Category's accounts"
msgstr "Konten der Kategorie anwenden"
@@ -314,26 +302,22 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Steuern der übergeordneten Kategorie anwenden"
-#, fuzzy
msgctxt "help:product.product,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
"Dieses Konto wird benutzt anstelle des Kontos, welches in der Kategorie "
"eingestellt ist."
-#, fuzzy
msgctxt "help:product.product,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
"Dieses Konto wird benutzt anstelle des Kontos, welches in der Kategorie "
"eingestellt ist."
-#, fuzzy
msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Wendet die Konten an, die in der Artikelkategorie definiert sind"
-#, fuzzy
msgctxt "help:product.product,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Wendet die Steuern an, die in der Artikelkategorie definiert sind"
@@ -350,7 +334,6 @@ msgstr ""
"Dieses Konto wird benutzt anstelle des Kontos, welches in der Kategorie "
"eingestellt ist."
-#, fuzzy
msgctxt "help:product.template,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Wendet die Konten an, die in der Artikelkategorie definiert sind"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 6ba6163..2669511 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -48,7 +48,6 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos usada"
-#, fuzzy
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr "Contabilidad"
@@ -139,69 +138,59 @@ msgstr "Usuario modificación"
msgctxt "field:product.configuration,default_accounts_category:"
msgid "Use Category's accounts by default"
-msgstr ""
+msgstr "Usar por defecto las cuentas de la categoría"
msgctxt "field:product.configuration,default_taxes_category:"
msgid "Use Category' taxes by default"
-msgstr ""
+msgstr "Usar por defecto los impuestos de la categoría"
msgctxt "field:product.product,account_category:"
msgid "Account Category"
-msgstr ""
+msgstr "Categoría contable"
-#, fuzzy
msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr "Cuenta de gastos"
-#, fuzzy
msgctxt "field:product.product,account_expense_used:"
msgid "Account Expense Used"
msgstr "Cuenta de gastos usada"
-#, fuzzy
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Cuenta de ingresos"
-#, fuzzy
msgctxt "field:product.product,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos usada"
-#, fuzzy
msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Usar cuentas de la categoría"
-#, fuzzy
msgctxt "field:product.product,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos de cliente"
-#, fuzzy
msgctxt "field:product.product,customer_taxes_used:"
msgid "Customer Taxes Used"
msgstr "Impuestos de cliente usados"
-#, fuzzy
msgctxt "field:product.product,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Impuestos de proveedor"
-#, fuzzy
msgctxt "field:product.product,supplier_taxes_used:"
msgid "Supplier Taxes Used"
msgstr "Impuestos de proveedor usados"
-#, fuzzy
msgctxt "field:product.product,taxes_category:"
msgid "Use Category's Taxes"
msgstr "Usar impuestos de la categoría"
msgctxt "field:product.template,account_category:"
msgid "Account Category"
-msgstr ""
+msgstr "Categoría contable"
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
@@ -219,7 +208,6 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos usada"
-#, fuzzy
msgctxt "field:product.template,accounts_category:"
msgid "Use Category's accounts"
msgstr "Usar cuentas de la categoría"
@@ -316,35 +304,30 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Usar los impuestos definidos en la categoría padre"
-#, fuzzy
msgctxt "help:product.product,account_expense:"
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."
+msgstr "Se usará esta cuenta en lugar de la definida en la categoría."
-#, fuzzy
msgctxt "help:product.product,account_revenue:"
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."
+msgstr "Se usará esta cuenta en lugar de la definida en la categoría."
-#, fuzzy
msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Usar las cuentas definidas en la categoría"
-#, fuzzy
msgctxt "help:product.product,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Usar los impuestos definidos en la categoría"
msgctxt "help:product.template,account_expense:"
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."
+msgstr "Se usará esta cuenta en lugar de la definida en la categoría."
msgctxt "help:product.template,account_revenue:"
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."
+msgstr "Se usará esta cuenta en lugar de la definida en la categoría."
-#, fuzzy
msgctxt "help:product.template,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Usar las cuentas definidas en la categoría"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index b27939a..b1fb211 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -12,19 +12,19 @@ msgstr "No hay una cuenta gastos/ingresos definida para el producto %s (%d)"
msgctxt "field:account.configuration,default_category_account_expense:"
msgid "Default Account Expense"
-msgstr ""
+msgstr "Cuenta de Gastos por Defecto"
msgctxt "field:account.configuration,default_category_account_revenue:"
msgid "Default Account Revenue"
-msgstr ""
+msgstr "Cuenta de Ingresos por Defecto"
msgctxt "field:account.configuration,default_product_account_expense:"
msgid "Default Account Expense"
-msgstr ""
+msgstr "Cuenta de Ingresos por Defecto"
msgctxt "field:account.configuration,default_product_account_revenue:"
msgid "Default Account Revenue"
-msgstr ""
+msgstr "Cuenta de Ingresos por Defecto"
msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
@@ -46,7 +46,6 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de Ingresos Usada"
-#, fuzzy
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr "Contabilidad"
@@ -137,69 +136,59 @@ msgstr "Modificado por Usuario"
msgctxt "field:product.configuration,default_accounts_category:"
msgid "Use Category's accounts by default"
-msgstr ""
+msgstr "Usar cuentas de la Categoría por defecto"
msgctxt "field:product.configuration,default_taxes_category:"
msgid "Use Category' taxes by default"
-msgstr ""
+msgstr "Usar impuestos de la Categoría por defecto"
msgctxt "field:product.product,account_category:"
msgid "Account Category"
-msgstr ""
+msgstr "Categoría de la Cuenta"
-#, fuzzy
msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr "Cuenta de Gastos"
-#, fuzzy
msgctxt "field:product.product,account_expense_used:"
msgid "Account Expense Used"
msgstr "Cuenta de Gastos Usada"
-#, fuzzy
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Cuenta de Ingresos"
-#, fuzzy
msgctxt "field:product.product,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de Ingresos Usada"
-#, fuzzy
msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Use Cuentas de la Categoría"
-#, fuzzy
msgctxt "field:product.product,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos del Cliente"
-#, fuzzy
msgctxt "field:product.product,customer_taxes_used:"
msgid "Customer Taxes Used"
-msgstr "Impuestos del Cliente Aplicados"
+msgstr "Impuestos del Cliente Utilizados"
-#, fuzzy
msgctxt "field:product.product,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Impuestos del Proveedor"
-#, fuzzy
msgctxt "field:product.product,supplier_taxes_used:"
msgid "Supplier Taxes Used"
-msgstr "Impuestos del Proveedor Aplicados"
+msgstr "Impuestos del Proveedor Utilizado"
-#, fuzzy
msgctxt "field:product.product,taxes_category:"
msgid "Use Category's Taxes"
msgstr "Usar Impuestos de la Categoría"
msgctxt "field:product.template,account_category:"
msgid "Account Category"
-msgstr ""
+msgstr "Categoría de Cuenta"
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
@@ -217,7 +206,6 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de Ingresos Usada"
-#, fuzzy
msgctxt "field:product.template,accounts_category:"
msgid "Use Category's accounts"
msgstr "Use Cuentas de la Categoría"
@@ -314,22 +302,18 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Usar los impuestos definidos en la categoria padre"
-#, fuzzy
msgctxt "help:product.product,account_expense:"
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."
-#, fuzzy
msgctxt "help:product.product,account_revenue:"
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."
-#, fuzzy
msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Use las cuentas definidas en la categoría"
-#, fuzzy
msgctxt "help:product.product,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Usar los impuestos definidos en la categoría"
@@ -342,7 +326,6 @@ msgctxt "help:product.template,account_revenue:"
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."
-#, fuzzy
msgctxt "help:product.template,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Use las cuentas definidas en la categoría"
@@ -373,7 +356,7 @@ msgstr "Categoría"
msgctxt "view:account.configuration:"
msgid "Product"
-msgstr ""
+msgstr "Producto"
msgctxt "view:product.category:"
msgid "Accounting"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 4195dbe..0e4ffc5 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -48,7 +48,6 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos utilizada"
-#, fuzzy
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr "Contabilidad"
@@ -139,69 +138,59 @@ msgstr "Modificado por usuario"
msgctxt "field:product.configuration,default_accounts_category:"
msgid "Use Category's accounts by default"
-msgstr ""
+msgstr "Utilizar las cuentas de la categoría por defecto"
msgctxt "field:product.configuration,default_taxes_category:"
msgid "Use Category' taxes by default"
-msgstr ""
+msgstr "Utilizar los impuestos de la categoría por defecto"
msgctxt "field:product.product,account_category:"
msgid "Account Category"
-msgstr ""
+msgstr "Categoría contable"
-#, fuzzy
msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr "Cuenta de gastos"
-#, fuzzy
msgctxt "field:product.product,account_expense_used:"
msgid "Account Expense Used"
msgstr "Cuenta de gastos utilizada"
-#, fuzzy
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Cuenta de ingresos"
-#, fuzzy
msgctxt "field:product.product,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos utilizada"
-#, fuzzy
msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Utilizar las cuentas de la categoría"
-#, fuzzy
msgctxt "field:product.product,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos de cliente"
-#, fuzzy
msgctxt "field:product.product,customer_taxes_used:"
msgid "Customer Taxes Used"
msgstr "Impuestos de cliente utilizados"
-#, fuzzy
msgctxt "field:product.product,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Impuestos de proveedor"
-#, fuzzy
msgctxt "field:product.product,supplier_taxes_used:"
msgid "Supplier Taxes Used"
msgstr "Impuestos de proveedor utilizados"
-#, fuzzy
msgctxt "field:product.product,taxes_category:"
msgid "Use Category's Taxes"
msgstr "Utilizar los impuestos de la categoría"
msgctxt "field:product.template,account_category:"
msgid "Account Category"
-msgstr ""
+msgstr "Categoría contable"
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
@@ -219,7 +208,6 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos utilizada"
-#, fuzzy
msgctxt "field:product.template,accounts_category:"
msgid "Use Category's accounts"
msgstr "Utilizar las cuentas de la categoría"
@@ -316,22 +304,18 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Utilizar los impuestos definidos en la categoría padre"
-#, fuzzy
msgctxt "help:product.product,account_expense:"
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."
-#, fuzzy
msgctxt "help:product.product,account_revenue:"
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."
-#, fuzzy
msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Utilizar las cuentas definidas en la categoría"
-#, fuzzy
msgctxt "help:product.product,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Utilizar los impuestos definidos en la categoría"
@@ -344,7 +328,6 @@ msgctxt "help:product.template,account_revenue:"
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."
-#, fuzzy
msgctxt "help:product.template,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Utilizar las cuentas definidas en la categoría"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index e3b2ce0..3dabe6a 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -48,7 +48,6 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos usada"
-#, fuzzy
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr "Contabilidad"
@@ -139,69 +138,59 @@ msgstr "Usuario modificación"
msgctxt "field:product.configuration,default_accounts_category:"
msgid "Use Category's accounts by default"
-msgstr ""
+msgstr "Usar cuentas de la categoría por defecto"
msgctxt "field:product.configuration,default_taxes_category:"
msgid "Use Category' taxes by default"
-msgstr ""
+msgstr "Usar impuestos de la categoría por defecto"
msgctxt "field:product.product,account_category:"
msgid "Account Category"
-msgstr ""
+msgstr "Categoría contable"
-#, fuzzy
msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr "Cuenta de gastos"
-#, fuzzy
msgctxt "field:product.product,account_expense_used:"
msgid "Account Expense Used"
msgstr "Cuenta de gastos usada"
-#, fuzzy
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Cuenta de ingresos"
-#, fuzzy
msgctxt "field:product.product,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos usada"
-#, fuzzy
msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Usar cuentas de la categoría"
-#, fuzzy
msgctxt "field:product.product,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos de cliente"
-#, fuzzy
msgctxt "field:product.product,customer_taxes_used:"
msgid "Customer Taxes Used"
msgstr "Impuestos de cliente usados"
-#, fuzzy
msgctxt "field:product.product,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Impuestos de proveedor"
-#, fuzzy
msgctxt "field:product.product,supplier_taxes_used:"
msgid "Supplier Taxes Used"
msgstr "Impuestos de proveedor usados"
-#, fuzzy
msgctxt "field:product.product,taxes_category:"
msgid "Use Category's Taxes"
msgstr "Usar impuestos de la categoría"
msgctxt "field:product.template,account_category:"
msgid "Account Category"
-msgstr ""
+msgstr "Categoría contable"
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
@@ -219,7 +208,6 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos usada"
-#, fuzzy
msgctxt "field:product.template,accounts_category:"
msgid "Use Category's accounts"
msgstr "Usar cuentas de la categoría"
@@ -316,22 +304,18 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Usar los impuestos definidos en la categoría padre."
-#, fuzzy
msgctxt "help:product.product,account_expense:"
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."
-#, fuzzy
msgctxt "help:product.product,account_revenue:"
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."
-#, fuzzy
msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Usar las cuentas definidas en la categoría."
-#, fuzzy
msgctxt "help:product.product,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Usar los impuestos definidos en la categoría."
@@ -344,7 +328,6 @@ msgctxt "help:product.template,account_revenue:"
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."
-#, fuzzy
msgctxt "help:product.template,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Usar las cuentas definidas en la categoría."
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 23e8bfc..937d6af 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -48,7 +48,6 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Compte de produits utilisé"
-#, fuzzy
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr "Comptabilité"
@@ -139,69 +138,59 @@ msgstr "Mis à jour par"
msgctxt "field:product.configuration,default_accounts_category:"
msgid "Use Category's accounts by default"
-msgstr ""
+msgstr "Utiliser les comptes de la catégorie par défaut"
msgctxt "field:product.configuration,default_taxes_category:"
msgid "Use Category' taxes by default"
-msgstr ""
+msgstr "Utiliser les taxes de la catégorie par défaut"
msgctxt "field:product.product,account_category:"
msgid "Account Category"
-msgstr ""
+msgstr "Catégorie comptable"
-#, fuzzy
msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr "Compte de charges"
-#, fuzzy
msgctxt "field:product.product,account_expense_used:"
msgid "Account Expense Used"
msgstr "Compte de charges utilisé"
-#, fuzzy
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Compte de produits"
-#, fuzzy
msgctxt "field:product.product,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Compte de produits utilisé"
-#, fuzzy
msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Utiliser les comptes de la catégorie"
-#, fuzzy
msgctxt "field:product.product,customer_taxes:"
msgid "Customer Taxes"
msgstr "Taxes client"
-#, fuzzy
msgctxt "field:product.product,customer_taxes_used:"
msgid "Customer Taxes Used"
msgstr "Taxes client utilisées"
-#, fuzzy
msgctxt "field:product.product,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Taxes fournisseur"
-#, fuzzy
msgctxt "field:product.product,supplier_taxes_used:"
msgid "Supplier Taxes Used"
msgstr "Taxes fournisseur utilisées"
-#, fuzzy
msgctxt "field:product.product,taxes_category:"
msgid "Use Category's Taxes"
msgstr "Utiliser les taxes de la catégorie"
msgctxt "field:product.template,account_category:"
msgid "Account Category"
-msgstr ""
+msgstr "Catégorie comptable"
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
@@ -219,7 +208,6 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Compte de produits utilisé"
-#, fuzzy
msgctxt "field:product.template,accounts_category:"
msgid "Use Category's accounts"
msgstr "Utiliser les comptes de la catégorie"
@@ -316,22 +304,18 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Utiliser les taxes de la catégorie parente"
-#, fuzzy
msgctxt "help:product.product,account_expense:"
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."
-#, fuzzy
msgctxt "help:product.product,account_revenue:"
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."
-#, fuzzy
msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Utiliser les comptes définis sur la catégorie"
-#, fuzzy
msgctxt "help:product.product,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Utiliser les taxes de la catégorie"
@@ -344,7 +328,6 @@ msgctxt "help:product.template,account_revenue:"
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."
-#, fuzzy
msgctxt "help:product.template,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Utiliser les comptes définis sur la catégorie"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 69fcb73..9cd8f06 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -46,7 +46,6 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Uporabljen konto prihodkov"
-#, fuzzy
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr "Računovodstvo"
@@ -137,7 +136,7 @@ msgstr "Zapisal"
msgctxt "field:product.configuration,default_accounts_category:"
msgid "Use Category's accounts by default"
-msgstr ""
+msgstr "Samodejno uporabi konte iz kategorije"
msgctxt "field:product.configuration,default_taxes_category:"
msgid "Use Category' taxes by default"
@@ -145,61 +144,51 @@ msgstr ""
msgctxt "field:product.product,account_category:"
msgid "Account Category"
-msgstr ""
+msgstr "Kategorija konta"
-#, fuzzy
msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr "Konto odhodkov"
-#, fuzzy
msgctxt "field:product.product,account_expense_used:"
msgid "Account Expense Used"
msgstr "Uporabljen konto odhodkov"
-#, fuzzy
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Konto prihodkov"
-#, fuzzy
msgctxt "field:product.product,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Uporabljen konto prihodkov"
-#, fuzzy
msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Uporabi konte iz kategorije"
-#, fuzzy
msgctxt "field:product.product,customer_taxes:"
msgid "Customer Taxes"
msgstr "Davki za kupce"
-#, fuzzy
msgctxt "field:product.product,customer_taxes_used:"
msgid "Customer Taxes Used"
msgstr "Uporabljeni davki kupca"
-#, fuzzy
msgctxt "field:product.product,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Davki za dobavitelje"
-#, fuzzy
msgctxt "field:product.product,supplier_taxes_used:"
msgid "Supplier Taxes Used"
msgstr "Uporabljeni davki dobavitelja"
-#, fuzzy
msgctxt "field:product.product,taxes_category:"
msgid "Use Category's Taxes"
msgstr "Uporabi davke iz kategorije"
msgctxt "field:product.template,account_category:"
msgid "Account Category"
-msgstr ""
+msgstr "Kategorija konta"
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
@@ -217,7 +206,6 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Uporabljen konto prihodkov"
-#, fuzzy
msgctxt "field:product.template,accounts_category:"
msgid "Use Category's accounts"
msgstr "Uporabi konte iz kategorije"
@@ -304,7 +292,7 @@ msgstr "Zapisano"
msgctxt "field:product.template-supplier-account.tax,write_uid:"
msgid "Write User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "help:product.category,account_parent:"
msgid "Use the accounts defined on the parent category"
@@ -314,22 +302,18 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Uporabi davke, določene v matični kategoriji"
-#, fuzzy
msgctxt "help:product.product,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Namesto konta v kategoriji se bo uporabil ta konto odhodkov."
-#, fuzzy
msgctxt "help:product.product,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "Namesto konta v kategoriji se bo uporabil ta konto odhodkov."
+msgstr "Namesto konta v kategoriji se bo uporabil ta konto prihodkov."
-#, fuzzy
msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Uporabite konte, definirane v kategoriji."
-#, fuzzy
msgctxt "help:product.product,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Uporabite davke, definirane v kategoriji."
@@ -342,7 +326,6 @@ msgctxt "help:product.template,account_revenue:"
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."
-#, fuzzy
msgctxt "help:product.template,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Uporabite konte, definirane v kategoriji."
@@ -398,3 +381,7 @@ msgstr "Konti"
msgctxt "view:product.template:"
msgid "Taxes"
msgstr "Davki"
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category's Taxes by default"
+msgstr "Samodejno uporabi davke iz kategorije "
diff --git a/tryton.cfg b/tryton.cfg
index 63d0544..06b8e41 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
account
company
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
index 701d486..d571dd6 100644
--- a/trytond_account_product.egg-info/PKG-INFO
+++ b/trytond_account_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-account-product
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to add accounting on product
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_account_product.egg-info/SOURCES.txt b/trytond_account_product.egg-info/SOURCES.txt
index c8bf542..94b2c02 100644
--- a/trytond_account_product.egg-info/SOURCES.txt
+++ b/trytond_account_product.egg-info/SOURCES.txt
@@ -27,16 +27,20 @@ tryton.cfg
./locale/hu_HU.po
./locale/it_IT.po
./locale/ja_JP.po
+./locale/lo_LA.po
./locale/lt_LT.po
./locale/nl_NL.po
./locale/pt_BR.po
./locale/ru_RU.po
./locale/sl_SI.po
+./locale/zh_CN.po
./tests/__init__.py
./tests/test_account_product.py
./view/category_form.xml
./view/configuration_form.xml
+./view/product_configuration_form.xml
./view/template_form.xml
+./view/template_tree.xml
locale/bg_BG.po
locale/ca_ES.po
locale/cs_CZ.po
diff --git a/trytond_account_product.egg-info/requires.txt b/trytond_account_product.egg-info/requires.txt
index a7cd47f..f3d7ad6 100644
--- a/trytond_account_product.egg-info/requires.txt
+++ b/trytond_account_product.egg-info/requires.txt
@@ -1,4 +1,4 @@
trytond_account >= 4.0, < 4.1
trytond_company >= 4.0, < 4.1
trytond_product >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit d994117293ba265079ee2a851fa6ce849f0d4ca0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:25:51 2016 +0200
Merging upstream version 4.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 0284d58..01b7c50 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+Version 4.0.0 - 2016-05-02
+* Bug fixes (see mercurial logs for details)
+* Move category into account_category
+* Rename account_category into accounts_category
+* Add Python3 support
+* Add configuration for default use category's accounts and taxes
+
Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
* Add default revenue/expense configuration
diff --git a/COPYRIGHT b/COPYRIGHT
index 3a28212..48f96af 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2015 Cédric Krier.
+Copyright (C) 2008-2016 Cédric Krier.
Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index f4396c9..396ec13 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_product
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add accounting on product
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.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_account_product
=======================
@@ -54,6 +54,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -67,6 +68,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/__init__.py b/__init__.py
index e337cf1..f2611cb 100644
--- a/__init__.py
+++ b/__init__.py
@@ -8,11 +8,13 @@ from .configuration import *
def register():
Pool.register(
+ ProductConfiguration,
Category,
CategoryCustomerTax,
CategorySupplierTax,
Template,
TemplateCustomerTax,
TemplateSupplierTax,
+ Product,
Configuration,
module='account_product', type_='model')
diff --git a/configuration.py b/configuration.py
index 9d9e8ae..acfd98c 100644
--- a/configuration.py
+++ b/configuration.py
@@ -3,9 +3,11 @@
from trytond.pool import PoolMeta, Pool
from trytond.model import fields
from trytond.pyson import Eval
+from trytond import backend
+from trytond.transaction import Transaction
-__all__ = ['Configuration']
+__all__ = ['Configuration', 'ProductConfiguration']
class Configuration:
@@ -60,3 +62,34 @@ class Configuration:
], limit=1)
return field
return super(Configuration, cls)._get_account_field(name)
+
+
+class ProductConfiguration:
+ __metaclass__ = PoolMeta
+ __name__ = 'product.configuration'
+
+ default_accounts_category = fields.Boolean(
+ 'Use Category\'s accounts by default')
+ default_taxes_category = fields.Boolean(
+ 'Use Category\' taxes by default')
+
+ @classmethod
+ def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
+
+ # Migration from 3.8: rename default_account_category into
+ # default_accounts_category
+ table = TableHandler(cls, module_name)
+ if table.column_exist('default_account_category'):
+ table.column_rename('default_account_category',
+ 'default_accounts_category', exception=True)
+
+ super(ProductConfiguration, cls).__register__(module_name)
+
+ @classmethod
+ def default_default_accounts_category(cls):
+ return False
+
+ @classmethod
+ def default_default_taxes_category(cls):
+ return False
diff --git a/configuration.xml b/configuration.xml
index 0eb9b87..7565c3d 100644
--- a/configuration.xml
+++ b/configuration.xml
@@ -8,5 +8,11 @@ this repository contains the full copyright notices and license terms. -->
<field name="inherit" ref="account.configuration_view_form"/>
<field name="name">configuration_form</field>
</record>
+
+ <record model="ir.ui.view" id="product_configuration_view_form">
+ <field name="model">product.configuration</field>
+ <field name="inherit" ref="product.product_configuration_view_form"/>
+ <field name="name">product_configuration_form</field>
+ </record>
</data>
</tryton>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 52dc395..de4b5f3 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -46,6 +46,11 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Използвани приходи по сметка"
+#, fuzzy
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr "Счетоводство"
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Данъци на клиенти"
@@ -130,10 +135,72 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr "Променено от"
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr "Разходи за сметка"
+
+#, fuzzy
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Използвани разходи по сметка"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr "Приход по сметка"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Използвани приходи по сметка"
+
+#, fuzzy
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Използване на сметките за категорията"
+#, fuzzy
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr "Данъци на клиенти"
+
+#, fuzzy
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Използвани данъци на клиенти"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr "Данъци на доставчик"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Използвани данъци на доставчик"
+
+#, fuzzy
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr "Използване на данъците за категорията"
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Разходи за сметка"
@@ -150,6 +217,11 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Използвани разходи по сметка"
+#, fuzzy
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr "Използване на сметките за категорията"
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Данъци на клиенти"
@@ -242,10 +314,26 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Използване на данъци от родителската категория"
-msgctxt "help:product.template,account_category:"
+#, fuzzy
+msgctxt "help:product.product,account_expense:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "Ще се използва тази сметка вместо тази зададена за категорията"
+
+#, fuzzy
+msgctxt "help:product.product,account_revenue:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "Ще се използва тази сметка вместо тази зададена за категорията"
+
+#, fuzzy
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Използване на сметките зададени за категорията"
+#, fuzzy
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr "Използване на данъците зададени за категорията"
+
msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Ще се използва тази сметка вместо тази зададена за категорията"
@@ -254,6 +342,11 @@ msgctxt "help:product.template,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Ще се използва тази сметка вместо тази зададена за категорията"
+#, fuzzy
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr "Използване на сметките зададени за категорията"
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Използване на данъците зададени за категорията"
@@ -276,7 +369,7 @@ msgstr "Шаблон на продукт - Данък на доставчик"
msgctxt "view:account.configuration:"
msgid "Category"
-msgstr ""
+msgstr "Категория"
msgctxt "view:account.configuration:"
msgid "Product"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 3141df3..201ca12 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -46,6 +46,11 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Compte d'ingressos usada"
+#, fuzzy
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr "Comptabilitat"
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impostos de client"
@@ -130,10 +135,72 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr "Usuari modificació"
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr "Compte de despeses"
+
+#, fuzzy
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Compte de despeses usada"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr "Compte d'ingressos"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Compte d'ingressos usada"
+
+#, fuzzy
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Usa comptes de la categoria"
+#, fuzzy
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr "Impostos de client"
+
+#, fuzzy
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Impostos de client usats"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr "Impostos de proveïdor"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Impostos de proveïdor usats"
+
+#, fuzzy
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr "Usa impostos de la categoria"
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Compte de despeses"
@@ -150,6 +217,11 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Compte d'ingressos usada"
+#, fuzzy
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr "Usa comptes de la categoria"
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impostos de client"
@@ -242,10 +314,26 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Utilitza els impostos definits en la categoria pare."
-msgctxt "help:product.template,account_category:"
+#, fuzzy
+msgctxt "help:product.product,account_expense:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
+
+#, fuzzy
+msgctxt "help:product.product,account_revenue:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
+
+#, fuzzy
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Utilitza els comptes definits en la categoria."
+#, fuzzy
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr "Utilitza els impostos definits en la categoria."
+
msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
@@ -254,6 +342,11 @@ msgctxt "help:product.template,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
+#, fuzzy
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr "Utilitza els comptes definits en la categoria."
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Utilitza els impostos definits en la categoria."
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 02d3a75..391e704 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -46,6 +46,10 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr ""
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr ""
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
@@ -130,10 +134,62 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr ""
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr ""
+
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr ""
+
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr ""
+
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr ""
+
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr ""
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr ""
+
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr ""
+
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr ""
+
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr ""
+
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr ""
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr ""
@@ -150,6 +206,10 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr ""
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr ""
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
@@ -242,10 +302,22 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr ""
-msgctxt "help:product.template,account_category:"
+msgctxt "help:product.product,account_expense:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.product,account_revenue:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr ""
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr ""
+
msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
@@ -254,6 +326,10 @@ msgctxt "help:product.template,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr ""
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index e318be8..5833299 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -46,6 +46,11 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Verwendetes Ertragskonto"
+#, fuzzy
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr "Buchhaltung"
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Steuern Kunde"
@@ -130,10 +135,72 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr "Letzte Änderung durch"
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr "Aufwandskonto"
+
+#, fuzzy
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Verwendetes Aufwandskonto"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr "Ertragskonto"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Verwendetes Ertragskonto"
+
+#, fuzzy
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Konten der Kategorie anwenden"
+#, fuzzy
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr "Steuern Kunde"
+
+#, fuzzy
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Für Kunden verwendete Steuern"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr "Steuern Lieferant"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Für Lieferanten verwendete Steuern"
+
+#, fuzzy
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr "Steuern der Kategorie anwenden"
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Aufwandskonto"
@@ -150,6 +217,11 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Verwendetes Ertragskonto"
+#, fuzzy
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr "Konten der Kategorie anwenden"
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Steuern (Kunden)"
@@ -242,10 +314,30 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Steuern der übergeordneten Kategorie anwenden"
-msgctxt "help:product.template,account_category:"
+#, fuzzy
+msgctxt "help:product.product,account_expense:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+"Dieses Konto wird benutzt anstelle des Kontos, welches in der Kategorie "
+"eingestellt ist."
+
+#, fuzzy
+msgctxt "help:product.product,account_revenue:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+"Dieses Konto wird benutzt anstelle des Kontos, welches in der Kategorie "
+"eingestellt ist."
+
+#, fuzzy
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Wendet die Konten an, die in der Artikelkategorie definiert sind"
+#, fuzzy
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr "Wendet die Steuern an, die in der Artikelkategorie definiert sind"
+
msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
@@ -258,6 +350,11 @@ msgstr ""
"Dieses Konto wird benutzt anstelle des Kontos, welches in der Kategorie "
"eingestellt ist."
+#, fuzzy
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr "Wendet die Konten an, die in der Artikelkategorie definiert sind"
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Wendet die Steuern an, die in der Artikelkategorie definiert sind"
@@ -298,14 +395,6 @@ msgctxt "view:product.category:"
msgid "Taxes"
msgstr "Steuern"
-msgctxt "view:product.product:"
-msgid "Accounting"
-msgstr "Buchhaltung"
-
-msgctxt "view:product.product:"
-msgid "Taxes"
-msgstr "Steuern"
-
msgctxt "view:product.template:"
msgid "Accounting"
msgstr "Buchhaltung"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 842128c..6ba6163 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -48,6 +48,11 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos usada"
+#, fuzzy
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr "Contabilidad"
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos de cliente"
@@ -132,10 +137,72 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr "Cuenta de gastos"
+
+#, fuzzy
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Cuenta de gastos usada"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr "Cuenta de ingresos"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Cuenta de ingresos usada"
+
+#, fuzzy
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Usar cuentas de la categoría"
+#, fuzzy
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr "Impuestos de cliente"
+
+#, fuzzy
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Impuestos de cliente usados"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr "Impuestos de proveedor"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Impuestos de proveedor usados"
+
+#, fuzzy
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr "Usar impuestos de la categoría"
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Cuenta de gastos"
@@ -152,6 +219,11 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos usada"
+#, fuzzy
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr "Usar cuentas de la categoría"
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos de cliente"
@@ -244,10 +316,26 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Usar los impuestos definidos en la categoría padre"
-msgctxt "help:product.template,account_category:"
+#, fuzzy
+msgctxt "help:product.product,account_expense:"
+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."
+
+#, fuzzy
+msgctxt "help:product.product,account_revenue:"
+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."
+
+#, fuzzy
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Usar las cuentas definidas en la categoría"
+#, fuzzy
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr "Usar los impuestos definidos en la categoría"
+
msgctxt "help:product.template,account_expense:"
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."
@@ -256,6 +344,11 @@ msgctxt "help:product.template,account_revenue:"
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."
+#, fuzzy
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr "Usar las cuentas definidas en la categoría"
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Usar los impuestos definidos en la categoría"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 0f5797d..b27939a 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -46,6 +46,11 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de Ingresos Usada"
+#, fuzzy
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr "Contabilidad"
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos del Cliente"
@@ -130,10 +135,72 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr "Modificado por Usuario"
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr "Cuenta de Gastos"
+
+#, fuzzy
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Cuenta de Gastos Usada"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr "Cuenta de Ingresos"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Cuenta de Ingresos Usada"
+
+#, fuzzy
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Use Cuentas de la Categoría"
+#, fuzzy
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr "Impuestos del Cliente"
+
+#, fuzzy
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Impuestos del Cliente Aplicados"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr "Impuestos del Proveedor"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Impuestos del Proveedor Aplicados"
+
+#, fuzzy
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr "Usar Impuestos de la Categoría"
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Cuenta de Gastos"
@@ -150,6 +217,11 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de Ingresos Usada"
+#, fuzzy
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr "Use Cuentas de la Categoría"
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos del Cliente"
@@ -242,10 +314,26 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Usar los impuestos definidos en la categoria padre"
-msgctxt "help:product.template,account_category:"
+#, fuzzy
+msgctxt "help:product.product,account_expense:"
+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."
+
+#, fuzzy
+msgctxt "help:product.product,account_revenue:"
+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."
+
+#, fuzzy
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Use las cuentas definidas en la categoría"
+#, fuzzy
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr "Usar los impuestos definidos en la categoría"
+
msgctxt "help:product.template,account_expense:"
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."
@@ -254,6 +342,11 @@ msgctxt "help:product.template,account_revenue:"
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."
+#, fuzzy
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr "Use las cuentas definidas en la categoría"
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Usar los impuestos definidos en la categoría"
@@ -276,7 +369,7 @@ msgstr "Plantilla Producto - Impuestos Proveedor"
msgctxt "view:account.configuration:"
msgid "Category"
-msgstr ""
+msgstr "Categoría"
msgctxt "view:account.configuration:"
msgid "Product"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 590489b..4195dbe 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -48,6 +48,11 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos utilizada"
+#, fuzzy
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr "Contabilidad"
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos de cliente"
@@ -132,10 +137,72 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr "Modificado por usuario"
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr "Cuenta de gastos"
+
+#, fuzzy
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Cuenta de gastos utilizada"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr "Cuenta de ingresos"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Cuenta de ingresos utilizada"
+
+#, fuzzy
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Utilizar las cuentas de la categoría"
+#, fuzzy
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr "Impuestos de cliente"
+
+#, fuzzy
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Impuestos de cliente utilizados"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr "Impuestos de proveedor"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Impuestos de proveedor utilizados"
+
+#, fuzzy
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr "Utilizar los impuestos de la categoría"
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Cuenta de gastos"
@@ -152,6 +219,11 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos utilizada"
+#, fuzzy
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr "Utilizar las cuentas de la categoría"
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos de cliente"
@@ -244,10 +316,26 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Utilizar los impuestos definidos en la categoría padre"
-msgctxt "help:product.template,account_category:"
+#, fuzzy
+msgctxt "help:product.product,account_expense:"
+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."
+
+#, fuzzy
+msgctxt "help:product.product,account_revenue:"
+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."
+
+#, fuzzy
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Utilizar las cuentas definidas en la categoría"
+#, fuzzy
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr "Utilizar los impuestos definidos en la categoría"
+
msgctxt "help:product.template,account_expense:"
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."
@@ -256,6 +344,11 @@ msgctxt "help:product.template,account_revenue:"
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."
+#, fuzzy
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr "Utilizar las cuentas definidas en la categoría"
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Utilizar los impuestos definidos en la categoría"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index bcc2a6c..e3b2ce0 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -48,6 +48,11 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos usada"
+#, fuzzy
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr "Contabilidad"
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos de cliente"
@@ -132,10 +137,72 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr "Cuenta de gastos"
+
+#, fuzzy
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Cuenta de gastos usada"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr "Cuenta de ingresos"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Cuenta de ingresos usada"
+
+#, fuzzy
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Usar cuentas de la categoría"
+#, fuzzy
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr "Impuestos de cliente"
+
+#, fuzzy
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Impuestos de cliente usados"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr "Impuestos de proveedor"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Impuestos de proveedor usados"
+
+#, fuzzy
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr "Usar impuestos de la categoría"
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Cuenta de gastos"
@@ -152,6 +219,11 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos usada"
+#, fuzzy
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr "Usar cuentas de la categoría"
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos de cliente"
@@ -244,10 +316,26 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Usar los impuestos definidos en la categoría padre."
-msgctxt "help:product.template,account_category:"
+#, fuzzy
+msgctxt "help:product.product,account_expense:"
+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."
+
+#, fuzzy
+msgctxt "help:product.product,account_revenue:"
+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."
+
+#, fuzzy
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Usar las cuentas definidas en la categoría."
+#, fuzzy
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr "Usar los impuestos definidos en la categoría."
+
msgctxt "help:product.template,account_expense:"
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."
@@ -256,6 +344,11 @@ msgctxt "help:product.template,account_revenue:"
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."
+#, fuzzy
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr "Usar las cuentas definidas en la categoría."
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Usar los impuestos definidos en la categoría."
diff --git a/locale/es_MX.po b/locale/es_MX.po
index 3dd6ab1..e02e27d 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -48,6 +48,10 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos usada"
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr ""
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos de cliente"
@@ -132,10 +136,72 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr "Cuenta de gastos"
+
+#, fuzzy
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Cuenta de gastos usada"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr "Cuenta de ingresos"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Cuenta de ingresos usada"
+
+#, fuzzy
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Usar cuentas de la categoría"
+#, fuzzy
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr "Impuestos de cliente"
+
+#, fuzzy
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Impuestos de cliente usados"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr "Impuestos de proveedor"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Impuestos de proveedor usados"
+
+#, fuzzy
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr "Usar impuestos de la categoría"
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Cuenta de gastos"
@@ -152,6 +218,11 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos usada"
+#, fuzzy
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr "Usar cuentas de la categoría"
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos de cliente"
@@ -244,10 +315,26 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Usar los impuestos definidos en la categoría padre."
-msgctxt "help:product.template,account_category:"
+#, fuzzy
+msgctxt "help:product.product,account_expense:"
+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."
+
+#, fuzzy
+msgctxt "help:product.product,account_revenue:"
+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."
+
+#, fuzzy
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Usar las cuentas definidas en la categoría."
+#, fuzzy
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr "Usar los impuestos definidos en la categoría."
+
msgctxt "help:product.template,account_expense:"
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."
@@ -256,6 +343,11 @@ msgctxt "help:product.template,account_revenue:"
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."
+#, fuzzy
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr "Usar las cuentas definidas en la categoría."
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Usar los impuestos definidos en la categoría."
@@ -276,9 +368,10 @@ msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Plantilla de producto - Impuesto de proveedor"
+#, fuzzy
msgctxt "view:account.configuration:"
msgid "Category"
-msgstr ""
+msgstr "Categoría"
msgctxt "view:account.configuration:"
msgid "Product"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index bf7e6f1..23e8bfc 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -48,6 +48,11 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Compte de produits utilisé"
+#, fuzzy
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr "Comptabilité"
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Taxes client"
@@ -132,10 +137,72 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr "Mis à jour par"
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr "Compte de charges"
+
+#, fuzzy
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Compte de charges utilisé"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr "Compte de produits"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Compte de produits utilisé"
+
+#, fuzzy
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Utiliser les comptes de la catégorie"
+#, fuzzy
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr "Taxes client"
+
+#, fuzzy
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Taxes client utilisées"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr "Taxes fournisseur"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Taxes fournisseur utilisées"
+
+#, fuzzy
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr "Utiliser les taxes de la catégorie"
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Compte de charge"
@@ -152,6 +219,11 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Compte de produits utilisé"
+#, fuzzy
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr "Utiliser les comptes de la catégorie"
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Taxes Client"
@@ -244,10 +316,26 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Utiliser les taxes de la catégorie parente"
-msgctxt "help:product.template,account_category:"
+#, fuzzy
+msgctxt "help:product.product,account_expense:"
+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."
+
+#, fuzzy
+msgctxt "help:product.product,account_revenue:"
+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."
+
+#, fuzzy
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Utiliser les comptes définis sur la catégorie"
+#, fuzzy
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr "Utiliser les taxes de la catégorie"
+
msgctxt "help:product.template,account_expense:"
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."
@@ -256,6 +344,11 @@ msgctxt "help:product.template,account_revenue:"
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."
+#, fuzzy
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr "Utiliser les comptes définis sur la catégorie"
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Utiliser les taxes de la catégorie"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 02d3a75..391e704 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -46,6 +46,10 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr ""
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr ""
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
@@ -130,10 +134,62 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr ""
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr ""
+
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr ""
+
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr ""
+
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr ""
+
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr ""
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr ""
+
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr ""
+
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr ""
+
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr ""
+
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr ""
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr ""
@@ -150,6 +206,10 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr ""
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr ""
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
@@ -242,10 +302,22 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr ""
-msgctxt "help:product.template,account_category:"
+msgctxt "help:product.product,account_expense:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.product,account_revenue:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr ""
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr ""
+
msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
@@ -254,6 +326,10 @@ msgctxt "help:product.template,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr ""
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 02d3a75..391e704 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -46,6 +46,10 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr ""
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr ""
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
@@ -130,10 +134,62 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr ""
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr ""
+
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr ""
+
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr ""
+
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr ""
+
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr ""
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr ""
+
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr ""
+
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr ""
+
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr ""
+
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr ""
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr ""
@@ -150,6 +206,10 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr ""
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr ""
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
@@ -242,10 +302,22 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr ""
-msgctxt "help:product.template,account_category:"
+msgctxt "help:product.product,account_expense:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.product,account_revenue:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr ""
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr ""
+
msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
@@ -254,6 +326,10 @@ msgctxt "help:product.template,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr ""
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr ""
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 02d3a75..391e704 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -46,6 +46,10 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr ""
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr ""
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
@@ -130,10 +134,62 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr ""
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr ""
+
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr ""
+
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr ""
+
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr ""
+
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr ""
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr ""
+
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr ""
+
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr ""
+
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr ""
+
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr ""
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr ""
@@ -150,6 +206,10 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr ""
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr ""
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
@@ -242,10 +302,22 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr ""
-msgctxt "help:product.template,account_category:"
+msgctxt "help:product.product,account_expense:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.product,account_revenue:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr ""
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr ""
+
msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
@@ -254,6 +326,10 @@ msgctxt "help:product.template,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr ""
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr ""
diff --git a/locale/ja_JP.po b/locale/lo_LA.po
similarity index 78%
copy from locale/ja_JP.po
copy to locale/lo_LA.po
index 02d3a75..a82c808 100644
--- a/locale/ja_JP.po
+++ b/locale/lo_LA.po
@@ -46,6 +46,10 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr ""
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr ""
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
@@ -130,10 +134,62 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr ""
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr ""
+
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr ""
+
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr ""
+
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr ""
+
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr ""
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr ""
+
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr ""
+
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr ""
+
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr ""
+
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr ""
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr ""
@@ -150,6 +206,10 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr ""
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr ""
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
@@ -242,10 +302,22 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr ""
-msgctxt "help:product.template,account_category:"
+msgctxt "help:product.product,account_expense:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.product,account_revenue:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr ""
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr ""
+
msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
@@ -254,6 +326,10 @@ msgctxt "help:product.template,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr ""
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr ""
@@ -288,7 +364,7 @@ msgstr ""
msgctxt "view:product.category:"
msgid "Accounts"
-msgstr ""
+msgstr "ບັນຊີ"
msgctxt "view:product.category:"
msgid "Taxes"
@@ -298,9 +374,10 @@ msgctxt "view:product.template:"
msgid "Accounting"
msgstr ""
+#, fuzzy
msgctxt "view:product.template:"
msgid "Accounts"
-msgstr ""
+msgstr "ບັນຊີ"
msgctxt "view:product.template:"
msgid "Taxes"
diff --git a/locale/lt_LT.po b/locale/lt_LT.po
index 02d3a75..391e704 100644
--- a/locale/lt_LT.po
+++ b/locale/lt_LT.po
@@ -46,6 +46,10 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr ""
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr ""
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
@@ -130,10 +134,62 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr ""
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr ""
+
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr ""
+
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr ""
+
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr ""
+
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr ""
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr ""
+
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr ""
+
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr ""
+
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr ""
+
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr ""
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr ""
@@ -150,6 +206,10 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr ""
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr ""
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
@@ -242,10 +302,22 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr ""
-msgctxt "help:product.template,account_category:"
+msgctxt "help:product.product,account_expense:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.product,account_revenue:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr ""
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr ""
+
msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
@@ -254,6 +326,10 @@ msgctxt "help:product.template,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr ""
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr ""
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index c15942a..2e76cef 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,9 +2,11 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "error:product.category:"
msgid "There is no account expense/revenue defined on the category %s (%d)"
msgstr ""
+"Er is geen kosten-/opbrengstenrekening gedefinieerd voor product %s (%d)"
msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
@@ -49,6 +51,11 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Opbrengstrekening gebruikt"
+#, fuzzy
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr "Boekhouden"
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Belasting klanten"
@@ -135,10 +142,72 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr ""
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr "Kostenrekening"
+
+#, fuzzy
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Gebruikte kostenrekening"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr "Opbrengstrekening"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Opbrengstrekening gebruikt"
+
+#, fuzzy
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Gebruik de rekeningen van de categorie"
+#, fuzzy
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr "Belasting klanten"
+
+#, fuzzy
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Belasting klanten gebruikt"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr "Belastingen inkoop"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Belasting klanten gebruikt"
+
+#, fuzzy
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr "Gebruik de belastingen van de categorie"
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Kostenrekening"
@@ -155,6 +224,11 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Opbrengstrekening gebruikt"
+#, fuzzy
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr "Gebruik de rekeningen van de categorie"
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Belasting klanten"
@@ -240,18 +314,38 @@ msgctxt "field:product.template-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr ""
+#, fuzzy
msgctxt "help:product.category,account_parent:"
msgid "Use the accounts defined on the parent category"
-msgstr ""
+msgstr "Gebruik de rekeningen van de categorie"
+#, fuzzy
msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
+msgstr "Gebruik de belastingen van de categorie"
+
+#, fuzzy
+msgctxt "help:product.product,account_expense:"
+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."
+
+#, fuzzy
+msgctxt "help:product.product,account_revenue:"
+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 "help:product.template,account_category:"
+#, fuzzy
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Gebruik de rekeningen van de categorie"
+#, fuzzy
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr "Gebruik de belastingen van de categorie"
+
msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
@@ -262,6 +356,11 @@ 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."
+#, fuzzy
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr "Gebruik de rekeningen van de categorie"
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Gebruik de belastingen van de categorie"
@@ -284,7 +383,7 @@ msgstr "Productsjabloon - Belasting inkoop"
msgctxt "view:account.configuration:"
msgid "Category"
-msgstr ""
+msgstr "Categorie"
msgctxt "view:account.configuration:"
msgid "Product"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 26e5fd9..bccad6a 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -46,6 +46,11 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Conta de Receitas Utilizada"
+#, fuzzy
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr "Contabilidade"
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Tributos do Cliente"
@@ -130,10 +135,72 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr "Gravado pelo usuário"
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr "Conta de Despesas"
+
+#, fuzzy
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Conta de Despesas Utilizada"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr "Conta de Receita"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Conta de Receitas Utilizada"
+
+#, fuzzy
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Utilizar as contas da categoria"
+#, fuzzy
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr "Tributos do Cliente"
+
+#, fuzzy
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Tributos do Cliente Utilizados"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr "Tributos do Fornecedor"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Tributos do Fornecedor Utilizados"
+
+#, fuzzy
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr "Utilize os Tributos da Categoria"
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Conta de Despesas"
@@ -150,6 +217,11 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Conta de Receiras Utilizada"
+#, fuzzy
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr "Utilizar as contas da categoria"
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Tributos do Cliente"
@@ -242,10 +314,26 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Utilize os tributos definidos na categoria pai"
-msgctxt "help:product.template,account_category:"
+#, fuzzy
+msgctxt "help:product.product,account_expense:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "Esta conta será utilizada no lugar daquela definida na categoria."
+
+#, fuzzy
+msgctxt "help:product.product,account_revenue:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "Esta conta será utilizada no lugar daquela definida na categoria."
+
+#, fuzzy
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Utilize as contas definidas na categoria"
+#, fuzzy
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr "Utilize os tributos definidos na categoria"
+
msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Esta conta será utilizada no lugar daquela definida na categoria."
@@ -254,6 +342,11 @@ msgctxt "help:product.template,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Esta conta será utilizada no lugar daquela definida na categoria."
+#, fuzzy
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr "Utilize as contas definidas na categoria"
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Utilize os tributos definidos na categoria"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index a6d07e9..e410f88 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -46,6 +46,11 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Использованный счет доходов"
+#, fuzzy
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr "Регистрационные данные"
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Налоги заказчика"
@@ -130,10 +135,72 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr "Изменено пользователем"
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr "Счет расходов"
+
+#, fuzzy
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Использованный счет расходов"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr "Счет доходов"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Использованный счет доходов"
+
+#, fuzzy
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Использовать счет категории"
+#, fuzzy
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr "Налоги заказчика"
+
+#, fuzzy
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Используемые налоги заказчика"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr "Налоги поставщика"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Используемые налоги поставщика"
+
+#, fuzzy
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr "Использовать налоги категории"
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Счет расходов"
@@ -150,6 +217,11 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Использованный счет доходов"
+#, fuzzy
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr "Использовать счет категории"
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Налоги заказчика"
@@ -242,10 +314,26 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Использовать налоги указанные для родительской категории"
-msgctxt "help:product.template,account_category:"
+#, fuzzy
+msgctxt "help:product.product,account_expense:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "Этот счет будет использован вместо указанного в категории."
+
+#, fuzzy
+msgctxt "help:product.product,account_revenue:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "Этот счет будет использован вместо указанного в категории."
+
+#, fuzzy
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Использовать счета указанные для категории"
+#, fuzzy
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr "Использовать налоги указанные для категории"
+
msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Этот счет будет использован вместо указанного в категории."
@@ -254,6 +342,11 @@ msgctxt "help:product.template,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Этот счет будет использован вместо указанного в категории."
+#, fuzzy
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr "Использовать счета указанные для категории"
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Использовать налоги указанные для категории"
@@ -276,7 +369,7 @@ msgstr "Шаблон продукта - Налоги поставщика"
msgctxt "view:account.configuration:"
msgid "Category"
-msgstr ""
+msgstr "Категория"
msgctxt "view:account.configuration:"
msgid "Product"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index f2dbabc..69fcb73 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -46,6 +46,11 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Uporabljen konto prihodkov"
+#, fuzzy
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr "Računovodstvo"
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Davki za kupce"
@@ -130,10 +135,72 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr "Zapisal"
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr "Konto odhodkov"
+
+#, fuzzy
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Uporabljen konto odhodkov"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr "Konto prihodkov"
+
+#, fuzzy
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Uporabljen konto prihodkov"
+
+#, fuzzy
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr "Uporabi konte iz kategorije"
+#, fuzzy
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr "Davki za kupce"
+
+#, fuzzy
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Uporabljeni davki kupca"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr "Davki za dobavitelje"
+
+#, fuzzy
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Uporabljeni davki dobavitelja"
+
+#, fuzzy
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr "Uporabi davke iz kategorije"
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Konto odhodkov"
@@ -150,6 +217,11 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Uporabljen konto prihodkov"
+#, fuzzy
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr "Uporabi konte iz kategorije"
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Davki za kupce"
@@ -242,10 +314,26 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr "Uporabi davke, določene v matični kategoriji"
-msgctxt "help:product.template,account_category:"
+#, fuzzy
+msgctxt "help:product.product,account_expense:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "Namesto konta v kategoriji se bo uporabil ta konto odhodkov."
+
+#, fuzzy
+msgctxt "help:product.product,account_revenue:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "Namesto konta v kategoriji se bo uporabil ta konto odhodkov."
+
+#, fuzzy
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr "Uporabite konte, definirane v kategoriji."
+#, fuzzy
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr "Uporabite davke, definirane v kategoriji."
+
msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Namesto konta v kategoriji se bo uporabil ta konto odhodkov."
@@ -254,6 +342,11 @@ msgctxt "help:product.template,account_revenue:"
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."
+#, fuzzy
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr "Uporabite konte, definirane v kategoriji."
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Uporabite davke, definirane v kategoriji."
diff --git a/locale/ja_JP.po b/locale/zh_CN.po
similarity index 78%
copy from locale/ja_JP.po
copy to locale/zh_CN.po
index 02d3a75..391e704 100644
--- a/locale/ja_JP.po
+++ b/locale/zh_CN.po
@@ -46,6 +46,10 @@ msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr ""
+msgctxt "field:product.category,accounting:"
+msgid "Accounting"
+msgstr ""
+
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
@@ -130,10 +134,62 @@ msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
msgstr ""
-msgctxt "field:product.template,account_category:"
+msgctxt "field:product.configuration,default_accounts_category:"
+msgid "Use Category's accounts by default"
+msgstr ""
+
+msgctxt "field:product.configuration,default_taxes_category:"
+msgid "Use Category' taxes by default"
+msgstr ""
+
+msgctxt "field:product.product,account_category:"
+msgid "Account Category"
+msgstr ""
+
+msgctxt "field:product.product,account_expense:"
+msgid "Account Expense"
+msgstr ""
+
+msgctxt "field:product.product,account_expense_used:"
+msgid "Account Expense Used"
+msgstr ""
+
+msgctxt "field:product.product,account_revenue:"
+msgid "Account Revenue"
+msgstr ""
+
+msgctxt "field:product.product,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr ""
+
+msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
msgstr ""
+msgctxt "field:product.product,customer_taxes:"
+msgid "Customer Taxes"
+msgstr ""
+
+msgctxt "field:product.product,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr ""
+
+msgctxt "field:product.product,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr ""
+
+msgctxt "field:product.product,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr ""
+
+msgctxt "field:product.product,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr ""
+
+msgctxt "field:product.template,account_category:"
+msgid "Account Category"
+msgstr ""
+
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr ""
@@ -150,6 +206,10 @@ msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr ""
+msgctxt "field:product.template,accounts_category:"
+msgid "Use Category's accounts"
+msgstr ""
+
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
@@ -242,10 +302,22 @@ msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
msgstr ""
-msgctxt "help:product.template,account_category:"
+msgctxt "help:product.product,account_expense:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.product,account_revenue:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.product,accounts_category:"
msgid "Use the accounts defined on the category"
msgstr ""
+msgctxt "help:product.product,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr ""
+
msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
@@ -254,6 +326,10 @@ msgctxt "help:product.template,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
+msgctxt "help:product.template,accounts_category:"
+msgid "Use the accounts defined on the category"
+msgstr ""
+
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr ""
diff --git a/product.py b/product.py
index 4056249..9d77c9d 100644
--- a/product.py
+++ b/product.py
@@ -3,15 +3,14 @@
import copy
from trytond.model import ModelSQL, fields
-from trytond.pyson import Eval, Or
+from trytond.pyson import Eval, Or, Bool
from trytond import backend
+from trytond.pool import PoolMeta, Pool
from trytond.transaction import Transaction
-from trytond.pool import PoolMeta
__all__ = ['Category', 'CategoryCustomerTax', 'CategorySupplierTax',
- 'Template', 'TemplateCustomerTax', 'TemplateSupplierTax',
+ 'Template', 'TemplateCustomerTax', 'TemplateSupplierTax', 'Product',
'MissingFunction']
-__metaclass__ = PoolMeta
class MissingFunction(fields.Function):
@@ -40,8 +39,18 @@ class MissingFunction(fields.Function):
class Category:
+ __metaclass__ = PoolMeta
__name__ = 'product.category'
+ accounting = fields.Boolean('Accounting', select=True,
+ states={
+ 'readonly': Bool(Eval('childs', [0])) | Bool(Eval('parent')),
+ },
+ depends=['parent'])
account_parent = fields.Boolean('Use Parent\'s accounts',
+ states={
+ 'invisible': ~Eval('accounting', False),
+ },
+ depends=['accounting'],
help='Use the accounts defined on the parent category')
account_expense = fields.Property(fields.Many2One('account.account',
'Account Expense', domain=[
@@ -50,9 +59,10 @@ class Category:
],
states={
'invisible': (~Eval('context', {}).get('company')
- | Eval('account_parent')),
+ | Eval('account_parent')
+ | ~Eval('accounting', False)),
},
- depends=['account_parent']))
+ depends=['account_parent', 'accounting']))
account_revenue = fields.Property(fields.Many2One('account.account',
'Account Revenue', domain=[
('kind', '=', 'revenue'),
@@ -60,14 +70,19 @@ class Category:
],
states={
'invisible': (~Eval('context', {}).get('company')
- | Eval('account_parent')),
+ | Eval('account_parent')
+ | ~Eval('accounting', False)),
},
- depends=['account_parent']))
+ depends=['account_parent', 'accounting']))
account_expense_used = MissingFunction(fields.Many2One('account.account',
'Account Expense Used'), 'missing_account', 'get_account')
account_revenue_used = MissingFunction(fields.Many2One('account.account',
'Account Revenue Used'), 'missing_account', 'get_account')
taxes_parent = fields.Boolean('Use the Parent\'s Taxes',
+ states={
+ 'invisible': ~Eval('accounting', False),
+ },
+ depends=['accounting'],
help='Use the taxes defined on the parent category')
customer_taxes = fields.Many2Many('product.category-customer-account.tax',
'category', 'tax', 'Customer Taxes',
@@ -78,9 +93,10 @@ class Category:
],
states={
'invisible': (~Eval('context', {}).get('company')
- | Eval('taxes_parent')),
+ | Eval('taxes_parent')
+ | ~Eval('accounting', False)),
},
- depends=['taxes_parent'])
+ depends=['taxes_parent', 'accounting'])
supplier_taxes = fields.Many2Many('product.category-supplier-account.tax',
'category', 'tax', 'Supplier Taxes',
order=[('tax.sequence', 'ASC'), ('tax.id', 'ASC')],
@@ -90,9 +106,10 @@ class Category:
],
states={
'invisible': (~Eval('context', {}).get('company')
- | Eval('taxes_parent')),
+ | Eval('taxes_parent')
+ | ~Eval('accounting', False)),
},
- depends=['taxes_parent'])
+ depends=['taxes_parent', 'accounting'])
customer_taxes_used = fields.Function(fields.One2Many('account.tax', None,
'Customer Taxes Used'), 'get_taxes')
supplier_taxes_used = fields.Function(fields.One2Many('account.tax', None,
@@ -106,11 +123,19 @@ class Category:
'expense/revenue defined on the category '
'%s (%d)'),
})
+ cls.parent.domain = [
+ ('accounting', '=', Eval('accounting', False)),
+ cls.parent.domain or []]
+ cls.parent.depends.append('accounting')
cls.parent.states['required'] = Or(
cls.parent.states.get('required', False),
Eval('account_parent', False) | Eval('taxes_parent', False))
cls.parent.depends.extend(['account_parent', 'taxes_parent'])
+ @classmethod
+ def default_accounting(cls):
+ return False
+
def get_account(self, name):
if self.account_parent:
# Use __getattr__ to avoid raise of exception
@@ -125,6 +150,12 @@ class Category:
else:
return [x.id for x in getattr(self, name[:-5])]
+ @fields.depends('parent', 'accounting')
+ def on_change_with_accounting(self):
+ if self.parent:
+ return self.parent.accounting
+ return self.accounting
+
@fields.depends('account_expense')
def on_change_account_expense(self):
if self.account_expense:
@@ -139,6 +170,14 @@ class Category:
else:
self.customer_taxes = []
+ @classmethod
+ def view_attributes(cls):
+ return super(Category, cls).view_attributes() + [
+ ('/form/notebook/page[@id="accounting"]', 'states', {
+ 'invisible': ~Eval('accounting', False),
+ }),
+ ]
+
class CategoryCustomerTax(ModelSQL):
'Category - Customer Tax'
@@ -152,9 +191,8 @@ class CategoryCustomerTax(ModelSQL):
@classmethod
def __register__(cls, module_name):
TableHandler = backend.get('TableHandler')
- cursor = Transaction().cursor
# Migration from 1.6 product renamed into category
- table = TableHandler(cursor, cls)
+ table = TableHandler(cls)
if table.column_exist('product'):
table.index_action('product', action='remove')
table.drop_fk('product')
@@ -174,9 +212,8 @@ class CategorySupplierTax(ModelSQL):
@classmethod
def __register__(cls, module_name):
TableHandler = backend.get('TableHandler')
- cursor = Transaction().cursor
# Migration from 1.6 product renamed into category
- table = TableHandler(cursor, cls)
+ table = TableHandler(cls)
if table.column_exist('product'):
table.index_action('product', action='remove')
table.drop_fk('product')
@@ -185,8 +222,18 @@ class CategorySupplierTax(ModelSQL):
class Template:
+ __metaclass__ = PoolMeta
__name__ = 'product.template'
- account_category = fields.Boolean('Use Category\'s accounts',
+ account_category = fields.Many2One('product.category', 'Account Category',
+ domain=[
+ ('accounting', '=', True),
+ ],
+ states={
+ 'required': (Eval('accounts_category', False)
+ | Eval('taxes_category', False)),
+ },
+ depends=['accounts_category', 'taxes_category'])
+ accounts_category = fields.Boolean('Use Category\'s accounts',
help='Use the accounts defined on the category')
account_expense = fields.Property(fields.Many2One('account.account',
'Account Expense', domain=[
@@ -195,10 +242,10 @@ class Template:
],
states={
'invisible': (~Eval('context', {}).get('company')
- | Eval('account_category')),
+ | Eval('accounts_category')),
},
help='This account will be used instead of the one defined'
- ' on the category.', depends=['account_category']))
+ ' on the category.', depends=['accounts_category']))
account_revenue = fields.Property(fields.Many2One('account.account',
'Account Revenue', domain=[
('kind', '=', 'revenue'),
@@ -206,10 +253,10 @@ class Template:
],
states={
'invisible': (~Eval('context', {}).get('company')
- | Eval('account_category')),
+ | Eval('accounts_category')),
},
help='This account will be used instead of the one defined'
- ' on the category.', depends=['account_category']))
+ ' on the category.', depends=['accounts_category']))
account_expense_used = MissingFunction(fields.Many2One('account.account',
'Account Expense Used'), 'missing_account', 'get_account')
account_revenue_used = MissingFunction(fields.Many2One('account.account',
@@ -250,25 +297,55 @@ class Template:
'missing_account': ('There is no account '
'expense/revenue defined on the product %s (%d)'),
})
- cls.category.states['required'] = Or(
- cls.category.states.get('required', False),
- Eval('account_category', False) | Eval('taxes_category', False))
- cls.category.depends.extend(['account_category', 'taxes_category'])
- @staticmethod
- def default_taxes_category():
- return None
+ @classmethod
+ def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
+ cursor = Transaction().connection.cursor()
+ pool = Pool()
+ Category = pool.get('product.category')
+ sql_table = cls.__table__()
+ category = Category.__table__()
+
+ table = TableHandler(cls, module_name)
+ category_exists = table.column_exist('category')
+
+ # Migration from 3.8: rename account_category into accounts_category
+ if table.column_exist('account_category'):
+ table.column_rename('account_category', 'accounts_category')
+
+ super(Template, cls).__register__(module_name)
+
+ # Migration from 3.8: duplicate category into account_category
+ if category_exists:
+ # Only accounting category until now
+ cursor.execute(*category.update([category.accounting], [True]))
+ cursor.execute(*sql_table.update(
+ [sql_table.account_category],
+ [sql_table.category]))
+
+ @classmethod
+ def default_accounts_category(cls):
+ pool = Pool()
+ Config = pool.get('product.configuration')
+ return Config(1).default_accounts_category
+
+ @classmethod
+ def default_taxes_category(cls):
+ pool = Pool()
+ Config = pool.get('product.configuration')
+ return Config(1).default_taxes_category
def get_account(self, name):
- if self.account_category:
- account = self.category.__getattr__(name)
+ if self.accounts_category:
+ account = self.account_category.__getattr__(name)
else:
account = getattr(self, name[:-5])
return account.id if account else None
def get_taxes(self, name):
if self.taxes_category:
- return [x.id for x in getattr(self.category, name)]
+ return [x.id for x in getattr(self.account_category, name)]
else:
return [x.id for x in getattr(self, name[:-5])]
@@ -307,3 +384,17 @@ class TemplateSupplierTax(ModelSQL):
ondelete='CASCADE', select=True, required=True)
tax = fields.Many2One('account.tax', 'Tax', ondelete='RESTRICT',
required=True)
+
+
+class Product:
+ __metaclass__ = PoolMeta
+ __name__ = 'product.product'
+ # Avoid raise of UserError from MissingFunction
+ account_expense_used = fields.Function(fields.Many2One('account.account',
+ 'Account Expense Used'), 'get_template')
+ account_revenue_used = fields.Function(fields.Many2One('account.account',
+ 'Account Revenue Used'), 'get_template')
+ customer_taxes_used = fields.Function(fields.One2Many('account.tax', None,
+ 'Customer Taxes Used'), 'get_template')
+ supplier_taxes_used = fields.Function(fields.One2Many('account.tax', None,
+ 'Supplier Taxes Used'), 'get_template')
diff --git a/product.xml b/product.xml
index a0e768d..ec2f159 100644
--- a/product.xml
+++ b/product.xml
@@ -16,5 +16,59 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">template_form</field>
</record>
+ <record model="ir.ui.view" id="template_view_tree">
+ <field name="model">product.template</field>
+ <field name="inherit" ref="product.template_view_tree"/>
+ <field name="name">template_tree</field>
+ </record>
+
+ <record model="ir.rule.group" id="rule_group_category_customer_taxes">
+ <field name="model"
+ search="[('model', '=', 'product.category-customer-account.tax')]"/>
+ <field name="global_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_category_customer_taxes">
+ <field name="domain"
+ eval="[('tax.company', '=', Eval('user', {}).get('company', None))]"
+ pyson="1"/>
+ <field name="rule_group" ref="rule_group_category_customer_taxes"/>
+ </record>
+
+ <record model="ir.rule.group" id="rule_group_category_supplier_taxes">
+ <field name="model"
+ search="[('model', '=', 'product.category-supplier-account.tax')]"/>
+ <field name="global_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_category_supplier_taxes">
+ <field name="domain"
+ eval="[('tax.company', '=', Eval('user', {}).get('company', None))]"
+ pyson="1"/>
+ <field name="rule_group" ref="rule_group_category_supplier_taxes"/>
+ </record>
+
+ <record model="ir.rule.group" id="rule_group_template_customer_taxes">
+ <field name="model"
+ search="[('model', '=', 'product.template-customer-account.tax')]"/>
+ <field name="global_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_template_customer_taxes">
+ <field name="domain"
+ eval="[('tax.company', '=', Eval('user', {}).get('company', None))]"
+ pyson="1"/>
+ <field name="rule_group" ref="rule_group_template_customer_taxes"/>
+ </record>
+
+ <record model="ir.rule.group" id="rule_group_template_supplier_taxes">
+ <field name="model"
+ search="[('model', '=', 'product.template-supplier-account.tax')]"/>
+ <field name="global_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_template_supplier_taxes">
+ <field name="domain"
+ eval="[('tax.company', '=', Eval('user', {}).get('company', None))]"
+ pyson="1"/>
+ <field name="rule_group" ref="rule_group_template_supplier_taxes"/>
+ </record>
+
</data>
</tryton>
diff --git a/setup.py b/setup.py
index 9251012..fd803a6 100644
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,17 @@
from setuptools import setup
import re
import os
-import ConfigParser
+import io
+try:
+ from configparser import ConfigParser
+except ImportError:
+ from ConfigParser import ConfigParser
def read(fname):
- return open(os.path.join(os.path.dirname(__file__), fname)).read()
+ return io.open(
+ os.path.join(os.path.dirname(__file__), fname),
+ 'r', encoding='utf-8').read()
def get_require_version(name):
@@ -21,7 +27,7 @@ def get_require_version(name):
major_version, minor_version + 1)
return require
-config = ConfigParser.ConfigParser()
+config = ConfigParser()
config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton'))
for key in ('depends', 'extras_depend', 'xml'):
@@ -43,7 +49,7 @@ if minor_version % 2:
requires = []
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res)(\W|$)', dep):
requires.append(get_require_version('trytond_%s' % dep))
requires.append(get_require_version('trytond'))
@@ -75,6 +81,7 @@ setup(name=name,
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
+ 'Natural Language :: Chinese (Simplified)',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
@@ -88,6 +95,9 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3.3',
+ 'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
@@ -102,4 +112,5 @@ setup(name=name,
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
+ use_2to3=True,
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 3675e1b..62199f8 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +1,9 @@
# 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 .test_account_product import suite
+try:
+ from trytond.modules.account_product.tests.test_account_product import suite
+except ImportError:
+ from .test_account_product import suite
__all__ = ['suite']
diff --git a/tests/test_account_product.py b/tests/test_account_product.py
index 7d9c434..efb5469 100644
--- a/tests/test_account_product.py
+++ b/tests/test_account_product.py
@@ -1,38 +1,47 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
import unittest
-import doctest
from decimal import Decimal
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT
-from trytond.transaction import Transaction
+from trytond.tests.test_tryton import ModuleTestCase, with_transaction
+from trytond.pool import Pool
from trytond.exceptions import UserError
+from trytond.modules.company.tests import create_company, set_company
+from trytond.modules.account.tests import create_chart
+
class AccountProductTestCase(ModuleTestCase):
'Test AccountProduct module'
module = 'account_product'
+ @with_transaction()
def test_account_used(self):
'Test account used'
- ProductTemplate = POOL.get('product.template')
- ProductCategory = POOL.get('product.category')
- Uom = POOL.get('product.uom')
- Account = POOL.get('account.account')
+ pool = Pool()
+ ProductTemplate = pool.get('product.template')
+ ProductCategory = pool.get('product.category')
+ Uom = pool.get('product.uom')
+ Account = pool.get('account.account')
+
+ company = create_company()
+ with set_company(company):
+ create_chart(company)
- with Transaction().start(DB_NAME, USER, context=CONTEXT):
unit, = Uom.search([
('name', '=', 'Unit'),
])
- unit_id = unit.id
+ account_expense, = Account.search([
+ ('kind', '=', 'expense'),
+ ])
+ # raise when empty
template = ProductTemplate(
name='test account used',
list_price=Decimal(10),
cost_price=Decimal(3),
- default_uom=unit_id,
+ default_uom=unit.id,
)
template.save()
@@ -41,37 +50,34 @@ class AccountProductTestCase(ModuleTestCase):
with self.assertRaises(UserError):
template.account_expense_used
- with Transaction().start(DB_NAME, USER, context=CONTEXT):
- account_expense, = Account.search([
- ('kind', '=', 'expense'),
- ])
- account_expense_id = account_expense.id
-
+ # with account
template = ProductTemplate(
name='test account used',
list_price=Decimal(10),
cost_price=Decimal(3),
- default_uom=unit_id,
- account_expense=account_expense_id,
+ default_uom=unit.id,
+ account_expense=account_expense.id,
)
template.save()
self.assertEqual(template.account_expense, account_expense)
self.assertEqual(template.account_expense_used, account_expense)
+ # with account on category
category = ProductCategory(name='test account used',
- account_expense=account_expense)
+ account_expense=account_expense, accounting=True)
category.save()
template.account_expense = None
- template.account_category = True
- template.category = category
+ template.accounts_category = True
+ template.account_category = category
template.save()
self.assertIsNone(template.account_expense)
self.assertEqual(template.account_expense_used, account_expense)
+ # with account on grant category
parent_category = ProductCategory(name='parent account used',
- account_expense=account_expense)
+ account_expense=account_expense, accounting=True)
parent_category.save()
category.account_expense = None
category.account_parent = True
@@ -82,24 +88,23 @@ class AccountProductTestCase(ModuleTestCase):
self.assertEqual(template.account_expense_used, account_expense)
self.assertEqual(category.account_expense_used, account_expense)
- with Transaction().start(DB_NAME, USER, context=CONTEXT):
-
+ # raise only at direct usage
templates = ProductTemplate.create([{
'name': 'test with account',
'list_price': Decimal(10),
'cost_price': Decimal(3),
- 'default_uom': unit_id,
- 'account_expense': account_expense_id,
+ 'default_uom': unit.id,
+ 'account_expense': account_expense.id,
}, {
'name': 'test without account',
'list_price': Decimal(10),
'cost_price': Decimal(3),
- 'default_uom': unit_id,
+ 'default_uom': unit.id,
'account_expense': None,
}])
self.assertEqual(templates[0].account_expense_used.id,
- account_expense_id)
+ account_expense.id)
with self.assertRaises(UserError):
templates[1].account_expense_used
@@ -107,10 +112,6 @@ class AccountProductTestCase(ModuleTestCase):
def suite():
suite = trytond.tests.test_tryton.suite()
- from trytond.modules.account.tests import test_account
- for test in test_account.suite():
- if test not in suite and not isinstance(test, doctest.DocTestCase):
- suite.addTest(test)
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
AccountProductTestCase))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index b2fb27a..63d0544 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
account
company
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
index 3229f2b..701d486 100644
--- a/trytond_account_product.egg-info/PKG-INFO
+++ b/trytond_account_product.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-product
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add accounting on product
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.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_account_product
=======================
@@ -54,6 +54,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -67,6 +68,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_account_product.egg-info/SOURCES.txt b/trytond_account_product.egg-info/SOURCES.txt
index a020464..c8bf542 100644
--- a/trytond_account_product.egg-info/SOURCES.txt
+++ b/trytond_account_product.egg-info/SOURCES.txt
@@ -50,11 +50,13 @@ locale/fr_FR.po
locale/hu_HU.po
locale/it_IT.po
locale/ja_JP.po
+locale/lo_LA.po
locale/lt_LT.po
locale/nl_NL.po
locale/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
+locale/zh_CN.po
trytond_account_product.egg-info/PKG-INFO
trytond_account_product.egg-info/SOURCES.txt
trytond_account_product.egg-info/dependency_links.txt
@@ -64,4 +66,6 @@ trytond_account_product.egg-info/requires.txt
trytond_account_product.egg-info/top_level.txt
view/category_form.xml
view/configuration_form.xml
-view/template_form.xml
\ No newline at end of file
+view/product_configuration_form.xml
+view/template_form.xml
+view/template_tree.xml
\ No newline at end of file
diff --git a/trytond_account_product.egg-info/requires.txt b/trytond_account_product.egg-info/requires.txt
index da29b11..a7cd47f 100644
--- a/trytond_account_product.egg-info/requires.txt
+++ b/trytond_account_product.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_account >= 3.8, < 3.9
-trytond_company >= 3.8, < 3.9
-trytond_product >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_account >= 4.0, < 4.1
+trytond_company >= 4.0, < 4.1
+trytond_product >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
diff --git a/view/category_form.xml b/view/category_form.xml
index 35812e0..c3bdce6 100644
--- a/view/category_form.xml
+++ b/view/category_form.xml
@@ -2,6 +2,10 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<data>
+ <xpath expr="/form/group[@id='checkboxes']" position="inside">
+ <label name="accounting"/>
+ <field name="accounting" xexpand="0" width="25"/>
+ </xpath>
<xpath
expr="/form/notebook/page[@id='childs']"
position="before">
diff --git a/view/product_configuration_form.xml b/view/product_configuration_form.xml
new file mode 100644
index 0000000..7a7b2dd
--- /dev/null
+++ b/view/product_configuration_form.xml
@@ -0,0 +1,12 @@
+<?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. -->
+<data>
+ <xpath expr="/form" position="inside">
+ <newline/>
+ <label name="default_accounts_category"/>
+ <field name="default_accounts_category"/>
+ <label name="default_taxes_category"/>
+ <field name="default_taxes_category"/>
+ </xpath>
+</data>
diff --git a/view/template_form.xml b/view/template_form.xml
index 382ebeb..6cd2c57 100644
--- a/view/template_form.xml
+++ b/view/template_form.xml
@@ -6,9 +6,11 @@ this repository contains the full copyright notices and license terms. -->
expr="/form/notebook/page[@id='general']"
position="after">
<page string="Accounting" col="4" id="accounting">
- <separator string="Accounts" id="accounts" colspan="4"/>
<label name="account_category"/>
<field name="account_category"/>
+ <separator string="Accounts" id="accounts" colspan="4"/>
+ <label name="accounts_category"/>
+ <field name="accounts_category"/>
<newline/>
<label name="account_revenue"/>
<field name="account_revenue"/>
diff --git a/view/template_tree.xml b/view/template_tree.xml
new file mode 100644
index 0000000..5f185aa
--- /dev/null
+++ b/view/template_tree.xml
@@ -0,0 +1,8 @@
+<?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. -->
+<data>
+ <xpath expr="/tree/field[@name='type']" position="after">
+ <field name="account_category"/>
+ </xpath>
+</data>
--
tryton-modules-account-product
More information about the tryton-debian-vcs
mailing list