[tryton-debian-vcs] tryton-modules-account-product branch upstream created. 1f78f841d4c16fb5e2b154a50f078adbc87da7b2
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:56:25 UTC 2013
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-product.git;a=commitdiff;h=1f78f841d4c16fb5e2b154a50f078adbc87da7b2
commit 1f78f841d4c16fb5e2b154a50f078adbc87da7b2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:26:25 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 94332a4..452cce6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 3a4dbb6..44ac868 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_product
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add accounting on product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_account_product
=======================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/es_CO.po b/locale/es_CO.po
index d443e88..4fedf7d 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -36,15 +36,15 @@ msgstr "Impuestos del Cliente"
msgctxt "field:product.category,customer_taxes_used:"
msgid "Customer Taxes Used"
-msgstr "Impuestos del Cliente Usados"
+msgstr "Impuestos del Cliente Aplicados"
msgctxt "field:product.category,supplier_taxes:"
msgid "Supplier Taxes"
-msgstr "Impuestos a Proveedores"
+msgstr "Impuestos del Proveedor"
msgctxt "field:product.category,supplier_taxes_used:"
msgid "Supplier Taxes Used"
-msgstr "Impuestos del Cliente Usados"
+msgstr "Impuestos del Proveedor Aplicados"
msgctxt "field:product.category,taxes_parent:"
msgid "Use the Parent's Taxes"
@@ -140,19 +140,19 @@ msgstr "Impuestos del Cliente"
msgctxt "field:product.template,customer_taxes_used:"
msgid "Customer Taxes Used"
-msgstr "Impuestos del Cliente Usados"
+msgstr "Impuestos del Cliente Aplicados"
msgctxt "field:product.template,supplier_taxes:"
msgid "Supplier Taxes"
-msgstr "Impuestos a Proveedores"
+msgstr "Impuestos del Proveedor"
msgctxt "field:product.template,supplier_taxes_used:"
msgid "Supplier Taxes Used"
-msgstr "Impuestos del Cliente Usados"
+msgstr "Impuestos del Proveedor Aplicados"
msgctxt "field:product.template,taxes_category:"
msgid "Use Category's Taxes"
-msgstr "Categorías de Impuesto"
+msgstr "Usar Categorías de Impuesto"
msgctxt "field:product.template-customer-account.tax,create_date:"
msgid "Create Date"
@@ -244,11 +244,11 @@ msgstr "Usar los impuestos definidos en la categoría"
msgctxt "model:product.category-customer-account.tax,name:"
msgid "Category - Customer Tax"
-msgstr "Categoría - Impuestos Cliente"
+msgstr "Categoría - Impuestos de Cliente"
msgctxt "model:product.category-supplier-account.tax,name:"
msgid "Category - Supplier Tax"
-msgstr "Categoría - Impuestos Proveedor"
+msgstr "Categoría - Impuesto de Proveedor"
msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 910063b..b6bbf9d 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -11,11 +11,6 @@ msgid "There is no account expense/revenue defined on the product %s (%d)"
msgstr ""
"Il n'y a pas de compte charges/produits définit sur le produit %s (%d)"
-msgctxt "error:product.template:"
-msgid "There is no account expense/revenue defined on the product %s (%d)"
-msgstr ""
-"Il n'y a pas de compte charges/produits définit sur le produit %s (%d)"
-
msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Compte de charges"
@@ -269,10 +264,6 @@ msgid "Accounting"
msgstr "Comptabilité"
msgctxt "view:product.category:"
-msgid "Accounting"
-msgstr "Comptabilité"
-
-msgctxt "view:product.category:"
msgid "Accounts"
msgstr "Comptes"
@@ -280,10 +271,6 @@ msgctxt "view:product.category:"
msgid "Taxes"
msgstr "Taxes"
-msgctxt "view:product.category:"
-msgid "Taxes"
-msgstr "Taxes"
-
msgctxt "view:product.product:"
msgid "Accounting"
msgstr "Comptabilité"
@@ -293,21 +280,9 @@ msgid "Accounting"
msgstr "Comptabilité"
msgctxt "view:product.template:"
-msgid "Accounting"
-msgstr "Comptabilité"
-
-msgctxt "view:product.template:"
-msgid "Accounts"
-msgstr "Comptes"
-
-msgctxt "view:product.template:"
msgid "Accounts"
msgstr "Comptes"
msgctxt "view:product.template:"
msgid "Taxes"
msgstr "Taxes"
-
-msgctxt "view:product.template:"
-msgid "Taxes"
-msgstr "Taxes"
diff --git a/locale/es_CO.po b/locale/sl_SI.po
similarity index 72%
copy from locale/es_CO.po
copy to locale/sl_SI.po
index d443e88..9409705 100644
--- a/locale/es_CO.po
+++ b/locale/sl_SI.po
@@ -4,63 +4,63 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.category:"
msgid "There is no account expense/revenue defined on the category %s (%d)"
-msgstr "No hay una cuenta gastos/ingresos definida para la categoria %s (%d)"
+msgstr "Za kategorijo %s (%d) ni določenega konta odhodkov/prihodkov"
msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
-msgstr "No hay una cuenta gastos/ingresos definida para el producto %s (%d)"
+msgstr "Za izdelek %s (%d) ni določenega konta prihodkov/odhodkov"
msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
-msgstr "Cuenta de Gastos"
+msgstr "Konto odhodkov"
msgctxt "field:product.category,account_expense_used:"
msgid "Account Expense Used"
-msgstr "Cuenta de Gastos Usada"
+msgstr "Uporabljen konto odhodkov"
msgctxt "field:product.category,account_parent:"
msgid "Use Parent's accounts"
-msgstr "Usar cuenta del Padre"
+msgstr "Uporabi matične konte"
msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
-msgstr "Cuenta de Ingresos"
+msgstr "Konto prihodkov"
msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
-msgstr "Cuenta de Ingresos Usada"
+msgstr "Uporabljen konto prihodkov"
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
-msgstr "Impuestos del Cliente"
+msgstr "Davki za kupce"
msgctxt "field:product.category,customer_taxes_used:"
msgid "Customer Taxes Used"
-msgstr "Impuestos del Cliente Usados"
+msgstr "Uporabljeni davki kupca"
msgctxt "field:product.category,supplier_taxes:"
msgid "Supplier Taxes"
-msgstr "Impuestos a Proveedores"
+msgstr "Davki za dobavitelje"
msgctxt "field:product.category,supplier_taxes_used:"
msgid "Supplier Taxes Used"
-msgstr "Impuestos del Cliente Usados"
+msgstr "Uporabljeni davki dobavitelja"
msgctxt "field:product.category,taxes_parent:"
msgid "Use the Parent's Taxes"
-msgstr "Usar Impuestos del Padre"
+msgstr "Uporabi matične davke"
msgctxt "field:product.category-customer-account.tax,category:"
msgid "Category"
-msgstr "Categoría"
+msgstr "Kategorija"
msgctxt "field:product.category-customer-account.tax,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Ustvarjeno"
msgctxt "field:product.category-customer-account.tax,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Ustvaril"
msgctxt "field:product.category-customer-account.tax,id:"
msgid "ID"
@@ -68,31 +68,31 @@ msgstr "ID"
msgctxt "field:product.category-customer-account.tax,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
-msgstr "Impuesto"
+msgstr "Davek"
msgctxt "field:product.category-customer-account.tax,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Zapisano"
msgctxt "field:product.category-customer-account.tax,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Zapisal"
msgctxt "field:product.category-supplier-account.tax,category:"
msgid "Category"
-msgstr "Categoría"
+msgstr "Kategorija"
msgctxt "field:product.category-supplier-account.tax,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Ustvarjeno"
msgctxt "field:product.category-supplier-account.tax,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Ustvaril"
msgctxt "field:product.category-supplier-account.tax,id:"
msgid "ID"
@@ -100,67 +100,67 @@ msgstr "ID"
msgctxt "field:product.category-supplier-account.tax,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
-msgstr "Impuesto"
+msgstr "Davek"
msgctxt "field:product.category-supplier-account.tax,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Zapisano"
msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Zapisal"
msgctxt "field:product.template,account_category:"
msgid "Use Category's accounts"
-msgstr "Use las cuentas de Categoría"
+msgstr "Uporabi konte iz kategorije"
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
-msgstr "Cuenta de Gastos"
+msgstr "Konto odhodkov"
msgctxt "field:product.template,account_expense_used:"
msgid "Account Expense Used"
-msgstr "Cuenta de Gastos Usada"
+msgstr "Uporabljen konto odhodkov"
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
-msgstr "Cuenta de Ingresos"
+msgstr "Konto prihodkov"
msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
-msgstr "Cuenta de Ingresos Usada"
+msgstr "Uporabljen konto prihodkov"
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
-msgstr "Impuestos del Cliente"
+msgstr "Davki za kupce"
msgctxt "field:product.template,customer_taxes_used:"
msgid "Customer Taxes Used"
-msgstr "Impuestos del Cliente Usados"
+msgstr "Uporabljeni davki kupca"
msgctxt "field:product.template,supplier_taxes:"
msgid "Supplier Taxes"
-msgstr "Impuestos a Proveedores"
+msgstr "Davki za dobavitelje"
msgctxt "field:product.template,supplier_taxes_used:"
msgid "Supplier Taxes Used"
-msgstr "Impuestos del Cliente Usados"
+msgstr "Uporabljeni davki dobavitelja"
msgctxt "field:product.template,taxes_category:"
msgid "Use Category's Taxes"
-msgstr "Categorías de Impuesto"
+msgstr "Uporabi davke iz kategorije"
msgctxt "field:product.template-customer-account.tax,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Ustvarjeno"
msgctxt "field:product.template-customer-account.tax,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Ustvaril"
msgctxt "field:product.template-customer-account.tax,id:"
msgid "ID"
@@ -168,31 +168,31 @@ msgstr "ID"
msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
-msgstr "Plantilla de Producto"
+msgstr "Predloga izdelka"
msgctxt "field:product.template-customer-account.tax,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
-msgstr "Impuesto"
+msgstr "Davek"
msgctxt "field:product.template-customer-account.tax,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Zapisano"
msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Zapisal"
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Ustvarjeno"
msgctxt "field:product.template-supplier-account.tax,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Ustvaril"
msgctxt "field:product.template-supplier-account.tax,id:"
msgid "ID"
@@ -200,88 +200,84 @@ msgstr "ID"
msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
-msgstr "Plantilla de Producto"
+msgstr "Predloga izdelka"
msgctxt "field:product.template-supplier-account.tax,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
-msgstr "Impuesto"
+msgstr "Davek"
msgctxt "field:product.template-supplier-account.tax,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Zapisano"
msgctxt "field:product.template-supplier-account.tax,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Ustvaril"
msgctxt "help:product.category,account_parent:"
msgid "Use the accounts defined on the parent category"
-msgstr "Usar las cuentas definidas en la categoria padre"
+msgstr "Uporabi konte, določene v matični kategoriji"
msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
-msgstr "Usar los impuestos definidos en la categoria padre"
+msgstr "Uporabi davke, določene v matični kategoriji"
msgctxt "help:product.template,account_category:"
msgid "Use the accounts defined on the category"
-msgstr "Use las cuentas definidas en la categoría"
+msgstr "Uporabite konte, definirane v kategoriji."
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 "Namesto konta v kategoriji se bo uporabil ta konto odhodkov."
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 "Namesto konta v kategoriji se bo uporabil ta konto prihodkov."
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
-msgstr "Usar los impuestos definidos en la categoría"
+msgstr "Uporabite davke, definirane v kategoriji."
msgctxt "model:product.category-customer-account.tax,name:"
msgid "Category - Customer Tax"
-msgstr "Categoría - Impuestos Cliente"
+msgstr "Kategorija - Davek kupca"
msgctxt "model:product.category-supplier-account.tax,name:"
msgid "Category - Supplier Tax"
-msgstr "Categoría - Impuestos Proveedor"
+msgstr "Kategorija - Davek dobavitelja"
msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
-msgstr "Plantilla Producto - Impuestos Cliente"
+msgstr "Predloga - Davek kupca"
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
-msgstr "Plantilla Producto - Impuestos Proveedor"
+msgstr "Predloga - Davek dobavitelja"
msgctxt "view:product.category:"
msgid "Accounting"
-msgstr "Contabilidad"
+msgstr "Računovodstvo"
msgctxt "view:product.category:"
msgid "Accounts"
-msgstr "Cuentas"
+msgstr "Konti"
msgctxt "view:product.category:"
msgid "Taxes"
-msgstr "Impuestos"
-
-msgctxt "view:product.product:"
-msgid "Accounting"
-msgstr "Contabilidad"
+msgstr "Davki"
msgctxt "view:product.template:"
msgid "Accounting"
-msgstr "Contabilidad"
+msgstr "Računovodstvo"
msgctxt "view:product.template:"
msgid "Accounts"
-msgstr "Cuentas"
+msgstr "Konti"
msgctxt "view:product.template:"
msgid "Taxes"
-msgstr "Impuestos"
+msgstr "Davki"
diff --git a/product.py b/product.py
index c31e57f..1e0b636 100644
--- a/product.py
+++ b/product.py
@@ -2,7 +2,7 @@
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelSQL, fields
from trytond.pyson import Eval, Or
-from trytond.backend import TableHandler
+from trytond import backend
from trytond.transaction import Transaction
from trytond.pool import PoolMeta
@@ -18,7 +18,7 @@ class Category:
account_expense = fields.Property(fields.Many2One('account.account',
'Account Expense', domain=[
('kind', '=', 'expense'),
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
], on_change=['account_expense'],
states={
'invisible': (~Eval('context', {}).get('company')
@@ -28,7 +28,7 @@ class Category:
account_revenue = fields.Property(fields.Many2One('account.account',
'Account Revenue', domain=[
('kind', '=', 'revenue'),
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
], on_change=['account_revenue'],
states={
'invisible': (~Eval('context', {}).get('company')
@@ -125,6 +125,7 @@ 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)
@@ -146,6 +147,7 @@ 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)
@@ -163,7 +165,7 @@ class Template:
account_expense = fields.Property(fields.Many2One('account.account',
'Account Expense', domain=[
('kind', '=', 'expense'),
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
], on_change=['account_category', 'account_expense'],
states={
'invisible': (~Eval('context', {}).get('company')
@@ -174,7 +176,7 @@ class Template:
account_revenue = fields.Property(fields.Many2One('account.account',
'Account Revenue', domain=[
('kind', '=', 'revenue'),
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
], on_change=['account_category', 'account_revenue'],
states={
'invisible': (~Eval('context', {}).get('company')
diff --git a/setup.py b/setup.py
index 4bbe9ca..c28e9f1 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(name='trytond_account_product',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index 95c1770..4932a5b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_account_product import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index da0fce1..4539ae6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
account
company
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
index aa8cf69..5f0c8a3 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: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add accounting on product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_account_product
=======================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_account_product.egg-info/SOURCES.txt b/trytond_account_product.egg-info/SOURCES.txt
index c8ece60..dc5bcfb 100644
--- a/trytond_account_product.egg-info/SOURCES.txt
+++ b/trytond_account_product.egg-info/SOURCES.txt
@@ -21,6 +21,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_account_product.egg-info/PKG-INFO
trytond_account_product.egg-info/SOURCES.txt
trytond_account_product.egg-info/dependency_links.txt
diff --git a/trytond_account_product.egg-info/requires.txt b/trytond_account_product.egg-info/requires.txt
index 12ea899..1b5fd4d 100644
--- a/trytond_account_product.egg-info/requires.txt
+++ b/trytond_account_product.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_account >= 2.8, < 2.9
-trytond_company >= 2.8, < 2.9
-trytond_product >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_account >= 3.0, < 3.1
+trytond_company >= 3.0, < 3.1
+trytond_product >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit 5ea111cf72b12cf0a6b1fc0579cb64a1a0a75f8d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:34:57 2013 +0200
Adding upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index b34f267..94332a4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.0 - 2013-04-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index ede3fac..5d422e0 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
-Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-2013 Cédric Krier.
+Copyright (C) 2008-2013 Bertrand Chenal.
+Copyright (C) 2008-2013 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/MANIFEST.in b/MANIFEST.in
index 44969c7..18ce53c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,5 +6,6 @@ include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
+include view/*.xml
include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 855ab1a..3a4dbb6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_account_product
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to add accounting on product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_account_product
=======================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Financial and Insurance Industry
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 :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 470db11..f5e16c0 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -232,11 +232,11 @@ msgstr "Utilitza els comptes 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 "Aquest compte s'utilitzarà en lloc del definit a la categoria."
+msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
msgctxt "help:product.template,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "Aquest compte s'utilitzarà en lloc del definit a la categoria."
+msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 7fc2923..ecc992a 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -16,7 +16,7 @@ msgstr "Konto Aufwand"
msgctxt "field:product.category,account_expense_used:"
msgid "Account Expense Used"
-msgstr "Konto Aufwand Benutzt"
+msgstr "Verwendetes Aufwandskonto"
msgctxt "field:product.category,account_parent:"
msgid "Use Parent's accounts"
@@ -124,7 +124,7 @@ msgstr "Konto Aufwand"
msgctxt "field:product.template,account_expense_used:"
msgid "Account Expense Used"
-msgstr "Konto Aufwand Benutzt"
+msgstr "Verwendetes Aufwandskonto"
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index ce9f8fa..0beb5a8 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -47,7 +47,7 @@ msgstr "Impuestos de proveedor"
msgctxt "field:product.category,supplier_taxes_used:"
msgid "Supplier Taxes Used"
-msgstr "Impuestos de cliente usados"
+msgstr "Impuestos de proveedor usados"
msgctxt "field:product.category,taxes_parent:"
msgid "Use the Parent's Taxes"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 01137f7..d443e88 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -60,7 +60,7 @@ msgstr "Fecha de Creación"
msgctxt "field:product.category-customer-account.tax,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:product.category-customer-account.tax,id:"
msgid "ID"
@@ -76,11 +76,11 @@ msgstr "Impuesto"
msgctxt "field:product.category-customer-account.tax,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de Modificación"
msgctxt "field:product.category-customer-account.tax,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por Usuario"
msgctxt "field:product.category-supplier-account.tax,category:"
msgid "Category"
@@ -92,7 +92,7 @@ msgstr "Fecha de Creación"
msgctxt "field:product.category-supplier-account.tax,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:product.category-supplier-account.tax,id:"
msgid "ID"
@@ -108,11 +108,11 @@ msgstr "Impuesto"
msgctxt "field:product.category-supplier-account.tax,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de Modificación"
msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por Usuario"
msgctxt "field:product.template,account_category:"
msgid "Use Category's accounts"
@@ -160,7 +160,7 @@ msgstr "Fecha de Creación"
msgctxt "field:product.template-customer-account.tax,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:product.template-customer-account.tax,id:"
msgid "ID"
@@ -180,11 +180,11 @@ msgstr "Impuesto"
msgctxt "field:product.template-customer-account.tax,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de Modificación"
msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por Usuario"
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
@@ -192,7 +192,7 @@ msgstr "Fecha de Creación"
msgctxt "field:product.template-supplier-account.tax,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:product.template-supplier-account.tax,id:"
msgid "ID"
@@ -212,11 +212,11 @@ msgstr "Impuesto"
msgctxt "field:product.template-supplier-account.tax,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de Modificación"
msgctxt "field:product.template-supplier-account.tax,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por Usuario"
msgctxt "help:product.category,account_parent:"
msgid "Use the accounts defined on the parent category"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 639a30b..54beb7d 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -234,11 +234,11 @@ msgstr "Usar las cuentas definidas 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."
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index e0db79e..910063b 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.category:"
msgid "There is no account expense/revenue defined on the category %s (%d)"
-msgstr "Il n'y a pas de compte de dépenses/revenus définé sur la catégorie"
+msgstr "Il n'y a pas de compte de charge/produit définé sur la catégorie"
msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 41e17e9..a68159f 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -4,290 +4,280 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.category:"
msgid "There is no account expense/revenue defined on the category %s (%d)"
-msgstr ""
+msgstr "Отсутствует расходный/доходный счет для категории %s (%d)"
msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
-msgstr ""
+msgstr "Отсутствует расходный/доходный счет для продукта %s (%d)"
msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
-msgstr ""
+msgstr "Счет расходов"
msgctxt "field:product.category,account_expense_used:"
msgid "Account Expense Used"
-msgstr ""
+msgstr "Использованный счет расходов"
msgctxt "field:product.category,account_parent:"
msgid "Use Parent's accounts"
-msgstr ""
+msgstr "Использовать родительский счет"
msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
-msgstr ""
+msgstr "Счет доходов"
msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
-msgstr ""
+msgstr "Использованный счет доходов"
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
-msgstr ""
+msgstr "Налоги заказчика"
msgctxt "field:product.category,customer_taxes_used:"
msgid "Customer Taxes Used"
-msgstr ""
+msgstr "Используемые налоги заказчика"
msgctxt "field:product.category,supplier_taxes:"
msgid "Supplier Taxes"
-msgstr ""
+msgstr "Налоги поставщика"
msgctxt "field:product.category,supplier_taxes_used:"
msgid "Supplier Taxes Used"
-msgstr ""
+msgstr "Используемые налоги поставщика"
msgctxt "field:product.category,taxes_parent:"
msgid "Use the Parent's Taxes"
-msgstr ""
+msgstr "Использовать родительские налоги"
-#, fuzzy
msgctxt "field:product.category-customer-account.tax,category:"
msgid "Category"
-msgstr "Категории"
+msgstr "Категория"
msgctxt "field:product.category-customer-account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
msgctxt "field:product.category-customer-account.tax,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
msgctxt "field:product.category-customer-account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:product.category-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Наименование"
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
-msgstr ""
+msgstr "Налог"
msgctxt "field:product.category-customer-account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
msgctxt "field:product.category-customer-account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
-#, fuzzy
msgctxt "field:product.category-supplier-account.tax,category:"
msgid "Category"
-msgstr "Категории"
+msgstr "Категория"
msgctxt "field:product.category-supplier-account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
msgctxt "field:product.category-supplier-account.tax,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
msgctxt "field:product.category-supplier-account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:product.category-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Наименование"
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
-msgstr ""
+msgstr "Налог"
msgctxt "field:product.category-supplier-account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "field:product.template,account_category:"
msgid "Use Category's accounts"
-msgstr ""
+msgstr "Использовать счет категории"
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
-msgstr ""
+msgstr "Счет расходов"
msgctxt "field:product.template,account_expense_used:"
msgid "Account Expense Used"
-msgstr ""
+msgstr "Использованный счет расходов"
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
-msgstr ""
+msgstr "Счет доходов"
msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
-msgstr ""
+msgstr "Использованный счет доходов"
msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
-msgstr ""
+msgstr "Налоги заказчика"
msgctxt "field:product.template,customer_taxes_used:"
msgid "Customer Taxes Used"
-msgstr ""
+msgstr "Используемые налоги заказчика"
msgctxt "field:product.template,supplier_taxes:"
msgid "Supplier Taxes"
-msgstr ""
+msgstr "Налоги поставщика"
msgctxt "field:product.template,supplier_taxes_used:"
msgid "Supplier Taxes Used"
-msgstr ""
+msgstr "Используемые налоги поставщика"
msgctxt "field:product.template,taxes_category:"
msgid "Use Category's Taxes"
-msgstr ""
+msgstr "Использовать налоги категории"
msgctxt "field:product.template-customer-account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
msgctxt "field:product.template-customer-account.tax,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
msgctxt "field:product.template-customer-account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
-msgstr "Шаблон Товара"
+msgstr "Шаблон продукта"
-#, fuzzy
msgctxt "field:product.template-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Наименование"
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
-msgstr ""
+msgstr "Налог"
msgctxt "field:product.template-customer-account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
msgctxt "field:product.template-supplier-account.tax,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
msgctxt "field:product.template-supplier-account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
-msgstr "Шаблон Товара"
+msgstr "Шаблон продукта"
-#, fuzzy
msgctxt "field:product.template-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Наименование"
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
-msgstr ""
+msgstr "Налог"
msgctxt "field:product.template-supplier-account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
msgctxt "field:product.template-supplier-account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "help:product.category,account_parent:"
msgid "Use the accounts defined on the parent category"
-msgstr ""
+msgstr "Использовать счета указанные для родительской категории"
msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
-msgstr ""
+msgstr "Использовать налоги указанные для родительской категории"
msgctxt "help:product.template,account_category:"
msgid "Use the accounts defined on the category"
-msgstr ""
+msgstr "Использовать счета указанные для категории"
msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
-msgstr ""
+msgstr "Этот счет будет использован вместо указанного в категории."
msgctxt "help:product.template,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
-msgstr ""
+msgstr "Этот счет будет использован вместо указанного в категории."
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
-msgstr ""
+msgstr "Использовать налоги указанные для категории"
msgctxt "model:product.category-customer-account.tax,name:"
msgid "Category - Customer Tax"
-msgstr ""
+msgstr "Категория - Налоги заказчика"
msgctxt "model:product.category-supplier-account.tax,name:"
msgid "Category - Supplier Tax"
-msgstr ""
+msgstr "Категория - Налоги поставщика"
msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
-msgstr ""
+msgstr "Шаблон продукта - Налоги заказчика"
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
-msgstr ""
+msgstr "Шаблон продукта - Налоги поставщика"
-#, fuzzy
msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Регистрационные данные"
msgctxt "view:product.category:"
msgid "Accounts"
-msgstr ""
+msgstr "Счета"
msgctxt "view:product.category:"
msgid "Taxes"
-msgstr ""
+msgstr "Налоги"
-#, fuzzy
msgctxt "view:product.template:"
msgid "Accounting"
msgstr "Регистрационные данные"
msgctxt "view:product.template:"
msgid "Accounts"
-msgstr ""
+msgstr "Счета"
msgctxt "view:product.template:"
msgid "Taxes"
-msgstr ""
+msgstr "Налоги"
diff --git a/product.py b/product.py
index b5602c7..c31e57f 100644
--- a/product.py
+++ b/product.py
@@ -42,14 +42,22 @@ class Category:
taxes_parent = fields.Boolean('Use the Parent\'s Taxes',
help='Use the taxes defined on the parent category')
customer_taxes = fields.Many2Many('product.category-customer-account.tax',
- 'category', 'tax', 'Customer Taxes', domain=[('parent', '=', None)],
+ 'category', 'tax', 'Customer Taxes',
+ domain=[('parent', '=', None), ['OR',
+ ('group', '=', None),
+ ('group.kind', 'in', ['sale', 'both'])],
+ ],
states={
'invisible': (~Eval('context', {}).get('company')
| Eval('taxes_parent')),
},
depends=['taxes_parent'])
supplier_taxes = fields.Many2Many('product.category-supplier-account.tax',
- 'category', 'tax', 'Supplier Taxes', domain=[('parent', '=', None)],
+ 'category', 'tax', 'Supplier Taxes',
+ domain=[('parent', '=', None), ['OR',
+ ('group', '=', None),
+ ('group.kind', 'in', ['purchase', 'both'])],
+ ],
states={
'invisible': (~Eval('context', {}).get('company')
| Eval('taxes_parent')),
@@ -160,19 +168,20 @@ class Template:
states={
'invisible': (~Eval('context', {}).get('company')
| Eval('account_category')),
- }, help='This account will be used instead of the one defined'\
- ' on the category.', depends=['account_category']))
+ },
+ help='This account will be used instead of the one defined'
+ ' on the category.', depends=['account_category']))
account_revenue = fields.Property(fields.Many2One('account.account',
- 'Account Revenue', domain=[
- ('kind', '=', 'revenue'),
- ('company', '=', Eval('context', {}).get('company', 0)),
- ], on_change=['account_category', 'account_revenue'],
- states={
- 'invisible': (~Eval('context', {}).get('company')
- | Eval('account_category')),
- },
- help='This account will be used instead of the one defined'\
- ' on the category.', depends=['account_category']))
+ 'Account Revenue', domain=[
+ ('kind', '=', 'revenue'),
+ ('company', '=', Eval('context', {}).get('company', 0)),
+ ], on_change=['account_category', 'account_revenue'],
+ states={
+ 'invisible': (~Eval('context', {}).get('company')
+ | Eval('account_category')),
+ },
+ help='This account will be used instead of the one defined'
+ ' on the category.', depends=['account_category']))
account_expense_used = fields.Function(fields.Many2One('account.account',
'Account Expense Used'), 'get_account')
account_revenue_used = fields.Function(fields.Many2One('account.account',
@@ -180,13 +189,21 @@ class Template:
taxes_category = fields.Boolean('Use Category\'s Taxes',
help='Use the taxes defined on the category')
customer_taxes = fields.Many2Many('product.template-customer-account.tax',
- 'product', 'tax', 'Customer Taxes', domain=[('parent', '=', None)],
+ 'product', 'tax', 'Customer Taxes',
+ domain=[('parent', '=', None), ['OR',
+ ('group', '=', None),
+ ('group.kind', 'in', ['sale', 'both'])],
+ ],
states={
'invisible': (~Eval('context', {}).get('company')
| Eval('taxes_category')),
}, depends=['taxes_category'])
supplier_taxes = fields.Many2Many('product.template-supplier-account.tax',
- 'product', 'tax', 'Supplier Taxes', domain=[('parent', '=', None)],
+ 'product', 'tax', 'Supplier Taxes',
+ domain=[('parent', '=', None), ['OR',
+ ('group', '=', None),
+ ('group.kind', 'in', ['purchase', 'both'])],
+ ],
states={
'invisible': (~Eval('context', {}).get('company')
| Eval('taxes_category')),
@@ -200,10 +217,9 @@ class Template:
def __setup__(cls):
super(Template, cls).__setup__()
cls._error_messages.update({
- 'missing_account': 'There is no account ' \
- 'expense/revenue defined on the product ' \
- '%s (%d)',
- })
+ '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))
diff --git a/product.xml b/product.xml
index 396a193..a0e768d 100644
--- a/product.xml
+++ b/product.xml
@@ -7,63 +7,13 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="category_view_form">
<field name="model">product.category</field>
<field name="inherit" ref="product.category_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form/notebook/page[@id="childs"]"
- position="before">
- <page string="Accounting" col="4" id="accounting">
- <separator string="Accounts" id="accounts" colspan="4"/>
- <label name="account_parent"/>
- <field name="account_parent"/>
- <newline/>
- <label name="account_revenue"/>
- <field name="account_revenue"/>
- <label name="account_expense"/>
- <field name="account_expense"/>
- <separator string="Taxes" id="taxes" colspan="4"/>
- <label name="taxes_parent"/>
- <field name="taxes_parent"/>
- <newline/>
- <field name="customer_taxes" colspan="2"/>
- <field name="supplier_taxes" colspan="2"/>
- </page>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">category_form</field>
</record>
<record model="ir.ui.view" id="template_view_form">
<field name="model">product.template</field>
<field name="inherit" ref="product.template_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- 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"/>
- <newline/>
- <label name="account_revenue"/>
- <field name="account_revenue"/>
- <label name="account_expense"/>
- <field name="account_expense"/>
- <separator string="Taxes" id="taxes" colspan="4"/>
- <label name="taxes_category"/>
- <field name="taxes_category"/>
- <newline/>
- <field name="customer_taxes" colspan="2"/>
- <field name="supplier_taxes" colspan="2"/>
- </page>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">template_form</field>
</record>
</data>
diff --git a/setup.py b/setup.py
index 5558da6..4bbe9ca 100644
--- a/setup.py
+++ b/setup.py
@@ -36,16 +36,16 @@ setup(name='trytond_account_product',
long_description=read('README'),
author='Tryton',
url='http://www.tryton.org/',
- download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ download_url=("http://downloads.tryton.org/" +
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
package_dir={'trytond.modules.account_product': '.'},
packages=[
'trytond.modules.account_product',
'trytond.modules.account_product.tests',
],
package_data={
- 'trytond.modules.account_product': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.account_product': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -56,6 +56,7 @@ setup(name='trytond_account_product',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
diff --git a/tryton.cfg b/tryton.cfg
index 52b68b2..da0fce1 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.0
depends:
account
company
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
index 3f3da45..aa8cf69 100644
--- a/trytond_account_product.egg-info/PKG-INFO
+++ b/trytond_account_product.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-account-product
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to add accounting on product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_account_product
=======================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Financial and Insurance Industry
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 :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/trytond_account_product.egg-info/SOURCES.txt b/trytond_account_product.egg-info/SOURCES.txt
index f3b3c19..c8ece60 100644
--- a/trytond_account_product.egg-info/SOURCES.txt
+++ b/trytond_account_product.egg-info/SOURCES.txt
@@ -27,4 +27,6 @@ trytond_account_product.egg-info/dependency_links.txt
trytond_account_product.egg-info/entry_points.txt
trytond_account_product.egg-info/not-zip-safe
trytond_account_product.egg-info/requires.txt
-trytond_account_product.egg-info/top_level.txt
\ No newline at end of file
+trytond_account_product.egg-info/top_level.txt
+view/category_form.xml
+view/template_form.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 3e8542b..12ea899 100644
--- a/trytond_account_product.egg-info/requires.txt
+++ b/trytond_account_product.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_account >= 2.6, < 2.7
-trytond_company >= 2.6, < 2.7
-trytond_product >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_account >= 2.8, < 2.9
+trytond_company >= 2.8, < 2.9
+trytond_product >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/category_form.xml b/view/category_form.xml
new file mode 100644
index 0000000..35812e0
--- /dev/null
+++ b/view/category_form.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+ <xpath
+ expr="/form/notebook/page[@id='childs']"
+ position="before">
+ <page string="Accounting" col="4" id="accounting">
+ <separator string="Accounts" id="accounts" colspan="4"/>
+ <label name="account_parent"/>
+ <field name="account_parent"/>
+ <newline/>
+ <label name="account_revenue"/>
+ <field name="account_revenue"/>
+ <label name="account_expense"/>
+ <field name="account_expense"/>
+ <separator string="Taxes" id="taxes" colspan="4"/>
+ <label name="taxes_parent"/>
+ <field name="taxes_parent"/>
+ <newline/>
+ <field name="customer_taxes" colspan="2"/>
+ <field name="supplier_taxes" colspan="2"/>
+ </page>
+ </xpath>
+</data>
diff --git a/view/template_form.xml b/view/template_form.xml
new file mode 100644
index 0000000..382ebeb
--- /dev/null
+++ b/view/template_form.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+ <xpath
+ 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"/>
+ <newline/>
+ <label name="account_revenue"/>
+ <field name="account_revenue"/>
+ <label name="account_expense"/>
+ <field name="account_expense"/>
+ <separator string="Taxes" id="taxes" colspan="4"/>
+ <label name="taxes_category"/>
+ <field name="taxes_category"/>
+ <newline/>
+ <field name="customer_taxes" colspan="2"/>
+ <field name="supplier_taxes" colspan="2"/>
+ </page>
+ </xpath>
+</data>
commit 5c5d5731171326783e5e9dcce4a24ab86d2638ac
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:53:20 2012 +0200
Adding upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 743b352..b34f267 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
-Version 2.4.1 - 2012-04-24
-* Restore es_AR translation
+Version 2.6.0 - 2012-10-22
+* Bug fixes (see mercurial logs for details)
Version 2.4.0 - 2012-04-23
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index 7f5d5fd..44969c7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
+include tryton.cfg
include *.xml
include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 60c5250..855ab1a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,16 +1,48 @@
Metadata-Version: 1.0
Name: trytond_account_product
-Version: 2.4.1
-Summary: Add accounting properties on product and category like:
- - account for expense / revenue
- - taxes for customer / supplier
-
+Version: 2.6.0
+Summary: Tryton module to add accounting on product
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_account_product
+ =======================
+
+ The account_product module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/README b/README
index 9fee7c8..107137d 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_account_product
=======================
The account_product module of the Tryton application platform.
-See __tryton__.py
Installing
----------
diff --git a/__init__.py b/__init__.py
index 915a9e2..1e0a874 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,16 @@
#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 trytond.pool import Pool
from .product import *
+
+
+def register():
+ Pool.register(
+ Category,
+ CategoryCustomerTax,
+ CategorySupplierTax,
+ Template,
+ TemplateCustomerTax,
+ TemplateSupplierTax,
+ module='account_product', type_='model')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 0186cf3..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,75 +0,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.
-{
- 'name': 'Account Product',
- 'name_bg_BG': 'Сметка за продукт',
- 'name_ca_ES': 'Comptabilitat de productes',
- 'name_de_DE': 'Buchhaltung Artikel',
- 'name_es_AR': 'Contabilidad de productos',
- 'name_es_CO': 'Contabilidad de Inventarios',
- 'name_es_ES': 'Contabilidad de productos',
- 'name_fr_FR': 'Compte produit',
- 'name_nl_NL': 'Boekhouding voor producten',
- 'version': '2.4.1',
- 'author': 'B2CK',
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- 'description': '''Add accounting properties on product and category like:
- - account for expense / revenue
- - taxes for customer / supplier
-''',
- 'description_bg_BG': '''Добавя счетоводни свойства на продукт и категория като:
- - сметка за разходи / приходу
- - данъци за клиент / доставчик
-''',
- 'description_ca_ES': '''Afegeix propietats de comptabilitat a productes i
-categories com:
- - Comptes de despeses i ingressos
- - Impostos per client i proveïdor
-''',
- 'description_de_DE': '''Fügt Eigenschaften für die Buchhaltung zu Artikeln und Artikelkategorien hinzu:
- - Aufwands- und Ertragskonto
- - Steuern für Kunden und Lieferanten
-''',
- 'description_es_AR': '''Añade propiedades de contabilidad en productos y categorías como:
- - Cuenta para gastos / ingresos
- - Impuestos para cliente / proveedor
-''',
- 'description_es_CO': '''Adiciona propiedades contables en productos y categorías:
- - contabilidad para gastos / ganancias
- - impuestos para cliente / proveedor
-''',
- 'description_es_ES': '''Añade propiedades de contabilidad a productos y categorías como:
- - Cuentas para gastos e ingresos
- - Impuestos para cliente y proveedor
-''',
- 'description_fr_FR': '''Ajoute des propriétés comptables sur les produits et leurs caétgories:
- - comptes de charge et revenu
- - taxes client et fournisseur
-''',
- 'description_nl_NL': '''Voegt boekhouding eigenschappen toe aan product en categorie als:
- - rekening voor kosten / opbrengsten
- - belastingregels voor klanten en leveranciers
-''',
- 'depends': [
- 'ir',
- 'account',
- 'company',
- 'product',
- ],
- 'xml': [
- 'product.xml',
- ],
- 'translation': [
- 'locale/bg_BG.po',
- 'locale/ca_ES.po',
- 'locale/cs_CZ.po',
- 'locale/de_DE.po',
- 'locale/es_AR.po',
- 'locale/es_CO.po',
- 'locale/es_ES.po',
- 'locale/fr_FR.po',
- 'locale/nl_NL.po',
- 'locale/ru_RU.po',
- ]
-}
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 74b6ea8..497d9ea 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.category:"
msgid "There is no account expense/revenue defined on the category %s (%d)"
-msgstr ""
+msgstr "Няма сметка за приход/разход зададена за тази категория %s (%d)"
msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
@@ -20,7 +20,7 @@ msgstr "Използвани разходи по сметка"
msgctxt "field:product.category,account_parent:"
msgid "Use Parent's accounts"
-msgstr ""
+msgstr "Използване на родителски сметки"
msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
@@ -48,7 +48,7 @@ msgstr "Използвани данъци на доставчик"
msgctxt "field:product.category,taxes_parent:"
msgid "Use the Parent's Taxes"
-msgstr ""
+msgstr "Използване на данъците на родителя"
msgctxt "field:product.category-customer-account.tax,category:"
msgid "Category"
@@ -146,7 +146,6 @@ msgctxt "field:product.template,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Данъци на доставчик"
-#, fuzzy
msgctxt "field:product.template,supplier_taxes_used:"
msgid "Supplier Taxes Used"
msgstr "Използвани данъци на доставчик"
@@ -221,11 +220,11 @@ msgstr "Променено от"
msgctxt "help:product.category,account_parent:"
msgid "Use the accounts defined on the parent category"
-msgstr ""
+msgstr "Използване на сметките зададени в родителската категория"
msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
-msgstr ""
+msgstr "Използване на данъци от родителската категория"
msgctxt "help:product.template,account_category:"
msgid "Use the accounts defined on the category"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 892121a..470db11 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,31 +4,28 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.category:"
msgid "There is no account expense/revenue defined on the category %s (%d)"
-msgstr ""
+msgstr "La categoria %s (%d) no té cap compte de despeses/ingressos definit."
msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
-msgstr ""
-"No hi ha cap compte de despeses/ingressos definit per al producte %s (%d)"
+msgstr "El producte %s (%d) no té cap compte de despeses/ingressos definit."
msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Compte de despeses"
-#, fuzzy
msgctxt "field:product.category,account_expense_used:"
msgid "Account Expense Used"
-msgstr "Compte de despesa usada"
+msgstr "Compte de despeses usada"
msgctxt "field:product.category,account_parent:"
msgid "Use Parent's accounts"
-msgstr ""
+msgstr "Usa comptes pare"
msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "Compte d'ingressos"
-#, fuzzy
msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Compte d'ingressos usada"
@@ -37,7 +34,6 @@ msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impostos de client"
-#, fuzzy
msgctxt "field:product.category,customer_taxes_used:"
msgid "Customer Taxes Used"
msgstr "Impostos de client usats"
@@ -46,32 +42,29 @@ msgctxt "field:product.category,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Impostos de proveïdor"
-#, fuzzy
msgctxt "field:product.category,supplier_taxes_used:"
msgid "Supplier Taxes Used"
-msgstr "Impostos de client usats"
+msgstr "Impostos de proveïdor usats"
msgctxt "field:product.category,taxes_parent:"
msgid "Use the Parent's Taxes"
-msgstr ""
+msgstr "Usa els impostos pare"
-#, fuzzy
msgctxt "field:product.category-customer-account.tax,category:"
msgid "Category"
msgstr "Categoria"
msgctxt "field:product.category-customer-account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:product.category-customer-account.tax,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:product.category-customer-account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.category-customer-account.tax,rec_name:"
msgid "Name"
@@ -83,29 +76,27 @@ msgstr "Impost"
msgctxt "field:product.category-customer-account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:product.category-customer-account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
-#, fuzzy
msgctxt "field:product.category-supplier-account.tax,category:"
msgid "Category"
msgstr "Categoria"
msgctxt "field:product.category-supplier-account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:product.category-supplier-account.tax,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:product.category-supplier-account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.category-supplier-account.tax,rec_name:"
msgid "Name"
@@ -117,23 +108,23 @@ msgstr "Impost"
msgctxt "field:product.category-supplier-account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:product.template,account_category:"
msgid "Use Category's accounts"
-msgstr "Usar els comptes de la categoria"
+msgstr "Usa comptes de la categoria"
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
-msgstr "Compte de despesa"
+msgstr "Compte de despeses"
msgctxt "field:product.template,account_expense_used:"
msgid "Account Expense Used"
-msgstr "Compte de despesa usada"
+msgstr "Compte de despeses usada"
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
@@ -153,29 +144,27 @@ msgstr "Impostos de client usats"
msgctxt "field:product.template,supplier_taxes:"
msgid "Supplier Taxes"
-msgstr "Impostos de proveïdors"
+msgstr "Impostos de proveïdor"
-#, fuzzy
msgctxt "field:product.template,supplier_taxes_used:"
msgid "Supplier Taxes Used"
-msgstr "Impostos de client usats"
+msgstr "Impostos de proveïdor usats"
msgctxt "field:product.template,taxes_category:"
msgid "Use Category's Taxes"
-msgstr "Usar els impostos de la categoria"
+msgstr "Usa impostos de la categoria"
msgctxt "field:product.template-customer-account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:product.template-customer-account.tax,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:product.template-customer-account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
@@ -191,24 +180,23 @@ msgstr "Impost"
msgctxt "field:product.template-customer-account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:product.template-supplier-account.tax,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:product.template-supplier-account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
@@ -224,57 +212,56 @@ msgstr "Impost"
msgctxt "field:product.template-supplier-account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:product.template-supplier-account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "help:product.category,account_parent:"
msgid "Use the accounts defined on the parent category"
-msgstr ""
+msgstr "Utilitza els comptes definits en la categoria pare."
msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
-msgstr ""
+msgstr "Utilitza els impostos definits en la categoria pare."
msgctxt "help:product.template,account_category:"
msgid "Use the accounts defined on the category"
-msgstr "Usar els comptes definits en la categoria"
+msgstr "Utilitza els comptes 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 "Aquest compte s'usarà en lloc del definit en la categoria."
+msgstr "Aquest compte s'utilitzarà en lloc del definit a la categoria."
msgctxt "help:product.template,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "Aquest compte s'usarà en lloc del definit en la categoria."
+msgstr "Aquest compte s'utilitzarà en lloc del definit a la categoria."
msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
-msgstr "Usar els impostos definits en la categoria"
+msgstr "Utilitza els impostos definits en la categoria."
msgctxt "model:product.category-customer-account.tax,name:"
msgid "Category - Customer Tax"
-msgstr "Categoria - Impostos de client"
+msgstr "Categoria - Impost de client"
msgctxt "model:product.category-supplier-account.tax,name:"
msgid "Category - Supplier Tax"
-msgstr "Categoria - Impostos de proveïdor"
+msgstr "Categoria - Impost de proveïdor"
msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
-msgstr "Plantilla de producte - Impostos de client"
+msgstr "Plantilla de producte - Impost client"
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
-msgstr "Plantilla de producte - Impostos de proveïdor"
+msgstr "Plantilla de producte - Impost proveïdor"
msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Comptabilitat"
-#, fuzzy
msgctxt "view:product.category:"
msgid "Accounts"
msgstr "Comptes"
@@ -283,10 +270,6 @@ msgctxt "view:product.category:"
msgid "Taxes"
msgstr "Impostos"
-msgctxt "view:product.product:"
-msgid "Accounting"
-msgstr "Comptabilitat"
-
msgctxt "view:product.template:"
msgid "Accounting"
msgstr "Comptabilitat"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 8646aee..01137f7 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.category:"
msgid "There is no account expense/revenue defined on the category %s (%d)"
-msgstr ""
+msgstr "No hay una cuenta gastos/ingresos definida para la categoria %s (%d)"
msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
@@ -14,20 +14,18 @@ msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Cuenta de Gastos"
-#, fuzzy
msgctxt "field:product.category,account_expense_used:"
msgid "Account Expense Used"
msgstr "Cuenta de Gastos Usada"
msgctxt "field:product.category,account_parent:"
msgid "Use Parent's accounts"
-msgstr ""
+msgstr "Usar cuenta del Padre"
msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "Cuenta de Ingresos"
-#, fuzzy
msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de Ingresos Usada"
@@ -36,7 +34,6 @@ msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos del Cliente"
-#, fuzzy
msgctxt "field:product.category,customer_taxes_used:"
msgid "Customer Taxes Used"
msgstr "Impuestos del Cliente Usados"
@@ -45,32 +42,29 @@ msgctxt "field:product.category,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Impuestos a Proveedores"
-#, fuzzy
msgctxt "field:product.category,supplier_taxes_used:"
msgid "Supplier Taxes Used"
msgstr "Impuestos del Cliente Usados"
msgctxt "field:product.category,taxes_parent:"
msgid "Use the Parent's Taxes"
-msgstr ""
+msgstr "Usar Impuestos del Padre"
-#, fuzzy
msgctxt "field:product.category-customer-account.tax,category:"
msgid "Category"
msgstr "Categoría"
msgctxt "field:product.category-customer-account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:product.category-customer-account.tax,create_uid:"
msgid "Create User"
msgstr "Crear usuario"
msgctxt "field:product.category-customer-account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.category-customer-account.tax,rec_name:"
msgid "Name"
@@ -82,29 +76,27 @@ msgstr "Impuesto"
msgctxt "field:product.category-customer-account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha modificación"
msgctxt "field:product.category-customer-account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuario modificación"
-#, fuzzy
msgctxt "field:product.category-supplier-account.tax,category:"
msgid "Category"
msgstr "Categoría"
msgctxt "field:product.category-supplier-account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:product.category-supplier-account.tax,create_uid:"
msgid "Create User"
msgstr "Crear usuario"
msgctxt "field:product.category-supplier-account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.category-supplier-account.tax,rec_name:"
msgid "Name"
@@ -116,11 +108,11 @@ msgstr "Impuesto"
msgctxt "field:product.category-supplier-account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha modificación"
msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuario modificación"
msgctxt "field:product.template,account_category:"
msgid "Use Category's accounts"
@@ -154,7 +146,6 @@ msgctxt "field:product.template,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Impuestos a Proveedores"
-#, fuzzy
msgctxt "field:product.template,supplier_taxes_used:"
msgid "Supplier Taxes Used"
msgstr "Impuestos del Cliente Usados"
@@ -165,16 +156,15 @@ msgstr "Categorías de Impuesto"
msgctxt "field:product.template-customer-account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:product.template-customer-account.tax,create_uid:"
msgid "Create User"
msgstr "Crear usuario"
msgctxt "field:product.template-customer-account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
@@ -190,24 +180,23 @@ msgstr "Impuesto"
msgctxt "field:product.template-customer-account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha modificación"
msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuario modificación"
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:product.template-supplier-account.tax,create_uid:"
msgid "Create User"
msgstr "Crear usuario"
msgctxt "field:product.template-supplier-account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
@@ -223,19 +212,19 @@ msgstr "Impuesto"
msgctxt "field:product.template-supplier-account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha modificación"
msgctxt "field:product.template-supplier-account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuario modificación"
msgctxt "help:product.category,account_parent:"
msgid "Use the accounts defined on the parent category"
-msgstr ""
+msgstr "Usar las cuentas definidas en la categoria padre"
msgctxt "help:product.category,taxes_parent:"
msgid "Use the taxes defined on the parent category"
-msgstr ""
+msgstr "Usar los impuestos definidos en la categoria padre"
msgctxt "help:product.template,account_category:"
msgid "Use the accounts defined on the category"
@@ -273,7 +262,6 @@ msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Contabilidad"
-#, fuzzy
msgctxt "view:product.category:"
msgid "Accounts"
msgstr "Cuentas"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index ce9f8fa..639a30b 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -5,13 +5,12 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.category:"
msgid "There is no account expense/revenue defined on the category %s (%d)"
msgstr ""
-"No existe ninguna cuenta de gastos/ingresos definida en la categoría %s "
-"(%d)."
+"La categoría %s (%d) no tiene ninguna cuenta de gastos/ingresos definida."
msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
msgstr ""
-"No existe ninguna cuenta de gastos/ingresos definida en el producto %s (%d)."
+"El producto %s (%d) no tiene ninguna cuenta de gastos/ingresos definida."
msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
@@ -47,7 +46,7 @@ msgstr "Impuestos de proveedor"
msgctxt "field:product.category,supplier_taxes_used:"
msgid "Supplier Taxes Used"
-msgstr "Impuestos de cliente usados"
+msgstr "Impuestos de proveedor usados"
msgctxt "field:product.category,taxes_parent:"
msgid "Use the Parent's Taxes"
diff --git a/product.py b/product.py
index da96a2c..b5602c7 100644
--- a/product.py
+++ b/product.py
@@ -1,16 +1,18 @@
#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 copy
-from trytond.model import ModelView, ModelSQL, fields
+from trytond.model import ModelSQL, fields
from trytond.pyson import Eval, Or
from trytond.backend import TableHandler
from trytond.transaction import Transaction
-from trytond.pool import Pool
+from trytond.pool import PoolMeta
+__all__ = ['Category', 'CategoryCustomerTax', 'CategorySupplierTax',
+ 'Template', 'TemplateCustomerTax', 'TemplateSupplierTax']
+__metaclass__ = PoolMeta
-class Category(ModelSQL, ModelView):
- _name = 'product.category'
+class Category:
+ __name__ = 'product.category'
account_parent = fields.Boolean('Use Parent\'s accounts',
help='Use the accounts defined on the parent category')
account_expense = fields.Property(fields.Many2One('account.account',
@@ -58,124 +60,103 @@ class Category(ModelSQL, ModelView):
supplier_taxes_used = fields.Function(fields.One2Many('account.tax', None,
'Supplier Taxes Used'), 'get_taxes')
- def __init__(self):
- super(Category, self).__init__()
- self._error_messages.update({
+ @classmethod
+ def __setup__(cls):
+ super(Category, cls).__setup__()
+ cls._error_messages.update({
'missing_account': ('There is no account '
'expense/revenue defined on the category '
'%s (%d)'),
})
- self.parent = copy.copy(self.parent)
- self.parent.states = copy.copy(self.parent.states)
- self.parent.states['required'] = Or(
- self.parent.states.get('required', False),
+ cls.parent.states['required'] = Or(
+ cls.parent.states.get('required', False),
Eval('account_parent', False) | Eval('taxes_parent', False))
- self.parent.depends = copy.copy(self.parent.depends)
- self.parent.depends.extend(['account_parent', 'taxes_parent'])
- self._reset_columns()
-
- def get_account(self, ids, name):
- accounts = {}
- for category in self.browse(ids):
- if category.account_parent:
- accounts[category.id] = category.parent[name].id
- elif category[name[:-5]]:
- accounts[category.id] = category[name[:-5]].id
- else:
- self.raise_user_error('missing_account',
- (category.name, category.id))
- return accounts
-
- def get_taxes(self, ids, name):
- taxes = {}
- for category in self.browse(ids):
- if category.taxes_parent:
- taxes[category.id] = [x.id for x in category.parent[name]]
- else:
- taxes[category.id] = [x.id for x in category[name[:-5]]]
- return taxes
-
- def on_change_account_expense(self, values):
- account_obj = Pool().get('account.account')
+ cls.parent.depends.extend(['account_parent', 'taxes_parent'])
+
+ def get_account(self, name):
+ if self.account_parent:
+ return getattr(self.parent, name).id
+ elif getattr(self, name[:-5]):
+ return getattr(self, name[:-5]).id
+ else:
+ self.raise_user_error('missing_account', (self.name, self.id))
+
+ def get_taxes(self, name):
+ if self.taxes_parent:
+ return [x.id for x in getattr(self.parent, name)]
+ else:
+ return [x.id for x in getattr(self, name[:-5])]
+
+ def on_change_account_expense(self):
supplier_taxes = []
result = {
'supplier_taxes': supplier_taxes,
- }
- if values.get('account_expense'):
- account = account_obj.browse(values['account_expense'])
- supplier_taxes.extend(tax.id for tax in account.taxes)
+ }
+ if self.account_expense:
+ supplier_taxes.extend(tax.id for tax in self.account_expense.taxes)
return result
- def on_change_account_revenue(self, values):
- account_obj = Pool().get('account.account')
+ def on_change_account_revenue(self):
customer_taxes = []
result = {
'customer_taxes': customer_taxes,
- }
- if values.get('account_revenue'):
- account = account_obj.browse(values['account_revenue'])
- customer_taxes.extend(tax.id for tax in account.taxes)
+ }
+ if self.account_revenue:
+ customer_taxes.extend(tax.id for tax in self.account_revenue.taxes)
return result
-Category()
-
class CategoryCustomerTax(ModelSQL):
'Category - Customer Tax'
- _name = 'product.category-customer-account.tax'
+ __name__ = 'product.category-customer-account.tax'
_table = 'product_category_customer_taxes_rel'
- _description = __doc__
category = fields.Many2One('product.category', 'Category',
ondelete='CASCADE', select=True, required=True)
tax = fields.Many2One('account.tax', 'Tax', ondelete='RESTRICT',
required=True)
- def init(self, module_name):
+ @classmethod
+ def __register__(cls, module_name):
cursor = Transaction().cursor
# Migration from 1.6 product renamed into category
- table = TableHandler(cursor, self)
+ table = TableHandler(cursor, cls)
if table.column_exist('product'):
table.index_action('product', action='remove')
table.drop_fk('product')
table.column_rename('product', 'category')
- super(CategoryCustomerTax, self).init(module_name)
-
-CategoryCustomerTax()
+ super(CategoryCustomerTax, cls).__register__(module_name)
class CategorySupplierTax(ModelSQL):
'Category - Supplier Tax'
- _name = 'product.category-supplier-account.tax'
+ __name__ = 'product.category-supplier-account.tax'
_table = 'product_category_supplier_taxes_rel'
- _description = __doc__
category = fields.Many2One('product.category', 'Category',
ondelete='CASCADE', select=True, required=True)
tax = fields.Many2One('account.tax', 'Tax', ondelete='RESTRICT',
required=True)
- def init(self, module_name):
+ @classmethod
+ def __register__(cls, module_name):
cursor = Transaction().cursor
# Migration from 1.6 product renamed into category
- table = TableHandler(cursor, self)
+ table = TableHandler(cursor, cls)
if table.column_exist('product'):
table.index_action('product', action='remove')
table.drop_fk('product')
table.column_rename('product', 'category')
- super(CategorySupplierTax, self).init(module_name)
+ super(CategorySupplierTax, cls).__register__(module_name)
-CategorySupplierTax()
-
-
-class Template(ModelSQL, ModelView):
- _name = 'product.template'
+class Template:
+ __name__ = 'product.template'
account_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=[
('kind', '=', 'expense'),
('company', '=', Eval('context', {}).get('company', 0)),
- ], on_change=['account_expense'],
+ ], on_change=['account_category', 'account_expense'],
states={
'invisible': (~Eval('context', {}).get('company')
| Eval('account_category')),
@@ -185,7 +166,7 @@ class Template(ModelSQL, ModelView):
'Account Revenue', domain=[
('kind', '=', 'revenue'),
('company', '=', Eval('context', {}).get('company', 0)),
- ], on_change=['account_revenue'],
+ ], on_change=['account_category', 'account_revenue'],
states={
'invisible': (~Eval('context', {}).get('company')
| Eval('account_category')),
@@ -215,92 +196,77 @@ class Template(ModelSQL, ModelView):
supplier_taxes_used = fields.Function(fields.One2Many('account.tax', None,
'Supplier Taxes Used'), 'get_taxes')
- def __init__(self):
- super(Template, self).__init__()
- self._error_messages.update({
+ @classmethod
+ def __setup__(cls):
+ super(Template, cls).__setup__()
+ cls._error_messages.update({
'missing_account': 'There is no account ' \
'expense/revenue defined on the product ' \
'%s (%d)',
})
- self.category = copy.copy(self.category)
- self.category.states = copy.copy(self.category.states)
- self.category.states['required'] = Or(
- self.category.states.get('required', False),
+ cls.category.states['required'] = Or(
+ cls.category.states.get('required', False),
Eval('account_category', False) | Eval('taxes_category', False))
- self.category.depends = copy.copy(self.category.depends)
- self.category.depends.extend(['account_category', 'taxes_category'])
- self._reset_columns()
+ cls.category.depends.extend(['account_category', 'taxes_category'])
- def default_taxes_category(self):
+ @staticmethod
+ def default_taxes_category():
return None
- def get_account(self, ids, name):
- accounts = {}
- for product in self.browse(ids):
- if product.account_category:
- accounts[product.id] = product.category[name].id
- elif product[name[:-5]]:
- accounts[product.id] = product[name[:-5]].id
- else:
- self.raise_user_error('missing_account',
- (product.name, product.id))
- return accounts
-
- def get_taxes(self, ids, name):
- taxes = {}
- for product in self.browse(ids):
- if product.taxes_category:
- taxes[product.id] = [x.id for x in product.category[name]]
- else:
- taxes[product.id] = [x.id for x in product[name[:-5]]]
- return taxes
-
- def on_change_account_expense(self, values):
- account_obj = Pool().get('account.account')
- supplier_taxes = []
- result = {
- 'supplier_taxes': supplier_taxes,
- }
- if values.get('account_expense'):
- account = account_obj.browse(values['account_expense'])
- supplier_taxes.extend(tax.id for tax in account.taxes)
+ def get_account(self, name):
+ if self.account_category:
+ return getattr(self.category, name).id
+ elif getattr(self, name[:-5]):
+ return getattr(self, name[:-5]).id
+ else:
+ self.raise_user_error('missing_account', (self.name, self.id))
+
+ def get_taxes(self, name):
+ if self.taxes_category:
+ return [x.id for x in getattr(self.category, name)]
+ else:
+ return [x.id for x in getattr(self, name[:-5])]
+
+ def on_change_account_expense(self):
+ result = {}
+ if not self.account_category:
+ supplier_taxes = []
+ result = {
+ 'supplier_taxes': supplier_taxes,
+ }
+ if self.account_expense:
+ supplier_taxes.extend(
+ tax.id for tax in self.account_expense.taxes)
return result
- def on_change_account_revenue(self, values):
- account_obj = Pool().get('account.account')
- customer_taxes = []
- result = {
- 'customer_taxes': customer_taxes,
- }
- if values.get('account_revenue'):
- account = account_obj.browse(values['account_revenue'])
- customer_taxes.extend(tax.id for tax in account.taxes)
+ def on_change_account_revenue(self):
+ result = {}
+ if not self.account_category:
+ customer_taxes = []
+ result = {
+ 'customer_taxes': customer_taxes,
+ }
+ if self.account_revenue:
+ customer_taxes.extend(
+ tax.id for tax in self.account_revenue.taxes)
return result
-Template()
-
class TemplateCustomerTax(ModelSQL):
'Product Template - Customer Tax'
- _name = 'product.template-customer-account.tax'
+ __name__ = 'product.template-customer-account.tax'
_table = 'product_customer_taxes_rel'
- _description = __doc__
product = fields.Many2One('product.template', 'Product Template',
ondelete='CASCADE', select=True, required=True)
tax = fields.Many2One('account.tax', 'Tax', ondelete='RESTRICT',
required=True)
-TemplateCustomerTax()
-
class TemplateSupplierTax(ModelSQL):
'Product Template - Supplier Tax'
- _name = 'product.template-supplier-account.tax'
+ __name__ = 'product.template-supplier-account.tax'
_table = 'product_supplier_taxes_rel'
- _description = __doc__
product = fields.Many2One('product.template', 'Product Template',
ondelete='CASCADE', select=True, required=True)
tax = fields.Many2One('account.tax', 'Tax', ondelete='RESTRICT',
required=True)
-
-TemplateSupplierTax()
diff --git a/setup.py b/setup.py
index c4fa32b..5558da6 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,19 @@
from setuptools import setup
import re
+import os
+import ConfigParser
-info = eval(open('__tryton__.py').read())
+
+def read(fname):
+ return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+config = ConfigParser.ConfigParser()
+config.readfp(open('tryton.cfg'))
+info = dict(config.items('tryton'))
+for key in ('depends', 'extras_depend', 'xml'):
+ if key in info:
+ info[key] = info[key].strip().splitlines()
major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
@@ -21,21 +32,21 @@ requires.append('trytond >= %s.%s, < %s.%s' %
setup(name='trytond_account_product',
version=info.get('version', '0.0.1'),
- description=info.get('description', ''),
- author=info.get('author', ''),
- author_email=info.get('email', ''),
- url=info.get('website', ''),
+ description='Tryton module to add accounting on product',
+ long_description=read('README'),
+ author='Tryton',
+ url='http://www.tryton.org/',
download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
package_dir={'trytond.modules.account_product': '.'},
packages=[
'trytond.modules.account_product',
'trytond.modules.account_product.tests',
- ],
+ ],
package_data={
'trytond.modules.account_product': info.get('xml', []) \
- + info.get('translation', []),
- },
+ + ['tryton.cfg', 'locale/*.po'],
+ },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -57,7 +68,7 @@ setup(name='trytond_account_product',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
'Topic :: Office/Business :: Financial :: Accounting',
- ],
+ ],
license='GPL-3',
install_requires=requires,
zip_safe=False,
@@ -67,4 +78,4 @@ setup(name='trytond_account_product',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
-)
+ )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..52b68b2
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,9 @@
+[tryton]
+version=2.6.0
+depends:
+ account
+ company
+ ir
+ product
+xml:
+ product.xml
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
index a16701c..3f3da45 100644
--- a/trytond_account_product.egg-info/PKG-INFO
+++ b/trytond_account_product.egg-info/PKG-INFO
@@ -1,16 +1,48 @@
Metadata-Version: 1.0
Name: trytond-account-product
-Version: 2.4.1
-Summary: Add accounting properties on product and category like:
- - account for expense / revenue
- - taxes for customer / supplier
-
+Version: 2.6.0
+Summary: Tryton module to add accounting on product
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_account_product
+ =======================
+
+ The account_product module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/trytond_account_product.egg-info/SOURCES.txt b/trytond_account_product.egg-info/SOURCES.txt
index 1bfc076..f3b3c19 100644
--- a/trytond_account_product.egg-info/SOURCES.txt
+++ b/trytond_account_product.egg-info/SOURCES.txt
@@ -6,8 +6,8 @@ MANIFEST.in
README
product.xml
setup.py
+tryton.cfg
./__init__.py
-./__tryton__.py
./product.py
./tests/__init__.py
./tests/test_account_product.py
diff --git a/trytond_account_product.egg-info/requires.txt b/trytond_account_product.egg-info/requires.txt
index 23cdd79..3e8542b 100644
--- a/trytond_account_product.egg-info/requires.txt
+++ b/trytond_account_product.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_account >= 2.4, < 2.5
-trytond_company >= 2.4, < 2.5
-trytond_product >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_account >= 2.6, < 2.7
+trytond_company >= 2.6, < 2.7
+trytond_product >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
\ No newline at end of file
commit a4ca26845108bab9150a210ec493214d5bfee436
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 25 11:03:28 2012 +0200
Adding upstream version 2.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index c993f8a..743b352 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.1 - 2012-04-24
+* Restore es_AR translation
+
Version 2.4.0 - 2012-04-23
* Bug fixes (see mercurial logs for details)
* Allow to use the accounts and taxes of parent category
diff --git a/PKG-INFO b/PKG-INFO
index daf4132..60c5250 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_product
-Version: 2.4.0
+Version: 2.4.1
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
diff --git a/__tryton__.py b/__tryton__.py
index a4a419a..0186cf3 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -10,7 +10,7 @@
'name_es_ES': 'Contabilidad de productos',
'name_fr_FR': 'Compte produit',
'name_nl_NL': 'Boekhouding voor producten',
- 'version': '2.4.0',
+ 'version': '2.4.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 542f292..ce9f8fa 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -1,3 +1,290 @@
#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.category:"
+msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgstr ""
+"No existe ninguna cuenta de gastos/ingresos definida en la categoría %s "
+"(%d)."
+
+msgctxt "error:product.template:"
+msgid "There is no account expense/revenue defined on the product %s (%d)"
+msgstr ""
+"No existe ninguna cuenta de gastos/ingresos definida en el producto %s (%d)."
+
+msgctxt "field:product.category,account_expense:"
+msgid "Account Expense"
+msgstr "Cuenta de gastos"
+
+msgctxt "field:product.category,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Cuenta de gastos usada"
+
+msgctxt "field:product.category,account_parent:"
+msgid "Use Parent's accounts"
+msgstr "Usar cuentas padre"
+
+msgctxt "field:product.category,account_revenue:"
+msgid "Account Revenue"
+msgstr "Cuenta de ingresos"
+
+msgctxt "field:product.category,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Cuenta de ingresos usada"
+
+msgctxt "field:product.category,customer_taxes:"
+msgid "Customer Taxes"
+msgstr "Impuestos de cliente"
+
+msgctxt "field:product.category,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Impuestos de cliente usados"
+
+msgctxt "field:product.category,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr "Impuestos de proveedor"
+
+msgctxt "field:product.category,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Impuestos de cliente usados"
+
+msgctxt "field:product.category,taxes_parent:"
+msgid "Use the Parent's Taxes"
+msgstr "Usar impuestos padre"
+
+msgctxt "field:product.category-customer-account.tax,category:"
+msgid "Category"
+msgstr "Categoría"
+
+msgctxt "field:product.category-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.category-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.category-customer-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.category-customer-account.tax,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.category-customer-account.tax,tax:"
+msgid "Tax"
+msgstr "Impuesto"
+
+msgctxt "field:product.category-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.category-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:product.category-supplier-account.tax,category:"
+msgid "Category"
+msgstr "Categoría"
+
+msgctxt "field:product.category-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.category-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.category-supplier-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.category-supplier-account.tax,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.category-supplier-account.tax,tax:"
+msgid "Tax"
+msgstr "Impuesto"
+
+msgctxt "field:product.category-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.category-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:product.template,account_category:"
+msgid "Use Category's accounts"
+msgstr "Usar cuentas de la categoría"
+
+msgctxt "field:product.template,account_expense:"
+msgid "Account Expense"
+msgstr "Cuenta de gastos"
+
+msgctxt "field:product.template,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Cuenta de gastos usada"
+
+msgctxt "field:product.template,account_revenue:"
+msgid "Account Revenue"
+msgstr "Cuenta de ingresos"
+
+msgctxt "field:product.template,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Cuenta de ingresos usada"
+
+msgctxt "field:product.template,customer_taxes:"
+msgid "Customer Taxes"
+msgstr "Impuestos de cliente"
+
+msgctxt "field:product.template,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Impuestos de cliente usados"
+
+msgctxt "field:product.template,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr "Impuestos de proveedor"
+
+msgctxt "field:product.template,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Impuestos de proveedor usados"
+
+msgctxt "field:product.template,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr "Usar impuestos de la categoría"
+
+msgctxt "field:product.template-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.template-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.template-customer-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-customer-account.tax,product:"
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+msgctxt "field:product.template-customer-account.tax,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.template-customer-account.tax,tax:"
+msgid "Tax"
+msgstr "Impuesto"
+
+msgctxt "field:product.template-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.template-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:product.template-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.template-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.template-supplier-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-supplier-account.tax,product:"
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+msgctxt "field:product.template-supplier-account.tax,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.template-supplier-account.tax,tax:"
+msgid "Tax"
+msgstr "Impuesto"
+
+msgctxt "field:product.template-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.template-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "help:product.category,account_parent:"
+msgid "Use the accounts defined on the parent category"
+msgstr "Usar las cuentas definidas en la categoría padre."
+
+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:"
+msgid "Use the accounts defined on the category"
+msgstr "Usar las cuentas definidas 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."
+
+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."
+
+msgctxt "help:product.template,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr "Usar los impuestos definidos en la categoría."
+
+msgctxt "model:product.category-customer-account.tax,name:"
+msgid "Category - Customer Tax"
+msgstr "Categoría - Impuesto de cliente"
+
+msgctxt "model:product.category-supplier-account.tax,name:"
+msgid "Category - Supplier Tax"
+msgstr "Categoría - Impuesto de proveedor"
+
+msgctxt "model:product.template-customer-account.tax,name:"
+msgid "Product Template - Customer Tax"
+msgstr "Plantilla de producto - Impuesto de cliente"
+
+msgctxt "model:product.template-supplier-account.tax,name:"
+msgid "Product Template - Supplier Tax"
+msgstr "Plantilla de producto - Impuesto de proveedor"
+
+msgctxt "view:product.category:"
+msgid "Accounting"
+msgstr "Contabilidad"
+
+msgctxt "view:product.category:"
+msgid "Accounts"
+msgstr "Cuentas"
+
+msgctxt "view:product.category:"
+msgid "Taxes"
+msgstr "Impuestos"
+
+msgctxt "view:product.product:"
+msgid "Accounting"
+msgstr "Contabilidad"
+
+msgctxt "view:product.template:"
+msgid "Accounting"
+msgstr "Contabilidad"
+
+msgctxt "view:product.template:"
+msgid "Accounts"
+msgstr "Cuentas"
+
+msgctxt "view:product.template:"
+msgid "Taxes"
+msgstr "Impuestos"
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
index 1c8771d..a16701c 100644
--- a/trytond_account_product.egg-info/PKG-INFO
+++ b/trytond_account_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-product
-Version: 2.4.0
+Version: 2.4.1
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
commit 187627eeb44653b2f499cdb82dd65e95c9f47cd2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:30:36 2012 +0200
Adding upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index c41ff0e..c993f8a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 2.4.0 - 2012-04-23
+* Bug fixes (see mercurial logs for details)
+* Allow to use the accounts and taxes of parent category
+
Version 2.2.0 - 2011-10-24
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index a9feb41..ede3fac 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2011 Cédric Krier.
-Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2012 Bertrand Chenal.
+Copyright (C) 2008-2012 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/INSTALL b/INSTALL
index 6a8303d..b8a472d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_account_product
Prerequisites
-------------
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_company (http://www.tryton.org/)
* trytond_account (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 221bdb8..daf4132 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_product
-Version: 2.2.0
+Version: 2.4.0
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index 70925e3..915a9e2 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,4 @@
#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 product import *
+from .product import *
diff --git a/__tryton__.py b/__tryton__.py
index e8388b1..a4a419a 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,12 +3,14 @@
{
'name': 'Account Product',
'name_bg_BG': 'Сметка за продукт',
+ 'name_ca_ES': 'Comptabilitat de productes',
'name_de_DE': 'Buchhaltung Artikel',
+ 'name_es_AR': 'Contabilidad de productos',
'name_es_CO': 'Contabilidad de Inventarios',
'name_es_ES': 'Contabilidad de productos',
'name_fr_FR': 'Compte produit',
'name_nl_NL': 'Boekhouding voor producten',
- 'version': '2.2.0',
+ 'version': '2.4.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -20,17 +22,26 @@
- сметка за разходи / приходу
- данъци за клиент / доставчик
''',
+ 'description_ca_ES': '''Afegeix propietats de comptabilitat a productes i
+categories com:
+ - Comptes de despeses i ingressos
+ - Impostos per client i proveïdor
+''',
'description_de_DE': '''Fügt Eigenschaften für die Buchhaltung zu Artikeln und Artikelkategorien hinzu:
- Aufwands- und Ertragskonto
- Steuern für Kunden und Lieferanten
''',
+ 'description_es_AR': '''Añade propiedades de contabilidad en productos y categorías como:
+ - Cuenta para gastos / ingresos
+ - Impuestos para cliente / proveedor
+''',
'description_es_CO': '''Adiciona propiedades contables en productos y categorías:
- contabilidad para gastos / ganancias
- impuestos para cliente / proveedor
''',
- 'description_es_ES': '''Añade propiedades de contabilidad productos y categorías como:
- - Cuenta para gastos / ingresos
- - impuestos para cliente / proveedor
+ 'description_es_ES': '''Añade propiedades de contabilidad a productos y categorías como:
+ - Cuentas para gastos e ingresos
+ - Impuestos para cliente y proveedor
''',
'description_fr_FR': '''Ajoute des propriétés comptables sur les produits et leurs caétgories:
- comptes de charge et revenu
@@ -51,8 +62,10 @@
],
'translation': [
'locale/bg_BG.po',
+ 'locale/ca_ES.po',
'locale/cs_CZ.po',
'locale/de_DE.po',
+ 'locale/es_AR.po',
'locale/es_CO.po',
'locale/es_ES.po',
'locale/fr_FR.po',
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 2dd7d68..74b6ea8 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,163 +2,283 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.template:0"
+msgctxt "error:product.category:"
+msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgstr ""
+
+msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
msgstr "Няма зададен сметка за разходи/приходи за продукт %s (%d)"
-msgctxt "field:product.category,account_expense:0"
+msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Разходи за сметка"
-msgctxt "field:product.category,account_revenue:0"
+msgctxt "field:product.category,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Използвани разходи по сметка"
+
+msgctxt "field:product.category,account_parent:"
+msgid "Use Parent's accounts"
+msgstr ""
+
+msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "Приход по сметка"
-msgctxt "field:product.category,customer_taxes:0"
+msgctxt "field:product.category,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Използвани приходи по сметка"
+
+msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Данъци на клиенти"
-msgctxt "field:product.category,supplier_taxes:0"
+msgctxt "field:product.category,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Използвани данъци на клиенти"
+
+msgctxt "field:product.category,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Данъци на доставчик"
-msgctxt "field:product.category-customer-account.tax,category:0"
+msgctxt "field:product.category,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Използвани данъци на доставчик"
+
+msgctxt "field:product.category,taxes_parent:"
+msgid "Use the Parent's Taxes"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,category:"
msgid "Category"
msgstr "Категория"
-msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgctxt "field:product.category-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:product.category-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:product.category-customer-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.category-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:product.category-customer-account.tax,tax:0"
+msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
msgstr "Данък"
-msgctxt "field:product.category-supplier-account.tax,category:0"
+msgctxt "field:product.category-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:product.category-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:product.category-supplier-account.tax,category:"
msgid "Category"
msgstr "Категория"
-msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgctxt "field:product.category-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:product.category-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:product.category-supplier-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.category-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
msgstr "Данък"
-msgctxt "field:product.template,account_category:0"
+msgctxt "field:product.category-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:product.category-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:product.template,account_category:"
msgid "Use Category's accounts"
msgstr "Използване на сметките за категорията"
-msgctxt "field:product.template,account_expense:0"
+msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Разходи за сметка"
-msgctxt "field:product.template,account_expense_used:0"
+msgctxt "field:product.template,account_expense_used:"
msgid "Account Expense Used"
msgstr "Използвани разходи по сметка"
-msgctxt "field:product.template,account_revenue:0"
+msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr "Приход по сметка"
-msgctxt "field:product.template,account_revenue_used:0"
+msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Използвани разходи по сметка"
-msgctxt "field:product.template,customer_taxes:0"
+msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Данъци на клиенти"
-msgctxt "field:product.template,customer_taxes_used:0"
+msgctxt "field:product.template,customer_taxes_used:"
msgid "Customer Taxes Used"
msgstr "Използвани данъци на клиенти"
-msgctxt "field:product.template,supplier_taxes:0"
+msgctxt "field:product.template,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Данъци на доставчик"
-msgctxt "field:product.template,supplier_taxes_used:0"
-msgid "Customer Taxes Used"
-msgstr "Използвани данъци на клиенти"
+#, fuzzy
+msgctxt "field:product.template,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Използвани данъци на доставчик"
-msgctxt "field:product.template,taxes_category:0"
+msgctxt "field:product.template,taxes_category:"
msgid "Use Category's Taxes"
msgstr "Използване на данъците за категорията"
-msgctxt "field:product.template-customer-account.tax,product:0"
+msgctxt "field:product.template-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:product.template-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:product.template-customer-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
msgstr "Щаблон за продукт"
-msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgctxt "field:product.template-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:product.template-customer-account.tax,tax:0"
+msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
msgstr "Данък"
-msgctxt "field:product.template-supplier-account.tax,product:0"
+msgctxt "field:product.template-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:product.template-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:product.template-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:product.template-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:product.template-supplier-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
msgstr "Щаблон за продукт"
-msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgctxt "field:product.template-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
msgstr "Данък"
-msgctxt "help:product.template,account_category:0"
+msgctxt "field:product.template-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:product.template-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "help:product.category,account_parent:"
+msgid "Use the accounts defined on the parent category"
+msgstr ""
+
+msgctxt "help:product.category,taxes_parent:"
+msgid "Use the taxes defined on the parent category"
+msgstr ""
+
+msgctxt "help:product.template,account_category:"
msgid "Use the accounts defined on the category"
msgstr "Използване на сметките зададени за категорията"
-msgctxt "help:product.template,account_expense:0"
+msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr "Ще се използва тази сметка вместо тази зададена за категорията"
-msgctxt "help:product.template,account_revenue:0"
+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,taxes_category:0"
+msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Използване на данъците зададени за категорията"
-msgctxt "model:product.category-customer-account.tax,name:0"
+msgctxt "model:product.category-customer-account.tax,name:"
msgid "Category - Customer Tax"
msgstr "Категория - Данък на клиент"
-msgctxt "model:product.category-supplier-account.tax,name:0"
+msgctxt "model:product.category-supplier-account.tax,name:"
msgid "Category - Supplier Tax"
msgstr "Категория - Данъци на доставчик"
-msgctxt "model:product.template-customer-account.tax,name:0"
+msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "Шаблон на продукт - Данък на клиент"
-msgctxt "model:product.template-supplier-account.tax,name:0"
+msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Шаблон на продукт - Данък на доставчик"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Счетоводство"
-#, fuzzy
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
+msgid "Accounts"
+msgstr "Сметки"
+
+msgctxt "view:product.category:"
msgid "Taxes"
msgstr "Данъци"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Accounting"
msgstr "Счетоводство"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Accounts"
msgstr "Сметки"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Taxes"
msgstr "Данъци"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..892121a
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,300 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.category:"
+msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgstr ""
+
+msgctxt "error:product.template:"
+msgid "There is no account expense/revenue defined on the product %s (%d)"
+msgstr ""
+"No hi ha cap compte de despeses/ingressos definit per al producte %s (%d)"
+
+msgctxt "field:product.category,account_expense:"
+msgid "Account Expense"
+msgstr "Compte de despeses"
+
+#, fuzzy
+msgctxt "field:product.category,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Compte de despesa usada"
+
+msgctxt "field:product.category,account_parent:"
+msgid "Use Parent's accounts"
+msgstr ""
+
+msgctxt "field:product.category,account_revenue:"
+msgid "Account Revenue"
+msgstr "Compte d'ingressos"
+
+#, fuzzy
+msgctxt "field:product.category,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Compte d'ingressos usada"
+
+msgctxt "field:product.category,customer_taxes:"
+msgid "Customer Taxes"
+msgstr "Impostos de client"
+
+#, fuzzy
+msgctxt "field:product.category,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Impostos de client usats"
+
+msgctxt "field:product.category,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr "Impostos de proveïdor"
+
+#, fuzzy
+msgctxt "field:product.category,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Impostos de client usats"
+
+msgctxt "field:product.category,taxes_parent:"
+msgid "Use the Parent's Taxes"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.category-customer-account.tax,category:"
+msgid "Category"
+msgstr "Categoria"
+
+msgctxt "field:product.category-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.category-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:product.category-customer-account.tax,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.category-customer-account.tax,tax:"
+msgid "Tax"
+msgstr "Impost"
+
+msgctxt "field:product.category-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.category-supplier-account.tax,category:"
+msgid "Category"
+msgstr "Categoria"
+
+msgctxt "field:product.category-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.category-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:product.category-supplier-account.tax,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.category-supplier-account.tax,tax:"
+msgid "Tax"
+msgstr "Impost"
+
+msgctxt "field:product.category-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.template,account_category:"
+msgid "Use Category's accounts"
+msgstr "Usar els comptes de la categoria"
+
+msgctxt "field:product.template,account_expense:"
+msgid "Account Expense"
+msgstr "Compte de despesa"
+
+msgctxt "field:product.template,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Compte de despesa usada"
+
+msgctxt "field:product.template,account_revenue:"
+msgid "Account Revenue"
+msgstr "Compte d'ingressos"
+
+msgctxt "field:product.template,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Compte d'ingressos usada"
+
+msgctxt "field:product.template,customer_taxes:"
+msgid "Customer Taxes"
+msgstr "Impostos de client"
+
+msgctxt "field:product.template,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Impostos de client usats"
+
+msgctxt "field:product.template,supplier_taxes:"
+msgid "Supplier Taxes"
+msgstr "Impostos de proveïdors"
+
+#, fuzzy
+msgctxt "field:product.template,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Impostos de client usats"
+
+msgctxt "field:product.template,taxes_category:"
+msgid "Use Category's Taxes"
+msgstr "Usar els impostos de la categoria"
+
+msgctxt "field:product.template-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:product.template-customer-account.tax,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,product:"
+msgid "Product Template"
+msgstr "Plantilla de producte"
+
+msgctxt "field:product.template-customer-account.tax,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.template-customer-account.tax,tax:"
+msgid "Tax"
+msgstr "Impost"
+
+msgctxt "field:product.template-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:product.template-supplier-account.tax,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,product:"
+msgid "Product Template"
+msgstr "Plantilla de producte"
+
+msgctxt "field:product.template-supplier-account.tax,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.template-supplier-account.tax,tax:"
+msgid "Tax"
+msgstr "Impost"
+
+msgctxt "field:product.template-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:product.category,account_parent:"
+msgid "Use the accounts defined on the parent category"
+msgstr ""
+
+msgctxt "help:product.category,taxes_parent:"
+msgid "Use the taxes defined on the parent category"
+msgstr ""
+
+msgctxt "help:product.template,account_category:"
+msgid "Use the accounts defined on the category"
+msgstr "Usar els comptes 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 "Aquest compte s'usarà en lloc del definit en la categoria."
+
+msgctxt "help:product.template,account_revenue:"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "Aquest compte s'usarà en lloc del definit en la categoria."
+
+msgctxt "help:product.template,taxes_category:"
+msgid "Use the taxes defined on the category"
+msgstr "Usar els impostos definits en la categoria"
+
+msgctxt "model:product.category-customer-account.tax,name:"
+msgid "Category - Customer Tax"
+msgstr "Categoria - Impostos de client"
+
+msgctxt "model:product.category-supplier-account.tax,name:"
+msgid "Category - Supplier Tax"
+msgstr "Categoria - Impostos de proveïdor"
+
+msgctxt "model:product.template-customer-account.tax,name:"
+msgid "Product Template - Customer Tax"
+msgstr "Plantilla de producte - Impostos de client"
+
+msgctxt "model:product.template-supplier-account.tax,name:"
+msgid "Product Template - Supplier Tax"
+msgstr "Plantilla de producte - Impostos de proveïdor"
+
+msgctxt "view:product.category:"
+msgid "Accounting"
+msgstr "Comptabilitat"
+
+#, fuzzy
+msgctxt "view:product.category:"
+msgid "Accounts"
+msgstr "Comptes"
+
+msgctxt "view:product.category:"
+msgid "Taxes"
+msgstr "Impostos"
+
+msgctxt "view:product.product:"
+msgid "Accounting"
+msgstr "Comptabilitat"
+
+msgctxt "view:product.template:"
+msgid "Accounting"
+msgstr "Comptabilitat"
+
+msgctxt "view:product.template:"
+msgid "Accounts"
+msgstr "Comptes"
+
+msgctxt "view:product.template:"
+msgid "Taxes"
+msgstr "Impostos"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 626688e..f0e547c 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,162 +2,282 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.template:0"
+msgctxt "error:product.category:"
+msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgstr ""
+
+msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
msgstr ""
-msgctxt "field:product.category,account_expense:0"
+msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr ""
-msgctxt "field:product.category,account_revenue:0"
+msgctxt "field:product.category,account_expense_used:"
+msgid "Account Expense Used"
+msgstr ""
+
+msgctxt "field:product.category,account_parent:"
+msgid "Use Parent's accounts"
+msgstr ""
+
+msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.category,customer_taxes:0"
+msgctxt "field:product.category,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr ""
+
+msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
-msgctxt "field:product.category,supplier_taxes:0"
+msgctxt "field:product.category,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr ""
+
+msgctxt "field:product.category,supplier_taxes:"
msgid "Supplier Taxes"
msgstr ""
-msgctxt "field:product.category-customer-account.tax,category:0"
+msgctxt "field:product.category,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr ""
+
+msgctxt "field:product.category,taxes_parent:"
+msgid "Use the Parent's Taxes"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,category:"
msgid "Category"
msgstr ""
-msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgctxt "field:product.category-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:product.category-customer-account.tax,tax:0"
+msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
msgstr ""
-msgctxt "field:product.category-supplier-account.tax,category:0"
+msgctxt "field:product.category-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,category:"
msgid "Category"
msgstr ""
-msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgctxt "field:product.category-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
msgstr ""
-msgctxt "field:product.template,account_category:0"
+msgctxt "field:product.category-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.template,account_category:"
msgid "Use Category's accounts"
msgstr ""
-msgctxt "field:product.template,account_expense:0"
+msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr ""
-msgctxt "field:product.template,account_expense_used:0"
+msgctxt "field:product.template,account_expense_used:"
msgid "Account Expense Used"
msgstr ""
-msgctxt "field:product.template,account_revenue:0"
+msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.template,account_revenue_used:0"
+msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr ""
-msgctxt "field:product.template,customer_taxes:0"
+msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
-msgctxt "field:product.template,customer_taxes_used:0"
+msgctxt "field:product.template,customer_taxes_used:"
msgid "Customer Taxes Used"
msgstr ""
-msgctxt "field:product.template,supplier_taxes:0"
+msgctxt "field:product.template,supplier_taxes:"
msgid "Supplier Taxes"
msgstr ""
-msgctxt "field:product.template,supplier_taxes_used:0"
-msgid "Customer Taxes Used"
+msgctxt "field:product.template,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
msgstr ""
-msgctxt "field:product.template,taxes_category:0"
+msgctxt "field:product.template,taxes_category:"
msgid "Use Category's Taxes"
msgstr ""
-msgctxt "field:product.template-customer-account.tax,product:0"
+msgctxt "field:product.template-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
msgstr ""
-msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgctxt "field:product.template-customer-account.tax,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:product.template-customer-account.tax,tax:0"
+msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
msgstr ""
-msgctxt "field:product.template-supplier-account.tax,product:0"
+msgctxt "field:product.template-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
msgstr ""
-msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgctxt "field:product.template-supplier-account.tax,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
msgstr ""
-msgctxt "help:product.template,account_category:0"
+msgctxt "field:product.template-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:product.category,account_parent:"
+msgid "Use the accounts defined on the parent category"
+msgstr ""
+
+msgctxt "help:product.category,taxes_parent:"
+msgid "Use the taxes defined on the parent category"
+msgstr ""
+
+msgctxt "help:product.template,account_category:"
msgid "Use the accounts defined on the category"
msgstr ""
-msgctxt "help:product.template,account_expense:0"
+msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
-msgctxt "help:product.template,account_revenue:0"
+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,taxes_category:0"
+msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr ""
-msgctxt "model:product.category-customer-account.tax,name:0"
+msgctxt "model:product.category-customer-account.tax,name:"
msgid "Category - Customer Tax"
msgstr ""
-msgctxt "model:product.category-supplier-account.tax,name:0"
+msgctxt "model:product.category-supplier-account.tax,name:"
msgid "Category - Supplier Tax"
msgstr ""
-msgctxt "model:product.template-customer-account.tax,name:0"
+msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr ""
-msgctxt "model:product.template-supplier-account.tax,name:0"
+msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr ""
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Accounting"
msgstr ""
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
+msgid "Accounts"
+msgstr ""
+
+msgctxt "view:product.category:"
msgid "Taxes"
msgstr ""
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Accounting"
msgstr ""
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Accounts"
msgstr ""
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Taxes"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 671f939..7fc2923 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,174 +2,294 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.template:0"
+msgctxt "error:product.category:"
+msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgstr "Es ist kein Aufwands-/Ertragskonto definiert für Artikel %s (%d)!"
+
+msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
msgstr "Es ist kein Aufwands-/Ertragskonto definiert für Artikel %s (%d)!"
-msgctxt "field:product.category,account_expense:0"
+msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Konto Aufwand"
-msgctxt "field:product.category,account_revenue:0"
+msgctxt "field:product.category,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Konto Aufwand Benutzt"
+
+msgctxt "field:product.category,account_parent:"
+msgid "Use Parent's accounts"
+msgstr "Konten der übergeordneten Kategorie anwenden"
+
+msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "Konto Ertrag"
-msgctxt "field:product.category,customer_taxes:0"
+msgctxt "field:product.category,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Verwendetes Ertragskonto"
+
+msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Steuern Kunde"
-msgctxt "field:product.category,supplier_taxes:0"
+msgctxt "field:product.category,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Für Kunden verwendete Steuern"
+
+msgctxt "field:product.category,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Steuern Lieferant"
-msgctxt "field:product.category-customer-account.tax,category:0"
+msgctxt "field:product.category,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Für Lieferanten verwendete Steuern"
+
+msgctxt "field:product.category,taxes_parent:"
+msgid "Use the Parent's Taxes"
+msgstr "Steuern der übergeordneten Kategorie anwenden"
+
+msgctxt "field:product.category-customer-account.tax,category:"
msgid "Category"
msgstr "Kategorie"
-msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgctxt "field:product.category-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:product.category-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:product.category-customer-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.category-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:product.category-customer-account.tax,tax:0"
+msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
msgstr "Steuer"
-msgctxt "field:product.category-supplier-account.tax,category:0"
+msgctxt "field:product.category-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:product.category-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:product.category-supplier-account.tax,category:"
msgid "Category"
msgstr "Kategorie"
-msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgctxt "field:product.category-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:product.category-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:product.category-supplier-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.category-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
msgstr "Steuer"
-msgctxt "field:product.template,account_category:0"
+msgctxt "field:product.category-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:product.category-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:product.template,account_category:"
msgid "Use Category's accounts"
msgstr "Konten der Kategorie anwenden"
-msgctxt "field:product.template,account_expense:0"
+msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Konto Aufwand"
-msgctxt "field:product.template,account_expense_used:0"
+msgctxt "field:product.template,account_expense_used:"
msgid "Account Expense Used"
msgstr "Konto Aufwand Benutzt"
-msgctxt "field:product.template,account_revenue:0"
+msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr "Konto Ertrag"
-msgctxt "field:product.template,account_revenue_used:0"
+msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Verwendetes Ertragskonto"
-msgctxt "field:product.template,customer_taxes:0"
+msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Steuern (Kunden)"
-msgctxt "field:product.template,customer_taxes_used:0"
+msgctxt "field:product.template,customer_taxes_used:"
msgid "Customer Taxes Used"
-msgstr "Benutzte Steuern für Kunden"
+msgstr "Für Kunden verwendete Steuern"
-msgctxt "field:product.template,supplier_taxes:0"
+msgctxt "field:product.template,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Steuern (Lieferanten)"
-msgctxt "field:product.template,supplier_taxes_used:0"
-msgid "Customer Taxes Used"
-msgstr "Benutzte Steuern für Lieferanten"
+msgctxt "field:product.template,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Für Lieferanten verwendete Steuern"
-msgctxt "field:product.template,taxes_category:0"
+msgctxt "field:product.template,taxes_category:"
msgid "Use Category's Taxes"
msgstr "Steuern der Kategorie anwenden"
-msgctxt "field:product.template-customer-account.tax,product:0"
+msgctxt "field:product.template-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:product.template-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:product.template-customer-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
msgstr "Artikelvorlage"
-msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgctxt "field:product.template-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:product.template-customer-account.tax,tax:0"
+msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
msgstr "Steuer"
-msgctxt "field:product.template-supplier-account.tax,product:0"
+msgctxt "field:product.template-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:product.template-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:product.template-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:product.template-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:product.template-supplier-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
msgstr "Artikelvorlage"
-msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgctxt "field:product.template-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
msgstr "Steuer"
-msgctxt "help:product.template,account_category:0"
+msgctxt "field:product.template-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:product.template-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "help:product.category,account_parent:"
+msgid "Use the accounts defined on the parent category"
+msgstr "Konten der übergeordneten Kategorie anwenden"
+
+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:"
msgid "Use the accounts defined on the category"
msgstr "Wendet die Konten an, die in der Artikelkategorie definiert sind"
-msgctxt "help:product.template,account_expense:0"
+msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
"Dieses Konto überschreibt das Konto welches in der Kategorie eingestellt "
"ist."
-msgctxt "help:product.template,account_revenue:0"
+msgctxt "help:product.template,account_revenue:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
"Dieses Konto überschreibt das Konto welches in der Kategorie eingestellt "
"ist."
-msgctxt "help:product.template,taxes_category:0"
+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"
-msgctxt "model:product.category-customer-account.tax,name:0"
+msgctxt "model:product.category-customer-account.tax,name:"
msgid "Category - Customer Tax"
msgstr "Artikelkategorie - Steuer Kunde"
-msgctxt "model:product.category-supplier-account.tax,name:0"
+msgctxt "model:product.category-supplier-account.tax,name:"
msgid "Category - Supplier Tax"
msgstr "Artikelkategorie - Steuer Lieferant"
-msgctxt "model:product.template-customer-account.tax,name:0"
+msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "Artikelvorlage - Steuer Kunde"
-msgctxt "model:product.template-supplier-account.tax,name:0"
+msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Artikelvorlage - Steuer Lieferant"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Buchhaltung"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
+msgid "Accounts"
+msgstr "Konten"
+
+msgctxt "view:product.category:"
msgid "Taxes"
msgstr "Steuern"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Accounting"
msgstr "Buchhaltung"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Taxes"
msgstr "Steuern"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Accounting"
msgstr "Buchhaltung"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Accounts"
msgstr "Konten"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Taxes"
msgstr "Steuern"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..542f292
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,3 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 710b31d..8646aee 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,168 +2,298 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.template:0"
+msgctxt "error:product.category:"
+msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgstr ""
+
+msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
msgstr "No hay una cuenta gastos/ingresos definida para el producto %s (%d)"
-msgctxt "field:product.category,account_expense:0"
+msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Cuenta de Gastos"
-msgctxt "field:product.category,account_revenue:0"
+#, fuzzy
+msgctxt "field:product.category,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Cuenta de Gastos Usada"
+
+msgctxt "field:product.category,account_parent:"
+msgid "Use Parent's accounts"
+msgstr ""
+
+msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "Cuenta de Ingresos"
-msgctxt "field:product.category,customer_taxes:0"
+#, fuzzy
+msgctxt "field:product.category,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Cuenta de Ingresos Usada"
+
+msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos del Cliente"
-msgctxt "field:product.category,supplier_taxes:0"
+#, fuzzy
+msgctxt "field:product.category,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Impuestos del Cliente Usados"
+
+msgctxt "field:product.category,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Impuestos a Proveedores"
#, fuzzy
-msgctxt "field:product.category-customer-account.tax,category:0"
+msgctxt "field:product.category,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Impuestos del Cliente Usados"
+
+msgctxt "field:product.category,taxes_parent:"
+msgid "Use the Parent's Taxes"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.category-customer-account.tax,category:"
msgid "Category"
msgstr "Categoría"
-msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgctxt "field:product.category-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.category-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:product.category-customer-account.tax,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.category-customer-account.tax,tax:0"
+msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
msgstr "Impuesto"
+msgctxt "field:product.category-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
#, fuzzy
-msgctxt "field:product.category-supplier-account.tax,category:0"
+msgctxt "field:product.category-supplier-account.tax,category:"
msgid "Category"
msgstr "Categoría"
-msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgctxt "field:product.category-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.category-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:product.category-supplier-account.tax,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
msgstr "Impuesto"
-msgctxt "field:product.template,account_category:0"
+msgctxt "field:product.category-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.template,account_category:"
msgid "Use Category's accounts"
msgstr "Use las cuentas de Categoría"
-msgctxt "field:product.template,account_expense:0"
+msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Cuenta de Gastos"
-msgctxt "field:product.template,account_expense_used:0"
+msgctxt "field:product.template,account_expense_used:"
msgid "Account Expense Used"
msgstr "Cuenta de Gastos Usada"
-msgctxt "field:product.template,account_revenue:0"
+msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr "Cuenta de Ingresos"
-msgctxt "field:product.template,account_revenue_used:0"
+msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de Ingresos Usada"
-msgctxt "field:product.template,customer_taxes:0"
+msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos del Cliente"
-msgctxt "field:product.template,customer_taxes_used:0"
+msgctxt "field:product.template,customer_taxes_used:"
msgid "Customer Taxes Used"
msgstr "Impuestos del Cliente Usados"
-msgctxt "field:product.template,supplier_taxes:0"
+msgctxt "field:product.template,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Impuestos a Proveedores"
-msgctxt "field:product.template,supplier_taxes_used:0"
-msgid "Customer Taxes Used"
+#, fuzzy
+msgctxt "field:product.template,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
msgstr "Impuestos del Cliente Usados"
-msgctxt "field:product.template,taxes_category:0"
+msgctxt "field:product.template,taxes_category:"
msgid "Use Category's Taxes"
msgstr "Categorías de Impuesto"
-msgctxt "field:product.template-customer-account.tax,product:0"
+msgctxt "field:product.template-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:product.template-customer-account.tax,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
msgstr "Plantilla de Producto"
-msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgctxt "field:product.template-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.template-customer-account.tax,tax:0"
+msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
msgstr "Impuesto"
-msgctxt "field:product.template-supplier-account.tax,product:0"
+msgctxt "field:product.template-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:product.template-supplier-account.tax,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
msgstr "Plantilla de Producto"
-msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgctxt "field:product.template-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
msgstr "Impuesto"
-msgctxt "help:product.template,account_category:0"
+msgctxt "field:product.template-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:product.category,account_parent:"
+msgid "Use the accounts defined on the parent category"
+msgstr ""
+
+msgctxt "help:product.category,taxes_parent:"
+msgid "Use the taxes defined on the parent category"
+msgstr ""
+
+msgctxt "help:product.template,account_category:"
msgid "Use the accounts defined on the category"
msgstr "Use las cuentas definidas en la categoría"
-msgctxt "help:product.template,account_expense:0"
+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."
-msgctxt "help:product.template,account_revenue:0"
+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."
-msgctxt "help:product.template,taxes_category:0"
+msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Usar los impuestos definidos en la categoría"
-msgctxt "model:product.category-customer-account.tax,name:0"
+msgctxt "model:product.category-customer-account.tax,name:"
msgid "Category - Customer Tax"
msgstr "Categoría - Impuestos Cliente"
-msgctxt "model:product.category-supplier-account.tax,name:0"
+msgctxt "model:product.category-supplier-account.tax,name:"
msgid "Category - Supplier Tax"
msgstr "Categoría - Impuestos Proveedor"
-msgctxt "model:product.template-customer-account.tax,name:0"
+msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "Plantilla Producto - Impuestos Cliente"
-msgctxt "model:product.template-supplier-account.tax,name:0"
+msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Plantilla Producto - Impuestos Proveedor"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Contabilidad"
-msgctxt "view:product.category:0"
+#, fuzzy
+msgctxt "view:product.category:"
+msgid "Accounts"
+msgstr "Cuentas"
+
+msgctxt "view:product.category:"
msgid "Taxes"
msgstr "Impuestos"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Accounting"
msgstr "Contabilidad"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Accounting"
msgstr "Contabilidad"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Accounts"
msgstr "Cuentas"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Taxes"
msgstr "Impuestos"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 7ec19a6..ce9f8fa 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,169 +2,289 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.template:0"
+msgctxt "error:product.category:"
+msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgstr ""
+"No existe ninguna cuenta de gastos/ingresos definida en la categoría %s "
+"(%d)."
+
+msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
msgstr ""
-"No hay ninguna cuenta de gastos/ingresos definida para el producto %s (%d)"
+"No existe ninguna cuenta de gastos/ingresos definida en el producto %s (%d)."
-msgctxt "field:product.category,account_expense:0"
+msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Cuenta de gastos"
-msgctxt "field:product.category,account_revenue:0"
+msgctxt "field:product.category,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Cuenta de gastos usada"
+
+msgctxt "field:product.category,account_parent:"
+msgid "Use Parent's accounts"
+msgstr "Usar cuentas padre"
+
+msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "Cuenta de ingresos"
-msgctxt "field:product.category,customer_taxes:0"
+msgctxt "field:product.category,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Cuenta de ingresos usada"
+
+msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos de cliente"
-msgctxt "field:product.category,supplier_taxes:0"
+msgctxt "field:product.category,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Impuestos de cliente usados"
+
+msgctxt "field:product.category,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Impuestos de proveedor"
-#, fuzzy
-msgctxt "field:product.category-customer-account.tax,category:0"
+msgctxt "field:product.category,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Impuestos de cliente usados"
+
+msgctxt "field:product.category,taxes_parent:"
+msgid "Use the Parent's Taxes"
+msgstr "Usar impuestos padre"
+
+msgctxt "field:product.category-customer-account.tax,category:"
msgid "Category"
msgstr "Categoría"
-msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgctxt "field:product.category-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.category-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.category-customer-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.category-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.category-customer-account.tax,tax:0"
+msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
msgstr "Impuesto"
-#, fuzzy
-msgctxt "field:product.category-supplier-account.tax,category:0"
+msgctxt "field:product.category-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.category-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:product.category-supplier-account.tax,category:"
msgid "Category"
msgstr "Categoría"
-msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgctxt "field:product.category-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.category-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.category-supplier-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.category-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
msgstr "Impuesto"
-msgctxt "field:product.template,account_category:0"
+msgctxt "field:product.category-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.category-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:product.template,account_category:"
msgid "Use Category's accounts"
-msgstr "Usar las cuentas de la categoría"
+msgstr "Usar cuentas de la categoría"
-msgctxt "field:product.template,account_expense:0"
+msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
-msgstr "Cuenta de gasto"
+msgstr "Cuenta de gastos"
-msgctxt "field:product.template,account_expense_used:0"
+msgctxt "field:product.template,account_expense_used:"
msgid "Account Expense Used"
-msgstr "Cuenta de gasto usada"
+msgstr "Cuenta de gastos usada"
-msgctxt "field:product.template,account_revenue:0"
+msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr "Cuenta de ingresos"
-msgctxt "field:product.template,account_revenue_used:0"
+msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Cuenta de ingresos usada"
-msgctxt "field:product.template,customer_taxes:0"
+msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Impuestos de cliente"
-msgctxt "field:product.template,customer_taxes_used:0"
+msgctxt "field:product.template,customer_taxes_used:"
msgid "Customer Taxes Used"
msgstr "Impuestos de cliente usados"
-msgctxt "field:product.template,supplier_taxes:0"
+msgctxt "field:product.template,supplier_taxes:"
msgid "Supplier Taxes"
-msgstr "Impuestos de proveedores"
+msgstr "Impuestos de proveedor"
-msgctxt "field:product.template,supplier_taxes_used:0"
-msgid "Customer Taxes Used"
-msgstr "Impuestos de cliente usados"
+msgctxt "field:product.template,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Impuestos de proveedor usados"
-msgctxt "field:product.template,taxes_category:0"
+msgctxt "field:product.template,taxes_category:"
msgid "Use Category's Taxes"
-msgstr "Usar los impuestos de la categoría"
+msgstr "Usar impuestos de la categoría"
-msgctxt "field:product.template-customer-account.tax,product:0"
+msgctxt "field:product.template-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.template-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.template-customer-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
msgstr "Plantilla de producto"
-msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgctxt "field:product.template-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.template-customer-account.tax,tax:0"
+msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
msgstr "Impuesto"
-msgctxt "field:product.template-supplier-account.tax,product:0"
+msgctxt "field:product.template-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.template-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:product.template-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.template-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.template-supplier-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
msgstr "Plantilla de producto"
-msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgctxt "field:product.template-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
msgstr "Impuesto"
-msgctxt "help:product.template,account_category:0"
+msgctxt "field:product.template-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.template-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "help:product.category,account_parent:"
+msgid "Use the accounts defined on the parent category"
+msgstr "Usar las cuentas definidas en la categoría padre."
+
+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:"
msgid "Use the accounts defined on the category"
-msgstr "Usar las cuentas definidas en la categoría"
+msgstr "Usar las cuentas definidas en la categoría."
-msgctxt "help:product.template,account_expense:0"
+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."
-msgctxt "help:product.template,account_revenue:0"
+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."
-msgctxt "help:product.template,taxes_category:0"
+msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
-msgstr "Usar los impuestos definidos en la categoría"
+msgstr "Usar los impuestos definidos en la categoría."
-msgctxt "model:product.category-customer-account.tax,name:0"
+msgctxt "model:product.category-customer-account.tax,name:"
msgid "Category - Customer Tax"
msgstr "Categoría - Impuesto de cliente"
-msgctxt "model:product.category-supplier-account.tax,name:0"
+msgctxt "model:product.category-supplier-account.tax,name:"
msgid "Category - Supplier Tax"
msgstr "Categoría - Impuesto de proveedor"
-msgctxt "model:product.template-customer-account.tax,name:0"
+msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "Plantilla de producto - Impuesto de cliente"
-msgctxt "model:product.template-supplier-account.tax,name:0"
+msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Plantilla de producto - Impuesto de proveedor"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Contabilidad"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
+msgid "Accounts"
+msgstr "Cuentas"
+
+msgctxt "view:product.category:"
msgid "Taxes"
msgstr "Impuestos"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Accounting"
msgstr "Contabilidad"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Accounting"
msgstr "Contabilidad"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Accounts"
msgstr "Cuentas"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Taxes"
msgstr "Impuestos"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index f3aacda..e0db79e 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,167 +2,312 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.template:0"
+msgctxt "error:product.category:"
+msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgstr "Il n'y a pas de compte de dépenses/revenus définé sur la catégorie"
+
+msgctxt "error:product.template:"
+msgid "There is no account expense/revenue defined on the product %s (%d)"
+msgstr ""
+"Il n'y a pas de compte charges/produits définit sur le produit %s (%d)"
+
+msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
msgstr ""
"Il n'y a pas de compte charges/produits définit sur le produit %s (%d)"
-msgctxt "field:product.category,account_expense:0"
+msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Compte de charges"
-msgctxt "field:product.category,account_revenue:0"
+msgctxt "field:product.category,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Compte de charges utilisé"
+
+msgctxt "field:product.category,account_parent:"
+msgid "Use Parent's accounts"
+msgstr "Utiliser les comptes du parent"
+
+msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "Compte de produits"
-msgctxt "field:product.category,customer_taxes:0"
+msgctxt "field:product.category,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Compte de produits utilisé"
+
+msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Taxes client"
-msgctxt "field:product.category,supplier_taxes:0"
+msgctxt "field:product.category,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Taxes client utilisées"
+
+msgctxt "field:product.category,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Taxes fournisseur"
-msgctxt "field:product.category-customer-account.tax,category:0"
+msgctxt "field:product.category,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Taxes fournisseur utilisées"
+
+msgctxt "field:product.category,taxes_parent:"
+msgid "Use the Parent's Taxes"
+msgstr "Utiliser les taxes du parent"
+
+msgctxt "field:product.category-customer-account.tax,category:"
msgid "Category"
msgstr "Catégorie"
-msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgctxt "field:product.category-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:product.category-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:product.category-customer-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.category-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:product.category-customer-account.tax,tax:0"
+msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
msgstr "Taxe"
-msgctxt "field:product.category-supplier-account.tax,category:0"
+msgctxt "field:product.category-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:product.category-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:product.category-supplier-account.tax,category:"
msgid "Category"
msgstr "Catégorie"
-msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgctxt "field:product.category-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:product.category-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:product.category-supplier-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.category-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
msgstr "Taxe"
-msgctxt "field:product.template,account_category:0"
+msgctxt "field:product.category-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:product.category-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:product.template,account_category:"
msgid "Use Category's accounts"
msgstr "Utiliser les comptes de la catégorie"
-msgctxt "field:product.template,account_expense:0"
+msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Compte de charge"
-msgctxt "field:product.template,account_expense_used:0"
+msgctxt "field:product.template,account_expense_used:"
msgid "Account Expense Used"
msgstr "Compte de charges utilisé"
-msgctxt "field:product.template,account_revenue:0"
+msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr "Compte de produits"
-msgctxt "field:product.template,account_revenue_used:0"
+msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Compte de produits utilisé"
-msgctxt "field:product.template,customer_taxes:0"
+msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Taxes Client"
-msgctxt "field:product.template,customer_taxes_used:0"
+msgctxt "field:product.template,customer_taxes_used:"
msgid "Customer Taxes Used"
-msgstr "Taxes utilisées"
+msgstr "Taxes client utilisées"
-msgctxt "field:product.template,supplier_taxes:0"
+msgctxt "field:product.template,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Taxes Fournisseur"
-msgctxt "field:product.template,supplier_taxes_used:0"
-msgid "Customer Taxes Used"
-msgstr "Taxes client utilisées"
+msgctxt "field:product.template,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Taxes Fournisseur utilisées"
-msgctxt "field:product.template,taxes_category:0"
+msgctxt "field:product.template,taxes_category:"
msgid "Use Category's Taxes"
msgstr "Utiliser les taxes de la catégorie"
-msgctxt "field:product.template-customer-account.tax,product:0"
+msgctxt "field:product.template-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:product.template-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:product.template-customer-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
msgstr "Modèle produit"
-msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgctxt "field:product.template-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:product.template-customer-account.tax,tax:0"
+msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
msgstr "Taxe"
-msgctxt "field:product.template-supplier-account.tax,product:0"
+msgctxt "field:product.template-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:product.template-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:product.template-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:product.template-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:product.template-supplier-account.tax,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
msgstr "Modèle produit"
-msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgctxt "field:product.template-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
msgstr "Taxe"
-msgctxt "help:product.template,account_category:0"
+msgctxt "field:product.template-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:product.template-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "help:product.category,account_parent:"
+msgid "Use the accounts defined on the parent category"
+msgstr "Utiliser les comptes de la catégorie parente"
+
+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:"
msgid "Use the accounts defined on the category"
msgstr "Utiliser les comptes définis sur la catégorie"
-msgctxt "help:product.template,account_expense:0"
+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."
-msgctxt "help:product.template,account_revenue:0"
+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."
-msgctxt "help:product.template,taxes_category:0"
+msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Utiliser les taxes de la catégorie"
-msgctxt "model:product.category-customer-account.tax,name:0"
+msgctxt "model:product.category-customer-account.tax,name:"
msgid "Category - Customer Tax"
msgstr "Catégorie - Taxe client"
-msgctxt "model:product.category-supplier-account.tax,name:0"
+msgctxt "model:product.category-supplier-account.tax,name:"
msgid "Category - Supplier Tax"
msgstr "Catégorie - Taxe fournisseur"
-msgctxt "model:product.template-customer-account.tax,name:0"
+msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "Modèle du produit - Taxe client"
-msgctxt "model:product.template-supplier-account.tax,name:0"
+msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Modèle du produit - Taxe fournisseur"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
+msgid "Accounting"
+msgstr "Comptabilité"
+
+msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Comptabilité"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
+msgid "Accounts"
+msgstr "Comptes"
+
+msgctxt "view:product.category:"
+msgid "Taxes"
+msgstr "Taxes"
+
+msgctxt "view:product.category:"
msgid "Taxes"
msgstr "Taxes"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Accounting"
msgstr "Comptabilité"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Accounting"
msgstr "Comptabilité"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
+msgid "Accounting"
+msgstr "Comptabilité"
+
+msgctxt "view:product.template:"
+msgid "Accounts"
+msgstr "Comptes"
+
+msgctxt "view:product.template:"
msgid "Accounts"
msgstr "Comptes"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
+msgid "Taxes"
+msgstr "Taxes"
+
+msgctxt "view:product.template:"
msgid "Taxes"
msgstr "Taxes"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 7d64688..abbf26f 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,166 +2,292 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.template:0"
+msgctxt "error:product.category:"
+msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgstr ""
+
+msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
msgstr ""
"Er is geen kosten-/opbrengstenrekening gedefinieerd voor product %s (%d)"
-msgctxt "field:product.category,account_expense:0"
+msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Kostenrekening"
-msgctxt "field:product.category,account_revenue:0"
+#, fuzzy
+msgctxt "field:product.category,account_expense_used:"
+msgid "Account Expense Used"
+msgstr "Gebruikte kostenrekening"
+
+msgctxt "field:product.category,account_parent:"
+msgid "Use Parent's accounts"
+msgstr ""
+
+msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "Opbrengstrekening"
-msgctxt "field:product.category,customer_taxes:0"
+#, fuzzy
+msgctxt "field:product.category,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr "Opbrengstrekening gebruikt"
+
+msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr "Belasting klanten"
-msgctxt "field:product.category,supplier_taxes:0"
+#, fuzzy
+msgctxt "field:product.category,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr "Belasting klanten gebruikt"
+
+msgctxt "field:product.category,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Belastingen inkoop"
-msgctxt "field:product.category-customer-account.tax,category:0"
+#, fuzzy
+msgctxt "field:product.category,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr "Belasting klanten gebruikt"
+
+msgctxt "field:product.category,taxes_parent:"
+msgid "Use the Parent's Taxes"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,category:"
msgid "Category"
msgstr "Categorie"
-msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgctxt "field:product.category-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:product.category-customer-account.tax,tax:0"
+msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
msgstr "Belasting"
-msgctxt "field:product.category-supplier-account.tax,category:0"
+msgctxt "field:product.category-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,category:"
msgid "Category"
msgstr "Categorie"
-msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgctxt "field:product.category-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
msgstr "Belasting"
-msgctxt "field:product.template,account_category:0"
+msgctxt "field:product.category-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.template,account_category:"
msgid "Use Category's accounts"
msgstr "Gebruik de rekeningen van de categorie"
-msgctxt "field:product.template,account_expense:0"
+msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Kostenrekening"
-msgctxt "field:product.template,account_expense_used:0"
+msgctxt "field:product.template,account_expense_used:"
msgid "Account Expense Used"
msgstr "Gebruikte kostenrekening"
-msgctxt "field:product.template,account_revenue:0"
+msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr "Opbrengstrekening"
-msgctxt "field:product.template,account_revenue_used:0"
+msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr "Opbrengstrekening gebruikt"
-msgctxt "field:product.template,customer_taxes:0"
+msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr "Belasting klanten"
-msgctxt "field:product.template,customer_taxes_used:0"
+msgctxt "field:product.template,customer_taxes_used:"
msgid "Customer Taxes Used"
msgstr "Belasting klanten gebruikt"
-msgctxt "field:product.template,supplier_taxes:0"
+msgctxt "field:product.template,supplier_taxes:"
msgid "Supplier Taxes"
msgstr "Belastingen inkoop"
-msgctxt "field:product.template,supplier_taxes_used:0"
-msgid "Customer Taxes Used"
+#, fuzzy
+msgctxt "field:product.template,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
msgstr "Belasting klanten gebruikt"
-msgctxt "field:product.template,taxes_category:0"
+msgctxt "field:product.template,taxes_category:"
msgid "Use Category's Taxes"
msgstr "Gebruik de belastingen van de categorie"
-msgctxt "field:product.template-customer-account.tax,product:0"
+msgctxt "field:product.template-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
msgstr "Productsjabloon"
-msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgctxt "field:product.template-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:product.template-customer-account.tax,tax:0"
+msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
msgstr "Belasting"
-msgctxt "field:product.template-supplier-account.tax,product:0"
+msgctxt "field:product.template-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
msgstr "Productsjabloon"
-msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgctxt "field:product.template-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
msgstr "Belasting"
-msgctxt "help:product.template,account_category:0"
+msgctxt "field:product.template-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:product.category,account_parent:"
+msgid "Use the accounts defined on the parent category"
+msgstr ""
+
+msgctxt "help:product.category,taxes_parent:"
+msgid "Use the taxes defined on the parent category"
+msgstr ""
+
+msgctxt "help:product.template,account_category:"
msgid "Use the accounts defined on the category"
msgstr "Gebruik de rekeningen van de categorie"
-msgctxt "help:product.template,account_expense:0"
+msgctxt "help:product.template,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."
-msgctxt "help:product.template,account_revenue:0"
+msgctxt "help:product.template,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,taxes_category:0"
+msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr "Gebruik de belastingen van de categorie"
-msgctxt "model:product.category-customer-account.tax,name:0"
+msgctxt "model:product.category-customer-account.tax,name:"
msgid "Category - Customer Tax"
msgstr "Categorie - belasting klant"
-msgctxt "model:product.category-supplier-account.tax,name:0"
+msgctxt "model:product.category-supplier-account.tax,name:"
msgid "Category - Supplier Tax"
msgstr "Categorie - belasting leverancier"
-msgctxt "model:product.template-customer-account.tax,name:0"
+msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "Productsjabloon - Belasting verkoop"
-msgctxt "model:product.template-supplier-account.tax,name:0"
+msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Productsjabloon - Belasting inkoop"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Boekhouden"
#, fuzzy
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
+msgid "Accounts"
+msgstr "Rekeningen"
+
+#, fuzzy
+msgctxt "view:product.category:"
msgid "Taxes"
msgstr "Belastingen"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Accounting"
msgstr "Boekhouden"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Accounts"
msgstr "Rekeningen"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Taxes"
msgstr "Belastingen"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 153a4c7..41e17e9 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,172 +2,292 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.template:0"
+msgctxt "error:product.category:"
+msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgstr ""
+
+msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
msgstr ""
-msgctxt "field:product.category,account_expense:0"
+msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr ""
-msgctxt "field:product.category,account_revenue:0"
+msgctxt "field:product.category,account_expense_used:"
+msgid "Account Expense Used"
+msgstr ""
+
+msgctxt "field:product.category,account_parent:"
+msgid "Use Parent's accounts"
+msgstr ""
+
+msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.category,customer_taxes:0"
+msgctxt "field:product.category,account_revenue_used:"
+msgid "Account Revenue Used"
+msgstr ""
+
+msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
-msgctxt "field:product.category,supplier_taxes:0"
+msgctxt "field:product.category,customer_taxes_used:"
+msgid "Customer Taxes Used"
+msgstr ""
+
+msgctxt "field:product.category,supplier_taxes:"
msgid "Supplier Taxes"
msgstr ""
+msgctxt "field:product.category,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
+msgstr ""
+
+msgctxt "field:product.category,taxes_parent:"
+msgid "Use the Parent's Taxes"
+msgstr ""
+
#, fuzzy
-msgctxt "field:product.category-customer-account.tax,category:0"
+msgctxt "field:product.category-customer-account.tax,category:"
msgid "Category"
msgstr "Категории"
+msgctxt "field:product.category-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgctxt "field:product.category-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "field:product.category-customer-account.tax,tax:0"
+msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
msgstr ""
+msgctxt "field:product.category-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
#, fuzzy
-msgctxt "field:product.category-supplier-account.tax,category:0"
+msgctxt "field:product.category-supplier-account.tax,category:"
msgid "Category"
msgstr "Категории"
+msgctxt "field:product.category-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgctxt "field:product.category-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
msgstr ""
-msgctxt "field:product.template,account_category:0"
+msgctxt "field:product.category-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.template,account_category:"
msgid "Use Category's accounts"
msgstr ""
-msgctxt "field:product.template,account_expense:0"
+msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr ""
-msgctxt "field:product.template,account_expense_used:0"
+msgctxt "field:product.template,account_expense_used:"
msgid "Account Expense Used"
msgstr ""
-msgctxt "field:product.template,account_revenue:0"
+msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.template,account_revenue_used:0"
+msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
msgstr ""
-msgctxt "field:product.template,customer_taxes:0"
+msgctxt "field:product.template,customer_taxes:"
msgid "Customer Taxes"
msgstr ""
-msgctxt "field:product.template,customer_taxes_used:0"
+msgctxt "field:product.template,customer_taxes_used:"
msgid "Customer Taxes Used"
msgstr ""
-msgctxt "field:product.template,supplier_taxes:0"
+msgctxt "field:product.template,supplier_taxes:"
msgid "Supplier Taxes"
msgstr ""
-msgctxt "field:product.template,supplier_taxes_used:0"
-msgid "Customer Taxes Used"
+msgctxt "field:product.template,supplier_taxes_used:"
+msgid "Supplier Taxes Used"
msgstr ""
-msgctxt "field:product.template,taxes_category:0"
+msgctxt "field:product.template,taxes_category:"
msgid "Use Category's Taxes"
msgstr ""
+msgctxt "field:product.template-customer-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:product.template-customer-account.tax,product:0"
+msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
msgstr "Шаблон Товара"
#, fuzzy
-msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgctxt "field:product.template-customer-account.tax,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "field:product.template-customer-account.tax,tax:0"
+msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
msgstr ""
+msgctxt "field:product.template-customer-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:product.template-supplier-account.tax,product:0"
+msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
msgstr "Шаблон Товара"
#, fuzzy
-msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgctxt "field:product.template-supplier-account.tax,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
msgstr ""
-msgctxt "help:product.template,account_category:0"
+msgctxt "field:product.template-supplier-account.tax,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:product.category,account_parent:"
+msgid "Use the accounts defined on the parent category"
+msgstr ""
+
+msgctxt "help:product.category,taxes_parent:"
+msgid "Use the taxes defined on the parent category"
+msgstr ""
+
+msgctxt "help:product.template,account_category:"
msgid "Use the accounts defined on the category"
msgstr ""
-msgctxt "help:product.template,account_expense:0"
+msgctxt "help:product.template,account_expense:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
-msgctxt "help:product.template,account_revenue:0"
+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,taxes_category:0"
+msgctxt "help:product.template,taxes_category:"
msgid "Use the taxes defined on the category"
msgstr ""
-msgctxt "model:product.category-customer-account.tax,name:0"
+msgctxt "model:product.category-customer-account.tax,name:"
msgid "Category - Customer Tax"
msgstr ""
-msgctxt "model:product.category-supplier-account.tax,name:0"
+msgctxt "model:product.category-supplier-account.tax,name:"
msgid "Category - Supplier Tax"
msgstr ""
-msgctxt "model:product.template-customer-account.tax,name:0"
+msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr ""
-msgctxt "model:product.template-supplier-account.tax,name:0"
+msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr ""
#, fuzzy
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Регистрационные данные"
-msgctxt "view:product.category:0"
+msgctxt "view:product.category:"
+msgid "Accounts"
+msgstr ""
+
+msgctxt "view:product.category:"
msgid "Taxes"
msgstr ""
#, fuzzy
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Accounting"
msgstr "Регистрационные данные"
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Accounts"
msgstr ""
-msgctxt "view:product.template:0"
+msgctxt "view:product.template:"
msgid "Taxes"
msgstr ""
diff --git a/product.py b/product.py
index 34c3e8c..da96a2c 100644
--- a/product.py
+++ b/product.py
@@ -1,7 +1,8 @@
#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 copy
from trytond.model import ModelView, ModelSQL, fields
-from trytond.pyson import Eval
+from trytond.pyson import Eval, Or
from trytond.backend import TableHandler
from trytond.transaction import Transaction
from trytond.pool import Pool
@@ -10,26 +11,89 @@ from trytond.pool import Pool
class Category(ModelSQL, ModelView):
_name = 'product.category'
+ account_parent = fields.Boolean('Use Parent\'s accounts',
+ help='Use the accounts defined on the parent category')
account_expense = fields.Property(fields.Many2One('account.account',
'Account Expense', domain=[
('kind', '=', 'expense'),
('company', '=', Eval('context', {}).get('company', 0)),
], on_change=['account_expense'],
states={
- 'invisible': ~Eval('context', {}).get('company'),
- }))
- account_revenue = fields.Property(fields.Many2One( 'account.account',
+ 'invisible': (~Eval('context', {}).get('company')
+ | Eval('account_parent')),
+ },
+ depends=['account_parent']))
+ account_revenue = fields.Property(fields.Many2One('account.account',
'Account Revenue', domain=[
('kind', '=', 'revenue'),
('company', '=', Eval('context', {}).get('company', 0)),
], on_change=['account_revenue'],
states={
- 'invisible': ~Eval('context', {}).get('company'),
- }))
+ 'invisible': (~Eval('context', {}).get('company')
+ | Eval('account_parent')),
+ },
+ depends=['account_parent']))
+ account_expense_used = fields.Function(fields.Many2One('account.account',
+ 'Account Expense Used'), 'get_account')
+ account_revenue_used = fields.Function(fields.Many2One('account.account',
+ 'Account Revenue Used'), 'get_account')
+ taxes_parent = fields.Boolean('Use the Parent\'s Taxes',
+ help='Use the taxes defined on the parent category')
customer_taxes = fields.Many2Many('product.category-customer-account.tax',
- 'category', 'tax', 'Customer Taxes', domain=[('parent', '=', False)])
+ 'category', 'tax', 'Customer Taxes', domain=[('parent', '=', None)],
+ states={
+ 'invisible': (~Eval('context', {}).get('company')
+ | Eval('taxes_parent')),
+ },
+ depends=['taxes_parent'])
supplier_taxes = fields.Many2Many('product.category-supplier-account.tax',
- 'category', 'tax', 'Supplier Taxes', domain=[('parent', '=', False)])
+ 'category', 'tax', 'Supplier Taxes', domain=[('parent', '=', None)],
+ states={
+ 'invisible': (~Eval('context', {}).get('company')
+ | Eval('taxes_parent')),
+ },
+ depends=['taxes_parent'])
+ 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,
+ 'Supplier Taxes Used'), 'get_taxes')
+
+ def __init__(self):
+ super(Category, self).__init__()
+ self._error_messages.update({
+ 'missing_account': ('There is no account '
+ 'expense/revenue defined on the category '
+ '%s (%d)'),
+ })
+ self.parent = copy.copy(self.parent)
+ self.parent.states = copy.copy(self.parent.states)
+ self.parent.states['required'] = Or(
+ self.parent.states.get('required', False),
+ Eval('account_parent', False) | Eval('taxes_parent', False))
+ self.parent.depends = copy.copy(self.parent.depends)
+ self.parent.depends.extend(['account_parent', 'taxes_parent'])
+ self._reset_columns()
+
+ def get_account(self, ids, name):
+ accounts = {}
+ for category in self.browse(ids):
+ if category.account_parent:
+ accounts[category.id] = category.parent[name].id
+ elif category[name[:-5]]:
+ accounts[category.id] = category[name[:-5]].id
+ else:
+ self.raise_user_error('missing_account',
+ (category.name, category.id))
+ return accounts
+
+ def get_taxes(self, ids, name):
+ taxes = {}
+ for category in self.browse(ids):
+ if category.taxes_parent:
+ taxes[category.id] = [x.id for x in category.parent[name]]
+ else:
+ taxes[category.id] = [x.id for x in category[name[:-5]]]
+ return taxes
def on_change_account_expense(self, values):
account_obj = Pool().get('account.account')
@@ -62,7 +126,7 @@ class CategoryCustomerTax(ModelSQL):
_table = 'product_category_customer_taxes_rel'
_description = __doc__
category = fields.Many2One('product.category', 'Category',
- ondelete='CASCADE', select=1, required=True)
+ ondelete='CASCADE', select=True, required=True)
tax = fields.Many2One('account.tax', 'Tax', ondelete='RESTRICT',
required=True)
@@ -85,7 +149,7 @@ class CategorySupplierTax(ModelSQL):
_table = 'product_category_supplier_taxes_rel'
_description = __doc__
category = fields.Many2One('product.category', 'Category',
- ondelete='CASCADE', select=1, required=True)
+ ondelete='CASCADE', select=True, required=True)
tax = fields.Many2One('account.tax', 'Tax', ondelete='RESTRICT',
required=True)
@@ -135,13 +199,13 @@ class Template(ModelSQL, ModelView):
taxes_category = fields.Boolean('Use Category\'s Taxes',
help='Use the taxes defined on the category')
customer_taxes = fields.Many2Many('product.template-customer-account.tax',
- 'product', 'tax', 'Customer Taxes', domain=[('parent', '=', False)],
+ 'product', 'tax', 'Customer Taxes', domain=[('parent', '=', None)],
states={
'invisible': (~Eval('context', {}).get('company')
| Eval('taxes_category')),
}, depends=['taxes_category'])
supplier_taxes = fields.Many2Many('product.template-supplier-account.tax',
- 'product', 'tax', 'Supplier Taxes', domain=[('parent', '=', False)],
+ 'product', 'tax', 'Supplier Taxes', domain=[('parent', '=', None)],
states={
'invisible': (~Eval('context', {}).get('company')
| Eval('taxes_category')),
@@ -149,7 +213,7 @@ class Template(ModelSQL, ModelView):
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,
- 'Customer Taxes Used'), 'get_taxes')
+ 'Supplier Taxes Used'), 'get_taxes')
def __init__(self):
super(Template, self).__init__()
@@ -158,34 +222,38 @@ class Template(ModelSQL, ModelView):
'expense/revenue defined on the product ' \
'%s (%d)',
})
+ self.category = copy.copy(self.category)
+ self.category.states = copy.copy(self.category.states)
+ self.category.states['required'] = Or(
+ self.category.states.get('required', False),
+ Eval('account_category', False) | Eval('taxes_category', False))
+ self.category.depends = copy.copy(self.category.depends)
+ self.category.depends.extend(['account_category', 'taxes_category'])
+ self._reset_columns()
def default_taxes_category(self):
- return False
+ return None
def get_account(self, ids, name):
- account_obj = Pool().get('account.account')
- res = {}
- name = name[:-5]
+ accounts = {}
for product in self.browse(ids):
- if product[name]:
- res[product.id] = product[name].id
+ if product.account_category:
+ accounts[product.id] = product.category[name].id
+ elif product[name[:-5]]:
+ accounts[product.id] = product[name[:-5]].id
else:
- if product.category[name]:
- res[product.id] = product.category[name].id
- else:
- self.raise_user_error('missing_account',
- (product.name, product.id))
- return res
+ self.raise_user_error('missing_account',
+ (product.name, product.id))
+ return accounts
def get_taxes(self, ids, name):
- res = {}
- name = name[:-5]
+ taxes = {}
for product in self.browse(ids):
if product.taxes_category:
- res[product.id] = [x.id for x in product.category[name]]
+ taxes[product.id] = [x.id for x in product.category[name]]
else:
- res[product.id] = [x.id for x in product[name]]
- return res
+ taxes[product.id] = [x.id for x in product[name[:-5]]]
+ return taxes
def on_change_account_expense(self, values):
account_obj = Pool().get('account.account')
@@ -218,7 +286,7 @@ class TemplateCustomerTax(ModelSQL):
_table = 'product_customer_taxes_rel'
_description = __doc__
product = fields.Many2One('product.template', 'Product Template',
- ondelete='CASCADE', select=1, required=True)
+ ondelete='CASCADE', select=True, required=True)
tax = fields.Many2One('account.tax', 'Tax', ondelete='RESTRICT',
required=True)
@@ -231,7 +299,7 @@ class TemplateSupplierTax(ModelSQL):
_table = 'product_supplier_taxes_rel'
_description = __doc__
product = fields.Many2One('product.template', 'Product Template',
- ondelete='CASCADE', select=1, required=True)
+ ondelete='CASCADE', select=True, required=True)
tax = fields.Many2One('account.tax', 'Tax', ondelete='RESTRICT',
required=True)
diff --git a/product.xml b/product.xml
index 1195cc7..396a193 100644
--- a/product.xml
+++ b/product.xml
@@ -14,11 +14,18 @@ this repository contains the full copyright notices and license terms. -->
expr="/form/notebook/page[@id="childs"]"
position="before">
<page string="Accounting" col="4" id="accounting">
+ <separator string="Accounts" id="accounts" colspan="4"/>
+ <label name="account_parent"/>
+ <field name="account_parent"/>
+ <newline/>
<label name="account_revenue"/>
<field name="account_revenue"/>
<label name="account_expense"/>
<field name="account_expense"/>
<separator string="Taxes" id="taxes" colspan="4"/>
+ <label name="taxes_parent"/>
+ <field name="taxes_parent"/>
+ <newline/>
<field name="customer_taxes" colspan="2"/>
<field name="supplier_taxes" colspan="2"/>
</page>
diff --git a/setup.py b/setup.py
index df0aeb8..c4fa32b 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
(dep, major_version, minor_version, major_version,
minor_version + 1))
diff --git a/tests/__init__.py b/tests/__init__.py
index 5c8aef2..95c1770 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#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
+from .test_account_product import suite
diff --git a/tests/test_account_product.py b/tests/test_account_product.py
index 6562f44..27b4cba 100644
--- a/tests/test_account_product.py
+++ b/tests/test_account_product.py
@@ -2,7 +2,8 @@
#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 sys, os
+import sys
+import os
DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
'..', '..', '..', '..', '..', 'trytond')))
if os.path.isdir(DIR):
@@ -33,6 +34,7 @@ class AccountProductTestCase(unittest.TestCase):
'''
test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
index 567f510..1c8771d 100644
--- a/trytond_account_product.egg-info/PKG-INFO
+++ b/trytond_account_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-product
-Version: 2.2.0
+Version: 2.4.0
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_account_product.egg-info/SOURCES.txt b/trytond_account_product.egg-info/SOURCES.txt
index 92d53ef..1bfc076 100644
--- a/trytond_account_product.egg-info/SOURCES.txt
+++ b/trytond_account_product.egg-info/SOURCES.txt
@@ -12,8 +12,10 @@ setup.py
./tests/__init__.py
./tests/test_account_product.py
locale/bg_BG.po
+locale/ca_ES.po
locale/cs_CZ.po
locale/de_DE.po
+locale/es_AR.po
locale/es_CO.po
locale/es_ES.po
locale/fr_FR.po
diff --git a/trytond_account_product.egg-info/requires.txt b/trytond_account_product.egg-info/requires.txt
index e9148de..23cdd79 100644
--- a/trytond_account_product.egg-info/requires.txt
+++ b/trytond_account_product.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_account >= 2.2, < 2.3
-trytond_company >= 2.2, < 2.3
-trytond_product >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_account >= 2.4, < 2.5
+trytond_company >= 2.4, < 2.5
+trytond_product >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
commit f413addf16444da46c6b98e16e8509c39b89e0b4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:20:29 2011 +0100
Adding upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 6dc3e78..c41ff0e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.0 - 2011-10-24
+* Bug fixes (see mercurial logs for details)
+
Version 2.0.0 - 2011-04-27
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index 5343ad8..7f5d5fd 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,4 +6,4 @@ include CHANGELOG
include LICENSE
include *.xml
include *.odt
-include *.csv
+include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 20843d3..221bdb8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_product
-Version: 2.0.0
+Version: 2.2.0
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
@@ -9,23 +9,25 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index b7a8aef..e8388b1 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_ES': 'Contabilidad de productos',
'name_fr_FR': 'Compte produit',
'name_nl_NL': 'Boekhouding voor producten',
- 'version': '2.0.0',
+ 'version': '2.2.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -50,11 +50,13 @@
'product.xml',
],
'translation': [
- 'bg_BG.csv',
- 'de_DE.csv',
- 'es_CO.csv',
- 'es_ES.csv',
- 'fr_FR.csv',
- 'nl_NL.csv',
+ 'locale/bg_BG.po',
+ 'locale/cs_CZ.po',
+ 'locale/de_DE.po',
+ 'locale/es_CO.po',
+ 'locale/es_ES.po',
+ 'locale/fr_FR.po',
+ 'locale/nl_NL.po',
+ 'locale/ru_RU.po',
]
}
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index 8b21341..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,42 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.template,0,There is no account expense/revenue defined on the product %s (%d),Няма зададен сметка за разходи/приходи за продукт %s (%d),0
-field,"product.category,account_expense",0,Account Expense,Разходи за сметка,0
-field,"product.category,account_revenue",0,Account Revenue,Приход по сметка,0
-field,"product.category,customer_taxes",0,Customer Taxes,Данъци на клиенти,0
-field,"product.category,supplier_taxes",0,Supplier Taxes,Данъци на доставчик,0
-field,"product.category-customer-account.tax,category",0,Category,Категория,0
-field,"product.category-customer-account.tax,product",0,Category,Категория,0
-field,"product.category-customer-account.tax,rec_name",0,Name,Име,0
-field,"product.category-customer-account.tax,tax",0,Tax,Данък,0
-field,"product.category-supplier-account.tax,category",0,Category,Категория,0
-field,"product.category-supplier-account.tax,product",0,Category,Категория,0
-field,"product.category-supplier-account.tax,rec_name",0,Name,Име,0
-field,"product.category-supplier-account.tax,tax",0,Tax,Данък,0
-field,"product.template,account_category",0,Use Category's accounts,Използване на сметките за категорията,0
-field,"product.template,account_expense",0,Account Expense,Разходи за сметка,0
-field,"product.template,account_expense_used",0,Account Expense Used,Използвани разходи по сметка,0
-field,"product.template,account_revenue",0,Account Revenue,Приход по сметка,0
-field,"product.template,account_revenue_used",0,Account Revenue Used,Използвани разходи по сметка,0
-field,"product.template,customer_taxes",0,Customer Taxes,Данъци на клиенти,0
-field,"product.template,customer_taxes_used",0,Customer Taxes Used,Използвани данъци на клиенти,0
-field,"product.template,supplier_taxes",0,Supplier Taxes,Данъци на доставчик,0
-field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Използвани данъци на клиенти,0
-field,"product.template,taxes_category",0,Use Category's Taxes,Използване на данъците за категорията,0
-field,"product.template-customer-account.tax,product",0,Product Template,Щаблон за продукт,0
-field,"product.template-customer-account.tax,rec_name",0,Name,Име,0
-field,"product.template-customer-account.tax,tax",0,Tax,Данък,0
-field,"product.template-supplier-account.tax,product",0,Product Template,Щаблон за продукт,0
-field,"product.template-supplier-account.tax,rec_name",0,Name,Име,0
-field,"product.template-supplier-account.tax,tax",0,Tax,Данък,0
-help,"product.template,account_category",0,Use the accounts defined on the category,Използване на сметките зададени за категорията,0
-help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Ще се използва тази сметка вместо тази зададена за категорията,0
-help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Ще се използва тази сметка вместо тази зададена за категорията,0
-help,"product.template,taxes_category",0,Use the taxes defined on the category,Използване на данъците зададени за категорията,0
-model,"product.category-customer-account.tax,name",0,Category - Customer Tax,Категория - Данък на клиент,0
-model,"product.category-supplier-account.tax,name",0,Category - Supplier Tax,Категория - Данъци на доставчик,0
-model,"product.template-customer-account.tax,name",0,Product Template - Customer Tax,Шаблон на продукт - Данък на клиент,0
-model,"product.template-supplier-account.tax,name",0,Product Template - Supplier Tax,Шаблон на продукт - Данък на доставчик,0
-view,product.category,0,Accounting,Счетоводство,0
-view,product.template,0,Accounting,Счетоводство,0
-view,product.template,0,Accounts,Сметки,0
-view,product.template,0,Taxes,Данъци,0
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index 9651b9e..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.template,0,There is no account expense/revenue defined on the product %s (%d),Es ist kein Aufwands-/Ertragskonto definiert für Artikel %s (%d)!,0
-field,"product.category,account_expense",0,Account Expense,Konto Aufwand,0
-field,"product.category,account_revenue",0,Account Revenue,Konto Ertrag,0
-field,"product.category,customer_taxes",0,Customer Taxes,Steuern Kunde,0
-field,"product.category,supplier_taxes",0,Supplier Taxes,Steuern Lieferant,0
-field,"product.category-customer-account.tax,category",0,Category,Kategorie,0
-field,"product.category-customer-account.tax,rec_name",0,Name,Name,0
-field,"product.category-customer-account.tax,tax",0,Tax,Steuer,0
-field,"product.category-supplier-account.tax,category",0,Category,Kategorie,0
-field,"product.category-supplier-account.tax,rec_name",0,Name,Name,0
-field,"product.category-supplier-account.tax,tax",0,Tax,Steuer,0
-field,"product.template,account_category",0,Use Category's accounts,Konten der Kategorie anwenden,0
-field,"product.template,account_expense",0,Account Expense,Konto Aufwand,0
-field,"product.template,account_expense_used",0,Account Expense Used,Konto Aufwand Benutzt,0
-field,"product.template,account_revenue",0,Account Revenue,Konto Ertrag,0
-field,"product.template,account_revenue_used",0,Account Revenue Used,Verwendetes Ertragskonto,0
-field,"product.template,customer_taxes",0,Customer Taxes,Steuern (Kunden),0
-field,"product.template,customer_taxes_used",0,Customer Taxes Used,Benutzte Steuern für Kunden,0
-field,"product.template,supplier_taxes",0,Supplier Taxes,Steuern (Lieferanten),0
-field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Benutzte Steuern für Lieferanten,0
-field,"product.template,taxes_category",0,Use Category's Taxes,Steuern der Kategorie anwenden,0
-field,"product.template-customer-account.tax,product",0,Product Template,Artikelvorlage,0
-field,"product.template-customer-account.tax,rec_name",0,Name,Name,0
-field,"product.template-customer-account.tax,tax",0,Tax,Steuer,0
-field,"product.template-supplier-account.tax,product",0,Product Template,Artikelvorlage,0
-field,"product.template-supplier-account.tax,rec_name",0,Name,Name,0
-field,"product.template-supplier-account.tax,tax",0,Tax,Steuer,0
-help,"product.template,account_category",0,Use the accounts defined on the category,"Wendet die Konten an, die in der Artikelkategorie definiert sind",0
-help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Dieses Konto überschreibt das Konto welches in der Kategorie eingestellt ist.,0
-help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Dieses Konto überschreibt das Konto welches in der Kategorie eingestellt ist.,0
-help,"product.template,taxes_category",0,Use the taxes defined on the category,"Wendet die Steuern an, die in der Artikelkategorie definiert sind",0
-model,"product.category-customer-account.tax,name",0,Category - Customer Tax,Artikelkategorie - Steuer Kunde,0
-model,"product.category-supplier-account.tax,name",0,Category - Supplier Tax,Artikelkategorie - Steuer Lieferant,0
-model,"product.template-customer-account.tax,name",0,Product Template - Customer Tax,Artikelvorlage - Steuer Kunde,0
-model,"product.template-supplier-account.tax,name",0,Product Template - Supplier Tax,Artikelvorlage - Steuer Lieferant,0
-view,product.category,0,Accounting,Buchhaltung,0
-view,product.category,0,Taxes,Steuern,0
-view,product.product,0,Accounting,Buchhaltung,0
-view,product.product,0,Taxes,Steuern,0
-view,product.template,0,Accounting,Buchhaltung,0
-view,product.template,0,Accounts,Konten,0
-view,product.template,0,Taxes,Steuern,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index cefe9a8..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,42 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.template,0,There is no account expense/revenue defined on the product %s (%d),No hay una cuenta gastos/ingresos definida para el producto %s (%d),0
-field,"product.category,account_expense",0,Account Expense,Cuenta de Gastos,0
-field,"product.category,account_revenue",0,Account Revenue,Cuenta de Ingresos,0
-field,"product.category-customer-account.tax,product",0,Category,Categoría,0
-field,"product.category-customer-account.tax,rec_name",0,Name,Nombre,0
-field,"product.category-customer-account.tax,tax",0,Tax,Impuesto,0
-field,"product.category,customer_taxes",0,Customer Taxes,Impuestos del Cliente,0
-field,"product.category-supplier-account.tax,product",0,Category,Categoría,0
-field,"product.category-supplier-account.tax,rec_name",0,Name,Nombre,0
-field,"product.category-supplier-account.tax,tax",0,Tax,Impuesto,0
-field,"product.category,supplier_taxes",0,Supplier Taxes,Impuestos a Proveedores,0
-field,"product.template,account_category",0,Use Category's accounts,Use las cuentas de Categoría,0
-field,"product.template,account_expense",0,Account Expense,Cuenta de Gastos,0
-field,"product.template,account_expense_used",0,Account Expense Used,Cuenta de Gastos Usada,0
-field,"product.template,account_revenue",0,Account Revenue,Cuenta de Ingresos,0
-field,"product.template,account_revenue_used",0,Account Revenue Used,Cuenta de Ingresos Usada,0
-field,"product.template-customer-account.tax,product",0,Product Template,Plantilla de Producto,0
-field,"product.template-customer-account.tax,rec_name",0,Name,Nombre,0
-field,"product.template-customer-account.tax,tax",0,Tax,Impuesto,0
-field,"product.template,customer_taxes",0,Customer Taxes,Impuestos del Cliente,0
-field,"product.template,customer_taxes_used",0,Customer Taxes Used,Impuestos del Cliente Usados,0
-field,"product.template-supplier-account.tax,product",0,Product Template,Plantilla de Producto,0
-field,"product.template-supplier-account.tax,rec_name",0,Name,Nombre,0
-field,"product.template-supplier-account.tax,tax",0,Tax,Impuesto,0
-field,"product.template,supplier_taxes",0,Supplier Taxes,Impuestos a Proveedores,0
-field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Impuestos del Cliente Usados,0
-field,"product.template,taxes_category",0,Use Category's Taxes,Categorías de Impuesto,0
-help,"product.template,account_category",0,Use the accounts defined on the category,Use las cuentas definidas en la categoría,0
-help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Esta cuenta se usará en lugar de la definida en la categoría.,0
-help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Esta cuenta se usará en lugar de la definida en la categoría.,0
-help,"product.template,taxes_category",0,Use the taxes defined on the category,Usar los impuestos definidos en la categoría,0
-model,"product.category-customer-account.tax,name",0,Category - Customer Tax,Categoría - Impuestos Cliente,0
-model,"product.category-supplier-account.tax,name",0,Category - Supplier Tax,Categoría - Impuestos Proveedor,0
-model,"product.template-customer-account.tax,name",0,Product Template - Customer Tax,Plantilla Producto - Impuestos Cliente,0
-model,"product.template-supplier-account.tax,name",0,Product Template - Supplier Tax,Plantilla Producto - Impuestos Proveedor,0
-view,product.category,0,Accounting,Contabilidad,0
-view,product.category,0,Taxes,Impuestos,0
-view,product.product,0,Accounting,Contabilidad,0
-view,product.template,0,Accounting,Contabilidad,0
-view,product.template,0,Accounts,Cuentas,0
-view,product.template,0,Taxes,Impuestos,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index c3f31ee..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,42 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.template,0,There is no account expense/revenue defined on the product %s (%d),No hay ninguna cuenta de gastos/ingresos definida para el producto %s (%d),0
-field,"product.category,account_expense",0,Account Expense,Cuenta de gastos,0
-field,"product.category,account_revenue",0,Account Revenue,Cuenta de ingresos,0
-field,"product.category-customer-account.tax,product",0,Category,Categoría,0
-field,"product.category-customer-account.tax,rec_name",0,Name,Nombre,0
-field,"product.category-customer-account.tax,tax",0,Tax,Impuesto,0
-field,"product.category,customer_taxes",0,Customer Taxes,Impuestos de cliente,0
-field,"product.category-supplier-account.tax,product",0,Category,Categoría,0
-field,"product.category-supplier-account.tax,rec_name",0,Name,Nombre,0
-field,"product.category-supplier-account.tax,tax",0,Tax,Impuesto,0
-field,"product.category,supplier_taxes",0,Supplier Taxes,Impuestos de proveedor,0
-field,"product.template,account_category",0,Use Category's accounts,Usar las cuentas de la categoría,0
-field,"product.template,account_expense",0,Account Expense,Cuenta de gasto,0
-field,"product.template,account_expense_used",0,Account Expense Used,Cuenta de gasto usada,0
-field,"product.template,account_revenue",0,Account Revenue,Cuenta de ingresos,0
-field,"product.template,account_revenue_used",0,Account Revenue Used,Cuenta de ingresos usada,0
-field,"product.template-customer-account.tax,product",0,Product Template,Plantilla de producto,0
-field,"product.template-customer-account.tax,rec_name",0,Name,Nombre,0
-field,"product.template-customer-account.tax,tax",0,Tax,Impuesto,0
-field,"product.template,customer_taxes",0,Customer Taxes,Impuestos de cliente,0
-field,"product.template,customer_taxes_used",0,Customer Taxes Used,Impuestos de cliente usados,0
-field,"product.template-supplier-account.tax,product",0,Product Template,Plantilla de producto,0
-field,"product.template-supplier-account.tax,rec_name",0,Name,Nombre,0
-field,"product.template-supplier-account.tax,tax",0,Tax,Impuesto,0
-field,"product.template,supplier_taxes",0,Supplier Taxes,Impuestos de proveedores,0
-field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Impuestos de cliente usados,0
-field,"product.template,taxes_category",0,Use Category's Taxes,Usar los impuestos de la categoría,0
-help,"product.template,account_category",0,Use the accounts defined on the category,Usar las cuentas definidas en la categoría,0
-help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Esta cuenta se usará en lugar de la definida en la categoría.,0
-help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Esta cuenta se usará en lugar de la definida en la categoría.,0
-help,"product.template,taxes_category",0,Use the taxes defined on the category,Usar los impuestos definidos en la categoría,0
-model,"product.category-customer-account.tax,name",0,Category - Customer Tax,Categoría - Impuesto de cliente,0
-model,"product.category-supplier-account.tax,name",0,Category - Supplier Tax,Categoría - Impuesto de proveedor,0
-model,"product.template-customer-account.tax,name",0,Product Template - Customer Tax,Plantilla de producto - Impuesto de cliente,0
-model,"product.template-supplier-account.tax,name",0,Product Template - Supplier Tax,Plantilla de producto - Impuesto de proveedor,0
-view,product.category,0,Accounting,Contabilidad,0
-view,product.category,0,Taxes,Impuestos,0
-view,product.product,0,Accounting,Contabilidad,0
-view,product.template,0,Accounting,Contabilidad,0
-view,product.template,0,Accounts,Cuentas,0
-view,product.template,0,Taxes,Impuestos,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index 94214f1..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,41 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.template,0,There is no account expense/revenue defined on the product %s (%d),Il n'y a pas de compte charges/produits définit sur le produit %s (%d),0
-field,"product.category,account_expense",0,Account Expense,Compte de charges,0
-field,"product.category,account_revenue",0,Account Revenue,Compte de produits,0
-field,"product.category,customer_taxes",0,Customer Taxes,Taxes client,0
-field,"product.category,supplier_taxes",0,Supplier Taxes,Taxes fournisseur,0
-field,"product.category-customer-account.tax,category",0,Category,Catégorie,0
-field,"product.category-customer-account.tax,rec_name",0,Name,Nom,0
-field,"product.category-customer-account.tax,tax",0,Tax,Taxe,0
-field,"product.category-supplier-account.tax,category",0,Category,Catégorie,0
-field,"product.category-supplier-account.tax,rec_name",0,Name,Nom,0
-field,"product.category-supplier-account.tax,tax",0,Tax,Taxe,0
-field,"product.template,account_category",0,Use Category's accounts,Utiliser les comptes de la catégorie,0
-field,"product.template,account_expense",0,Account Expense,Compte de charge,0
-field,"product.template,account_expense_used",0,Account Expense Used,Compte de charges utilisé,0
-field,"product.template,account_revenue",0,Account Revenue,Compte de produits,0
-field,"product.template,account_revenue_used",0,Account Revenue Used,Compte de produits utilisé,0
-field,"product.template,customer_taxes",0,Customer Taxes,Taxes Client,0
-field,"product.template,customer_taxes_used",0,Customer Taxes Used,Taxes utilisées,0
-field,"product.template,supplier_taxes",0,Supplier Taxes,Taxes Fournisseur,0
-field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Taxes client utilisées,0
-field,"product.template,taxes_category",0,Use Category's Taxes,Utiliser les taxes de la catégorie,0
-field,"product.template-customer-account.tax,product",0,Product Template,Modèle produit,0
-field,"product.template-customer-account.tax,rec_name",0,Name,Nom,0
-field,"product.template-customer-account.tax,tax",0,Tax,Taxe,0
-field,"product.template-supplier-account.tax,product",0,Product Template,Modèle produit,0
-field,"product.template-supplier-account.tax,rec_name",0,Name,Nom,0
-field,"product.template-supplier-account.tax,tax",0,Tax,Taxe,0
-help,"product.template,account_category",0,Use the accounts defined on the category,Utiliser les comptes définis sur la catégorie,0
-help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Ce compte sera utilisé au lieu de celui défini sur la catégorie.,0
-help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Ce compte sera utilisé au lieu de celui défini sur la catégorie.,0
-help,"product.template,taxes_category",0,Use the taxes defined on the category,Utiliser les taxes de la catégorie,0
-model,"product.category-customer-account.tax,name",0,Category - Customer Tax,Catégorie - Taxe client,0
-model,"product.category-supplier-account.tax,name",0,Category - Supplier Tax,Catégorie - Taxe fournisseur,0
-model,"product.template-customer-account.tax,name",0,Product Template - Customer Tax,Modèle du produit - Taxe client,0
-model,"product.template-supplier-account.tax,name",0,Product Template - Supplier Tax,Modèle du produit - Taxe fournisseur,0
-view,product.category,0,Accounting,Comptabilité,0
-view,product.product,0,Accounting,Comptabilité,0
-view,product.template,0,Accounting,Comptabilité,0
-view,product.template,0,Accounts,Comptes,0
-view,product.template,0,Taxes,Taxes,0
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..2dd7d68
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,164 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.template:0"
+msgid "There is no account expense/revenue defined on the product %s (%d)"
+msgstr "Няма зададен сметка за разходи/приходи за продукт %s (%d)"
+
+msgctxt "field:product.category,account_expense:0"
+msgid "Account Expense"
+msgstr "Разходи за сметка"
+
+msgctxt "field:product.category,account_revenue:0"
+msgid "Account Revenue"
+msgstr "Приход по сметка"
+
+msgctxt "field:product.category,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr "Данъци на клиенти"
+
+msgctxt "field:product.category,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr "Данъци на доставчик"
+
+msgctxt "field:product.category-customer-account.tax,category:0"
+msgid "Category"
+msgstr "Категория"
+
+msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:product.category-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr "Данък"
+
+msgctxt "field:product.category-supplier-account.tax,category:0"
+msgid "Category"
+msgstr "Категория"
+
+msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr "Данък"
+
+msgctxt "field:product.template,account_category:0"
+msgid "Use Category's accounts"
+msgstr "Използване на сметките за категорията"
+
+msgctxt "field:product.template,account_expense:0"
+msgid "Account Expense"
+msgstr "Разходи за сметка"
+
+msgctxt "field:product.template,account_expense_used:0"
+msgid "Account Expense Used"
+msgstr "Използвани разходи по сметка"
+
+msgctxt "field:product.template,account_revenue:0"
+msgid "Account Revenue"
+msgstr "Приход по сметка"
+
+msgctxt "field:product.template,account_revenue_used:0"
+msgid "Account Revenue Used"
+msgstr "Използвани разходи по сметка"
+
+msgctxt "field:product.template,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr "Данъци на клиенти"
+
+msgctxt "field:product.template,customer_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr "Използвани данъци на клиенти"
+
+msgctxt "field:product.template,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr "Данъци на доставчик"
+
+msgctxt "field:product.template,supplier_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr "Използвани данъци на клиенти"
+
+msgctxt "field:product.template,taxes_category:0"
+msgid "Use Category's Taxes"
+msgstr "Използване на данъците за категорията"
+
+msgctxt "field:product.template-customer-account.tax,product:0"
+msgid "Product Template"
+msgstr "Щаблон за продукт"
+
+msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:product.template-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr "Данък"
+
+msgctxt "field:product.template-supplier-account.tax,product:0"
+msgid "Product Template"
+msgstr "Щаблон за продукт"
+
+msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr "Данък"
+
+msgctxt "help:product.template,account_category:0"
+msgid "Use the accounts defined on the category"
+msgstr "Използване на сметките зададени за категорията"
+
+msgctxt "help:product.template,account_expense:0"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "Ще се използва тази сметка вместо тази зададена за категорията"
+
+msgctxt "help:product.template,account_revenue:0"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "Ще се използва тази сметка вместо тази зададена за категорията"
+
+msgctxt "help:product.template,taxes_category:0"
+msgid "Use the taxes defined on the category"
+msgstr "Използване на данъците зададени за категорията"
+
+msgctxt "model:product.category-customer-account.tax,name:0"
+msgid "Category - Customer Tax"
+msgstr "Категория - Данък на клиент"
+
+msgctxt "model:product.category-supplier-account.tax,name:0"
+msgid "Category - Supplier Tax"
+msgstr "Категория - Данъци на доставчик"
+
+msgctxt "model:product.template-customer-account.tax,name:0"
+msgid "Product Template - Customer Tax"
+msgstr "Шаблон на продукт - Данък на клиент"
+
+msgctxt "model:product.template-supplier-account.tax,name:0"
+msgid "Product Template - Supplier Tax"
+msgstr "Шаблон на продукт - Данък на доставчик"
+
+msgctxt "view:product.category:0"
+msgid "Accounting"
+msgstr "Счетоводство"
+
+#, fuzzy
+msgctxt "view:product.category:0"
+msgid "Taxes"
+msgstr "Данъци"
+
+msgctxt "view:product.template:0"
+msgid "Accounting"
+msgstr "Счетоводство"
+
+msgctxt "view:product.template:0"
+msgid "Accounts"
+msgstr "Сметки"
+
+msgctxt "view:product.template:0"
+msgid "Taxes"
+msgstr "Данъци"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..626688e
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,163 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.template:0"
+msgid "There is no account expense/revenue defined on the product %s (%d)"
+msgstr ""
+
+msgctxt "field:product.category,account_expense:0"
+msgid "Account Expense"
+msgstr ""
+
+msgctxt "field:product.category,account_revenue:0"
+msgid "Account Revenue"
+msgstr ""
+
+msgctxt "field:product.category,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr ""
+
+msgctxt "field:product.category,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,category:0"
+msgid "Category"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.category-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,category:0"
+msgid "Category"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr ""
+
+msgctxt "field:product.template,account_category:0"
+msgid "Use Category's accounts"
+msgstr ""
+
+msgctxt "field:product.template,account_expense:0"
+msgid "Account Expense"
+msgstr ""
+
+msgctxt "field:product.template,account_expense_used:0"
+msgid "Account Expense Used"
+msgstr ""
+
+msgctxt "field:product.template,account_revenue:0"
+msgid "Account Revenue"
+msgstr ""
+
+msgctxt "field:product.template,account_revenue_used:0"
+msgid "Account Revenue Used"
+msgstr ""
+
+msgctxt "field:product.template,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr ""
+
+msgctxt "field:product.template,customer_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr ""
+
+msgctxt "field:product.template,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr ""
+
+msgctxt "field:product.template,supplier_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr ""
+
+msgctxt "field:product.template,taxes_category:0"
+msgid "Use Category's Taxes"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,product:0"
+msgid "Product Template"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.template-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,product:0"
+msgid "Product Template"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr ""
+
+msgctxt "help:product.template,account_category:0"
+msgid "Use the accounts defined on the category"
+msgstr ""
+
+msgctxt "help:product.template,account_expense:0"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.template,account_revenue:0"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.template,taxes_category:0"
+msgid "Use the taxes defined on the category"
+msgstr ""
+
+msgctxt "model:product.category-customer-account.tax,name:0"
+msgid "Category - Customer Tax"
+msgstr ""
+
+msgctxt "model:product.category-supplier-account.tax,name:0"
+msgid "Category - Supplier Tax"
+msgstr ""
+
+msgctxt "model:product.template-customer-account.tax,name:0"
+msgid "Product Template - Customer Tax"
+msgstr ""
+
+msgctxt "model:product.template-supplier-account.tax,name:0"
+msgid "Product Template - Supplier Tax"
+msgstr ""
+
+msgctxt "view:product.category:0"
+msgid "Accounting"
+msgstr ""
+
+msgctxt "view:product.category:0"
+msgid "Taxes"
+msgstr ""
+
+msgctxt "view:product.template:0"
+msgid "Accounting"
+msgstr ""
+
+msgctxt "view:product.template:0"
+msgid "Accounts"
+msgstr ""
+
+msgctxt "view:product.template:0"
+msgid "Taxes"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..671f939
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,175 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.template:0"
+msgid "There is no account expense/revenue defined on the product %s (%d)"
+msgstr "Es ist kein Aufwands-/Ertragskonto definiert für Artikel %s (%d)!"
+
+msgctxt "field:product.category,account_expense:0"
+msgid "Account Expense"
+msgstr "Konto Aufwand"
+
+msgctxt "field:product.category,account_revenue:0"
+msgid "Account Revenue"
+msgstr "Konto Ertrag"
+
+msgctxt "field:product.category,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr "Steuern Kunde"
+
+msgctxt "field:product.category,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr "Steuern Lieferant"
+
+msgctxt "field:product.category-customer-account.tax,category:0"
+msgid "Category"
+msgstr "Kategorie"
+
+msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.category-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr "Steuer"
+
+msgctxt "field:product.category-supplier-account.tax,category:0"
+msgid "Category"
+msgstr "Kategorie"
+
+msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr "Steuer"
+
+msgctxt "field:product.template,account_category:0"
+msgid "Use Category's accounts"
+msgstr "Konten der Kategorie anwenden"
+
+msgctxt "field:product.template,account_expense:0"
+msgid "Account Expense"
+msgstr "Konto Aufwand"
+
+msgctxt "field:product.template,account_expense_used:0"
+msgid "Account Expense Used"
+msgstr "Konto Aufwand Benutzt"
+
+msgctxt "field:product.template,account_revenue:0"
+msgid "Account Revenue"
+msgstr "Konto Ertrag"
+
+msgctxt "field:product.template,account_revenue_used:0"
+msgid "Account Revenue Used"
+msgstr "Verwendetes Ertragskonto"
+
+msgctxt "field:product.template,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr "Steuern (Kunden)"
+
+msgctxt "field:product.template,customer_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr "Benutzte Steuern für Kunden"
+
+msgctxt "field:product.template,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr "Steuern (Lieferanten)"
+
+msgctxt "field:product.template,supplier_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr "Benutzte Steuern für Lieferanten"
+
+msgctxt "field:product.template,taxes_category:0"
+msgid "Use Category's Taxes"
+msgstr "Steuern der Kategorie anwenden"
+
+msgctxt "field:product.template-customer-account.tax,product:0"
+msgid "Product Template"
+msgstr "Artikelvorlage"
+
+msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.template-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr "Steuer"
+
+msgctxt "field:product.template-supplier-account.tax,product:0"
+msgid "Product Template"
+msgstr "Artikelvorlage"
+
+msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr "Steuer"
+
+msgctxt "help:product.template,account_category:0"
+msgid "Use the accounts defined on the category"
+msgstr "Wendet die Konten an, die in der Artikelkategorie definiert sind"
+
+msgctxt "help:product.template,account_expense:0"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+"Dieses Konto überschreibt das Konto welches in der Kategorie eingestellt "
+"ist."
+
+msgctxt "help:product.template,account_revenue:0"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+"Dieses Konto überschreibt das Konto welches in der Kategorie eingestellt "
+"ist."
+
+msgctxt "help:product.template,taxes_category:0"
+msgid "Use the taxes defined on the category"
+msgstr "Wendet die Steuern an, die in der Artikelkategorie definiert sind"
+
+msgctxt "model:product.category-customer-account.tax,name:0"
+msgid "Category - Customer Tax"
+msgstr "Artikelkategorie - Steuer Kunde"
+
+msgctxt "model:product.category-supplier-account.tax,name:0"
+msgid "Category - Supplier Tax"
+msgstr "Artikelkategorie - Steuer Lieferant"
+
+msgctxt "model:product.template-customer-account.tax,name:0"
+msgid "Product Template - Customer Tax"
+msgstr "Artikelvorlage - Steuer Kunde"
+
+msgctxt "model:product.template-supplier-account.tax,name:0"
+msgid "Product Template - Supplier Tax"
+msgstr "Artikelvorlage - Steuer Lieferant"
+
+msgctxt "view:product.category:0"
+msgid "Accounting"
+msgstr "Buchhaltung"
+
+msgctxt "view:product.category:0"
+msgid "Taxes"
+msgstr "Steuern"
+
+msgctxt "view:product.product:0"
+msgid "Accounting"
+msgstr "Buchhaltung"
+
+msgctxt "view:product.product:0"
+msgid "Taxes"
+msgstr "Steuern"
+
+msgctxt "view:product.template:0"
+msgid "Accounting"
+msgstr "Buchhaltung"
+
+msgctxt "view:product.template:0"
+msgid "Accounts"
+msgstr "Konten"
+
+msgctxt "view:product.template:0"
+msgid "Taxes"
+msgstr "Steuern"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..710b31d
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,169 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.template:0"
+msgid "There is no account expense/revenue defined on the product %s (%d)"
+msgstr "No hay una cuenta gastos/ingresos definida para el producto %s (%d)"
+
+msgctxt "field:product.category,account_expense:0"
+msgid "Account Expense"
+msgstr "Cuenta de Gastos"
+
+msgctxt "field:product.category,account_revenue:0"
+msgid "Account Revenue"
+msgstr "Cuenta de Ingresos"
+
+msgctxt "field:product.category,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr "Impuestos del Cliente"
+
+msgctxt "field:product.category,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr "Impuestos a Proveedores"
+
+#, fuzzy
+msgctxt "field:product.category-customer-account.tax,category:0"
+msgid "Category"
+msgstr "Categoría"
+
+msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.category-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr "Impuesto"
+
+#, fuzzy
+msgctxt "field:product.category-supplier-account.tax,category:0"
+msgid "Category"
+msgstr "Categoría"
+
+msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr "Impuesto"
+
+msgctxt "field:product.template,account_category:0"
+msgid "Use Category's accounts"
+msgstr "Use las cuentas de Categoría"
+
+msgctxt "field:product.template,account_expense:0"
+msgid "Account Expense"
+msgstr "Cuenta de Gastos"
+
+msgctxt "field:product.template,account_expense_used:0"
+msgid "Account Expense Used"
+msgstr "Cuenta de Gastos Usada"
+
+msgctxt "field:product.template,account_revenue:0"
+msgid "Account Revenue"
+msgstr "Cuenta de Ingresos"
+
+msgctxt "field:product.template,account_revenue_used:0"
+msgid "Account Revenue Used"
+msgstr "Cuenta de Ingresos Usada"
+
+msgctxt "field:product.template,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr "Impuestos del Cliente"
+
+msgctxt "field:product.template,customer_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr "Impuestos del Cliente Usados"
+
+msgctxt "field:product.template,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr "Impuestos a Proveedores"
+
+msgctxt "field:product.template,supplier_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr "Impuestos del Cliente Usados"
+
+msgctxt "field:product.template,taxes_category:0"
+msgid "Use Category's Taxes"
+msgstr "Categorías de Impuesto"
+
+msgctxt "field:product.template-customer-account.tax,product:0"
+msgid "Product Template"
+msgstr "Plantilla de Producto"
+
+msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.template-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr "Impuesto"
+
+msgctxt "field:product.template-supplier-account.tax,product:0"
+msgid "Product Template"
+msgstr "Plantilla de Producto"
+
+msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr "Impuesto"
+
+msgctxt "help:product.template,account_category:0"
+msgid "Use the accounts defined on the category"
+msgstr "Use las cuentas definidas en la categoría"
+
+msgctxt "help:product.template,account_expense:0"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "Esta cuenta se usará en lugar de la definida en la categoría."
+
+msgctxt "help:product.template,account_revenue:0"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "Esta cuenta se usará en lugar de la definida en la categoría."
+
+msgctxt "help:product.template,taxes_category:0"
+msgid "Use the taxes defined on the category"
+msgstr "Usar los impuestos definidos en la categoría"
+
+msgctxt "model:product.category-customer-account.tax,name:0"
+msgid "Category - Customer Tax"
+msgstr "Categoría - Impuestos Cliente"
+
+msgctxt "model:product.category-supplier-account.tax,name:0"
+msgid "Category - Supplier Tax"
+msgstr "Categoría - Impuestos Proveedor"
+
+msgctxt "model:product.template-customer-account.tax,name:0"
+msgid "Product Template - Customer Tax"
+msgstr "Plantilla Producto - Impuestos Cliente"
+
+msgctxt "model:product.template-supplier-account.tax,name:0"
+msgid "Product Template - Supplier Tax"
+msgstr "Plantilla Producto - Impuestos Proveedor"
+
+msgctxt "view:product.category:0"
+msgid "Accounting"
+msgstr "Contabilidad"
+
+msgctxt "view:product.category:0"
+msgid "Taxes"
+msgstr "Impuestos"
+
+msgctxt "view:product.product:0"
+msgid "Accounting"
+msgstr "Contabilidad"
+
+msgctxt "view:product.template:0"
+msgid "Accounting"
+msgstr "Contabilidad"
+
+msgctxt "view:product.template:0"
+msgid "Accounts"
+msgstr "Cuentas"
+
+msgctxt "view:product.template:0"
+msgid "Taxes"
+msgstr "Impuestos"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..7ec19a6
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,170 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.template:0"
+msgid "There is no account expense/revenue defined on the product %s (%d)"
+msgstr ""
+"No hay ninguna cuenta de gastos/ingresos definida para el producto %s (%d)"
+
+msgctxt "field:product.category,account_expense:0"
+msgid "Account Expense"
+msgstr "Cuenta de gastos"
+
+msgctxt "field:product.category,account_revenue:0"
+msgid "Account Revenue"
+msgstr "Cuenta de ingresos"
+
+msgctxt "field:product.category,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr "Impuestos de cliente"
+
+msgctxt "field:product.category,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr "Impuestos de proveedor"
+
+#, fuzzy
+msgctxt "field:product.category-customer-account.tax,category:0"
+msgid "Category"
+msgstr "Categoría"
+
+msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.category-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr "Impuesto"
+
+#, fuzzy
+msgctxt "field:product.category-supplier-account.tax,category:0"
+msgid "Category"
+msgstr "Categoría"
+
+msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr "Impuesto"
+
+msgctxt "field:product.template,account_category:0"
+msgid "Use Category's accounts"
+msgstr "Usar las cuentas de la categoría"
+
+msgctxt "field:product.template,account_expense:0"
+msgid "Account Expense"
+msgstr "Cuenta de gasto"
+
+msgctxt "field:product.template,account_expense_used:0"
+msgid "Account Expense Used"
+msgstr "Cuenta de gasto usada"
+
+msgctxt "field:product.template,account_revenue:0"
+msgid "Account Revenue"
+msgstr "Cuenta de ingresos"
+
+msgctxt "field:product.template,account_revenue_used:0"
+msgid "Account Revenue Used"
+msgstr "Cuenta de ingresos usada"
+
+msgctxt "field:product.template,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr "Impuestos de cliente"
+
+msgctxt "field:product.template,customer_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr "Impuestos de cliente usados"
+
+msgctxt "field:product.template,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr "Impuestos de proveedores"
+
+msgctxt "field:product.template,supplier_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr "Impuestos de cliente usados"
+
+msgctxt "field:product.template,taxes_category:0"
+msgid "Use Category's Taxes"
+msgstr "Usar los impuestos de la categoría"
+
+msgctxt "field:product.template-customer-account.tax,product:0"
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.template-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr "Impuesto"
+
+msgctxt "field:product.template-supplier-account.tax,product:0"
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr "Impuesto"
+
+msgctxt "help:product.template,account_category:0"
+msgid "Use the accounts defined on the category"
+msgstr "Usar las cuentas definidas en la categoría"
+
+msgctxt "help:product.template,account_expense:0"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "Esta cuenta se usará en lugar de la definida en la categoría."
+
+msgctxt "help:product.template,account_revenue:0"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "Esta cuenta se usará en lugar de la definida en la categoría."
+
+msgctxt "help:product.template,taxes_category:0"
+msgid "Use the taxes defined on the category"
+msgstr "Usar los impuestos definidos en la categoría"
+
+msgctxt "model:product.category-customer-account.tax,name:0"
+msgid "Category - Customer Tax"
+msgstr "Categoría - Impuesto de cliente"
+
+msgctxt "model:product.category-supplier-account.tax,name:0"
+msgid "Category - Supplier Tax"
+msgstr "Categoría - Impuesto de proveedor"
+
+msgctxt "model:product.template-customer-account.tax,name:0"
+msgid "Product Template - Customer Tax"
+msgstr "Plantilla de producto - Impuesto de cliente"
+
+msgctxt "model:product.template-supplier-account.tax,name:0"
+msgid "Product Template - Supplier Tax"
+msgstr "Plantilla de producto - Impuesto de proveedor"
+
+msgctxt "view:product.category:0"
+msgid "Accounting"
+msgstr "Contabilidad"
+
+msgctxt "view:product.category:0"
+msgid "Taxes"
+msgstr "Impuestos"
+
+msgctxt "view:product.product:0"
+msgid "Accounting"
+msgstr "Contabilidad"
+
+msgctxt "view:product.template:0"
+msgid "Accounting"
+msgstr "Contabilidad"
+
+msgctxt "view:product.template:0"
+msgid "Accounts"
+msgstr "Cuentas"
+
+msgctxt "view:product.template:0"
+msgid "Taxes"
+msgstr "Impuestos"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..f3aacda
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,168 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.template:0"
+msgid "There is no account expense/revenue defined on the product %s (%d)"
+msgstr ""
+"Il n'y a pas de compte charges/produits définit sur le produit %s (%d)"
+
+msgctxt "field:product.category,account_expense:0"
+msgid "Account Expense"
+msgstr "Compte de charges"
+
+msgctxt "field:product.category,account_revenue:0"
+msgid "Account Revenue"
+msgstr "Compte de produits"
+
+msgctxt "field:product.category,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr "Taxes client"
+
+msgctxt "field:product.category,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr "Taxes fournisseur"
+
+msgctxt "field:product.category-customer-account.tax,category:0"
+msgid "Category"
+msgstr "Catégorie"
+
+msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.category-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr "Taxe"
+
+msgctxt "field:product.category-supplier-account.tax,category:0"
+msgid "Category"
+msgstr "Catégorie"
+
+msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr "Taxe"
+
+msgctxt "field:product.template,account_category:0"
+msgid "Use Category's accounts"
+msgstr "Utiliser les comptes de la catégorie"
+
+msgctxt "field:product.template,account_expense:0"
+msgid "Account Expense"
+msgstr "Compte de charge"
+
+msgctxt "field:product.template,account_expense_used:0"
+msgid "Account Expense Used"
+msgstr "Compte de charges utilisé"
+
+msgctxt "field:product.template,account_revenue:0"
+msgid "Account Revenue"
+msgstr "Compte de produits"
+
+msgctxt "field:product.template,account_revenue_used:0"
+msgid "Account Revenue Used"
+msgstr "Compte de produits utilisé"
+
+msgctxt "field:product.template,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr "Taxes Client"
+
+msgctxt "field:product.template,customer_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr "Taxes utilisées"
+
+msgctxt "field:product.template,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr "Taxes Fournisseur"
+
+msgctxt "field:product.template,supplier_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr "Taxes client utilisées"
+
+msgctxt "field:product.template,taxes_category:0"
+msgid "Use Category's Taxes"
+msgstr "Utiliser les taxes de la catégorie"
+
+msgctxt "field:product.template-customer-account.tax,product:0"
+msgid "Product Template"
+msgstr "Modèle produit"
+
+msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.template-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr "Taxe"
+
+msgctxt "field:product.template-supplier-account.tax,product:0"
+msgid "Product Template"
+msgstr "Modèle produit"
+
+msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr "Taxe"
+
+msgctxt "help:product.template,account_category:0"
+msgid "Use the accounts defined on the category"
+msgstr "Utiliser les comptes définis sur la catégorie"
+
+msgctxt "help:product.template,account_expense:0"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "Ce compte sera utilisé au lieu de celui défini sur la catégorie."
+
+msgctxt "help:product.template,account_revenue:0"
+msgid "This account will be used instead of the one defined on the category."
+msgstr "Ce compte sera utilisé au lieu de celui défini sur la catégorie."
+
+msgctxt "help:product.template,taxes_category:0"
+msgid "Use the taxes defined on the category"
+msgstr "Utiliser les taxes de la catégorie"
+
+msgctxt "model:product.category-customer-account.tax,name:0"
+msgid "Category - Customer Tax"
+msgstr "Catégorie - Taxe client"
+
+msgctxt "model:product.category-supplier-account.tax,name:0"
+msgid "Category - Supplier Tax"
+msgstr "Catégorie - Taxe fournisseur"
+
+msgctxt "model:product.template-customer-account.tax,name:0"
+msgid "Product Template - Customer Tax"
+msgstr "Modèle du produit - Taxe client"
+
+msgctxt "model:product.template-supplier-account.tax,name:0"
+msgid "Product Template - Supplier Tax"
+msgstr "Modèle du produit - Taxe fournisseur"
+
+msgctxt "view:product.category:0"
+msgid "Accounting"
+msgstr "Comptabilité"
+
+msgctxt "view:product.category:0"
+msgid "Taxes"
+msgstr "Taxes"
+
+msgctxt "view:product.product:0"
+msgid "Accounting"
+msgstr "Comptabilité"
+
+msgctxt "view:product.template:0"
+msgid "Accounting"
+msgstr "Comptabilité"
+
+msgctxt "view:product.template:0"
+msgid "Accounts"
+msgstr "Comptes"
+
+msgctxt "view:product.template:0"
+msgid "Taxes"
+msgstr "Taxes"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..7d64688
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,167 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.template:0"
+msgid "There is no account expense/revenue defined on the product %s (%d)"
+msgstr ""
+"Er is geen kosten-/opbrengstenrekening gedefinieerd voor product %s (%d)"
+
+msgctxt "field:product.category,account_expense:0"
+msgid "Account Expense"
+msgstr "Kostenrekening"
+
+msgctxt "field:product.category,account_revenue:0"
+msgid "Account Revenue"
+msgstr "Opbrengstrekening"
+
+msgctxt "field:product.category,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr "Belasting klanten"
+
+msgctxt "field:product.category,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr "Belastingen inkoop"
+
+msgctxt "field:product.category-customer-account.tax,category:0"
+msgid "Category"
+msgstr "Categorie"
+
+msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.category-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr "Belasting"
+
+msgctxt "field:product.category-supplier-account.tax,category:0"
+msgid "Category"
+msgstr "Categorie"
+
+msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr "Belasting"
+
+msgctxt "field:product.template,account_category:0"
+msgid "Use Category's accounts"
+msgstr "Gebruik de rekeningen van de categorie"
+
+msgctxt "field:product.template,account_expense:0"
+msgid "Account Expense"
+msgstr "Kostenrekening"
+
+msgctxt "field:product.template,account_expense_used:0"
+msgid "Account Expense Used"
+msgstr "Gebruikte kostenrekening"
+
+msgctxt "field:product.template,account_revenue:0"
+msgid "Account Revenue"
+msgstr "Opbrengstrekening"
+
+msgctxt "field:product.template,account_revenue_used:0"
+msgid "Account Revenue Used"
+msgstr "Opbrengstrekening gebruikt"
+
+msgctxt "field:product.template,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr "Belasting klanten"
+
+msgctxt "field:product.template,customer_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr "Belasting klanten gebruikt"
+
+msgctxt "field:product.template,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr "Belastingen inkoop"
+
+msgctxt "field:product.template,supplier_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr "Belasting klanten gebruikt"
+
+msgctxt "field:product.template,taxes_category:0"
+msgid "Use Category's Taxes"
+msgstr "Gebruik de belastingen van de categorie"
+
+msgctxt "field:product.template-customer-account.tax,product:0"
+msgid "Product Template"
+msgstr "Productsjabloon"
+
+msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.template-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr "Belasting"
+
+msgctxt "field:product.template-supplier-account.tax,product:0"
+msgid "Product Template"
+msgstr "Productsjabloon"
+
+msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr "Belasting"
+
+msgctxt "help:product.template,account_category:0"
+msgid "Use the accounts defined on the category"
+msgstr "Gebruik de rekeningen van de categorie"
+
+msgctxt "help:product.template,account_expense:0"
+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_revenue:0"
+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,taxes_category:0"
+msgid "Use the taxes defined on the category"
+msgstr "Gebruik de belastingen van de categorie"
+
+msgctxt "model:product.category-customer-account.tax,name:0"
+msgid "Category - Customer Tax"
+msgstr "Categorie - belasting klant"
+
+msgctxt "model:product.category-supplier-account.tax,name:0"
+msgid "Category - Supplier Tax"
+msgstr "Categorie - belasting leverancier"
+
+msgctxt "model:product.template-customer-account.tax,name:0"
+msgid "Product Template - Customer Tax"
+msgstr "Productsjabloon - Belasting verkoop"
+
+msgctxt "model:product.template-supplier-account.tax,name:0"
+msgid "Product Template - Supplier Tax"
+msgstr "Productsjabloon - Belasting inkoop"
+
+msgctxt "view:product.category:0"
+msgid "Accounting"
+msgstr "Boekhouden"
+
+#, fuzzy
+msgctxt "view:product.category:0"
+msgid "Taxes"
+msgstr "Belastingen"
+
+msgctxt "view:product.template:0"
+msgid "Accounting"
+msgstr "Boekhouden"
+
+msgctxt "view:product.template:0"
+msgid "Accounts"
+msgstr "Rekeningen"
+
+msgctxt "view:product.template:0"
+msgid "Taxes"
+msgstr "Belastingen"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..153a4c7
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,173 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.template:0"
+msgid "There is no account expense/revenue defined on the product %s (%d)"
+msgstr ""
+
+msgctxt "field:product.category,account_expense:0"
+msgid "Account Expense"
+msgstr ""
+
+msgctxt "field:product.category,account_revenue:0"
+msgid "Account Revenue"
+msgstr ""
+
+msgctxt "field:product.category,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr ""
+
+msgctxt "field:product.category,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.category-customer-account.tax,category:0"
+msgid "Category"
+msgstr "Категории"
+
+#, fuzzy
+msgctxt "field:product.category-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:product.category-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.category-supplier-account.tax,category:0"
+msgid "Category"
+msgstr "Категории"
+
+#, fuzzy
+msgctxt "field:product.category-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:product.category-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr ""
+
+msgctxt "field:product.template,account_category:0"
+msgid "Use Category's accounts"
+msgstr ""
+
+msgctxt "field:product.template,account_expense:0"
+msgid "Account Expense"
+msgstr ""
+
+msgctxt "field:product.template,account_expense_used:0"
+msgid "Account Expense Used"
+msgstr ""
+
+msgctxt "field:product.template,account_revenue:0"
+msgid "Account Revenue"
+msgstr ""
+
+msgctxt "field:product.template,account_revenue_used:0"
+msgid "Account Revenue Used"
+msgstr ""
+
+msgctxt "field:product.template,customer_taxes:0"
+msgid "Customer Taxes"
+msgstr ""
+
+msgctxt "field:product.template,customer_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr ""
+
+msgctxt "field:product.template,supplier_taxes:0"
+msgid "Supplier Taxes"
+msgstr ""
+
+msgctxt "field:product.template,supplier_taxes_used:0"
+msgid "Customer Taxes Used"
+msgstr ""
+
+msgctxt "field:product.template,taxes_category:0"
+msgid "Use Category's Taxes"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-customer-account.tax,product:0"
+msgid "Product Template"
+msgstr "Шаблон Товара"
+
+#, fuzzy
+msgctxt "field:product.template-customer-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:product.template-customer-account.tax,tax:0"
+msgid "Tax"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-supplier-account.tax,product:0"
+msgid "Product Template"
+msgstr "Шаблон Товара"
+
+#, fuzzy
+msgctxt "field:product.template-supplier-account.tax,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:product.template-supplier-account.tax,tax:0"
+msgid "Tax"
+msgstr ""
+
+msgctxt "help:product.template,account_category:0"
+msgid "Use the accounts defined on the category"
+msgstr ""
+
+msgctxt "help:product.template,account_expense:0"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.template,account_revenue:0"
+msgid "This account will be used instead of the one defined on the category."
+msgstr ""
+
+msgctxt "help:product.template,taxes_category:0"
+msgid "Use the taxes defined on the category"
+msgstr ""
+
+msgctxt "model:product.category-customer-account.tax,name:0"
+msgid "Category - Customer Tax"
+msgstr ""
+
+msgctxt "model:product.category-supplier-account.tax,name:0"
+msgid "Category - Supplier Tax"
+msgstr ""
+
+msgctxt "model:product.template-customer-account.tax,name:0"
+msgid "Product Template - Customer Tax"
+msgstr ""
+
+msgctxt "model:product.template-supplier-account.tax,name:0"
+msgid "Product Template - Supplier Tax"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:product.category:0"
+msgid "Accounting"
+msgstr "Регистрационные данные"
+
+msgctxt "view:product.category:0"
+msgid "Taxes"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:product.template:0"
+msgid "Accounting"
+msgstr "Регистрационные данные"
+
+msgctxt "view:product.template:0"
+msgid "Accounts"
+msgstr ""
+
+msgctxt "view:product.template:0"
+msgid "Taxes"
+msgstr ""
diff --git a/nl_NL.csv b/nl_NL.csv
deleted file mode 100644
index 58e45fe..0000000
--- a/nl_NL.csv
+++ /dev/null
@@ -1,40 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.template,0,There is no account expense/revenue defined on the product %s (%d),Er is geen kosten-/opbrengstenrekening gedefinieerd voor product %s (%d),0
-field,"product.category,account_expense",0,Account Expense,Kostenrekening,0
-field,"product.category,account_revenue",0,Account Revenue,Opbrengstrekening,0
-field,"product.category,customer_taxes",0,Customer Taxes,Belasting klanten,0
-field,"product.category,supplier_taxes",0,Supplier Taxes,Belastingen inkoop,0
-field,"product.category-customer-account.tax,category",0,Category,Categorie,0
-field,"product.category-customer-account.tax,rec_name",0,Name,Naam,0
-field,"product.category-customer-account.tax,tax",0,Tax,Belasting,0
-field,"product.category-supplier-account.tax,category",0,Category,Categorie,0
-field,"product.category-supplier-account.tax,rec_name",0,Name,Naam,0
-field,"product.category-supplier-account.tax,tax",0,Tax,Belasting,0
-field,"product.template,account_category",0,Use Category's accounts,Gebruik de rekeningen van de categorie,0
-field,"product.template,account_expense",0,Account Expense,Kostenrekening,0
-field,"product.template,account_expense_used",0,Account Expense Used,Gebruikte kostenrekening,0
-field,"product.template,account_revenue",0,Account Revenue,Opbrengstrekening,0
-field,"product.template,account_revenue_used",0,Account Revenue Used,Opbrengstrekening gebruikt,0
-field,"product.template,customer_taxes",0,Customer Taxes,Belasting klanten,0
-field,"product.template,customer_taxes_used",0,Customer Taxes Used,Belasting klanten gebruikt,0
-field,"product.template,supplier_taxes",0,Supplier Taxes,Belastingen inkoop,0
-field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Belasting klanten gebruikt,0
-field,"product.template,taxes_category",0,Use Category's Taxes,Gebruik de belastingen van de categorie,0
-field,"product.template-customer-account.tax,product",0,Product Template,Productsjabloon,0
-field,"product.template-customer-account.tax,rec_name",0,Name,Naam,0
-field,"product.template-customer-account.tax,tax",0,Tax,Belasting,0
-field,"product.template-supplier-account.tax,product",0,Product Template,Productsjabloon,0
-field,"product.template-supplier-account.tax,rec_name",0,Name,Naam,0
-field,"product.template-supplier-account.tax,tax",0,Tax,Belasting,0
-help,"product.template,account_category",0,Use the accounts defined on the category,Gebruik de rekeningen van de categorie,0
-help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Deze rekening zal gebruikt worden in de plaats van die van de categorie.,0
-help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Deze rekening zal gebruikt worden in de plaats van die van de categorie.,0
-help,"product.template,taxes_category",0,Use the taxes defined on the category,Gebruik de belastingen van de categorie,0
-model,"product.category-customer-account.tax,name",0,Category - Customer Tax,Categorie - belasting klant,0
-model,"product.category-supplier-account.tax,name",0,Category - Supplier Tax,Categorie - belasting leverancier,0
-model,"product.template-customer-account.tax,name",0,Product Template - Customer Tax,Productsjabloon - Belasting verkoop,0
-model,"product.template-supplier-account.tax,name",0,Product Template - Supplier Tax,Productsjabloon - Belasting inkoop,0
-view,product.category,0,Accounting,Boekhouden,0
-view,product.template,0,Accounting,Boekhouden,0
-view,product.template,0,Accounts,Rekeningen,0
-view,product.template,0,Taxes,Belastingen,0
diff --git a/product.py b/product.py
index 54f5b34..34c3e8c 100644
--- a/product.py
+++ b/product.py
@@ -1,35 +1,58 @@
#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 trytond.model import ModelView, ModelSQL, fields
-from trytond.pyson import Not, Eval, Bool, Or
+from trytond.pyson import Eval
from trytond.backend import TableHandler
from trytond.transaction import Transaction
+from trytond.pool import Pool
class Category(ModelSQL, ModelView):
_name = 'product.category'
account_expense = fields.Property(fields.Many2One('account.account',
- 'Account Expense', domain=[
- ('kind', '=', 'expense'),
- ('company', '=', Eval('company')),
- ],
- states={
- 'invisible': Not(Bool(Eval('company'))),
- }))
+ 'Account Expense', domain=[
+ ('kind', '=', 'expense'),
+ ('company', '=', Eval('context', {}).get('company', 0)),
+ ], on_change=['account_expense'],
+ states={
+ 'invisible': ~Eval('context', {}).get('company'),
+ }))
account_revenue = fields.Property(fields.Many2One( 'account.account',
- 'Account Revenue', domain=[
- ('kind', '=', 'revenue'),
- ('company', '=', Eval('company')),
- ],
- states={
- 'invisible': Not(Bool(Eval('company'))),
- }))
+ 'Account Revenue', domain=[
+ ('kind', '=', 'revenue'),
+ ('company', '=', Eval('context', {}).get('company', 0)),
+ ], on_change=['account_revenue'],
+ states={
+ 'invisible': ~Eval('context', {}).get('company'),
+ }))
customer_taxes = fields.Many2Many('product.category-customer-account.tax',
'category', 'tax', 'Customer Taxes', domain=[('parent', '=', False)])
supplier_taxes = fields.Many2Many('product.category-supplier-account.tax',
'category', 'tax', 'Supplier Taxes', domain=[('parent', '=', False)])
+ def on_change_account_expense(self, values):
+ account_obj = Pool().get('account.account')
+ supplier_taxes = []
+ result = {
+ 'supplier_taxes': supplier_taxes,
+ }
+ if values.get('account_expense'):
+ account = account_obj.browse(values['account_expense'])
+ supplier_taxes.extend(tax.id for tax in account.taxes)
+ return result
+
+ def on_change_account_revenue(self, values):
+ account_obj = Pool().get('account.account')
+ customer_taxes = []
+ result = {
+ 'customer_taxes': customer_taxes,
+ }
+ if values.get('account_revenue'):
+ account = account_obj.browse(values['account_revenue'])
+ customer_taxes.extend(tax.id for tax in account.taxes)
+ return result
+
Category()
@@ -85,42 +108,43 @@ class Template(ModelSQL, ModelView):
account_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=[
- ('kind', '=', 'expense'),
- ('company', '=', Eval('company')),
- ],
- states={
- 'invisible': Or(Not(Bool(Eval('company'))),
- Bool(Eval('account_category'))),
- }, help='This account will be used instead of the one defined ' \
- 'on the category.', depends=['account_category']))
+ 'Account Expense', domain=[
+ ('kind', '=', 'expense'),
+ ('company', '=', Eval('context', {}).get('company', 0)),
+ ], on_change=['account_expense'],
+ states={
+ 'invisible': (~Eval('context', {}).get('company')
+ | Eval('account_category')),
+ }, help='This account will be used instead of the one defined'\
+ ' on the category.', depends=['account_category']))
account_revenue = fields.Property(fields.Many2One('account.account',
- 'Account Revenue', domain=[
- ('kind', '=', 'revenue'),
- ('company', '=', Eval('company')),
- ],
- states={
- 'invisible': Or(Not(Bool(Eval('company'))),
- Bool(Eval('account_category'))),
- }, help='This account will be used instead of the one defined ' \
- 'on the category.', depends=['account_category']))
+ 'Account Revenue', domain=[
+ ('kind', '=', 'revenue'),
+ ('company', '=', Eval('context', {}).get('company', 0)),
+ ], on_change=['account_revenue'],
+ states={
+ 'invisible': (~Eval('context', {}).get('company')
+ | Eval('account_category')),
+ },
+ help='This account will be used instead of the one defined'\
+ ' on the category.', depends=['account_category']))
account_expense_used = fields.Function(fields.Many2One('account.account',
'Account Expense Used'), 'get_account')
account_revenue_used = fields.Function(fields.Many2One('account.account',
'Account Revenue Used'), 'get_account')
- taxes_category = fields.Boolean('Use Category\'s Taxes', help='Use the taxes ' \
- 'defined on the category')
+ taxes_category = fields.Boolean('Use Category\'s Taxes',
+ help='Use the taxes defined on the category')
customer_taxes = fields.Many2Many('product.template-customer-account.tax',
- 'product', 'tax', 'Customer Taxes', domain=[('parent', '=', False)],
- states={
- 'invisible': Or(Not(Bool(Eval('company'))),
- Bool(Eval('taxes_category'))),
+ 'product', 'tax', 'Customer Taxes', domain=[('parent', '=', False)],
+ states={
+ 'invisible': (~Eval('context', {}).get('company')
+ | Eval('taxes_category')),
}, depends=['taxes_category'])
supplier_taxes = fields.Many2Many('product.template-supplier-account.tax',
- 'product', 'tax', 'Supplier Taxes', domain=[('parent', '=', False)],
- states={
- 'invisible': Or(Not(Bool(Eval('company'))),
- Bool(Eval('taxes_category'))),
+ 'product', 'tax', 'Supplier Taxes', domain=[('parent', '=', False)],
+ states={
+ 'invisible': (~Eval('context', {}).get('company')
+ | Eval('taxes_category')),
}, depends=['taxes_category'])
customer_taxes_used = fields.Function(fields.One2Many('account.tax', None,
'Customer Taxes Used'), 'get_taxes')
@@ -139,7 +163,7 @@ class Template(ModelSQL, ModelView):
return False
def get_account(self, ids, name):
- account_obj = self.pool.get('account.account')
+ account_obj = Pool().get('account.account')
res = {}
name = name[:-5]
for product in self.browse(ids):
@@ -163,6 +187,28 @@ class Template(ModelSQL, ModelView):
res[product.id] = [x.id for x in product[name]]
return res
+ def on_change_account_expense(self, values):
+ account_obj = Pool().get('account.account')
+ supplier_taxes = []
+ result = {
+ 'supplier_taxes': supplier_taxes,
+ }
+ if values.get('account_expense'):
+ account = account_obj.browse(values['account_expense'])
+ supplier_taxes.extend(tax.id for tax in account.taxes)
+ return result
+
+ def on_change_account_revenue(self, values):
+ account_obj = Pool().get('account.account')
+ customer_taxes = []
+ result = {
+ 'customer_taxes': customer_taxes,
+ }
+ if values.get('account_revenue'):
+ account = account_obj.browse(values['account_revenue'])
+ customer_taxes.extend(tax.id for tax in account.taxes)
+ return result
+
Template()
diff --git a/product.xml b/product.xml
index ab36bd4..1195cc7 100644
--- a/product.xml
+++ b/product.xml
@@ -18,10 +18,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="account_revenue"/>
<label name="account_expense"/>
<field name="account_expense"/>
- <separator name="customer_taxes" colspan="4"/>
- <field name="customer_taxes" colspan="4"/>
- <separator name="supplier_taxes" colspan="4"/>
- <field name="supplier_taxes" colspan="4"/>
+ <separator string="Taxes" id="taxes" colspan="4"/>
+ <field name="customer_taxes" colspan="2"/>
+ <field name="supplier_taxes" colspan="2"/>
</page>
</xpath>
</data>
@@ -51,8 +50,6 @@ this repository contains the full copyright notices and license terms. -->
<label name="taxes_category"/>
<field name="taxes_category"/>
<newline/>
- <separator name="customer_taxes" colspan="2"/>
- <separator name="supplier_taxes" colspan="2"/>
<field name="customer_taxes" colspan="2"/>
<field name="supplier_taxes" colspan="2"/>
</page>
diff --git a/setup.py b/setup.py
index 52c1292..df0aeb8 100644
--- a/setup.py
+++ b/setup.py
@@ -39,18 +39,20 @@ setup(name='trytond_account_product',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Russian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
diff --git a/tests/test_account_product.py b/tests/test_account_product.py
index 74229fa..6562f44 100644
--- a/tests/test_account_product.py
+++ b/tests/test_account_product.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view
+from trytond.tests.test_tryton import test_view, test_depends
class AccountProductTestCase(unittest.TestCase):
@@ -27,6 +27,12 @@ class AccountProductTestCase(unittest.TestCase):
'''
test_view('account_product')
+ def test0006depends(self):
+ '''
+ Test depends.
+ '''
+ test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
index 266e36d..567f510 100644
--- a/trytond_account_product.egg-info/PKG-INFO
+++ b/trytond_account_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-product
-Version: 2.0.0
+Version: 2.2.0
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
@@ -9,23 +9,25 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_account_product.egg-info/SOURCES.txt b/trytond_account_product.egg-info/SOURCES.txt
index 215aea9..92d53ef 100644
--- a/trytond_account_product.egg-info/SOURCES.txt
+++ b/trytond_account_product.egg-info/SOURCES.txt
@@ -4,12 +4,6 @@ INSTALL
LICENSE
MANIFEST.in
README
-bg_BG.csv
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
-nl_NL.csv
product.xml
setup.py
./__init__.py
@@ -17,6 +11,14 @@ setup.py
./product.py
./tests/__init__.py
./tests/test_account_product.py
+locale/bg_BG.po
+locale/cs_CZ.po
+locale/de_DE.po
+locale/es_CO.po
+locale/es_ES.po
+locale/fr_FR.po
+locale/nl_NL.po
+locale/ru_RU.po
trytond_account_product.egg-info/PKG-INFO
trytond_account_product.egg-info/SOURCES.txt
trytond_account_product.egg-info/dependency_links.txt
diff --git a/trytond_account_product.egg-info/requires.txt b/trytond_account_product.egg-info/requires.txt
index 85de3ec..e9148de 100644
--- a/trytond_account_product.egg-info/requires.txt
+++ b/trytond_account_product.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_account >= 2.0, < 2.1
-trytond_company >= 2.0, < 2.1
-trytond_product >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_account >= 2.2, < 2.3
+trytond_company >= 2.2, < 2.3
+trytond_product >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
commit 9052010ecc7c262fa2983a92729d7357957a17f9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:12:38 2011 +0200
Adding upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index cf28ced..6dc3e78 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.0 - 2011-04-27
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.0 - 2010-11-01
* Bug fixes (see mercurial logs for details)
* Rename product field into category for product.category-customer-account.tax
diff --git a/COPYRIGHT b/COPYRIGHT
index 94a43fb..a9feb41 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
+Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2011 Bertrand Chenal.
+Copyright (C) 2008-2011 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
-Copyright (C) 2008-2010 Cédric Krier.
-Copyright (C) 2008-2010 Bertrand Chenal.
-Copyright (C) 2008-2010 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index e2047ff..20843d3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_product
-Version: 1.8.0
+Version: 2.0.0
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -18,11 +18,15 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/__tryton__.py b/__tryton__.py
index 5deab53..b7a8aef 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,11 +2,13 @@
#this repository contains the full copyright notices and license terms.
{
'name': 'Account Product',
+ 'name_bg_BG': 'Сметка за продукт',
'name_de_DE': 'Buchhaltung Artikel',
'name_es_CO': 'Contabilidad de Inventarios',
'name_es_ES': 'Contabilidad de productos',
'name_fr_FR': 'Compte produit',
- 'version': '1.8.0',
+ 'name_nl_NL': 'Boekhouding voor producten',
+ 'version': '2.0.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -14,6 +16,10 @@
- account for expense / revenue
- taxes for customer / supplier
''',
+ 'description_bg_BG': '''Добавя счетоводни свойства на продукт и категория като:
+ - сметка за разходи / приходу
+ - данъци за клиент / доставчик
+''',
'description_de_DE': '''Fügt Eigenschaften für die Buchhaltung zu Artikeln und Artikelkategorien hinzu:
- Aufwands- und Ertragskonto
- Steuern für Kunden und Lieferanten
@@ -30,6 +36,10 @@
- comptes de charge et revenu
- taxes client et fournisseur
''',
+ 'description_nl_NL': '''Voegt boekhouding eigenschappen toe aan product en categorie als:
+ - rekening voor kosten / opbrengsten
+ - belastingregels voor klanten en leveranciers
+''',
'depends': [
'ir',
'account',
@@ -40,9 +50,11 @@
'product.xml',
],
'translation': [
+ 'bg_BG.csv',
'de_DE.csv',
'es_CO.csv',
'es_ES.csv',
'fr_FR.csv',
+ 'nl_NL.csv',
]
}
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..8b21341
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,42 @@
+type,name,res_id,src,value,fuzzy
+error,product.template,0,There is no account expense/revenue defined on the product %s (%d),Няма зададен сметка за разходи/приходи за продукт %s (%d),0
+field,"product.category,account_expense",0,Account Expense,Разходи за сметка,0
+field,"product.category,account_revenue",0,Account Revenue,Приход по сметка,0
+field,"product.category,customer_taxes",0,Customer Taxes,Данъци на клиенти,0
+field,"product.category,supplier_taxes",0,Supplier Taxes,Данъци на доставчик,0
+field,"product.category-customer-account.tax,category",0,Category,Категория,0
+field,"product.category-customer-account.tax,product",0,Category,Категория,0
+field,"product.category-customer-account.tax,rec_name",0,Name,Име,0
+field,"product.category-customer-account.tax,tax",0,Tax,Данък,0
+field,"product.category-supplier-account.tax,category",0,Category,Категория,0
+field,"product.category-supplier-account.tax,product",0,Category,Категория,0
+field,"product.category-supplier-account.tax,rec_name",0,Name,Име,0
+field,"product.category-supplier-account.tax,tax",0,Tax,Данък,0
+field,"product.template,account_category",0,Use Category's accounts,Използване на сметките за категорията,0
+field,"product.template,account_expense",0,Account Expense,Разходи за сметка,0
+field,"product.template,account_expense_used",0,Account Expense Used,Използвани разходи по сметка,0
+field,"product.template,account_revenue",0,Account Revenue,Приход по сметка,0
+field,"product.template,account_revenue_used",0,Account Revenue Used,Използвани разходи по сметка,0
+field,"product.template,customer_taxes",0,Customer Taxes,Данъци на клиенти,0
+field,"product.template,customer_taxes_used",0,Customer Taxes Used,Използвани данъци на клиенти,0
+field,"product.template,supplier_taxes",0,Supplier Taxes,Данъци на доставчик,0
+field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Използвани данъци на клиенти,0
+field,"product.template,taxes_category",0,Use Category's Taxes,Използване на данъците за категорията,0
+field,"product.template-customer-account.tax,product",0,Product Template,Щаблон за продукт,0
+field,"product.template-customer-account.tax,rec_name",0,Name,Име,0
+field,"product.template-customer-account.tax,tax",0,Tax,Данък,0
+field,"product.template-supplier-account.tax,product",0,Product Template,Щаблон за продукт,0
+field,"product.template-supplier-account.tax,rec_name",0,Name,Име,0
+field,"product.template-supplier-account.tax,tax",0,Tax,Данък,0
+help,"product.template,account_category",0,Use the accounts defined on the category,Използване на сметките зададени за категорията,0
+help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Ще се използва тази сметка вместо тази зададена за категорията,0
+help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Ще се използва тази сметка вместо тази зададена за категорията,0
+help,"product.template,taxes_category",0,Use the taxes defined on the category,Използване на данъците зададени за категорията,0
+model,"product.category-customer-account.tax,name",0,Category - Customer Tax,Категория - Данък на клиент,0
+model,"product.category-supplier-account.tax,name",0,Category - Supplier Tax,Категория - Данъци на доставчик,0
+model,"product.template-customer-account.tax,name",0,Product Template - Customer Tax,Шаблон на продукт - Данък на клиент,0
+model,"product.template-supplier-account.tax,name",0,Product Template - Supplier Tax,Шаблон на продукт - Данък на доставчик,0
+view,product.category,0,Accounting,Счетоводство,0
+view,product.template,0,Accounting,Счетоводство,0
+view,product.template,0,Accounts,Сметки,0
+view,product.template,0,Taxes,Данъци,0
diff --git a/nl_NL.csv b/nl_NL.csv
new file mode 100644
index 0000000..58e45fe
--- /dev/null
+++ b/nl_NL.csv
@@ -0,0 +1,40 @@
+type,name,res_id,src,value,fuzzy
+error,product.template,0,There is no account expense/revenue defined on the product %s (%d),Er is geen kosten-/opbrengstenrekening gedefinieerd voor product %s (%d),0
+field,"product.category,account_expense",0,Account Expense,Kostenrekening,0
+field,"product.category,account_revenue",0,Account Revenue,Opbrengstrekening,0
+field,"product.category,customer_taxes",0,Customer Taxes,Belasting klanten,0
+field,"product.category,supplier_taxes",0,Supplier Taxes,Belastingen inkoop,0
+field,"product.category-customer-account.tax,category",0,Category,Categorie,0
+field,"product.category-customer-account.tax,rec_name",0,Name,Naam,0
+field,"product.category-customer-account.tax,tax",0,Tax,Belasting,0
+field,"product.category-supplier-account.tax,category",0,Category,Categorie,0
+field,"product.category-supplier-account.tax,rec_name",0,Name,Naam,0
+field,"product.category-supplier-account.tax,tax",0,Tax,Belasting,0
+field,"product.template,account_category",0,Use Category's accounts,Gebruik de rekeningen van de categorie,0
+field,"product.template,account_expense",0,Account Expense,Kostenrekening,0
+field,"product.template,account_expense_used",0,Account Expense Used,Gebruikte kostenrekening,0
+field,"product.template,account_revenue",0,Account Revenue,Opbrengstrekening,0
+field,"product.template,account_revenue_used",0,Account Revenue Used,Opbrengstrekening gebruikt,0
+field,"product.template,customer_taxes",0,Customer Taxes,Belasting klanten,0
+field,"product.template,customer_taxes_used",0,Customer Taxes Used,Belasting klanten gebruikt,0
+field,"product.template,supplier_taxes",0,Supplier Taxes,Belastingen inkoop,0
+field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Belasting klanten gebruikt,0
+field,"product.template,taxes_category",0,Use Category's Taxes,Gebruik de belastingen van de categorie,0
+field,"product.template-customer-account.tax,product",0,Product Template,Productsjabloon,0
+field,"product.template-customer-account.tax,rec_name",0,Name,Naam,0
+field,"product.template-customer-account.tax,tax",0,Tax,Belasting,0
+field,"product.template-supplier-account.tax,product",0,Product Template,Productsjabloon,0
+field,"product.template-supplier-account.tax,rec_name",0,Name,Naam,0
+field,"product.template-supplier-account.tax,tax",0,Tax,Belasting,0
+help,"product.template,account_category",0,Use the accounts defined on the category,Gebruik de rekeningen van de categorie,0
+help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Deze rekening zal gebruikt worden in de plaats van die van de categorie.,0
+help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Deze rekening zal gebruikt worden in de plaats van die van de categorie.,0
+help,"product.template,taxes_category",0,Use the taxes defined on the category,Gebruik de belastingen van de categorie,0
+model,"product.category-customer-account.tax,name",0,Category - Customer Tax,Categorie - belasting klant,0
+model,"product.category-supplier-account.tax,name",0,Category - Supplier Tax,Categorie - belasting leverancier,0
+model,"product.template-customer-account.tax,name",0,Product Template - Customer Tax,Productsjabloon - Belasting verkoop,0
+model,"product.template-supplier-account.tax,name",0,Product Template - Supplier Tax,Productsjabloon - Belasting inkoop,0
+view,product.category,0,Accounting,Boekhouden,0
+view,product.template,0,Accounting,Boekhouden,0
+view,product.template,0,Accounts,Rekeningen,0
+view,product.template,0,Taxes,Belastingen,0
diff --git a/setup.py b/setup.py
index 92f3147..52c1292 100644
--- a/setup.py
+++ b/setup.py
@@ -43,12 +43,16 @@ setup(name='trytond_account_product',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: Bulgarian',
+ 'Natural Language :: Dutch',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2.5',
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
'Topic :: Office/Business :: Financial :: Accounting',
],
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
index 02f8146..266e36d 100644
--- a/trytond_account_product.egg-info/PKG-INFO
+++ b/trytond_account_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-product
-Version: 1.8.0
+Version: 2.0.0
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -18,11 +18,15 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/trytond_account_product.egg-info/SOURCES.txt b/trytond_account_product.egg-info/SOURCES.txt
index 6c1d1c0..215aea9 100644
--- a/trytond_account_product.egg-info/SOURCES.txt
+++ b/trytond_account_product.egg-info/SOURCES.txt
@@ -4,10 +4,12 @@ INSTALL
LICENSE
MANIFEST.in
README
+bg_BG.csv
de_DE.csv
es_CO.csv
es_ES.csv
fr_FR.csv
+nl_NL.csv
product.xml
setup.py
./__init__.py
diff --git a/trytond_account_product.egg-info/requires.txt b/trytond_account_product.egg-info/requires.txt
index 77e10cf..85de3ec 100644
--- a/trytond_account_product.egg-info/requires.txt
+++ b/trytond_account_product.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_account >= 1.8, < 1.9
-trytond_company >= 1.8, < 1.9
-trytond_product >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_account >= 2.0, < 2.1
+trytond_company >= 2.0, < 2.1
+trytond_product >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit a065cf35ea6223ffbed2f0a59b5e5e8bdfe9fea2
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:12:02 2010 +0100
Adding upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 4a1ac32..cf28ced 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+* Rename product field into category for product.category-customer-account.tax
+ and product.category-supplier-account.tax
+
Version 1.6.0 - 2010-05-12
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index 3f622c7..6a8303d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_account_product
Prerequisites
-------------
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_company (http://www.tryton.org/)
* trytond_account (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 2cab0bd..e2047ff 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_product
-Version: 1.6.0
+Version: 1.8.0
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 3585cd5..5deab53 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Contabilidad de Inventarios',
'name_es_ES': 'Contabilidad de productos',
'name_fr_FR': 'Compte produit',
- 'version': '1.6.0',
+ 'version': '1.8.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/de_DE.csv b/de_DE.csv
index fa557f1..9651b9e 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -2,30 +2,30 @@ type,name,res_id,src,value,fuzzy
error,product.template,0,There is no account expense/revenue defined on the product %s (%d),Es ist kein Aufwands-/Ertragskonto definiert für Artikel %s (%d)!,0
field,"product.category,account_expense",0,Account Expense,Konto Aufwand,0
field,"product.category,account_revenue",0,Account Revenue,Konto Ertrag,0
-field,"product.category-customer-account.tax,product",0,Category,Kategorie,0
+field,"product.category,customer_taxes",0,Customer Taxes,Steuern Kunde,0
+field,"product.category,supplier_taxes",0,Supplier Taxes,Steuern Lieferant,0
+field,"product.category-customer-account.tax,category",0,Category,Kategorie,0
field,"product.category-customer-account.tax,rec_name",0,Name,Name,0
field,"product.category-customer-account.tax,tax",0,Tax,Steuer,0
-field,"product.category,customer_taxes",0,Customer Taxes,Steuern Kunde,0
-field,"product.category-supplier-account.tax,product",0,Category,Kategorie,0
+field,"product.category-supplier-account.tax,category",0,Category,Kategorie,0
field,"product.category-supplier-account.tax,rec_name",0,Name,Name,0
field,"product.category-supplier-account.tax,tax",0,Tax,Steuer,0
-field,"product.category,supplier_taxes",0,Supplier Taxes,Steuern Lieferant,0
field,"product.template,account_category",0,Use Category's accounts,Konten der Kategorie anwenden,0
field,"product.template,account_expense",0,Account Expense,Konto Aufwand,0
field,"product.template,account_expense_used",0,Account Expense Used,Konto Aufwand Benutzt,0
field,"product.template,account_revenue",0,Account Revenue,Konto Ertrag,0
field,"product.template,account_revenue_used",0,Account Revenue Used,Verwendetes Ertragskonto,0
+field,"product.template,customer_taxes",0,Customer Taxes,Steuern (Kunden),0
+field,"product.template,customer_taxes_used",0,Customer Taxes Used,Benutzte Steuern für Kunden,0
+field,"product.template,supplier_taxes",0,Supplier Taxes,Steuern (Lieferanten),0
+field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Benutzte Steuern für Lieferanten,0
+field,"product.template,taxes_category",0,Use Category's Taxes,Steuern der Kategorie anwenden,0
field,"product.template-customer-account.tax,product",0,Product Template,Artikelvorlage,0
field,"product.template-customer-account.tax,rec_name",0,Name,Name,0
field,"product.template-customer-account.tax,tax",0,Tax,Steuer,0
-field,"product.template,customer_taxes",0,Customer Taxes,Steuern (Kunden),0
-field,"product.template,customer_taxes_used",0,Customer Taxes Used,Benutzte Steuern für Kunden,0
field,"product.template-supplier-account.tax,product",0,Product Template,Artikelvorlage,0
field,"product.template-supplier-account.tax,rec_name",0,Name,Name,0
field,"product.template-supplier-account.tax,tax",0,Tax,Steuer,0
-field,"product.template,supplier_taxes",0,Supplier Taxes,Steuern (Lieferanten),0
-field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Benutzte Steuern für Lieferanten,0
-field,"product.template,taxes_category",0,Use Category's Taxes,Steuern der Kategorie anwenden,0
help,"product.template,account_category",0,Use the accounts defined on the category,"Wendet die Konten an, die in der Artikelkategorie definiert sind",0
help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Dieses Konto überschreibt das Konto welches in der Kategorie eingestellt ist.,0
help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Dieses Konto überschreibt das Konto welches in der Kategorie eingestellt ist.,0
diff --git a/fr_FR.csv b/fr_FR.csv
index 37dbdee..94214f1 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -2,30 +2,30 @@ type,name,res_id,src,value,fuzzy
error,product.template,0,There is no account expense/revenue defined on the product %s (%d),Il n'y a pas de compte charges/produits définit sur le produit %s (%d),0
field,"product.category,account_expense",0,Account Expense,Compte de charges,0
field,"product.category,account_revenue",0,Account Revenue,Compte de produits,0
-field,"product.category-customer-account.tax,product",0,Category,Catégorie,0
+field,"product.category,customer_taxes",0,Customer Taxes,Taxes client,0
+field,"product.category,supplier_taxes",0,Supplier Taxes,Taxes fournisseur,0
+field,"product.category-customer-account.tax,category",0,Category,Catégorie,0
field,"product.category-customer-account.tax,rec_name",0,Name,Nom,0
field,"product.category-customer-account.tax,tax",0,Tax,Taxe,0
-field,"product.category,customer_taxes",0,Customer Taxes,Taxes client,0
-field,"product.category-supplier-account.tax,product",0,Category,Catégorie,0
+field,"product.category-supplier-account.tax,category",0,Category,Catégorie,0
field,"product.category-supplier-account.tax,rec_name",0,Name,Nom,0
field,"product.category-supplier-account.tax,tax",0,Tax,Taxe,0
-field,"product.category,supplier_taxes",0,Supplier Taxes,Taxes fournisseur,0
field,"product.template,account_category",0,Use Category's accounts,Utiliser les comptes de la catégorie,0
field,"product.template,account_expense",0,Account Expense,Compte de charge,0
field,"product.template,account_expense_used",0,Account Expense Used,Compte de charges utilisé,0
field,"product.template,account_revenue",0,Account Revenue,Compte de produits,0
field,"product.template,account_revenue_used",0,Account Revenue Used,Compte de produits utilisé,0
+field,"product.template,customer_taxes",0,Customer Taxes,Taxes Client,0
+field,"product.template,customer_taxes_used",0,Customer Taxes Used,Taxes utilisées,0
+field,"product.template,supplier_taxes",0,Supplier Taxes,Taxes Fournisseur,0
+field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Taxes client utilisées,0
+field,"product.template,taxes_category",0,Use Category's Taxes,Utiliser les taxes de la catégorie,0
field,"product.template-customer-account.tax,product",0,Product Template,Modèle produit,0
field,"product.template-customer-account.tax,rec_name",0,Name,Nom,0
field,"product.template-customer-account.tax,tax",0,Tax,Taxe,0
-field,"product.template,customer_taxes",0,Customer Taxes,Taxes Client,0
-field,"product.template,customer_taxes_used",0,Customer Taxes Used,Taxes utilisées,0
field,"product.template-supplier-account.tax,product",0,Product Template,Modèle produit,0
field,"product.template-supplier-account.tax,rec_name",0,Name,Nom,0
field,"product.template-supplier-account.tax,tax",0,Tax,Taxe,0
-field,"product.template,supplier_taxes",0,Supplier Taxes,Taxes Fournisseur,0
-field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Taxes client utilisées,0
-field,"product.template,taxes_category",0,Use Category's Taxes,Utiliser les taxes de la catégorie,0
help,"product.template,account_category",0,Use the accounts defined on the category,Utiliser les comptes définis sur la catégorie,0
help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Ce compte sera utilisé au lieu de celui défini sur la catégorie.,0
help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Ce compte sera utilisé au lieu de celui défini sur la catégorie.,0
diff --git a/product.py b/product.py
index 62e5f5e..54f5b34 100644
--- a/product.py
+++ b/product.py
@@ -2,6 +2,8 @@
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import Not, Eval, Bool, Or
+from trytond.backend import TableHandler
+from trytond.transaction import Transaction
class Category(ModelSQL, ModelView):
@@ -24,9 +26,9 @@ class Category(ModelSQL, ModelView):
'invisible': Not(Bool(Eval('company'))),
}))
customer_taxes = fields.Many2Many('product.category-customer-account.tax',
- 'product', 'tax', 'Customer Taxes', domain=[('parent', '=', False)])
+ 'category', 'tax', 'Customer Taxes', domain=[('parent', '=', False)])
supplier_taxes = fields.Many2Many('product.category-supplier-account.tax',
- 'product', 'tax', 'Supplier Taxes', domain=[('parent', '=', False)])
+ 'category', 'tax', 'Supplier Taxes', domain=[('parent', '=', False)])
Category()
@@ -36,11 +38,21 @@ class CategoryCustomerTax(ModelSQL):
_name = 'product.category-customer-account.tax'
_table = 'product_category_customer_taxes_rel'
_description = __doc__
- product = fields.Many2One('product.category', 'Category',
+ category = fields.Many2One('product.category', 'Category',
ondelete='CASCADE', select=1, required=True)
tax = fields.Many2One('account.tax', 'Tax', ondelete='RESTRICT',
required=True)
+ def init(self, module_name):
+ cursor = Transaction().cursor
+ # Migration from 1.6 product renamed into category
+ table = TableHandler(cursor, self)
+ if table.column_exist('product'):
+ table.index_action('product', action='remove')
+ table.drop_fk('product')
+ table.column_rename('product', 'category')
+ super(CategoryCustomerTax, self).init(module_name)
+
CategoryCustomerTax()
@@ -49,11 +61,21 @@ class CategorySupplierTax(ModelSQL):
_name = 'product.category-supplier-account.tax'
_table = 'product_category_supplier_taxes_rel'
_description = __doc__
- product = fields.Many2One('product.category', 'Category',
+ category = fields.Many2One('product.category', 'Category',
ondelete='CASCADE', select=1, required=True)
tax = fields.Many2One('account.tax', 'Tax', ondelete='RESTRICT',
required=True)
+ def init(self, module_name):
+ cursor = Transaction().cursor
+ # Migration from 1.6 product renamed into category
+ table = TableHandler(cursor, self)
+ if table.column_exist('product'):
+ table.index_action('product', action='remove')
+ table.drop_fk('product')
+ table.column_rename('product', 'category')
+ super(CategorySupplierTax, self).init(module_name)
+
CategorySupplierTax()
@@ -113,28 +135,28 @@ class Template(ModelSQL, ModelView):
'%s (%d)',
})
- def default_taxes_category(self, cursor, user, context=None):
+ def default_taxes_category(self):
return False
- def get_account(self, cursor, user, ids, name, context=None):
+ def get_account(self, ids, name):
account_obj = self.pool.get('account.account')
res = {}
name = name[:-5]
- for product in self.browse(cursor, user, ids, context=context):
+ for product in self.browse(ids):
if product[name]:
res[product.id] = product[name].id
else:
if product.category[name]:
res[product.id] = product.category[name].id
else:
- self.raise_user_error(cursor, 'missing_account',
- (product.name, product.id), context=context)
+ self.raise_user_error('missing_account',
+ (product.name, product.id))
return res
- def get_taxes(self, cursor, user, ids, name, context=None):
+ def get_taxes(self, ids, name):
res = {}
name = name[:-5]
- for product in self.browse(cursor, user, ids, context=context):
+ for product in self.browse(ids):
if product.taxes_category:
res[product.id] = [x.id for x in product.category[name]]
else:
diff --git a/tests/test_account_product.py b/tests/test_account_product.py
index 0cd8cb4..74229fa 100644
--- a/tests/test_account_product.py
+++ b/tests/test_account_product.py
@@ -25,7 +25,7 @@ class AccountProductTestCase(unittest.TestCase):
'''
Test views.
'''
- self.assertRaises(Exception, test_view('account_product'))
+ test_view('account_product')
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
index 1a7b0a4..02f8146 100644
--- a/trytond_account_product.egg-info/PKG-INFO
+++ b/trytond_account_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-product
-Version: 1.6.0
+Version: 1.8.0
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_account_product.egg-info/requires.txt b/trytond_account_product.egg-info/requires.txt
index cdf473b..77e10cf 100644
--- a/trytond_account_product.egg-info/requires.txt
+++ b/trytond_account_product.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_account >= 1.6, < 1.7
-trytond_company >= 1.6, < 1.7
-trytond_product >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_account >= 1.8, < 1.9
+trytond_company >= 1.8, < 1.9
+trytond_product >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
commit abee10dfd9b98f7b2153ce96f8c4f4b576a21d74
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 11:28:41 2010 +0200
Adding upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index b4765f1..4a1ac32 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.6.0 - 2010-05-12
+* Bug fixes (see mercurial logs for details)
+
Version 1.4.0 - 2009-10-19
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 37fef2d..94a43fb 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
Copyright (C) 2004-2008 Tiny SPRL.
-Copyright (C) 2008 Cédric Krier.
-Copyright (C) 2008 Bertrand Chenal.
-Copyright (C) 2008 B2CK SPRL.
+Copyright (C) 2008-2010 Cédric Krier.
+Copyright (C) 2008-2010 Bertrand Chenal.
+Copyright (C) 2008-2010 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/MANIFEST.in b/MANIFEST.in
index c61b52d..5343ad8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,4 +7,3 @@ include LICENSE
include *.xml
include *.odt
include *.csv
-include tests/*
diff --git a/PKG-INFO b/PKG-INFO
index 37144ad..2cab0bd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_product
-Version: 1.4.0
+Version: 1.6.0
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 758f1cb..3585cd5 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Contabilidad de Inventarios',
'name_es_ES': 'Contabilidad de productos',
'name_fr_FR': 'Compte produit',
- 'version': '1.4.0',
+ 'version': '1.6.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/de_DE.csv b/de_DE.csv
index eaa6ae2..fa557f1 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -12,7 +12,7 @@ field,"product.category-supplier-account.tax,tax",0,Tax,Steuer,0
field,"product.category,supplier_taxes",0,Supplier Taxes,Steuern Lieferant,0
field,"product.template,account_category",0,Use Category's accounts,Konten der Kategorie anwenden,0
field,"product.template,account_expense",0,Account Expense,Konto Aufwand,0
-field,"product.template,account_expense_used",0,Account Expense Used,Konto Aufwand benutzt,0
+field,"product.template,account_expense_used",0,Account Expense Used,Konto Aufwand Benutzt,0
field,"product.template,account_revenue",0,Account Revenue,Konto Ertrag,0
field,"product.template,account_revenue_used",0,Account Revenue Used,Verwendetes Ertragskonto,0
field,"product.template-customer-account.tax,product",0,Product Template,Artikelvorlage,0
diff --git a/es_CO.csv b/es_CO.csv
index 5bd3e31..cefe9a8 100644
--- a/es_CO.csv
+++ b/es_CO.csv
@@ -1,7 +1,7 @@
type,name,res_id,src,value,fuzzy
-error,product.template,0,There is no account expense/revenue defined on the product %s (%d),No hay una cuenta gastos/ganancias definida para el producto %s (%d),0
+error,product.template,0,There is no account expense/revenue defined on the product %s (%d),No hay una cuenta gastos/ingresos definida para el producto %s (%d),0
field,"product.category,account_expense",0,Account Expense,Cuenta de Gastos,0
-field,"product.category,account_revenue",0,Account Revenue,Cuenta de Ganancias,0
+field,"product.category,account_revenue",0,Account Revenue,Cuenta de Ingresos,0
field,"product.category-customer-account.tax,product",0,Category,Categoría,0
field,"product.category-customer-account.tax,rec_name",0,Name,Nombre,0
field,"product.category-customer-account.tax,tax",0,Tax,Impuesto,0
@@ -13,8 +13,8 @@ field,"product.category,supplier_taxes",0,Supplier Taxes,Impuestos a Proveedores
field,"product.template,account_category",0,Use Category's accounts,Use las cuentas de Categoría,0
field,"product.template,account_expense",0,Account Expense,Cuenta de Gastos,0
field,"product.template,account_expense_used",0,Account Expense Used,Cuenta de Gastos Usada,0
-field,"product.template,account_revenue",0,Account Revenue,Cuenta de Ganancias,0
-field,"product.template,account_revenue_used",0,Account Revenue Used,Cuenta de Ganancias Usada,0
+field,"product.template,account_revenue",0,Account Revenue,Cuenta de Ingresos,0
+field,"product.template,account_revenue_used",0,Account Revenue Used,Cuenta de Ingresos Usada,0
field,"product.template-customer-account.tax,product",0,Product Template,Plantilla de Producto,0
field,"product.template-customer-account.tax,rec_name",0,Name,Nombre,0
field,"product.template-customer-account.tax,tax",0,Tax,Impuesto,0
diff --git a/product.py b/product.py
index 64d8b02..62e5f5e 100644
--- a/product.py
+++ b/product.py
@@ -1,23 +1,28 @@
#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 trytond.model import ModelView, ModelSQL, fields
+from trytond.pyson import Not, Eval, Bool, Or
class Category(ModelSQL, ModelView):
_name = 'product.category'
- account_expense = fields.Property(type='many2one',
- relation='account.account', string='Account Expense',
- domain=[('kind', '=', 'expense'), "('company', '=', company)"],
- states={
- 'invisible': "not company",
- })
- account_revenue = fields.Property(type='many2one',
- relation='account.account', string='Account Revenue',
- domain=[('kind', '=', 'revenue'), "('company', '=', company)"],
- states={
- 'invisible': "not company",
- })
+ account_expense = fields.Property(fields.Many2One('account.account',
+ 'Account Expense', domain=[
+ ('kind', '=', 'expense'),
+ ('company', '=', Eval('company')),
+ ],
+ states={
+ 'invisible': Not(Bool(Eval('company'))),
+ }))
+ account_revenue = fields.Property(fields.Many2One( 'account.account',
+ 'Account Revenue', domain=[
+ ('kind', '=', 'revenue'),
+ ('company', '=', Eval('company')),
+ ],
+ states={
+ 'invisible': Not(Bool(Eval('company'))),
+ }))
customer_taxes = fields.Many2Many('product.category-customer-account.tax',
'product', 'tax', 'Customer Taxes', domain=[('parent', '=', False)])
supplier_taxes = fields.Many2Many('product.category-supplier-account.tax',
@@ -57,40 +62,48 @@ class Template(ModelSQL, ModelView):
account_category = fields.Boolean('Use Category\'s accounts',
help='Use the accounts defined on the category')
- account_expense = fields.Property(type='many2one',
- string='Account Expense', relation='account.account',
- domain=[('kind', '=', 'expense'), "('company', '=', company)"],
- states={
- 'invisible': "not bool(company) or bool(account_category)",
- }, help='This account will be used instead of the one defined ' \
- 'on the category.', depends=['account_category'])
- account_revenue = fields.Property(type='many2one',
- string='Account Revenue', relation='account.account',
- domain=[('kind', '=', 'revenue'), "('company', '=', company)"],
- states={
- 'invisible': "not bool(company) or bool(account_category)",
- }, help='This account will be used instead of the one defined ' \
- 'on the category.', depends=['account_category'])
- account_expense_used = fields.Function('get_account', type='many2one',
- relation='account.account', string='Account Expense Used')
- account_revenue_used = fields.Function('get_account', type='many2one',
- relation='account.account', string='Account Revenue Used')
+ account_expense = fields.Property(fields.Many2One('account.account',
+ 'Account Expense', domain=[
+ ('kind', '=', 'expense'),
+ ('company', '=', Eval('company')),
+ ],
+ states={
+ 'invisible': Or(Not(Bool(Eval('company'))),
+ Bool(Eval('account_category'))),
+ }, help='This account will be used instead of the one defined ' \
+ 'on the category.', depends=['account_category']))
+ account_revenue = fields.Property(fields.Many2One('account.account',
+ 'Account Revenue', domain=[
+ ('kind', '=', 'revenue'),
+ ('company', '=', Eval('company')),
+ ],
+ states={
+ 'invisible': Or(Not(Bool(Eval('company'))),
+ Bool(Eval('account_category'))),
+ }, help='This account will be used instead of the one defined ' \
+ 'on the category.', depends=['account_category']))
+ account_expense_used = fields.Function(fields.Many2One('account.account',
+ 'Account Expense Used'), 'get_account')
+ account_revenue_used = fields.Function(fields.Many2One('account.account',
+ 'Account Revenue Used'), 'get_account')
taxes_category = fields.Boolean('Use Category\'s Taxes', help='Use the taxes ' \
'defined on the category')
customer_taxes = fields.Many2Many('product.template-customer-account.tax',
'product', 'tax', 'Customer Taxes', domain=[('parent', '=', False)],
states={
- 'invisible': "not bool(company) or bool(taxes_category)",
+ 'invisible': Or(Not(Bool(Eval('company'))),
+ Bool(Eval('taxes_category'))),
}, depends=['taxes_category'])
supplier_taxes = fields.Many2Many('product.template-supplier-account.tax',
'product', 'tax', 'Supplier Taxes', domain=[('parent', '=', False)],
states={
- 'invisible': "not bool(company) or bool(taxes_category)",
+ 'invisible': Or(Not(Bool(Eval('company'))),
+ Bool(Eval('taxes_category'))),
}, depends=['taxes_category'])
- customer_taxes_used = fields.Function('get_taxes', type='many2many',
- relation='account.tax', string='Customer Taxes Used')
- supplier_taxes_used = fields.Function('get_taxes', type='many2many',
- relation='account.tax', string='Customer Taxes Used')
+ 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,
+ 'Customer Taxes Used'), 'get_taxes')
def __init__(self):
super(Template, self).__init__()
@@ -103,7 +116,7 @@ class Template(ModelSQL, ModelView):
def default_taxes_category(self, cursor, user, context=None):
return False
- def get_account(self, cursor, user, ids, name, arg, context=None):
+ def get_account(self, cursor, user, ids, name, context=None):
account_obj = self.pool.get('account.account')
res = {}
name = name[:-5]
@@ -118,7 +131,7 @@ class Template(ModelSQL, ModelView):
(product.name, product.id), context=context)
return res
- def get_taxes(self, cursor, user, ids, name, arg, context=None):
+ def get_taxes(self, cursor, user, ids, name, context=None):
res = {}
name = name[:-5]
for product in self.browse(cursor, user, ids, context=context):
diff --git a/setup.py b/setup.py
index 10831d2..92f3147 100644
--- a/setup.py
+++ b/setup.py
@@ -2,19 +2,22 @@
#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 setuptools import setup, find_packages
+from setuptools import setup
import re
-info = eval(file('__tryton__.py').read())
+info = eval(open('__tryton__.py').read())
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
- requires.append('trytond_' + dep)
-
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
-requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+ requires.append('trytond_%s >= %s.%s, < %s.%s' %
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
+requires.append('trytond >= %s.%s, < %s.%s' %
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_account_product',
version=info.get('version', '0.0.1'),
@@ -27,6 +30,7 @@ setup(name='trytond_account_product',
package_dir={'trytond.modules.account_product': '.'},
packages=[
'trytond.modules.account_product',
+ 'trytond.modules.account_product.tests',
],
package_data={
'trytond.modules.account_product': info.get('xml', []) \
@@ -55,4 +59,6 @@ setup(name='trytond_account_product',
[trytond.modules]
account_product = trytond.modules.account_product
""",
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 5a37df5..5c8aef2 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#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 *
+from test_account_product import suite
diff --git a/tests/test_account_product.py b/tests/test_account_product.py
index 1649a91..0cd8cb4 100644
--- a/tests/test_account_product.py
+++ b/tests/test_account_product.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+from trytond.tests.test_tryton import test_view
class AccountProductTestCase(unittest.TestCase):
@@ -28,11 +28,10 @@ class AccountProductTestCase(unittest.TestCase):
self.assertRaises(Exception, test_view('account_product'))
def suite():
- return unittest.TestLoader().loadTestsFromTestCase(AccountProductTestCase)
+ suite = trytond.tests.test_tryton.suite()
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+ AccountProductTestCase))
+ return suite
if __name__ == '__main__':
- suiteTrytond = trytond.tests.test_tryton.suite()
- suiteAccountProduct = suite()
- alltests = unittest.TestSuite([suiteTrytond, suiteAccountProduct])
- unittest.TextTestRunner(verbosity=2).run(alltests)
- SOCK.disconnect()
+ unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
index 98dc535..1a7b0a4 100644
--- a/trytond_account_product.egg-info/PKG-INFO
+++ b/trytond_account_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-product
-Version: 1.4.0
+Version: 1.6.0
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_account_product.egg-info/SOURCES.txt b/trytond_account_product.egg-info/SOURCES.txt
index c6d6356..6c1d1c0 100644
--- a/trytond_account_product.egg-info/SOURCES.txt
+++ b/trytond_account_product.egg-info/SOURCES.txt
@@ -13,8 +13,8 @@ setup.py
./__init__.py
./__tryton__.py
./product.py
-tests/__init__.py
-tests/test_account_product.py
+./tests/__init__.py
+./tests/test_account_product.py
trytond_account_product.egg-info/PKG-INFO
trytond_account_product.egg-info/SOURCES.txt
trytond_account_product.egg-info/dependency_links.txt
diff --git a/trytond_account_product.egg-info/requires.txt b/trytond_account_product.egg-info/requires.txt
index 71da958..cdf473b 100644
--- a/trytond_account_product.egg-info/requires.txt
+++ b/trytond_account_product.egg-info/requires.txt
@@ -1,5 +1,4 @@
-trytond_account
-trytond_company
-trytond_product
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond_account >= 1.6, < 1.7
+trytond_company >= 1.6, < 1.7
+trytond_product >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
commit 4463a8e071d47ea1cd45c018e3ad8001ee8a41e9
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 21:36:14 2009 +0200
Adding upstream version 1.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index d28f483..b4765f1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.4.0 - 2009-10-19
+* Bug fixes (see mercurial logs for details)
+
Version 1.2.0 - 2009-04-20
* Bug fixes (see mercurial logs for details)
* Allow egg installation
diff --git a/INSTALL b/INSTALL
index 1847d5c..3f622c7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,7 +5,7 @@ Prerequisites
-------------
* Python 2.4 or later (http://www.python.org/)
- * trytond 1.1.x (http://www.tryton.org/)
+ * trytond (http://www.tryton.org/)
* trytond_company (http://www.tryton.org/)
* trytond_account (http://www.tryton.org/)
* trytond_product (http://www.tryton.org/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 5343ad8..c61b52d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,3 +7,4 @@ include LICENSE
include *.xml
include *.odt
include *.csv
+include tests/*
diff --git a/PKG-INFO b/PKG-INFO
index d2ffe39..37144ad 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_product
-Version: 1.2.0
+Version: 1.4.0
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.2/
+Download-URL: http://downloads.tryton.org/1.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 900e45b..758f1cb 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,10 +3,10 @@
{
'name': 'Account Product',
'name_de_DE': 'Buchhaltung Artikel',
- 'name_fr_FR': 'Compte produit',
'name_es_CO': 'Contabilidad de Inventarios',
- 'name_es_ES': 'Contabilidad de Inventarios',
- 'version': '1.2.0',
+ 'name_es_ES': 'Contabilidad de productos',
+ 'name_fr_FR': 'Compte produit',
+ 'version': '1.4.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -18,18 +18,18 @@
- Aufwands- und Ertragskonto
- Steuern für Kunden und Lieferanten
''',
- 'description_fr_FR': '''Ajoute des propriétés comptables sur les produits et leurs caétgories:
- - comptes de dépense et revenu
- - taxes client et fournisseur
-''',
'description_es_CO': '''Adiciona propiedades contables en productos y categorías:
- contabilidad para gastos / ganancias
- impuestos para cliente / proveedor
''',
- 'description_es_ES': '''Adiciona propiedades contables en productos y categorías:
- - contabilidad para gastos / ganancias
+ 'description_es_ES': '''Añade propiedades de contabilidad productos y categorías como:
+ - Cuenta para gastos / ingresos
- impuestos para cliente / proveedor
''',
+ 'description_fr_FR': '''Ajoute des propriétés comptables sur les produits et leurs caétgories:
+ - comptes de charge et revenu
+ - taxes client et fournisseur
+''',
'depends': [
'ir',
'account',
diff --git a/de_DE.csv b/de_DE.csv
index a86d225..eaa6ae2 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -1,5 +1,5 @@
type,name,res_id,src,value,fuzzy
-error,product.template,0,There is no account expense/revenue defined on the product %s (%d),Es ist kein Aufwands-/Erlöskonto definiert für Artikel %s (%d)!,0
+error,product.template,0,There is no account expense/revenue defined on the product %s (%d),Es ist kein Aufwands-/Ertragskonto definiert für Artikel %s (%d)!,0
field,"product.category,account_expense",0,Account Expense,Konto Aufwand,0
field,"product.category,account_revenue",0,Account Revenue,Konto Ertrag,0
field,"product.category-customer-account.tax,product",0,Category,Kategorie,0
@@ -14,7 +14,7 @@ field,"product.template,account_category",0,Use Category's accounts,Konten der K
field,"product.template,account_expense",0,Account Expense,Konto Aufwand,0
field,"product.template,account_expense_used",0,Account Expense Used,Konto Aufwand benutzt,0
field,"product.template,account_revenue",0,Account Revenue,Konto Ertrag,0
-field,"product.template,account_revenue_used",0,Account Revenue Used,Benutztes Ertragskonto,0
+field,"product.template,account_revenue_used",0,Account Revenue Used,Verwendetes Ertragskonto,0
field,"product.template-customer-account.tax,product",0,Product Template,Artikelvorlage,0
field,"product.template-customer-account.tax,rec_name",0,Name,Name,0
field,"product.template-customer-account.tax,tax",0,Tax,Steuer,0
diff --git a/fr_FR.csv b/fr_FR.csv
index 65738d0..37dbdee 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -1,7 +1,7 @@
type,name,res_id,src,value,fuzzy
-error,product.template,0,There is no account expense/revenue defined on the product %s (%d),Il n'y a pas de compte dépense/revenu définit sur le produit %s (%d),0
-field,"product.category,account_expense",0,Account Expense,Compte de dépense,0
-field,"product.category,account_revenue",0,Account Revenue,Compte de revenu,0
+error,product.template,0,There is no account expense/revenue defined on the product %s (%d),Il n'y a pas de compte charges/produits définit sur le produit %s (%d),0
+field,"product.category,account_expense",0,Account Expense,Compte de charges,0
+field,"product.category,account_revenue",0,Account Revenue,Compte de produits,0
field,"product.category-customer-account.tax,product",0,Category,Catégorie,0
field,"product.category-customer-account.tax,rec_name",0,Name,Nom,0
field,"product.category-customer-account.tax,tax",0,Tax,Taxe,0
@@ -11,10 +11,10 @@ field,"product.category-supplier-account.tax,rec_name",0,Name,Nom,0
field,"product.category-supplier-account.tax,tax",0,Tax,Taxe,0
field,"product.category,supplier_taxes",0,Supplier Taxes,Taxes fournisseur,0
field,"product.template,account_category",0,Use Category's accounts,Utiliser les comptes de la catégorie,0
-field,"product.template,account_expense",0,Account Expense,Compte de dépense,0
-field,"product.template,account_expense_used",0,Account Expense Used,Compte de dépense utilisé,0
-field,"product.template,account_revenue",0,Account Revenue,Compte de revenu,0
-field,"product.template,account_revenue_used",0,Account Revenue Used,Compte de revenu utilisé,0
+field,"product.template,account_expense",0,Account Expense,Compte de charge,0
+field,"product.template,account_expense_used",0,Account Expense Used,Compte de charges utilisé,0
+field,"product.template,account_revenue",0,Account Revenue,Compte de produits,0
+field,"product.template,account_revenue_used",0,Account Revenue Used,Compte de produits utilisé,0
field,"product.template-customer-account.tax,product",0,Product Template,Modèle produit,0
field,"product.template-customer-account.tax,rec_name",0,Name,Nom,0
field,"product.template-customer-account.tax,tax",0,Tax,Taxe,0
@@ -30,10 +30,10 @@ help,"product.template,account_category",0,Use the accounts defined on the categ
help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Ce compte sera utilisé au lieu de celui défini sur la catégorie.,0
help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Ce compte sera utilisé au lieu de celui défini sur la catégorie.,0
help,"product.template,taxes_category",0,Use the taxes defined on the category,Utiliser les taxes de la catégorie,0
-model,"product.category-customer-account.tax,name",0,Category - Customer Tax,Catégorie - Tax client,0
-model,"product.category-supplier-account.tax,name",0,Category - Supplier Tax,Catégorie - Tax fournisseur,0
-model,"product.template-customer-account.tax,name",0,Product Template - Customer Tax,Modèle du produit - Tax client,0
-model,"product.template-supplier-account.tax,name",0,Product Template - Supplier Tax,Modèle du produit - Tax fournisseur,0
+model,"product.category-customer-account.tax,name",0,Category - Customer Tax,Catégorie - Taxe client,0
+model,"product.category-supplier-account.tax,name",0,Category - Supplier Tax,Catégorie - Taxe fournisseur,0
+model,"product.template-customer-account.tax,name",0,Product Template - Customer Tax,Modèle du produit - Taxe client,0
+model,"product.template-supplier-account.tax,name",0,Product Template - Supplier Tax,Modèle du produit - Taxe fournisseur,0
view,product.category,0,Accounting,Comptabilité,0
view,product.product,0,Accounting,Comptabilité,0
view,product.template,0,Accounting,Comptabilité,0
diff --git a/product.py b/product.py
index 3228658..64d8b02 100644
--- a/product.py
+++ b/product.py
@@ -8,13 +8,13 @@ class Category(ModelSQL, ModelView):
account_expense = fields.Property(type='many2one',
relation='account.account', string='Account Expense',
- domain="[('kind', '=', 'expense'), ('company', '=', company)]",
+ domain=[('kind', '=', 'expense'), "('company', '=', company)"],
states={
'invisible': "not company",
})
account_revenue = fields.Property(type='many2one',
relation='account.account', string='Account Revenue',
- domain="[('kind', '=', 'revenue'), ('company', '=', company)]",
+ domain=[('kind', '=', 'revenue'), "('company', '=', company)"],
states={
'invisible': "not company",
})
@@ -59,18 +59,16 @@ class Template(ModelSQL, ModelView):
help='Use the accounts defined on the category')
account_expense = fields.Property(type='many2one',
string='Account Expense', relation='account.account',
- domain="[('kind', '=', 'expense'), ('company', '=', company)]",
+ domain=[('kind', '=', 'expense'), "('company', '=', company)"],
states={
'invisible': "not bool(company) or bool(account_category)",
- 'required': "not bool(account_category)",
}, help='This account will be used instead of the one defined ' \
'on the category.', depends=['account_category'])
account_revenue = fields.Property(type='many2one',
string='Account Revenue', relation='account.account',
- domain="[('kind', '=', 'revenue'), ('company', '=', company)]",
+ domain=[('kind', '=', 'revenue'), "('company', '=', company)"],
states={
'invisible': "not bool(company) or bool(account_category)",
- 'required': "not bool(account_category)",
}, help='This account will be used instead of the one defined ' \
'on the category.', depends=['account_category'])
account_expense_used = fields.Function('get_account', type='many2one',
diff --git a/setup.py b/setup.py
index 815f86d..10831d2 100644
--- a/setup.py
+++ b/setup.py
@@ -9,17 +9,12 @@ info = eval(file('__tryton__.py').read())
requires = []
for dep in info.get('depends', []):
- match = re.compile(
- '(ir|res|workflow|webdav)((\s|$|<|>|<=|>=|==|!=).*?$)').match(dep)
- if match:
- continue
- else:
- dep = 'trytond_' + dep
- requires.append(dep)
+ if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ requires.append('trytond_' + dep)
major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, str(int(minor_version) + 1)))
+requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
setup(name='trytond_account_product',
version=info.get('version', '0.0.1'),
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..5a37df5
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,4 @@
+#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 *
diff --git a/tests/test_account_product.py b/tests/test_account_product.py
new file mode 100644
index 0000000..1649a91
--- /dev/null
+++ b/tests/test_account_product.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+#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 sys, os
+DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+ '..', '..', '..', '..', '..', 'trytond')))
+if os.path.isdir(DIR):
+ sys.path.insert(0, os.path.dirname(DIR))
+
+import unittest
+import trytond.tests.test_tryton
+from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+
+
+class AccountProductTestCase(unittest.TestCase):
+ '''
+ Test AccountProduct module.
+ '''
+
+ def setUp(self):
+ trytond.tests.test_tryton.install_module('account_product')
+
+ def test0005views(self):
+ '''
+ Test views.
+ '''
+ self.assertRaises(Exception, test_view('account_product'))
+
+def suite():
+ return unittest.TestLoader().loadTestsFromTestCase(AccountProductTestCase)
+
+if __name__ == '__main__':
+ suiteTrytond = trytond.tests.test_tryton.suite()
+ suiteAccountProduct = suite()
+ alltests = unittest.TestSuite([suiteTrytond, suiteAccountProduct])
+ unittest.TextTestRunner(verbosity=2).run(alltests)
+ SOCK.disconnect()
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
index 738d296..98dc535 100644
--- a/trytond_account_product.egg-info/PKG-INFO
+++ b/trytond_account_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-product
-Version: 1.2.0
+Version: 1.4.0
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.2/
+Download-URL: http://downloads.tryton.org/1.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_account_product.egg-info/SOURCES.txt b/trytond_account_product.egg-info/SOURCES.txt
index 57140c1..c6d6356 100644
--- a/trytond_account_product.egg-info/SOURCES.txt
+++ b/trytond_account_product.egg-info/SOURCES.txt
@@ -13,6 +13,8 @@ setup.py
./__init__.py
./__tryton__.py
./product.py
+tests/__init__.py
+tests/test_account_product.py
trytond_account_product.egg-info/PKG-INFO
trytond_account_product.egg-info/SOURCES.txt
trytond_account_product.egg-info/dependency_links.txt
diff --git a/trytond_account_product.egg-info/requires.txt b/trytond_account_product.egg-info/requires.txt
index c1d0161..71da958 100644
--- a/trytond_account_product.egg-info/requires.txt
+++ b/trytond_account_product.egg-info/requires.txt
@@ -1,5 +1,5 @@
trytond_account
trytond_company
trytond_product
-trytond >= 1.2
-trytond < 1.3
\ No newline at end of file
+trytond >= 1.4
+trytond < 1.5
\ No newline at end of file
commit 472d3da79321f6a7aecbd3ffd71af094e31fd067
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Apr 21 11:12:34 2009 +0200
Adding upstream version 1.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 9801fce..d28f483 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
-Version 1.0.1 - 2008-12-01
+Version 1.2.0 - 2009-04-20
+* Bug fixes (see mercurial logs for details)
* Allow egg installation
Version 1.0.0 - 2008-11-17
diff --git a/INSTALL b/INSTALL
index a9e12cd..1847d5c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,7 +5,7 @@ Prerequisites
-------------
* Python 2.4 or later (http://www.python.org/)
- * trytond 0.0.x (http://www.tryton.org/)
+ * trytond 1.1.x (http://www.tryton.org/)
* trytond_company (http://www.tryton.org/)
* trytond_account (http://www.tryton.org/)
* trytond_product (http://www.tryton.org/)
@@ -13,7 +13,7 @@ Prerequisites
Installation
------------
-Once you've downloaded and unpacked a trytond_account_product source release, enter the
+Once you've downloaded and unpacked the trytond_account_product source release, enter the
directory where the archive was unpacked, and run:
python setup.py install
diff --git a/PKG-INFO b/PKG-INFO
index 8f5d867..d2ffe39 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_product
-Version: 1.0.1
+Version: 1.2.0
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.0/
+Download-URL: http://downloads.tryton.org/1.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index abf8bb1..900e45b 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -4,8 +4,9 @@
'name': 'Account Product',
'name_de_DE': 'Buchhaltung Artikel',
'name_fr_FR': 'Compte produit',
+ 'name_es_CO': 'Contabilidad de Inventarios',
'name_es_ES': 'Contabilidad de Inventarios',
- 'version': '1.0.1',
+ 'version': '1.2.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -21,6 +22,10 @@
- comptes de dépense et revenu
- taxes client et fournisseur
''',
+ 'description_es_CO': '''Adiciona propiedades contables en productos y categorías:
+ - contabilidad para gastos / ganancias
+ - impuestos para cliente / proveedor
+''',
'description_es_ES': '''Adiciona propiedades contables en productos y categorías:
- contabilidad para gastos / ganancias
- impuestos para cliente / proveedor
@@ -36,6 +41,7 @@
],
'translation': [
'de_DE.csv',
+ 'es_CO.csv',
'es_ES.csv',
'fr_FR.csv',
]
diff --git a/de_DE.csv b/de_DE.csv
index c771f83..a86d225 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -1,22 +1,43 @@
type,name,res_id,src,value,fuzzy
-error,product.template,0,There is no account expense/revenue define on the product %s (%d),Es ist kein Aufwands-/Ertragskonto in Artikel %s (%d) angegeben,0
+error,product.template,0,There is no account expense/revenue defined on the product %s (%d),Es ist kein Aufwands-/Erlöskonto definiert für Artikel %s (%d)!,0
field,"product.category,account_expense",0,Account Expense,Konto Aufwand,0
field,"product.category,account_revenue",0,Account Revenue,Konto Ertrag,0
+field,"product.category-customer-account.tax,product",0,Category,Kategorie,0
+field,"product.category-customer-account.tax,rec_name",0,Name,Name,0
+field,"product.category-customer-account.tax,tax",0,Tax,Steuer,0
field,"product.category,customer_taxes",0,Customer Taxes,Steuern Kunde,0
+field,"product.category-supplier-account.tax,product",0,Category,Kategorie,0
+field,"product.category-supplier-account.tax,rec_name",0,Name,Name,0
+field,"product.category-supplier-account.tax,tax",0,Tax,Steuer,0
field,"product.category,supplier_taxes",0,Supplier Taxes,Steuern Lieferant,0
+field,"product.template,account_category",0,Use Category's accounts,Konten der Kategorie anwenden,0
field,"product.template,account_expense",0,Account Expense,Konto Aufwand,0
field,"product.template,account_expense_used",0,Account Expense Used,Konto Aufwand benutzt,0
field,"product.template,account_revenue",0,Account Revenue,Konto Ertrag,0
field,"product.template,account_revenue_used",0,Account Revenue Used,Benutztes Ertragskonto,0
+field,"product.template-customer-account.tax,product",0,Product Template,Artikelvorlage,0
+field,"product.template-customer-account.tax,rec_name",0,Name,Name,0
+field,"product.template-customer-account.tax,tax",0,Tax,Steuer,0
field,"product.template,customer_taxes",0,Customer Taxes,Steuern (Kunden),0
field,"product.template,customer_taxes_used",0,Customer Taxes Used,Benutzte Steuern für Kunden,0
+field,"product.template-supplier-account.tax,product",0,Product Template,Artikelvorlage,0
+field,"product.template-supplier-account.tax,rec_name",0,Name,Name,0
+field,"product.template-supplier-account.tax,tax",0,Tax,Steuer,0
field,"product.template,supplier_taxes",0,Supplier Taxes,Steuern (Lieferanten),0
field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Benutzte Steuern für Lieferanten,0
-field,"product.template,taxes_category",0,Use Category's Taxes,Wende die Steuern der Kategorie an,0
+field,"product.template,taxes_category",0,Use Category's Taxes,Steuern der Kategorie anwenden,0
+help,"product.template,account_category",0,Use the accounts defined on the category,"Wendet die Konten an, die in der Artikelkategorie definiert sind",0
help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Dieses Konto überschreibt das Konto welches in der Kategorie eingestellt ist.,0
help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Dieses Konto überschreibt das Konto welches in der Kategorie eingestellt ist.,0
-help,"product.template,taxes_category",0,Use the taxes defined on the category,"Wendet die Steuern an, die in dieser Kategorie definiert sind",0
+help,"product.template,taxes_category",0,Use the taxes defined on the category,"Wendet die Steuern an, die in der Artikelkategorie definiert sind",0
+model,"product.category-customer-account.tax,name",0,Category - Customer Tax,Artikelkategorie - Steuer Kunde,0
+model,"product.category-supplier-account.tax,name",0,Category - Supplier Tax,Artikelkategorie - Steuer Lieferant,0
+model,"product.template-customer-account.tax,name",0,Product Template - Customer Tax,Artikelvorlage - Steuer Kunde,0
+model,"product.template-supplier-account.tax,name",0,Product Template - Supplier Tax,Artikelvorlage - Steuer Lieferant,0
view,product.category,0,Accounting,Buchhaltung,0
view,product.category,0,Taxes,Steuern,0
view,product.product,0,Accounting,Buchhaltung,0
view,product.product,0,Taxes,Steuern,0
+view,product.template,0,Accounting,Buchhaltung,0
+view,product.template,0,Accounts,Konten,0
+view,product.template,0,Taxes,Steuern,0
diff --git a/es_ES.csv b/es_CO.csv
similarity index 50%
copy from es_ES.csv
copy to es_CO.csv
index e25549a..5bd3e31 100644
--- a/es_ES.csv
+++ b/es_CO.csv
@@ -1,21 +1,42 @@
type,name,res_id,src,value,fuzzy
-error,product.template,0,There is no account expense/revenue define on the product %s (%d),No hay una cuenta gasto/entrada definida en el producto %s (%d),0
+error,product.template,0,There is no account expense/revenue defined on the product %s (%d),No hay una cuenta gastos/ganancias definida para el producto %s (%d),0
field,"product.category,account_expense",0,Account Expense,Cuenta de Gastos,0
field,"product.category,account_revenue",0,Account Revenue,Cuenta de Ganancias,0
+field,"product.category-customer-account.tax,product",0,Category,Categoría,0
+field,"product.category-customer-account.tax,rec_name",0,Name,Nombre,0
+field,"product.category-customer-account.tax,tax",0,Tax,Impuesto,0
field,"product.category,customer_taxes",0,Customer Taxes,Impuestos del Cliente,0
+field,"product.category-supplier-account.tax,product",0,Category,Categoría,0
+field,"product.category-supplier-account.tax,rec_name",0,Name,Nombre,0
+field,"product.category-supplier-account.tax,tax",0,Tax,Impuesto,0
field,"product.category,supplier_taxes",0,Supplier Taxes,Impuestos a Proveedores,0
+field,"product.template,account_category",0,Use Category's accounts,Use las cuentas de Categoría,0
field,"product.template,account_expense",0,Account Expense,Cuenta de Gastos,0
field,"product.template,account_expense_used",0,Account Expense Used,Cuenta de Gastos Usada,0
field,"product.template,account_revenue",0,Account Revenue,Cuenta de Ganancias,0
field,"product.template,account_revenue_used",0,Account Revenue Used,Cuenta de Ganancias Usada,0
+field,"product.template-customer-account.tax,product",0,Product Template,Plantilla de Producto,0
+field,"product.template-customer-account.tax,rec_name",0,Name,Nombre,0
+field,"product.template-customer-account.tax,tax",0,Tax,Impuesto,0
field,"product.template,customer_taxes",0,Customer Taxes,Impuestos del Cliente,0
field,"product.template,customer_taxes_used",0,Customer Taxes Used,Impuestos del Cliente Usados,0
+field,"product.template-supplier-account.tax,product",0,Product Template,Plantilla de Producto,0
+field,"product.template-supplier-account.tax,rec_name",0,Name,Nombre,0
+field,"product.template-supplier-account.tax,tax",0,Tax,Impuesto,0
field,"product.template,supplier_taxes",0,Supplier Taxes,Impuestos a Proveedores,0
field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Impuestos del Cliente Usados,0
field,"product.template,taxes_category",0,Use Category's Taxes,Categorías de Impuesto,0
+help,"product.template,account_category",0,Use the accounts defined on the category,Use las cuentas definidas en la categoría,0
help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Esta cuenta se usará en lugar de la definida en la categoría.,0
help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Esta cuenta se usará en lugar de la definida en la categoría.,0
help,"product.template,taxes_category",0,Use the taxes defined on the category,Usar los impuestos definidos en la categoría,0
+model,"product.category-customer-account.tax,name",0,Category - Customer Tax,Categoría - Impuestos Cliente,0
+model,"product.category-supplier-account.tax,name",0,Category - Supplier Tax,Categoría - Impuestos Proveedor,0
+model,"product.template-customer-account.tax,name",0,Product Template - Customer Tax,Plantilla Producto - Impuestos Cliente,0
+model,"product.template-supplier-account.tax,name",0,Product Template - Supplier Tax,Plantilla Producto - Impuestos Proveedor,0
view,product.category,0,Accounting,Contabilidad,0
view,product.category,0,Taxes,Impuestos,0
view,product.product,0,Accounting,Contabilidad,0
+view,product.template,0,Accounting,Contabilidad,0
+view,product.template,0,Accounts,Cuentas,0
+view,product.template,0,Taxes,Impuestos,0
diff --git a/es_ES.csv b/es_ES.csv
index e25549a..c3f31ee 100644
--- a/es_ES.csv
+++ b/es_ES.csv
@@ -1,21 +1,42 @@
type,name,res_id,src,value,fuzzy
-error,product.template,0,There is no account expense/revenue define on the product %s (%d),No hay una cuenta gasto/entrada definida en el producto %s (%d),0
-field,"product.category,account_expense",0,Account Expense,Cuenta de Gastos,0
-field,"product.category,account_revenue",0,Account Revenue,Cuenta de Ganancias,0
-field,"product.category,customer_taxes",0,Customer Taxes,Impuestos del Cliente,0
-field,"product.category,supplier_taxes",0,Supplier Taxes,Impuestos a Proveedores,0
-field,"product.template,account_expense",0,Account Expense,Cuenta de Gastos,0
-field,"product.template,account_expense_used",0,Account Expense Used,Cuenta de Gastos Usada,0
-field,"product.template,account_revenue",0,Account Revenue,Cuenta de Ganancias,0
-field,"product.template,account_revenue_used",0,Account Revenue Used,Cuenta de Ganancias Usada,0
-field,"product.template,customer_taxes",0,Customer Taxes,Impuestos del Cliente,0
-field,"product.template,customer_taxes_used",0,Customer Taxes Used,Impuestos del Cliente Usados,0
-field,"product.template,supplier_taxes",0,Supplier Taxes,Impuestos a Proveedores,0
-field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Impuestos del Cliente Usados,0
-field,"product.template,taxes_category",0,Use Category's Taxes,Categorías de Impuesto,0
+error,product.template,0,There is no account expense/revenue defined on the product %s (%d),No hay ninguna cuenta de gastos/ingresos definida para el producto %s (%d),0
+field,"product.category,account_expense",0,Account Expense,Cuenta de gastos,0
+field,"product.category,account_revenue",0,Account Revenue,Cuenta de ingresos,0
+field,"product.category-customer-account.tax,product",0,Category,Categoría,0
+field,"product.category-customer-account.tax,rec_name",0,Name,Nombre,0
+field,"product.category-customer-account.tax,tax",0,Tax,Impuesto,0
+field,"product.category,customer_taxes",0,Customer Taxes,Impuestos de cliente,0
+field,"product.category-supplier-account.tax,product",0,Category,Categoría,0
+field,"product.category-supplier-account.tax,rec_name",0,Name,Nombre,0
+field,"product.category-supplier-account.tax,tax",0,Tax,Impuesto,0
+field,"product.category,supplier_taxes",0,Supplier Taxes,Impuestos de proveedor,0
+field,"product.template,account_category",0,Use Category's accounts,Usar las cuentas de la categoría,0
+field,"product.template,account_expense",0,Account Expense,Cuenta de gasto,0
+field,"product.template,account_expense_used",0,Account Expense Used,Cuenta de gasto usada,0
+field,"product.template,account_revenue",0,Account Revenue,Cuenta de ingresos,0
+field,"product.template,account_revenue_used",0,Account Revenue Used,Cuenta de ingresos usada,0
+field,"product.template-customer-account.tax,product",0,Product Template,Plantilla de producto,0
+field,"product.template-customer-account.tax,rec_name",0,Name,Nombre,0
+field,"product.template-customer-account.tax,tax",0,Tax,Impuesto,0
+field,"product.template,customer_taxes",0,Customer Taxes,Impuestos de cliente,0
+field,"product.template,customer_taxes_used",0,Customer Taxes Used,Impuestos de cliente usados,0
+field,"product.template-supplier-account.tax,product",0,Product Template,Plantilla de producto,0
+field,"product.template-supplier-account.tax,rec_name",0,Name,Nombre,0
+field,"product.template-supplier-account.tax,tax",0,Tax,Impuesto,0
+field,"product.template,supplier_taxes",0,Supplier Taxes,Impuestos de proveedores,0
+field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Impuestos de cliente usados,0
+field,"product.template,taxes_category",0,Use Category's Taxes,Usar los impuestos de la categoría,0
+help,"product.template,account_category",0,Use the accounts defined on the category,Usar las cuentas definidas en la categoría,0
help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Esta cuenta se usará en lugar de la definida en la categoría.,0
help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Esta cuenta se usará en lugar de la definida en la categoría.,0
help,"product.template,taxes_category",0,Use the taxes defined on the category,Usar los impuestos definidos en la categoría,0
+model,"product.category-customer-account.tax,name",0,Category - Customer Tax,Categoría - Impuesto de cliente,0
+model,"product.category-supplier-account.tax,name",0,Category - Supplier Tax,Categoría - Impuesto de proveedor,0
+model,"product.template-customer-account.tax,name",0,Product Template - Customer Tax,Plantilla de producto - Impuesto de cliente,0
+model,"product.template-supplier-account.tax,name",0,Product Template - Supplier Tax,Plantilla de producto - Impuesto de proveedor,0
view,product.category,0,Accounting,Contabilidad,0
view,product.category,0,Taxes,Impuestos,0
view,product.product,0,Accounting,Contabilidad,0
+view,product.template,0,Accounting,Contabilidad,0
+view,product.template,0,Accounts,Cuentas,0
+view,product.template,0,Taxes,Impuestos,0
diff --git a/fr_FR.csv b/fr_FR.csv
index 0799170..65738d0 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -1,20 +1,41 @@
type,name,res_id,src,value,fuzzy
-error,product.template,0,There is no account expense/revenue define on the product %s (%d),Il n'y a pas de compte dépense/revenu définit sur le produit %s (%d),0
-field,"product.category,account_expense",0,Account Expense,Compte de Dépense,0
-field,"product.category,account_revenue",0,Account Revenue,Compte de Revenu,0
+error,product.template,0,There is no account expense/revenue defined on the product %s (%d),Il n'y a pas de compte dépense/revenu définit sur le produit %s (%d),0
+field,"product.category,account_expense",0,Account Expense,Compte de dépense,0
+field,"product.category,account_revenue",0,Account Revenue,Compte de revenu,0
+field,"product.category-customer-account.tax,product",0,Category,Catégorie,0
+field,"product.category-customer-account.tax,rec_name",0,Name,Nom,0
+field,"product.category-customer-account.tax,tax",0,Tax,Taxe,0
field,"product.category,customer_taxes",0,Customer Taxes,Taxes client,0
+field,"product.category-supplier-account.tax,product",0,Category,Catégorie,0
+field,"product.category-supplier-account.tax,rec_name",0,Name,Nom,0
+field,"product.category-supplier-account.tax,tax",0,Tax,Taxe,0
field,"product.category,supplier_taxes",0,Supplier Taxes,Taxes fournisseur,0
-field,"product.template,account_expense",0,Account Expense,Compte de Dépense,0
-field,"product.template,account_expense_used",0,Account Expense Used,Compte de Dépense Utilisé,0
-field,"product.template,account_revenue",0,Account Revenue,Compte de Revenu,0
-field,"product.template,account_revenue_used",0,Account Revenue Used,Compte de Revenu Utilisé,0
+field,"product.template,account_category",0,Use Category's accounts,Utiliser les comptes de la catégorie,0
+field,"product.template,account_expense",0,Account Expense,Compte de dépense,0
+field,"product.template,account_expense_used",0,Account Expense Used,Compte de dépense utilisé,0
+field,"product.template,account_revenue",0,Account Revenue,Compte de revenu,0
+field,"product.template,account_revenue_used",0,Account Revenue Used,Compte de revenu utilisé,0
+field,"product.template-customer-account.tax,product",0,Product Template,Modèle produit,0
+field,"product.template-customer-account.tax,rec_name",0,Name,Nom,0
+field,"product.template-customer-account.tax,tax",0,Tax,Taxe,0
field,"product.template,customer_taxes",0,Customer Taxes,Taxes Client,0
field,"product.template,customer_taxes_used",0,Customer Taxes Used,Taxes utilisées,0
+field,"product.template-supplier-account.tax,product",0,Product Template,Modèle produit,0
+field,"product.template-supplier-account.tax,rec_name",0,Name,Nom,0
+field,"product.template-supplier-account.tax,tax",0,Tax,Taxe,0
field,"product.template,supplier_taxes",0,Supplier Taxes,Taxes Fournisseur,0
field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Taxes client utilisées,0
field,"product.template,taxes_category",0,Use Category's Taxes,Utiliser les taxes de la catégorie,0
+help,"product.template,account_category",0,Use the accounts defined on the category,Utiliser les comptes définis sur la catégorie,0
help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Ce compte sera utilisé au lieu de celui défini sur la catégorie.,0
help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Ce compte sera utilisé au lieu de celui défini sur la catégorie.,0
help,"product.template,taxes_category",0,Use the taxes defined on the category,Utiliser les taxes de la catégorie,0
+model,"product.category-customer-account.tax,name",0,Category - Customer Tax,Catégorie - Tax client,0
+model,"product.category-supplier-account.tax,name",0,Category - Supplier Tax,Catégorie - Tax fournisseur,0
+model,"product.template-customer-account.tax,name",0,Product Template - Customer Tax,Modèle du produit - Tax client,0
+model,"product.template-supplier-account.tax,name",0,Product Template - Supplier Tax,Modèle du produit - Tax fournisseur,0
view,product.category,0,Accounting,Comptabilité,0
view,product.product,0,Accounting,Comptabilité,0
+view,product.template,0,Accounting,Comptabilité,0
+view,product.template,0,Accounts,Comptes,0
+view,product.template,0,Taxes,Taxes,0
diff --git a/product.py b/product.py
index 2fe36ee..3228658 100644
--- a/product.py
+++ b/product.py
@@ -1,10 +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 trytond.model import ModelView, ModelSQL, fields
-from trytond.osv import fields, OSV
-
-class Category(OSV):
+class Category(ModelSQL, ModelView):
_name = 'product.category'
account_expense = fields.Property(type='many2one',
@@ -19,49 +18,77 @@ class Category(OSV):
states={
'invisible': "not company",
})
- customer_taxes = fields.Many2Many('account.tax',
- 'product_category_customer_taxes_rel', 'product', 'tax',
- 'Customer Taxes', domain=[('parent', '=', False)])
- supplier_taxes = fields.Many2Many('account.tax',
- 'product_category_supplier_taxes_rel', 'product', 'tax',
- 'Supplier Taxes', domain=[('parent', '=', False)])
+ customer_taxes = fields.Many2Many('product.category-customer-account.tax',
+ 'product', 'tax', 'Customer Taxes', domain=[('parent', '=', False)])
+ supplier_taxes = fields.Many2Many('product.category-supplier-account.tax',
+ 'product', 'tax', 'Supplier Taxes', domain=[('parent', '=', False)])
Category()
-class Template(OSV):
+class CategoryCustomerTax(ModelSQL):
+ 'Category - Customer Tax'
+ _name = 'product.category-customer-account.tax'
+ _table = 'product_category_customer_taxes_rel'
+ _description = __doc__
+ product = fields.Many2One('product.category', 'Category',
+ ondelete='CASCADE', select=1, required=True)
+ tax = fields.Many2One('account.tax', 'Tax', ondelete='RESTRICT',
+ required=True)
+
+CategoryCustomerTax()
+
+
+class CategorySupplierTax(ModelSQL):
+ 'Category - Supplier Tax'
+ _name = 'product.category-supplier-account.tax'
+ _table = 'product_category_supplier_taxes_rel'
+ _description = __doc__
+ product = fields.Many2One('product.category', 'Category',
+ ondelete='CASCADE', select=1, required=True)
+ tax = fields.Many2One('account.tax', 'Tax', ondelete='RESTRICT',
+ required=True)
+
+CategorySupplierTax()
+
+
+class Template(ModelSQL, ModelView):
_name = 'product.template'
+ account_category = fields.Boolean('Use Category\'s accounts',
+ help='Use the accounts defined on the category')
account_expense = fields.Property(type='many2one',
string='Account Expense', relation='account.account',
domain="[('kind', '=', 'expense'), ('company', '=', company)]",
states={
- 'invisible': "not company",
+ 'invisible': "not bool(company) or bool(account_category)",
+ 'required': "not bool(account_category)",
}, help='This account will be used instead of the one defined ' \
- 'on the category.')
+ 'on the category.', depends=['account_category'])
account_revenue = fields.Property(type='many2one',
string='Account Revenue', relation='account.account',
domain="[('kind', '=', 'revenue'), ('company', '=', company)]",
states={
- 'invisible': "not company",
+ 'invisible': "not bool(company) or bool(account_category)",
+ 'required': "not bool(account_category)",
}, help='This account will be used instead of the one defined ' \
- 'on the category.')
+ 'on the category.', depends=['account_category'])
account_expense_used = fields.Function('get_account', type='many2one',
relation='account.account', string='Account Expense Used')
account_revenue_used = fields.Function('get_account', type='many2one',
relation='account.account', string='Account Revenue Used')
taxes_category = fields.Boolean('Use Category\'s Taxes', help='Use the taxes ' \
'defined on the category')
- customer_taxes = fields.Many2Many('account.tax',
- 'product_customer_taxes_rel', 'product', 'tax',
- 'Customer Taxes', domain=[('parent', '=', False)], states={
- 'invisible': "bool(taxes_category)",
- })
- supplier_taxes = fields.Many2Many('account.tax',
- 'product_supplier_taxes_rel', 'product', 'tax',
- 'Supplier Taxes', domain=[('parent', '=', False)], states={
- 'invisible': "bool(taxes_category)",
- })
+ customer_taxes = fields.Many2Many('product.template-customer-account.tax',
+ 'product', 'tax', 'Customer Taxes', domain=[('parent', '=', False)],
+ states={
+ 'invisible': "not bool(company) or bool(taxes_category)",
+ }, depends=['taxes_category'])
+ supplier_taxes = fields.Many2Many('product.template-supplier-account.tax',
+ 'product', 'tax', 'Supplier Taxes', domain=[('parent', '=', False)],
+ states={
+ 'invisible': "not bool(company) or bool(taxes_category)",
+ }, depends=['taxes_category'])
customer_taxes_used = fields.Function('get_taxes', type='many2many',
relation='account.tax', string='Customer Taxes Used')
supplier_taxes_used = fields.Function('get_taxes', type='many2many',
@@ -71,7 +98,7 @@ class Template(OSV):
super(Template, self).__init__()
self._error_messages.update({
'missing_account': 'There is no account ' \
- 'expense/revenue define on the product ' \
+ 'expense/revenue defined on the product ' \
'%s (%d)',
})
@@ -84,12 +111,10 @@ class Template(OSV):
name = name[:-5]
for product in self.browse(cursor, user, ids, context=context):
if product[name]:
- res[product.id] = account_obj.name_get(cursor, user,
- product[name].id, context=context)[0]
+ res[product.id] = product[name].id
else:
if product.category[name]:
- res[product.id] = account_obj.name_get(cursor, user,
- product.category[name].id, context=context)[0]
+ res[product.id] = product.category[name].id
else:
self.raise_user_error(cursor, 'missing_account',
(product.name, product.id), context=context)
@@ -106,3 +131,29 @@ class Template(OSV):
return res
Template()
+
+
+class TemplateCustomerTax(ModelSQL):
+ 'Product Template - Customer Tax'
+ _name = 'product.template-customer-account.tax'
+ _table = 'product_customer_taxes_rel'
+ _description = __doc__
+ product = fields.Many2One('product.template', 'Product Template',
+ ondelete='CASCADE', select=1, required=True)
+ tax = fields.Many2One('account.tax', 'Tax', ondelete='RESTRICT',
+ required=True)
+
+TemplateCustomerTax()
+
+
+class TemplateSupplierTax(ModelSQL):
+ 'Product Template - Supplier Tax'
+ _name = 'product.template-supplier-account.tax'
+ _table = 'product_supplier_taxes_rel'
+ _description = __doc__
+ product = fields.Many2One('product.template', 'Product Template',
+ ondelete='CASCADE', select=1, required=True)
+ tax = fields.Many2One('account.tax', 'Tax', ondelete='RESTRICT',
+ required=True)
+
+TemplateSupplierTax()
diff --git a/product.xml b/product.xml
index 370de51..ab36bd4 100644
--- a/product.xml
+++ b/product.xml
@@ -11,9 +11,9 @@ this repository contains the full copyright notices and license terms. -->
<![CDATA[
<data>
<xpath
- expr="/form/notebook/page[@string="Childs"]"
- position="after">
- <page string="Accounting" col="4">
+ expr="/form/notebook/page[@id="childs"]"
+ position="before">
+ <page string="Accounting" col="4" id="accounting">
<label name="account_revenue"/>
<field name="account_revenue"/>
<label name="account_expense"/>
@@ -29,26 +29,32 @@ this repository contains the full copyright notices and license terms. -->
</field>
</record>
- <record model="ir.ui.view" id="product_view_form">
- <field name="model">product.product</field>
- <field name="inherit" ref="product.product_view_form"/>
+ <record model="ir.ui.view" id="template_view_form">
+ <field name="model">product.template</field>
+ <field name="inherit" ref="product.template_view_form"/>
<field name="arch" type="xml">
<![CDATA[
<data>
<xpath
- expr="/form/notebook/page[@string="General"]"
+ expr="/form/notebook/page[@id="general"]"
position="after">
- <page string="Accounting" col="4">
+ <page string="Accounting" col="4" id="accounting">
+ <separator string="Accounts" id="accounts" colspan="4"/>
+ <label name="account_category"/>
+ <field name="account_category"/>
+ <newline/>
<label name="account_revenue"/>
<field name="account_revenue"/>
<label name="account_expense"/>
<field name="account_expense"/>
+ <separator string="Taxes" id="taxes" colspan="4"/>
<label name="taxes_category"/>
<field name="taxes_category"/>
- <separator name="customer_taxes" colspan="4"/>
- <field name="customer_taxes" colspan="4"/>
- <separator name="supplier_taxes" colspan="4"/>
- <field name="supplier_taxes" colspan="4"/>
+ <newline/>
+ <separator name="customer_taxes" colspan="2"/>
+ <separator name="supplier_taxes" colspan="2"/>
+ <field name="customer_taxes" colspan="2"/>
+ <field name="supplier_taxes" colspan="2"/>
</page>
</xpath>
</data>
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
index 4b5ccce..738d296 100644
--- a/trytond_account_product.egg-info/PKG-INFO
+++ b/trytond_account_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-product
-Version: 1.0.1
+Version: 1.2.0
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.0/
+Download-URL: http://downloads.tryton.org/1.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_account_product.egg-info/SOURCES.txt b/trytond_account_product.egg-info/SOURCES.txt
index 796c6ce..57140c1 100644
--- a/trytond_account_product.egg-info/SOURCES.txt
+++ b/trytond_account_product.egg-info/SOURCES.txt
@@ -5,6 +5,7 @@ LICENSE
MANIFEST.in
README
de_DE.csv
+es_CO.csv
es_ES.csv
fr_FR.csv
product.xml
diff --git a/trytond_account_product.egg-info/requires.txt b/trytond_account_product.egg-info/requires.txt
index bda2b85..c1d0161 100644
--- a/trytond_account_product.egg-info/requires.txt
+++ b/trytond_account_product.egg-info/requires.txt
@@ -1,5 +1,5 @@
trytond_account
trytond_company
trytond_product
-trytond >= 1.0
-trytond < 1.1
\ No newline at end of file
+trytond >= 1.2
+trytond < 1.3
\ No newline at end of file
commit 7cb20a789dfab1fa8fa7704b9861bf2048670db6
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jan 28 02:02:14 2009 +0100
Adding upstream version 1.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index eacaaef..9801fce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.0.1 - 2008-12-01
+* Allow egg installation
+
Version 1.0.0 - 2008-11-17
* Initial release
diff --git a/PKG-INFO b/PKG-INFO
index 795eff5..8f5d867 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_product
-Version: 1.0.0
+Version: 1.0.1
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
@@ -9,6 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
+Download-URL: http://downloads.tryton.org/1.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 52c2ead..abf8bb1 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -5,7 +5,7 @@
'name_de_DE': 'Buchhaltung Artikel',
'name_fr_FR': 'Compte produit',
'name_es_ES': 'Contabilidad de Inventarios',
- 'version': '1.0.0',
+ 'version': '1.0.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/setup.py b/setup.py
index 3729093..815f86d 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,8 @@ setup(name='trytond_account_product',
author=info.get('author', ''),
author_email=info.get('email', ''),
url=info.get('website', ''),
+ download_url="http://downloads.tryton.org/" + \
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
package_dir={'trytond.modules.account_product': '.'},
packages=[
'trytond.modules.account_product',
@@ -53,4 +55,9 @@ setup(name='trytond_account_product',
],
license='GPL-3',
install_requires=requires,
+ zip_safe=False,
+ entry_points="""
+ [trytond.modules]
+ account_product = trytond.modules.account_product
+ """,
)
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
index aa29b46..4b5ccce 100644
--- a/trytond_account_product.egg-info/PKG-INFO
+++ b/trytond_account_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-product
-Version: 1.0.0
+Version: 1.0.1
Summary: Add accounting properties on product and category like:
- account for expense / revenue
- taxes for customer / supplier
@@ -9,6 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
+Download-URL: http://downloads.tryton.org/1.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_account_product.egg-info/SOURCES.txt b/trytond_account_product.egg-info/SOURCES.txt
index aa2f45c..796c6ce 100644
--- a/trytond_account_product.egg-info/SOURCES.txt
+++ b/trytond_account_product.egg-info/SOURCES.txt
@@ -15,5 +15,7 @@ setup.py
trytond_account_product.egg-info/PKG-INFO
trytond_account_product.egg-info/SOURCES.txt
trytond_account_product.egg-info/dependency_links.txt
+trytond_account_product.egg-info/entry_points.txt
+trytond_account_product.egg-info/not-zip-safe
trytond_account_product.egg-info/requires.txt
trytond_account_product.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_account_product.egg-info/entry_points.txt b/trytond_account_product.egg-info/entry_points.txt
new file mode 100644
index 0000000..b54533b
--- /dev/null
+++ b/trytond_account_product.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ account_product = trytond.modules.account_product
+
\ No newline at end of file
diff --git a/trytond_account_product.egg-info/not-zip-safe b/trytond_account_product.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_account_product.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
commit d401b6793b546d44bd2961cb621f5f72388c2031
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Nov 18 13:05:53 2008 +0100
Adding upstream version 1.0.0.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..eacaaef
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.0.0 - 2008-11-17
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..37fef2d
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,17 @@
+Copyright (C) 2004-2008 Tiny SPRL.
+Copyright (C) 2008 Cédric Krier.
+Copyright (C) 2008 Bertrand Chenal.
+Copyright (C) 2008 B2CK SPRL.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..a9e12cd
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,32 @@
+Installing trytond_account_product
+==================================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond 0.0.x (http://www.tryton.org/)
+ * trytond_company (http://www.tryton.org/)
+ * trytond_account (http://www.tryton.org/)
+ * trytond_product (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked a trytond_account_product source release, enter the
+directory where the archive was unpacked, and run:
+
+ python setup.py install
+
+Note that you may need administrator/root privileges for this step, as
+this command will by default attempt to install module to the Python
+site-packages directory on your system.
+
+For advanced options, please refer to the easy_install and/or the distutils
+documentation:
+
+ http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://docs.python.org/inst/inst.html
+
+To use without installation, extract the archive into ``trytond/modules`` with
+the directory name account_product.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..5343ad8
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,9 @@
+include INSTALL
+include README
+include TODO
+include COPYRIGHT
+include CHANGELOG
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..795eff5
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,27 @@
+Metadata-Version: 1.0
+Name: trytond_account_product
+Version: 1.0.0
+Summary: Add accounting properties on product and category like:
+ - account for expense / revenue
+ - taxes for customer / supplier
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
+Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/README b/README
new file mode 100644
index 0000000..9fee7c8
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_account_product
+=======================
+
+The account_product module of the Tryton application platform.
+See __tryton__.py
+
+Installing
+----------
+
+See INSTALL
+
+Support
+-------
+
+If you encounter any problems with Tryton, please don't hesitate to ask
+questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+License
+-------
+
+See LICENSE
+
+Copyright
+---------
+
+See COPYRIGHT
+
+
+For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..70925e3
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,4 @@
+#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 product import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..52c2ead
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,42 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+{
+ 'name': 'Account Product',
+ 'name_de_DE': 'Buchhaltung Artikel',
+ 'name_fr_FR': 'Compte produit',
+ 'name_es_ES': 'Contabilidad de Inventarios',
+ 'version': '1.0.0',
+ 'author': 'B2CK',
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ 'description': '''Add accounting properties on product and category like:
+ - account for expense / revenue
+ - taxes for customer / supplier
+''',
+ 'description_de_DE': '''Fügt Eigenschaften für die Buchhaltung zu Artikeln und Artikelkategorien hinzu:
+ - Aufwands- und Ertragskonto
+ - Steuern für Kunden und Lieferanten
+''',
+ 'description_fr_FR': '''Ajoute des propriétés comptables sur les produits et leurs caétgories:
+ - comptes de dépense et revenu
+ - taxes client et fournisseur
+''',
+ 'description_es_ES': '''Adiciona propiedades contables en productos y categorías:
+ - contabilidad para gastos / ganancias
+ - impuestos para cliente / proveedor
+''',
+ 'depends': [
+ 'ir',
+ 'account',
+ 'company',
+ 'product',
+ ],
+ 'xml': [
+ 'product.xml',
+ ],
+ 'translation': [
+ 'de_DE.csv',
+ 'es_ES.csv',
+ 'fr_FR.csv',
+ ]
+}
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..c771f83
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,22 @@
+type,name,res_id,src,value,fuzzy
+error,product.template,0,There is no account expense/revenue define on the product %s (%d),Es ist kein Aufwands-/Ertragskonto in Artikel %s (%d) angegeben,0
+field,"product.category,account_expense",0,Account Expense,Konto Aufwand,0
+field,"product.category,account_revenue",0,Account Revenue,Konto Ertrag,0
+field,"product.category,customer_taxes",0,Customer Taxes,Steuern Kunde,0
+field,"product.category,supplier_taxes",0,Supplier Taxes,Steuern Lieferant,0
+field,"product.template,account_expense",0,Account Expense,Konto Aufwand,0
+field,"product.template,account_expense_used",0,Account Expense Used,Konto Aufwand benutzt,0
+field,"product.template,account_revenue",0,Account Revenue,Konto Ertrag,0
+field,"product.template,account_revenue_used",0,Account Revenue Used,Benutztes Ertragskonto,0
+field,"product.template,customer_taxes",0,Customer Taxes,Steuern (Kunden),0
+field,"product.template,customer_taxes_used",0,Customer Taxes Used,Benutzte Steuern für Kunden,0
+field,"product.template,supplier_taxes",0,Supplier Taxes,Steuern (Lieferanten),0
+field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Benutzte Steuern für Lieferanten,0
+field,"product.template,taxes_category",0,Use Category's Taxes,Wende die Steuern der Kategorie an,0
+help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Dieses Konto überschreibt das Konto welches in der Kategorie eingestellt ist.,0
+help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Dieses Konto überschreibt das Konto welches in der Kategorie eingestellt ist.,0
+help,"product.template,taxes_category",0,Use the taxes defined on the category,"Wendet die Steuern an, die in dieser Kategorie definiert sind",0
+view,product.category,0,Accounting,Buchhaltung,0
+view,product.category,0,Taxes,Steuern,0
+view,product.product,0,Accounting,Buchhaltung,0
+view,product.product,0,Taxes,Steuern,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..e25549a
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,21 @@
+type,name,res_id,src,value,fuzzy
+error,product.template,0,There is no account expense/revenue define on the product %s (%d),No hay una cuenta gasto/entrada definida en el producto %s (%d),0
+field,"product.category,account_expense",0,Account Expense,Cuenta de Gastos,0
+field,"product.category,account_revenue",0,Account Revenue,Cuenta de Ganancias,0
+field,"product.category,customer_taxes",0,Customer Taxes,Impuestos del Cliente,0
+field,"product.category,supplier_taxes",0,Supplier Taxes,Impuestos a Proveedores,0
+field,"product.template,account_expense",0,Account Expense,Cuenta de Gastos,0
+field,"product.template,account_expense_used",0,Account Expense Used,Cuenta de Gastos Usada,0
+field,"product.template,account_revenue",0,Account Revenue,Cuenta de Ganancias,0
+field,"product.template,account_revenue_used",0,Account Revenue Used,Cuenta de Ganancias Usada,0
+field,"product.template,customer_taxes",0,Customer Taxes,Impuestos del Cliente,0
+field,"product.template,customer_taxes_used",0,Customer Taxes Used,Impuestos del Cliente Usados,0
+field,"product.template,supplier_taxes",0,Supplier Taxes,Impuestos a Proveedores,0
+field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Impuestos del Cliente Usados,0
+field,"product.template,taxes_category",0,Use Category's Taxes,Categorías de Impuesto,0
+help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Esta cuenta se usará en lugar de la definida en la categoría.,0
+help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Esta cuenta se usará en lugar de la definida en la categoría.,0
+help,"product.template,taxes_category",0,Use the taxes defined on the category,Usar los impuestos definidos en la categoría,0
+view,product.category,0,Accounting,Contabilidad,0
+view,product.category,0,Taxes,Impuestos,0
+view,product.product,0,Accounting,Contabilidad,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..0799170
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,20 @@
+type,name,res_id,src,value,fuzzy
+error,product.template,0,There is no account expense/revenue define on the product %s (%d),Il n'y a pas de compte dépense/revenu définit sur le produit %s (%d),0
+field,"product.category,account_expense",0,Account Expense,Compte de Dépense,0
+field,"product.category,account_revenue",0,Account Revenue,Compte de Revenu,0
+field,"product.category,customer_taxes",0,Customer Taxes,Taxes client,0
+field,"product.category,supplier_taxes",0,Supplier Taxes,Taxes fournisseur,0
+field,"product.template,account_expense",0,Account Expense,Compte de Dépense,0
+field,"product.template,account_expense_used",0,Account Expense Used,Compte de Dépense Utilisé,0
+field,"product.template,account_revenue",0,Account Revenue,Compte de Revenu,0
+field,"product.template,account_revenue_used",0,Account Revenue Used,Compte de Revenu Utilisé,0
+field,"product.template,customer_taxes",0,Customer Taxes,Taxes Client,0
+field,"product.template,customer_taxes_used",0,Customer Taxes Used,Taxes utilisées,0
+field,"product.template,supplier_taxes",0,Supplier Taxes,Taxes Fournisseur,0
+field,"product.template,supplier_taxes_used",0,Customer Taxes Used,Taxes client utilisées,0
+field,"product.template,taxes_category",0,Use Category's Taxes,Utiliser les taxes de la catégorie,0
+help,"product.template,account_expense",0,This account will be used instead of the one defined on the category.,Ce compte sera utilisé au lieu de celui défini sur la catégorie.,0
+help,"product.template,account_revenue",0,This account will be used instead of the one defined on the category.,Ce compte sera utilisé au lieu de celui défini sur la catégorie.,0
+help,"product.template,taxes_category",0,Use the taxes defined on the category,Utiliser les taxes de la catégorie,0
+view,product.category,0,Accounting,Comptabilité,0
+view,product.product,0,Accounting,Comptabilité,0
diff --git a/product.py b/product.py
new file mode 100644
index 0000000..2fe36ee
--- /dev/null
+++ b/product.py
@@ -0,0 +1,108 @@
+#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 trytond.osv import fields, OSV
+
+
+class Category(OSV):
+ _name = 'product.category'
+
+ account_expense = fields.Property(type='many2one',
+ relation='account.account', string='Account Expense',
+ domain="[('kind', '=', 'expense'), ('company', '=', company)]",
+ states={
+ 'invisible': "not company",
+ })
+ account_revenue = fields.Property(type='many2one',
+ relation='account.account', string='Account Revenue',
+ domain="[('kind', '=', 'revenue'), ('company', '=', company)]",
+ states={
+ 'invisible': "not company",
+ })
+ customer_taxes = fields.Many2Many('account.tax',
+ 'product_category_customer_taxes_rel', 'product', 'tax',
+ 'Customer Taxes', domain=[('parent', '=', False)])
+ supplier_taxes = fields.Many2Many('account.tax',
+ 'product_category_supplier_taxes_rel', 'product', 'tax',
+ 'Supplier Taxes', domain=[('parent', '=', False)])
+
+Category()
+
+
+class Template(OSV):
+ _name = 'product.template'
+
+ account_expense = fields.Property(type='many2one',
+ string='Account Expense', relation='account.account',
+ domain="[('kind', '=', 'expense'), ('company', '=', company)]",
+ states={
+ 'invisible': "not company",
+ }, help='This account will be used instead of the one defined ' \
+ 'on the category.')
+ account_revenue = fields.Property(type='many2one',
+ string='Account Revenue', relation='account.account',
+ domain="[('kind', '=', 'revenue'), ('company', '=', company)]",
+ states={
+ 'invisible': "not company",
+ }, help='This account will be used instead of the one defined ' \
+ 'on the category.')
+ account_expense_used = fields.Function('get_account', type='many2one',
+ relation='account.account', string='Account Expense Used')
+ account_revenue_used = fields.Function('get_account', type='many2one',
+ relation='account.account', string='Account Revenue Used')
+ taxes_category = fields.Boolean('Use Category\'s Taxes', help='Use the taxes ' \
+ 'defined on the category')
+ customer_taxes = fields.Many2Many('account.tax',
+ 'product_customer_taxes_rel', 'product', 'tax',
+ 'Customer Taxes', domain=[('parent', '=', False)], states={
+ 'invisible': "bool(taxes_category)",
+ })
+ supplier_taxes = fields.Many2Many('account.tax',
+ 'product_supplier_taxes_rel', 'product', 'tax',
+ 'Supplier Taxes', domain=[('parent', '=', False)], states={
+ 'invisible': "bool(taxes_category)",
+ })
+ customer_taxes_used = fields.Function('get_taxes', type='many2many',
+ relation='account.tax', string='Customer Taxes Used')
+ supplier_taxes_used = fields.Function('get_taxes', type='many2many',
+ relation='account.tax', string='Customer Taxes Used')
+
+ def __init__(self):
+ super(Template, self).__init__()
+ self._error_messages.update({
+ 'missing_account': 'There is no account ' \
+ 'expense/revenue define on the product ' \
+ '%s (%d)',
+ })
+
+ def default_taxes_category(self, cursor, user, context=None):
+ return False
+
+ def get_account(self, cursor, user, ids, name, arg, context=None):
+ account_obj = self.pool.get('account.account')
+ res = {}
+ name = name[:-5]
+ for product in self.browse(cursor, user, ids, context=context):
+ if product[name]:
+ res[product.id] = account_obj.name_get(cursor, user,
+ product[name].id, context=context)[0]
+ else:
+ if product.category[name]:
+ res[product.id] = account_obj.name_get(cursor, user,
+ product.category[name].id, context=context)[0]
+ else:
+ self.raise_user_error(cursor, 'missing_account',
+ (product.name, product.id), context=context)
+ return res
+
+ def get_taxes(self, cursor, user, ids, name, arg, context=None):
+ res = {}
+ name = name[:-5]
+ for product in self.browse(cursor, user, ids, context=context):
+ if product.taxes_category:
+ res[product.id] = [x.id for x in product.category[name]]
+ else:
+ res[product.id] = [x.id for x in product[name]]
+ return res
+
+Template()
diff --git a/product.xml b/product.xml
new file mode 100644
index 0000000..370de51
--- /dev/null
+++ b/product.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+
+ <record model="ir.ui.view" id="category_view_form">
+ <field name="model">product.category</field>
+ <field name="inherit" ref="product.category_view_form"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath
+ expr="/form/notebook/page[@string="Childs"]"
+ position="after">
+ <page string="Accounting" col="4">
+ <label name="account_revenue"/>
+ <field name="account_revenue"/>
+ <label name="account_expense"/>
+ <field name="account_expense"/>
+ <separator name="customer_taxes" colspan="4"/>
+ <field name="customer_taxes" colspan="4"/>
+ <separator name="supplier_taxes" colspan="4"/>
+ <field name="supplier_taxes" colspan="4"/>
+ </page>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="product_view_form">
+ <field name="model">product.product</field>
+ <field name="inherit" ref="product.product_view_form"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath
+ expr="/form/notebook/page[@string="General"]"
+ position="after">
+ <page string="Accounting" col="4">
+ <label name="account_revenue"/>
+ <field name="account_revenue"/>
+ <label name="account_expense"/>
+ <field name="account_expense"/>
+ <label name="taxes_category"/>
+ <field name="taxes_category"/>
+ <separator name="customer_taxes" colspan="4"/>
+ <field name="customer_taxes" colspan="4"/>
+ <separator name="supplier_taxes" colspan="4"/>
+ <field name="supplier_taxes" colspan="4"/>
+ </page>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+
+ </data>
+</tryton>
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..3729093
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+#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 setuptools import setup, find_packages
+import re
+
+info = eval(file('__tryton__.py').read())
+
+requires = []
+for dep in info.get('depends', []):
+ match = re.compile(
+ '(ir|res|workflow|webdav)((\s|$|<|>|<=|>=|==|!=).*?$)').match(dep)
+ if match:
+ continue
+ else:
+ dep = 'trytond_' + dep
+ requires.append(dep)
+
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+requires.append('trytond >= %s.%s' % (major_version, minor_version))
+requires.append('trytond < %s.%s' % (major_version, str(int(minor_version) + 1)))
+
+setup(name='trytond_account_product',
+ version=info.get('version', '0.0.1'),
+ description=info.get('description', ''),
+ author=info.get('author', ''),
+ author_email=info.get('email', ''),
+ url=info.get('website', ''),
+ package_dir={'trytond.modules.account_product': '.'},
+ packages=[
+ 'trytond.modules.account_product',
+ ],
+ package_data={
+ 'trytond.modules.account_product': info.get('xml', []) \
+ + info.get('translation', []),
+ },
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Financial and Insurance Industry',
+ 'Intended Audience :: Legal Industry',
+ 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: English',
+ 'Natural Language :: French',
+ 'Natural Language :: German',
+ 'Natural Language :: Spanish',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Topic :: Office/Business',
+ 'Topic :: Office/Business :: Financial :: Accounting',
+ ],
+ license='GPL-3',
+ install_requires=requires,
+)
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
new file mode 100644
index 0000000..aa29b46
--- /dev/null
+++ b/trytond_account_product.egg-info/PKG-INFO
@@ -0,0 +1,27 @@
+Metadata-Version: 1.0
+Name: trytond-account-product
+Version: 1.0.0
+Summary: Add accounting properties on product and category like:
+ - account for expense / revenue
+ - taxes for customer / supplier
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
+Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/trytond_account_product.egg-info/SOURCES.txt b/trytond_account_product.egg-info/SOURCES.txt
new file mode 100644
index 0000000..aa2f45c
--- /dev/null
+++ b/trytond_account_product.egg-info/SOURCES.txt
@@ -0,0 +1,19 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+de_DE.csv
+es_ES.csv
+fr_FR.csv
+product.xml
+setup.py
+./__init__.py
+./__tryton__.py
+./product.py
+trytond_account_product.egg-info/PKG-INFO
+trytond_account_product.egg-info/SOURCES.txt
+trytond_account_product.egg-info/dependency_links.txt
+trytond_account_product.egg-info/requires.txt
+trytond_account_product.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_account_product.egg-info/dependency_links.txt b/trytond_account_product.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_account_product.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_account_product.egg-info/requires.txt b/trytond_account_product.egg-info/requires.txt
new file mode 100644
index 0000000..bda2b85
--- /dev/null
+++ b/trytond_account_product.egg-info/requires.txt
@@ -0,0 +1,5 @@
+trytond_account
+trytond_company
+trytond_product
+trytond >= 1.0
+trytond < 1.1
\ No newline at end of file
diff --git a/trytond_account_product.egg-info/top_level.txt b/trytond_account_product.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_account_product.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
--
tryton-modules-account-product
More information about the tryton-debian-vcs
mailing list