[tryton-debian-vcs] tryton-modules-account-product branch upstream updated. upstream/4.4.0-1-ga5eeafc
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Fri Nov 10 12:07:40 UTC 2017
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=upstream/4.4.0-1-ga5eeafc
commit a5eeafc6ce74fbebdb102b16905569258f661d72
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 6 14:40:30 2017 +0100
Adding upstream version 4.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..e0bc2f7
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,51 @@
+clone:
+ hg:
+ image: plugins/hg
+
+pipeline:
+ tox:
+ image: ${IMAGE}
+ environment:
+ - CFLAGS=-O0
+ - DB_CACHE=/cache
+ - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE
+ - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
+ commands:
+ - pip install tox
+ - tox -e "${TOXENV}-${DATABASE}"
+ volumes:
+ - cache:/root/.cache
+
+services:
+ postgresql:
+ image: postgres
+ when:
+ matrix:
+ DATABASE: postgresql
+
+matrix:
+ include:
+ - IMAGE: python:2.7
+ TOXENV: py27
+ DATABASE: sqlite
+ - IMAGE: python:2.7
+ TOXENV: py27
+ DATABASE: postgresql
+ - IMAGE: python:3.4
+ TOXENV: py34
+ DATABASE: sqlite
+ - IMAGE: python:3.4
+ TOXENV: py34
+ DATABASE: postgresql
+ - IMAGE: python:3.5
+ TOXENV: py35
+ DATABASE: sqlite
+ - IMAGE: python:3.5
+ TOXENV: py35
+ DATABASE: postgresql
+ - IMAGE: python:3.6
+ TOXENV: py36
+ DATABASE: sqlite
+ - IMAGE: python:3.6
+ TOXENV: py36
+ DATABASE: postgresql
diff --git a/CHANGELOG b/CHANGELOG
index d9ca7bb..a579f17 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+Version 4.6.0 - 2017-10-30
+* Bug fixes (see mercurial logs for details)
+* Allow to set default category and product accounts on configuration wizard
+* Replace MissingFunction with properties
+
Version 4.4.0 - 2017-05-01
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index b75e703..8b815be 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_product
-Version: 4.4.0
+Version: 4.6.0
Summary: Tryton module to add accounting on product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
Description: trytond_account_product
=======================
@@ -69,9 +69,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/__init__.py b/__init__.py
index f74314e..3290452 100644
--- a/__init__.py
+++ b/__init__.py
@@ -4,6 +4,7 @@
from trytond.pool import Pool
from .product import *
from .configuration import *
+from . import account
def register():
@@ -13,11 +14,17 @@ def register():
CategoryAccount,
CategoryCustomerTax,
CategorySupplierTax,
+ account.CreateChartProperties,
Template,
TemplateAccount,
TemplateCustomerTax,
TemplateSupplierTax,
Product,
+ TemplateAccountCategory,
+ TemplateCategoryAll,
Configuration,
ConfigurationDefaultAccount,
module='account_product', type_='model')
+ Pool.register(
+ account.CreateChart,
+ module='account_product', type_='wizard')
diff --git a/account.py b/account.py
new file mode 100644
index 0000000..1cb4e50
--- /dev/null
+++ b/account.py
@@ -0,0 +1,61 @@
+# 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 PoolMeta, Pool
+from trytond.pyson import Eval
+from trytond.model import fields
+from trytond.transaction import Transaction
+
+__all__ = ['CreateChart', 'CreateChartProperties']
+
+
+class CreateChartProperties:
+ __metaclass__ = PoolMeta
+ __name__ = 'account.create_chart.properties'
+
+ product_account_expense = fields.Many2One(
+ 'account.account', 'Default Expense Account',
+ domain=[
+ ('kind', '=', 'expense'),
+ ('company', '=', Eval('company')),
+ ],
+ depends=['company'])
+ product_account_revenue = fields.Many2One(
+ 'account.account', 'Default Revenue Account',
+ domain=[
+ ('kind', '=', 'revenue'),
+ ('company', '=', Eval('company')),
+ ],
+ depends=['company'])
+ category_account_expense = fields.Many2One(
+ 'account.account', 'Default Expense Account',
+ domain=[
+ ('kind', '=', 'expense'),
+ ('company', '=', Eval('company')),
+ ],
+ depends=['company'])
+ category_account_revenue = fields.Many2One(
+ 'account.account', 'Default Revenue Account',
+ domain=[
+ ('kind', '=', 'revenue'),
+ ('company', '=', Eval('company')),
+ ],
+ depends=['company'])
+
+
+class CreateChart:
+ __metaclass__ = PoolMeta
+ __name__ = 'account.create_chart'
+
+ def transition_create_properties(self):
+ pool = Pool()
+ Configuration = pool.get('account.configuration')
+ state = super(CreateChart, self).transition_create_properties()
+
+ with Transaction().set_context(company=self.properties.company.id):
+ config = Configuration(1)
+ for name in ['product_account_expense', 'product_account_revenue',
+ 'category_account_expense', 'category_account_revenue']:
+ setattr(config, 'default_%s' % name,
+ getattr(self.properties, name, None))
+ config.save()
+ return state
diff --git a/account.xml b/account.xml
new file mode 100644
index 0000000..35e8678
--- /dev/null
+++ b/account.xml
@@ -0,0 +1,13 @@
+<?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="create_chart_properties_view_form">
+ <field name="model">account.create_chart.properties</field>
+ <field name="inherit"
+ ref="account.create_chart_properties_view_form"/>
+ <field name="name">create_chart_properties_form</field>
+ </record>
+ </data>
+</tryton>
diff --git a/locale/bg.po b/locale/bg.po
index 308cfcf..5ba6234 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -1,9 +1,12 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "error:product.category:"
-msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
msgstr "Няма сметка за приход/разход зададена за тази категория %s (%d)"
msgctxt "error:product.template:"
@@ -46,14 +49,26 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr ""
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Разходи за сметка"
-msgctxt "field:product.category,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Използвани разходи по сметка"
-
msgctxt "field:product.category,account_parent:"
msgid "Use Parent's accounts"
msgstr "Използване на родителски сметки"
@@ -62,10 +77,6 @@ msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "Приход по сметка"
-msgctxt "field:product.category,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Използвани приходи по сметка"
-
#, fuzzy
msgctxt "field:product.category,accounting:"
msgid "Accounting"
@@ -113,8 +124,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
@@ -145,8 +156,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
@@ -194,10 +205,9 @@ msgctxt "field:product.category.account,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:product.category.account,write_date:"
@@ -227,21 +237,11 @@ msgid "Account Expense"
msgstr "Разходи за сметка"
#, fuzzy
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Използвани разходи по сметка"
-
-#, fuzzy
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Приход по сметка"
#, fuzzy
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Използвани приходи по сметка"
-
-#, fuzzy
msgctxt "field:product.product,accounts:"
msgid "Accounts"
msgstr "Сметки"
@@ -284,18 +284,10 @@ msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Разходи за сметка"
-msgctxt "field:product.template,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Използвани разходи по сметка"
-
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr "Приход по сметка"
-msgctxt "field:product.template,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Използвани разходи по сметка"
-
#, fuzzy
msgctxt "field:product.template,accounts:"
msgid "Accounts"
@@ -343,8 +335,8 @@ msgid "Product Template"
msgstr "Щаблон за продукт"
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
@@ -358,6 +350,44 @@ msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
msgstr "Променено от"
+#, fuzzy
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr "Категория"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
msgstr "Създадено на"
@@ -375,8 +405,8 @@ msgid "Product Template"
msgstr "Щаблон за продукт"
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
@@ -419,10 +449,9 @@ msgctxt "field:product.template.account,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template.account,template:"
msgid "Template"
@@ -524,6 +553,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "Шаблон на продукт - Данък на клиент"
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr ""
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Шаблон на продукт - Данък на доставчик"
@@ -541,6 +574,16 @@ msgctxt "view:account.configuration:"
msgid "Product"
msgstr "Продукт"
+#, fuzzy
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr "Категория"
+
+#, fuzzy
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr "Продукт"
+
msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Счетоводство"
diff --git a/locale/ca.po b/locale/ca.po
index 96c134f..381cc4e 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -1,10 +1,14 @@
-#
+#
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 "La categoria %s (%d) no té cap compte de despeses/ingressos definit."
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
+msgstr ""
+"La categoria %(name)s (%(id)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)"
@@ -46,14 +50,26 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr "Compte d'ingressos per defecte"
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr "Compte de despeses per defecte"
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr "Compte de ingressos per defecte"
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
+msgstr "Compte de despeses per defecte"
+
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
+msgstr "Compte de ingressos per defecte"
+
msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Compte de despeses"
-msgctxt "field:product.category,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Compte de despeses usada"
-
msgctxt "field:product.category,account_parent:"
msgid "Use Parent's accounts"
msgstr "Usa comptes pare"
@@ -62,10 +78,6 @@ msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "Compte d'ingressos"
-msgctxt "field:product.category,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Compte d'ingressos usada"
-
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr "Comptabilitat"
@@ -111,8 +123,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
@@ -143,8 +155,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
@@ -187,8 +199,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:product.category.account,write_date:"
msgid "Write Date"
@@ -214,18 +226,10 @@ msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr "Compte de despeses"
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Compte de despeses usada"
-
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Compte d'ingressos"
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Compte d'ingressos usada"
-
msgctxt "field:product.product,accounts:"
msgid "Accounts"
msgstr "Comptes"
@@ -262,18 +266,10 @@ msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Compte de despeses"
-msgctxt "field:product.template,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Compte de despeses 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,accounts:"
msgid "Accounts"
msgstr "Comptes"
@@ -319,8 +315,8 @@ msgid "Product Template"
msgstr "Plantilla de producte"
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
@@ -334,6 +330,38 @@ msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
msgstr "Usuari de modificació"
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr "Categoria"
+
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr "Data de creació"
+
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr "Usuari de creació"
+
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr "Nom del registre"
+
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr "Plantilla"
+
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr "Data de modificació"
+
+msgctxt "field:product.template-product.category.account,write_uid:"
+msgid "Write User"
+msgstr "Usuari de modificació"
+
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
msgstr "Data de creació"
@@ -351,8 +379,8 @@ msgid "Product Template"
msgstr "Plantilla de producte"
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
@@ -391,8 +419,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:product.template.account,template:"
msgid "Template"
@@ -498,6 +526,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "Plantilla de producte - Impost client"
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr "Plantilla - Categoria Comptable"
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Plantilla de producte - Impost proveïdor"
@@ -514,6 +546,14 @@ msgctxt "view:account.configuration:"
msgid "Product"
msgstr "Producte"
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr "Categoria"
+
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr "Producte"
+
msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Comptabilitat"
diff --git a/locale/cs.po b/locale/cs.po
index ea4d3cf..15a4fbc 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,9 +1,11 @@
-#
+#
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)"
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
msgstr ""
msgctxt "error:product.template:"
@@ -46,12 +48,24 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr ""
-msgctxt "field:product.category,account_expense:"
-msgid "Account Expense"
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
msgstr ""
-msgctxt "field:product.category,account_expense_used:"
-msgid "Account Expense Used"
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:product.category,account_expense:"
+msgid "Account Expense"
msgstr ""
msgctxt "field:product.category,account_parent:"
@@ -62,10 +76,6 @@ msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.category,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr ""
@@ -110,10 +120,9 @@ msgctxt "field:product.category-customer-account.tax,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
@@ -143,10 +152,9 @@ msgctxt "field:product.category-supplier-account.tax,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
@@ -188,10 +196,9 @@ msgctxt "field:product.category.account,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category.account,write_date:"
msgid "Write Date"
@@ -217,18 +224,10 @@ msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr ""
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr ""
-
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
msgctxt "field:product.product,accounts:"
msgid "Accounts"
msgstr ""
@@ -265,18 +264,10 @@ msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr ""
-msgctxt "field:product.template,account_expense_used:"
-msgid "Account Expense Used"
-msgstr ""
-
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.template,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
msgctxt "field:product.template,accounts:"
msgid "Accounts"
msgstr ""
@@ -321,10 +312,9 @@ msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
msgstr ""
-#, fuzzy
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
@@ -338,6 +328,38 @@ msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,write_uid:"
+msgid "Write User"
+msgstr ""
+
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
msgstr ""
@@ -354,10 +376,9 @@ msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
msgstr ""
-#, fuzzy
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
@@ -395,10 +416,9 @@ msgctxt "field:product.template.account,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template.account,template:"
msgid "Template"
@@ -496,6 +516,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr ""
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr ""
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr ""
@@ -512,6 +536,14 @@ msgctxt "view:account.configuration:"
msgid "Product"
msgstr ""
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr ""
+
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr ""
+
msgctxt "view:product.category:"
msgid "Accounting"
msgstr ""
diff --git a/locale/de.po b/locale/de.po
index aa3107a..e6ada84 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,9 +1,12 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "error:product.category:"
-msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
msgstr "Es ist kein Aufwands-/Ertragskonto definiert für Kategorie %s (%d)."
msgctxt "error:product.template:"
@@ -46,14 +49,26 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr "Standardertragskonto"
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Aufwandskonto"
-msgctxt "field:product.category,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Verwendetes Aufwandskonto"
-
msgctxt "field:product.category,account_parent:"
msgid "Use Parent's accounts"
msgstr "Konten der übergeordneten Kategorie anwenden"
@@ -62,10 +77,6 @@ msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "Ertragskonto"
-msgctxt "field:product.category,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Verwendetes Ertragskonto"
-
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr "Buchhaltung"
@@ -111,8 +122,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
@@ -143,8 +154,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
@@ -187,8 +198,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category.account,write_date:"
msgid "Write Date"
@@ -214,18 +225,10 @@ msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr "Aufwandskonto"
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Verwendetes Aufwandskonto"
-
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Ertragskonto"
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Verwendetes Ertragskonto"
-
msgctxt "field:product.product,accounts:"
msgid "Accounts"
msgstr "Konten"
@@ -262,18 +265,10 @@ msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Aufwandskonto"
-msgctxt "field:product.template,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Verwendetes Aufwandskonto"
-
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr "Ertragskonto"
-msgctxt "field:product.template,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Verwendetes Ertragskonto"
-
msgctxt "field:product.template,accounts:"
msgid "Accounts"
msgstr "Konten"
@@ -319,8 +314,8 @@ msgid "Product Template"
msgstr "Artikel"
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
@@ -334,6 +329,45 @@ msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
msgstr "Letzte Änderung durch"
+#, fuzzy
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr "Kategorie"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr "Vorlage"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
msgstr "Erstellungsdatum"
@@ -351,8 +385,8 @@ msgid "Product Template"
msgstr "Artikel"
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
@@ -391,8 +425,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template.account,template:"
msgid "Template"
@@ -502,6 +536,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "Artikel - Steuer Kunde"
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr ""
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Artikel - Steuer Lieferant"
@@ -518,6 +556,16 @@ msgctxt "view:account.configuration:"
msgid "Product"
msgstr "Artikel"
+#, fuzzy
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr "Kategorie"
+
+#, fuzzy
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr "Artikel"
+
msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Buchhaltung"
diff --git a/locale/es.po b/locale/es.po
index f6b39d6..7069654 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,11 +1,14 @@
-#
+#
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)"
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
msgstr ""
-"La categoría %s (%d) no tiene ninguna cuenta de gastos/ingresos definida."
+"La categoría %(name)s (%(id)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)"
@@ -48,14 +51,26 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr "Cuenta de ingresos por defecto"
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr "Cuenta gastos por defecto"
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr "Cuenta ingresos por defecto"
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
+msgstr "Cuenta gastos por defecto"
+
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
+msgstr "Cuenta ingresos por defecto"
+
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"
@@ -64,10 +79,6 @@ 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,accounting:"
msgid "Accounting"
msgstr "Contabilidad"
@@ -113,8 +124,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
@@ -145,8 +156,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
@@ -189,8 +200,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:product.category.account,write_date:"
msgid "Write Date"
@@ -216,18 +227,10 @@ msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr "Cuenta de gastos"
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Cuenta de gastos usada"
-
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Cuenta de ingresos"
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Cuenta de ingresos usada"
-
msgctxt "field:product.product,accounts:"
msgid "Accounts"
msgstr "Cuentas"
@@ -264,18 +267,10 @@ 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,accounts:"
msgid "Accounts"
msgstr "Cuentas"
@@ -321,8 +316,8 @@ msgid "Product Template"
msgstr "Plantilla de producto"
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
@@ -336,6 +331,38 @@ msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
msgstr "Usuario de modificación"
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr "Categoría"
+
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr "Usuario de creación"
+
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr "Nombre del registro"
+
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr "Plantilla"
+
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:product.template-product.category.account,write_uid:"
+msgid "Write User"
+msgstr "Usuario de modificación"
+
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
msgstr "Fecha de creación"
@@ -353,8 +380,8 @@ msgid "Product Template"
msgstr "Plantilla de producto"
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
@@ -393,8 +420,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:product.template.account,template:"
msgid "Template"
@@ -502,6 +529,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "Plantilla de producto - Impuesto de cliente"
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr "Plantilla - Categoría Contable"
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Plantilla de producto - Impuesto de proveedor"
@@ -518,6 +549,14 @@ msgctxt "view:account.configuration:"
msgid "Product"
msgstr "Producto"
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr "Categoría"
+
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr "Producto"
+
msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Contabilidad"
diff --git a/locale/es_419.po b/locale/es_419.po
index 9391665..3aa7ddf 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -1,9 +1,12 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "error:product.category:"
-msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
msgstr ""
"No hay ninguna cuenta de gastos/ingresos definida en la categoría %s (%d)"
@@ -48,14 +51,26 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr ""
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
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 utilizada"
-
msgctxt "field:product.category,account_parent:"
msgid "Use Parent's accounts"
msgstr "Utilizar las cuentas del padre"
@@ -64,10 +79,6 @@ 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 utilizada"
-
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr ""
@@ -113,7 +124,7 @@ msgid "ID"
msgstr ""
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:product.category-customer-account.tax,tax:"
@@ -145,7 +156,7 @@ msgid "ID"
msgstr ""
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:product.category-supplier-account.tax,tax:"
@@ -190,7 +201,7 @@ msgid "ID"
msgstr ""
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:product.category.account,write_date:"
@@ -218,18 +229,10 @@ msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr "Cuenta de gastos"
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Cuenta de gastos utilizada"
-
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Cuenta de ingresos"
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Cuenta de ingresos utilizada"
-
msgctxt "field:product.product,accounts:"
msgid "Accounts"
msgstr ""
@@ -266,18 +269,10 @@ 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 utilizada"
-
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 utilizada"
-
msgctxt "field:product.template,accounts:"
msgid "Accounts"
msgstr ""
@@ -323,7 +318,7 @@ msgid "Product Template"
msgstr ""
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:product.template-customer-account.tax,tax:"
@@ -338,6 +333,40 @@ msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
msgstr "Modificado por usuario"
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_uid:"
+msgid "Write User"
+msgstr "Modificado por usuario"
+
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
msgstr ""
@@ -355,7 +384,7 @@ msgid "Product Template"
msgstr ""
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:product.template-supplier-account.tax,tax:"
@@ -396,7 +425,7 @@ msgid "ID"
msgstr ""
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:product.template.account,template:"
@@ -496,6 +525,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr ""
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr ""
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr ""
@@ -512,6 +545,14 @@ msgctxt "view:account.configuration:"
msgid "Product"
msgstr ""
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr ""
+
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr ""
+
msgctxt "view:product.category:"
msgid "Accounting"
msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 29e97a5..361d703 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,11 +1,14 @@
-#
+#
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)"
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
msgstr ""
-"Il n'y a pas de compte de charges/produits défini sur la catégorie %s (%d)"
+"Il n'y a pas de compte de charges/produits défini sur la catégorie %(name)s "
+"(%(id)d)"
msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
@@ -48,14 +51,26 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr "Compte de produits par défaut"
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr "Compte de charges par défaut"
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr "Compte de produits par défaut"
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
+msgstr "Compte de charges par défaut"
+
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
+msgstr "Compte de produits par défaut"
+
msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Compte de charges"
-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"
@@ -64,10 +79,6 @@ msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "Compte de produits"
-msgctxt "field:product.category,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Compte de produits utilisé"
-
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr "Comptabilité"
@@ -113,8 +124,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
@@ -145,8 +156,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
@@ -189,8 +200,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:product.category.account,write_date:"
msgid "Write Date"
@@ -216,18 +227,10 @@ msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr "Compte de charges"
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Compte de charges utilisé"
-
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Compte de produits"
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Compte de produits utilisé"
-
msgctxt "field:product.product,accounts:"
msgid "Accounts"
msgstr "Comptes"
@@ -264,18 +267,10 @@ msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Compte de charges"
-msgctxt "field:product.template,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Compte de charges utilisé"
-
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr "Compte de produits"
-msgctxt "field:product.template,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Compte de produits utilisé"
-
msgctxt "field:product.template,accounts:"
msgid "Accounts"
msgstr "Comptes"
@@ -321,8 +316,8 @@ msgid "Product Template"
msgstr "Modèle produit"
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
@@ -336,6 +331,38 @@ msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
msgstr "Mis à jour par"
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr "Catégorie"
+
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
+
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr "Modèle"
+
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:product.template-product.category.account,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"
@@ -353,8 +380,8 @@ msgid "Product Template"
msgstr "Modèle produit"
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
@@ -393,8 +420,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:product.template.account,template:"
msgid "Template"
@@ -498,6 +525,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "Modèle du produit - Taxe client"
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr "Modèle - Catégorie comptable"
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Modèle du produit - Taxe fournisseur"
@@ -514,6 +545,14 @@ msgctxt "view:account.configuration:"
msgid "Product"
msgstr "Produit"
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr "Catégorie"
+
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr "Produit"
+
msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Comptabilité"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 72ab53e..1ba10a2 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -1,9 +1,11 @@
-#
+#
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)"
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
msgstr ""
msgctxt "error:product.template:"
@@ -46,12 +48,24 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr ""
-msgctxt "field:product.category,account_expense:"
-msgid "Account Expense"
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
msgstr ""
-msgctxt "field:product.category,account_expense_used:"
-msgid "Account Expense Used"
+msgctxt "field:product.category,account_expense:"
+msgid "Account Expense"
msgstr ""
msgctxt "field:product.category,account_parent:"
@@ -62,10 +76,6 @@ msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.category,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr ""
@@ -115,10 +125,9 @@ msgctxt "field:product.category-customer-account.tax,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
@@ -154,10 +163,9 @@ msgctxt "field:product.category-supplier-account.tax,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
@@ -205,10 +213,9 @@ msgctxt "field:product.category.account,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:product.category.account,write_date:"
@@ -236,18 +243,10 @@ msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr ""
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr ""
-
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
#, fuzzy
msgctxt "field:product.product,accounts:"
msgid "Accounts"
@@ -285,18 +284,10 @@ msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr ""
-msgctxt "field:product.template,account_expense_used:"
-msgid "Account Expense Used"
-msgstr ""
-
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.template,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
#, fuzzy
msgctxt "field:product.template,accounts:"
msgid "Accounts"
@@ -346,10 +337,9 @@ msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
msgstr "Cikk sablon"
-#, fuzzy
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
@@ -366,6 +356,44 @@ msgid "Write User"
msgstr "Által módosítva"
#, fuzzy
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr "Kategória"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr "Létrehozás détuma"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr "Által létrehozva "
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr "utolsó módosítás dátuma"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_uid:"
+msgid "Write User"
+msgstr "Által módosítva"
+
+#, fuzzy
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
msgstr "Létrehozás détuma"
@@ -385,10 +413,9 @@ msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
msgstr "Cikk sablon"
-#, fuzzy
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
@@ -431,10 +458,9 @@ msgctxt "field:product.template.account,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template.account,template:"
msgid "Template"
@@ -534,6 +560,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr ""
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr ""
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr ""
@@ -552,6 +582,16 @@ msgctxt "view:account.configuration:"
msgid "Product"
msgstr "Termék"
+#, fuzzy
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr "Kategória"
+
+#, fuzzy
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr "Termék"
+
msgctxt "view:product.category:"
msgid "Accounting"
msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 23c7b55..08f14db 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1,9 +1,12 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "error:product.category:"
-msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
msgstr ""
"Manca la definizione del conto di costo/ricavo per la categoria %s (%d)"
@@ -52,14 +55,26 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr "Conto di ricavo predefinito"
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Conto di costo"
-msgctxt "field:product.category,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Conto di costo utilizzato"
-
msgctxt "field:product.category,account_parent:"
msgid "Use Parent's accounts"
msgstr "Utilizzare i conti padre"
@@ -68,10 +83,6 @@ msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "Conto di ricavo"
-msgctxt "field:product.category,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Conto di ricavo utilizzato"
-
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr "Contabilità"
@@ -118,8 +129,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
@@ -150,8 +161,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
@@ -199,10 +210,9 @@ msgctxt "field:product.category.account,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:product.category.account,write_date:"
@@ -230,18 +240,10 @@ msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr "Conto di costo"
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Conto di costo utilizzato"
-
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Conto di ricavo"
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Conto di ricavo utilizzato"
-
#, fuzzy
msgctxt "field:product.product,accounts:"
msgid "Accounts"
@@ -279,18 +281,10 @@ msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Conto di costo"
-msgctxt "field:product.template,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Conto di costo utilizzato"
-
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr "Conto di ricavo"
-msgctxt "field:product.template,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Conto di ricavo utilizzato"
-
#, fuzzy
msgctxt "field:product.template,accounts:"
msgid "Accounts"
@@ -337,8 +331,8 @@ msgid "Product Template"
msgstr "Modello prodotto/articolo"
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
@@ -352,6 +346,44 @@ msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
msgstr "Modificato da"
+#, fuzzy
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr "Categoria"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr "Data creazione"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr "Creato da"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr "Data modifica"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_uid:"
+msgid "Write User"
+msgstr "Modificato da"
+
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
msgstr "Creato il"
@@ -369,8 +401,8 @@ msgid "Product Template"
msgstr "Prototipo di prodotto"
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
@@ -413,10 +445,9 @@ msgctxt "field:product.template.account,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template.account,template:"
msgid "Template"
@@ -518,6 +549,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "Modello Prodotto - Imposta cliente"
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr ""
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Modello di prodotto - Imposta fornitore"
@@ -534,6 +569,16 @@ msgctxt "view:account.configuration:"
msgid "Product"
msgstr "Prodotto"
+#, fuzzy
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr "Categoria"
+
+#, fuzzy
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr "Prodotto"
+
msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Contabilità"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 4eb8d36..15a4fbc 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -1,9 +1,11 @@
-#
+#
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)"
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
msgstr ""
msgctxt "error:product.template:"
@@ -46,12 +48,24 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr ""
-msgctxt "field:product.category,account_expense:"
-msgid "Account Expense"
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
msgstr ""
-msgctxt "field:product.category,account_expense_used:"
-msgid "Account Expense Used"
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:product.category,account_expense:"
+msgid "Account Expense"
msgstr ""
msgctxt "field:product.category,account_parent:"
@@ -62,10 +76,6 @@ msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.category,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr ""
@@ -111,7 +121,7 @@ msgid "ID"
msgstr ""
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:product.category-customer-account.tax,tax:"
@@ -143,7 +153,7 @@ msgid "ID"
msgstr ""
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:product.category-supplier-account.tax,tax:"
@@ -187,7 +197,7 @@ msgid "ID"
msgstr ""
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:product.category.account,write_date:"
@@ -214,18 +224,10 @@ msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr ""
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr ""
-
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
msgctxt "field:product.product,accounts:"
msgid "Accounts"
msgstr ""
@@ -262,18 +264,10 @@ msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr ""
-msgctxt "field:product.template,account_expense_used:"
-msgid "Account Expense Used"
-msgstr ""
-
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.template,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
msgctxt "field:product.template,accounts:"
msgid "Accounts"
msgstr ""
@@ -319,7 +313,7 @@ msgid "Product Template"
msgstr ""
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:product.template-customer-account.tax,tax:"
@@ -334,6 +328,38 @@ msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,write_uid:"
+msgid "Write User"
+msgstr ""
+
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
msgstr ""
@@ -351,7 +377,7 @@ msgid "Product Template"
msgstr ""
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:product.template-supplier-account.tax,tax:"
@@ -391,7 +417,7 @@ msgid "ID"
msgstr ""
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:product.template.account,template:"
@@ -490,6 +516,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr ""
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr ""
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr ""
@@ -506,6 +536,14 @@ msgctxt "view:account.configuration:"
msgid "Product"
msgstr ""
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr ""
+
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr ""
+
msgctxt "view:product.category:"
msgid "Accounting"
msgstr ""
diff --git a/locale/lo.po b/locale/lo.po
index 9dde780..db5d2b2 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -1,9 +1,12 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "error:product.category:"
-msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
msgstr "ບໍ່ມີ ບັນຊີລາຍຈ່າຍ - ລາຍຮັບ ທີ່ກຳນົດໄວ້ໃນ ໝວດ %s (%d)"
msgctxt "error:product.template:"
@@ -50,14 +53,26 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr "ບັນຊີພາກຮັບ"
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "ບັນຊີລາຍຈ່າຍ"
-msgctxt "field:product.category,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "ບັນຊີລາຍຈ່າຍທີ່ໃຊ້"
-
msgctxt "field:product.category,account_parent:"
msgid "Use Parent's accounts"
msgstr "ໃຊ້ຮ່ວງບັນຊີ"
@@ -66,10 +81,6 @@ msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "ບັນຊີລາຍຮັບ"
-msgctxt "field:product.category,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "ບັນຊີລາຍຮັບທີ່ໃຊ້"
-
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr "ການບັນຊີ"
@@ -116,8 +127,8 @@ msgid "ID"
msgstr "ເລກລຳດັບ"
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
@@ -148,8 +159,8 @@ msgid "ID"
msgstr "ເລກລຳດັບ"
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
@@ -197,10 +208,9 @@ msgctxt "field:product.category.account,id:"
msgid "ID"
msgstr "ເລກລຳດັບ"
-#, fuzzy
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:product.category.account,write_date:"
@@ -228,18 +238,10 @@ msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr "ບັນຊີລາຍຈ່າຍ"
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "ບັນຊີລາຍຈ່າຍທີ່ໃຊ້"
-
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "ບັນຊີລາຍຮັບ"
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "ບັນຊີລາຍຮັບທີ່ໃຊ້"
-
#, fuzzy
msgctxt "field:product.product,accounts:"
msgid "Accounts"
@@ -277,18 +279,10 @@ msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "ບັນຊີລາຍຈ່າຍ"
-msgctxt "field:product.template,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "ບັນຊີລາຍຈ່າຍທີ່ໃຊ້"
-
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr "ບັນຊີລາຍຮັບ"
-msgctxt "field:product.template,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "ບັນຊີລາຍຮັບທີ່ໃຊ້"
-
#, fuzzy
msgctxt "field:product.template,accounts:"
msgid "Accounts"
@@ -335,8 +329,8 @@ msgid "Product Template"
msgstr "ຮ່າງແບບຜະລິດຕະພັນ"
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
@@ -350,6 +344,44 @@ msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
msgstr "ຜູ້ບັນທຶກ"
+#, fuzzy
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr "ໝວດ"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr "ວັນທີສ້າງ"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr "ຜູ້ສ້າງ"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr "ເລກລຳດັບ"
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr "ວັນທີບັນທຶກ"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_uid:"
+msgid "Write User"
+msgstr "ຜູ້ບັນທຶກ"
+
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
msgstr "ວັນທີສ້າງ"
@@ -367,8 +399,8 @@ msgid "Product Template"
msgstr "ຮ່າງແບບຜະລິດຕະພັນ"
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
@@ -411,10 +443,9 @@ msgctxt "field:product.template.account,id:"
msgid "ID"
msgstr "ເລກລຳດັບ"
-#, fuzzy
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template.account,template:"
msgid "Template"
@@ -516,6 +547,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "ຮ່າງແບບຜະລິດຕະພັນ - ພາສີລູກຄ້າ"
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr ""
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "ຮ່າງແບບຜະລິດຕະພັນ - ພາສີຜູ້ສະໜອງ"
@@ -532,6 +567,16 @@ msgctxt "view:account.configuration:"
msgid "Product"
msgstr "ຜະລິດຕະພັນ"
+#, fuzzy
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr "ໝວດ"
+
+#, fuzzy
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr "ຜະລິດຕະພັນ"
+
msgctxt "view:product.category:"
msgid "Accounting"
msgstr "ການບັນຊີ"
diff --git a/locale/lt.po b/locale/lt.po
index ea4d3cf..15a4fbc 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -1,9 +1,11 @@
-#
+#
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)"
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
msgstr ""
msgctxt "error:product.template:"
@@ -46,12 +48,24 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr ""
-msgctxt "field:product.category,account_expense:"
-msgid "Account Expense"
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
msgstr ""
-msgctxt "field:product.category,account_expense_used:"
-msgid "Account Expense Used"
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:product.category,account_expense:"
+msgid "Account Expense"
msgstr ""
msgctxt "field:product.category,account_parent:"
@@ -62,10 +76,6 @@ msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.category,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr ""
@@ -110,10 +120,9 @@ msgctxt "field:product.category-customer-account.tax,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
@@ -143,10 +152,9 @@ msgctxt "field:product.category-supplier-account.tax,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
@@ -188,10 +196,9 @@ msgctxt "field:product.category.account,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category.account,write_date:"
msgid "Write Date"
@@ -217,18 +224,10 @@ msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr ""
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr ""
-
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
msgctxt "field:product.product,accounts:"
msgid "Accounts"
msgstr ""
@@ -265,18 +264,10 @@ msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr ""
-msgctxt "field:product.template,account_expense_used:"
-msgid "Account Expense Used"
-msgstr ""
-
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.template,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
msgctxt "field:product.template,accounts:"
msgid "Accounts"
msgstr ""
@@ -321,10 +312,9 @@ msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
msgstr ""
-#, fuzzy
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
@@ -338,6 +328,38 @@ msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,write_uid:"
+msgid "Write User"
+msgstr ""
+
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
msgstr ""
@@ -354,10 +376,9 @@ msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
msgstr ""
-#, fuzzy
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
@@ -395,10 +416,9 @@ msgctxt "field:product.template.account,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template.account,template:"
msgid "Template"
@@ -496,6 +516,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr ""
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr ""
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr ""
@@ -512,6 +536,14 @@ msgctxt "view:account.configuration:"
msgid "Product"
msgstr ""
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr ""
+
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr ""
+
msgctxt "view:product.category:"
msgid "Accounting"
msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index d8a73cf..74ac3bf 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1,10 +1,12 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
#, fuzzy
msgctxt "error:product.category:"
-msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
msgstr ""
"Er is geen kosten-/opbrengstenrekening gedefinieerd voor product %s (%d)"
@@ -49,15 +51,26 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr ""
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Kostenrekening"
-#, 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 ""
@@ -67,11 +80,6 @@ msgid "Account Revenue"
msgstr "Opbrengstrekening"
#, fuzzy
-msgctxt "field:product.category,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Opbrengstrekening gebruikt"
-
-#, fuzzy
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr "Boekhouden"
@@ -123,8 +131,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
@@ -160,8 +168,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
@@ -211,10 +219,9 @@ msgctxt "field:product.category.account,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:product.category.account,write_date:"
@@ -244,21 +251,11 @@ msgid "Account Expense"
msgstr "Kostenrekening"
#, fuzzy
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Gebruikte kostenrekening"
-
-#, fuzzy
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Opbrengstrekening"
#, fuzzy
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Opbrengstrekening gebruikt"
-
-#, fuzzy
msgctxt "field:product.product,accounts:"
msgid "Accounts"
msgstr "Rekeningen"
@@ -301,18 +298,10 @@ msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Kostenrekening"
-msgctxt "field:product.template,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Gebruikte kostenrekening"
-
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr "Opbrengstrekening"
-msgctxt "field:product.template,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Opbrengstrekening gebruikt"
-
#, fuzzy
msgctxt "field:product.template,accounts:"
msgid "Accounts"
@@ -364,8 +353,8 @@ msgid "Product Template"
msgstr "Productsjabloon"
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
@@ -382,6 +371,44 @@ msgid "Write User"
msgstr "Gebruiker"
#, fuzzy
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr "Categorie"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr "Datum"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr "Gebruiker"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr "Schrijfdatum"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_uid:"
+msgid "Write User"
+msgstr "Gebruiker"
+
+#, fuzzy
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
msgstr "Datum"
@@ -401,8 +428,8 @@ msgid "Product Template"
msgstr "Productsjabloon"
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
@@ -447,10 +474,9 @@ msgctxt "field:product.template.account,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template.account,template:"
msgid "Template"
@@ -552,6 +578,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "Productsjabloon - Belasting verkoop"
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr ""
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Productsjabloon - Belasting inkoop"
@@ -569,6 +599,16 @@ msgctxt "view:account.configuration:"
msgid "Product"
msgstr "Producten"
+#, fuzzy
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr "Categorie"
+
+#, fuzzy
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr "Producten"
+
msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Boekhouden"
diff --git a/locale/pl.po b/locale/pl.po
index 4eb8d36..15bd6d4 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,9 +1,11 @@
-#
+#
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)"
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
msgstr ""
msgctxt "error:product.template:"
@@ -46,12 +48,24 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr ""
-msgctxt "field:product.category,account_expense:"
-msgid "Account Expense"
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
msgstr ""
-msgctxt "field:product.category,account_expense_used:"
-msgid "Account Expense Used"
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:product.category,account_expense:"
+msgid "Account Expense"
msgstr ""
msgctxt "field:product.category,account_parent:"
@@ -62,17 +76,13 @@ msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.category,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr ""
msgctxt "field:product.category,accounts:"
msgid "Accounts"
-msgstr ""
+msgstr "Konta"
msgctxt "field:product.category,customer_taxes:"
msgid "Customer Taxes"
@@ -96,67 +106,67 @@ msgstr ""
msgctxt "field:product.category-customer-account.tax,category:"
msgid "Category"
-msgstr ""
+msgstr "Kategoria"
msgctxt "field:product.category-customer-account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:product.category-customer-account.tax,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:product.category-customer-account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
-msgstr ""
+msgstr "Podatek"
msgctxt "field:product.category-customer-account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:product.category-customer-account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
msgctxt "field:product.category-supplier-account.tax,category:"
msgid "Category"
-msgstr ""
+msgstr "Kategoria"
msgctxt "field:product.category-supplier-account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:product.category-supplier-account.tax,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:product.category-supplier-account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
-msgstr ""
+msgstr "Podatek"
msgctxt "field:product.category-supplier-account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:product.category-supplier-account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
msgctxt "field:product.category.account,account_expense:"
msgid "Account Expense"
@@ -168,35 +178,35 @@ msgstr ""
msgctxt "field:product.category.account,category:"
msgid "Category"
-msgstr ""
+msgstr "Kategoria"
msgctxt "field:product.category.account,company:"
msgid "Company"
-msgstr ""
+msgstr "Firma"
msgctxt "field:product.category.account,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:product.category.account,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:product.category.account,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:product.category.account,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:product.category.account,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
msgctxt "field:product.configuration,default_accounts_category:"
msgid "Use Category's accounts by default"
@@ -214,21 +224,13 @@ msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr ""
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr ""
-
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
msgctxt "field:product.product,accounts:"
msgid "Accounts"
-msgstr ""
+msgstr "Konta"
msgctxt "field:product.product,accounts_category:"
msgid "Use Category's accounts"
@@ -262,21 +264,13 @@ msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr ""
-msgctxt "field:product.template,account_expense_used:"
-msgid "Account Expense Used"
-msgstr ""
-
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.template,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
msgctxt "field:product.template,accounts:"
msgid "Accounts"
-msgstr ""
+msgstr "Konta"
msgctxt "field:product.template,accounts_category:"
msgid "Use Category's accounts"
@@ -304,67 +298,99 @@ msgstr ""
msgctxt "field:product.template-customer-account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:product.template-customer-account.tax,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:product.template-customer-account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
-msgstr ""
+msgstr "Szablon produktu"
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
-msgstr ""
+msgstr "Podatek"
msgctxt "field:product.template-customer-account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
+
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr "Kategoria"
+
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr "Data utworzenia"
+
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr "Utworzył"
+
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
+
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr "Szablon"
+
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr "Data zapisu"
+
+msgctxt "field:product.template-product.category.account,write_uid:"
+msgid "Write User"
+msgstr "Zapisał"
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:product.template-supplier-account.tax,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:product.template-supplier-account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
-msgstr ""
+msgstr "Szablon produktu"
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
-msgstr ""
+msgstr "Podatek"
msgctxt "field:product.template-supplier-account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:product.template-supplier-account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
msgctxt "field:product.template.account,account_expense:"
msgid "Account Expense"
@@ -376,35 +402,35 @@ msgstr ""
msgctxt "field:product.template.account,company:"
msgid "Company"
-msgstr ""
+msgstr "Firma"
msgctxt "field:product.template.account,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:product.template.account,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:product.template.account,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:product.template.account,template:"
msgid "Template"
-msgstr ""
+msgstr "Szablon"
msgctxt "field:product.template.account,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:product.template.account,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
msgctxt "help:product.category,account_parent:"
msgid "Use the accounts defined on the parent category."
@@ -490,6 +516,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr ""
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr ""
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr ""
@@ -500,11 +530,19 @@ msgstr ""
msgctxt "view:account.configuration:"
msgid "Category"
-msgstr ""
+msgstr "Kategoria"
msgctxt "view:account.configuration:"
msgid "Product"
-msgstr ""
+msgstr "Produkt"
+
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr "Kategoria"
+
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr "Produkt"
msgctxt "view:product.category:"
msgid "Accounting"
@@ -512,11 +550,11 @@ msgstr ""
msgctxt "view:product.category:"
msgid "Accounts"
-msgstr ""
+msgstr "Konta"
msgctxt "view:product.category:"
msgid "Taxes"
-msgstr ""
+msgstr "Podatki"
msgctxt "view:product.template:"
msgid "Accounting"
@@ -524,8 +562,8 @@ msgstr ""
msgctxt "view:product.template:"
msgid "Accounts"
-msgstr ""
+msgstr "Konta"
msgctxt "view:product.template:"
msgid "Taxes"
-msgstr ""
+msgstr "Podatki"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 29eb69a..952feb0 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,10 +1,14 @@
-#
+#
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 "Não existe conta de despesa/receita definida para categoria %s (%d)"
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
+msgstr ""
+"Não existe conta de despesa/receita definida para categoria %(name)s "
+"(%(id)d)"
msgctxt "error:product.template:"
msgid "There is no account expense/revenue defined on the product %s (%d)"
@@ -46,14 +50,26 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr "Conta Padrão de Receita"
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr "Conta de Despesas Padrão"
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr "Conta de Receitas Padrão"
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
+msgstr "Conta de Despesas Padrão"
+
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
+msgstr "Conta de Receitas Padrão"
+
msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Conta de Despesas"
-msgctxt "field:product.category,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Conta de Despesas Utilizada"
-
msgctxt "field:product.category,account_parent:"
msgid "Use Parent's accounts"
msgstr "Utilizar as contas do pai"
@@ -62,10 +78,6 @@ msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "Conta de Receita"
-msgctxt "field:product.category,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Conta de Receitas Utilizada"
-
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr "Contabilidade"
@@ -111,8 +123,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
@@ -143,8 +155,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
@@ -187,8 +199,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:product.category.account,write_date:"
msgid "Write Date"
@@ -214,18 +226,10 @@ msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr "Conta de Despesas"
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Conta de Despesas Utilizada"
-
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Conta de Receita"
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Conta de Receitas Utilizada"
-
msgctxt "field:product.product,accounts:"
msgid "Accounts"
msgstr "Contas"
@@ -262,18 +266,10 @@ msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Conta de Despesas"
-msgctxt "field:product.template,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Conta de Despesas Utilizada"
-
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr "Conta de Receitas"
-msgctxt "field:product.template,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Conta de Receiras Utilizada"
-
msgctxt "field:product.template,accounts:"
msgid "Accounts"
msgstr "Contas"
@@ -319,8 +315,8 @@ msgid "Product Template"
msgstr "Modelo de produto"
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
@@ -334,6 +330,38 @@ msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
msgstr "Gravado pelo usuário"
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr "Categoria"
+
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr "Data de criação"
+
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr "Criado pelo usuário"
+
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr "Nome do Registro"
+
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr "Modelo"
+
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr "Data de gravação"
+
+msgctxt "field:product.template-product.category.account,write_uid:"
+msgid "Write User"
+msgstr "Gravado pelo usuário"
+
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
msgstr "Data de criação"
@@ -351,8 +379,8 @@ msgid "Product Template"
msgstr "Modelo de produto"
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
@@ -391,8 +419,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:product.template.account,template:"
msgid "Template"
@@ -494,6 +522,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "Modelo do Produto - Tributo do Cliente"
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr "Modelo - Categorias de Contas"
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Modelo de Produto - Tributo de Fornecedor"
@@ -510,6 +542,14 @@ msgctxt "view:account.configuration:"
msgid "Product"
msgstr "Produto"
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr "Categoria"
+
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr "Produto"
+
msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Contabilidade"
diff --git a/locale/ru.po b/locale/ru.po
index 7707f23..20903fe 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,9 +1,12 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "error:product.category:"
-msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
msgstr "Отсутствует расходный/доходный счет для категории %s (%d)"
msgctxt "error:product.template:"
@@ -46,14 +49,26 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr ""
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Счет расходов"
-msgctxt "field:product.category,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Использованный счет расходов"
-
msgctxt "field:product.category,account_parent:"
msgid "Use Parent's accounts"
msgstr "Использовать родительский счет"
@@ -62,10 +77,6 @@ msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "Счет доходов"
-msgctxt "field:product.category,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Использованный счет доходов"
-
#, fuzzy
msgctxt "field:product.category,accounting:"
msgid "Accounting"
@@ -113,8 +124,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
@@ -145,8 +156,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
@@ -194,10 +205,9 @@ msgctxt "field:product.category.account,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:product.category.account,write_date:"
@@ -227,21 +237,11 @@ msgid "Account Expense"
msgstr "Счет расходов"
#, fuzzy
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Использованный счет расходов"
-
-#, fuzzy
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Счет доходов"
#, fuzzy
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Использованный счет доходов"
-
-#, fuzzy
msgctxt "field:product.product,accounts:"
msgid "Accounts"
msgstr "Счета"
@@ -284,18 +284,10 @@ msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Счет расходов"
-msgctxt "field:product.template,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Использованный счет расходов"
-
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr "Счет доходов"
-msgctxt "field:product.template,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Использованный счет доходов"
-
#, fuzzy
msgctxt "field:product.template,accounts:"
msgid "Accounts"
@@ -343,8 +335,8 @@ msgid "Product Template"
msgstr "Шаблон продукта"
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
@@ -358,6 +350,44 @@ msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
msgstr "Изменено пользователем"
+#, fuzzy
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr "Категория"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr "Дата создания"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr "Создано пользователем"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr "Дата изменения"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_uid:"
+msgid "Write User"
+msgstr "Изменено пользователем"
+
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
msgstr "Дата создания"
@@ -375,8 +405,8 @@ msgid "Product Template"
msgstr "Шаблон продукта"
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
@@ -419,10 +449,9 @@ msgctxt "field:product.template.account,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template.account,template:"
msgid "Template"
@@ -524,6 +553,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "Шаблон продукта - Налоги заказчика"
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr ""
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Шаблон продукта - Налоги поставщика"
@@ -541,6 +574,16 @@ msgctxt "view:account.configuration:"
msgid "Product"
msgstr "Товарно материальные ценности (ТМЦ)"
+#, fuzzy
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr "Категория"
+
+#, fuzzy
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr "Товарно материальные ценности (ТМЦ)"
+
msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Регистрационные данные"
diff --git a/locale/sl.po b/locale/sl.po
index b68e146..372d6ab 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -1,9 +1,12 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "error:product.category:"
-msgid "There is no account expense/revenue defined on the category %s (%d)"
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
msgstr "Za kategorijo %s (%d) ni določenega konta odhodkov/prihodkov"
msgctxt "error:product.template:"
@@ -46,14 +49,26 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr "Privzet konto prihodkov"
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
msgstr "Konto odhodkov"
-msgctxt "field:product.category,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Uporabljen konto odhodkov"
-
msgctxt "field:product.category,account_parent:"
msgid "Use Parent's accounts"
msgstr "Uporabi matične konte"
@@ -62,10 +77,6 @@ msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr "Konto prihodkov"
-msgctxt "field:product.category,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Uporabljen konto prihodkov"
-
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr "Računovodstvo"
@@ -111,8 +122,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
@@ -143,8 +154,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
@@ -187,8 +198,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category.account,write_date:"
msgid "Write Date"
@@ -214,18 +225,10 @@ msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr "Konto odhodkov"
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Uporabljen konto odhodkov"
-
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr "Konto prihodkov"
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Uporabljen konto prihodkov"
-
msgctxt "field:product.product,accounts:"
msgid "Accounts"
msgstr "Konti"
@@ -262,18 +265,10 @@ msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr "Konto odhodkov"
-msgctxt "field:product.template,account_expense_used:"
-msgid "Account Expense Used"
-msgstr "Uporabljen konto odhodkov"
-
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr "Konto prihodkov"
-msgctxt "field:product.template,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr "Uporabljen konto prihodkov"
-
msgctxt "field:product.template,accounts:"
msgid "Accounts"
msgstr "Konti"
@@ -319,8 +314,8 @@ msgid "Product Template"
msgstr "Predloga izdelka"
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
@@ -334,6 +329,45 @@ msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
msgstr "Zapisal"
+#, fuzzy
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr "Kategorija"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr "Izdelano"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr "Izdelal"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr "Predloga"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
msgstr "Izdelano"
@@ -351,8 +385,8 @@ msgid "Product Template"
msgstr "Predloga izdelka"
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
@@ -391,8 +425,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template.account,template:"
msgid "Template"
@@ -490,6 +524,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr "Predloga - Davek kupca"
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr ""
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr "Predloga - Davek dobavitelja"
@@ -506,6 +544,16 @@ msgctxt "view:account.configuration:"
msgid "Product"
msgstr "Izdelek"
+#, fuzzy
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr "Kategorija"
+
+#, fuzzy
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr "Izdelek"
+
msgctxt "view:product.category:"
msgid "Accounting"
msgstr "Računovodstvo"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 2d6bb8b..ead2e60 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,9 +1,11 @@
-#
+#
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)"
+msgid ""
+"There is no account expense/revenue defined on the category %(name)s "
+"(%(id)d)"
msgstr ""
msgctxt "error:product.template:"
@@ -46,12 +48,24 @@ msgctxt ""
msgid "Default Account Revenue"
msgstr ""
-msgctxt "field:product.category,account_expense:"
-msgid "Account Expense"
+msgctxt "field:account.create_chart.properties,category_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,category_account_revenue:"
+msgid "Default Revenue Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_expense:"
+msgid "Default Expense Account"
+msgstr ""
+
+msgctxt "field:account.create_chart.properties,product_account_revenue:"
+msgid "Default Revenue Account"
msgstr ""
-msgctxt "field:product.category,account_expense_used:"
-msgid "Account Expense Used"
+msgctxt "field:product.category,account_expense:"
+msgid "Account Expense"
msgstr ""
msgctxt "field:product.category,account_parent:"
@@ -62,10 +76,6 @@ msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.category,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
msgctxt "field:product.category,accounting:"
msgid "Accounting"
msgstr ""
@@ -113,10 +123,9 @@ msgctxt "field:product.category-customer-account.tax,id:"
msgid "ID"
msgstr "编号"
-#, fuzzy
msgctxt "field:product.category-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-customer-account.tax,tax:"
msgid "Tax"
@@ -151,10 +160,9 @@ msgctxt "field:product.category-supplier-account.tax,id:"
msgid "ID"
msgstr "编号"
-#, fuzzy
msgctxt "field:product.category-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.category-supplier-account.tax,tax:"
msgid "Tax"
@@ -201,10 +209,9 @@ msgctxt "field:product.category.account,id:"
msgid "ID"
msgstr "编号"
-#, fuzzy
msgctxt "field:product.category.account,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:product.category.account,write_date:"
@@ -232,18 +239,10 @@ msgctxt "field:product.product,account_expense:"
msgid "Account Expense"
msgstr ""
-msgctxt "field:product.product,account_expense_used:"
-msgid "Account Expense Used"
-msgstr ""
-
msgctxt "field:product.product,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.product,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
msgctxt "field:product.product,accounts:"
msgid "Accounts"
msgstr ""
@@ -280,18 +279,10 @@ msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
msgstr ""
-msgctxt "field:product.template,account_expense_used:"
-msgid "Account Expense Used"
-msgstr ""
-
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
msgstr ""
-msgctxt "field:product.template,account_revenue_used:"
-msgid "Account Revenue Used"
-msgstr ""
-
msgctxt "field:product.template,accounts:"
msgid "Accounts"
msgstr ""
@@ -339,10 +330,9 @@ msgctxt "field:product.template-customer-account.tax,product:"
msgid "Product Template"
msgstr ""
-#, fuzzy
msgctxt "field:product.template-customer-account.tax,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-customer-account.tax,tax:"
msgid "Tax"
@@ -358,6 +348,43 @@ msgctxt "field:product.template-customer-account.tax,write_uid:"
msgid "Write User"
msgstr "写入帐号"
+msgctxt "field:product.template-product.category.account,category:"
+msgid "Category"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_date:"
+msgid "Create Date"
+msgstr "创建日期:"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,create_uid:"
+msgid "Create User"
+msgstr "添加用户"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,id:"
+msgid "ID"
+msgstr "编号"
+
+msgctxt "field:product.template-product.category.account,rec_name:"
+msgid "Record Name"
+msgstr ""
+
+msgctxt "field:product.template-product.category.account,template:"
+msgid "Template"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_date:"
+msgid "Write Date"
+msgstr "写入日期"
+
+#, fuzzy
+msgctxt "field:product.template-product.category.account,write_uid:"
+msgid "Write User"
+msgstr "写入帐号"
+
#, fuzzy
msgctxt "field:product.template-supplier-account.tax,create_date:"
msgid "Create Date"
@@ -377,10 +404,9 @@ msgctxt "field:product.template-supplier-account.tax,product:"
msgid "Product Template"
msgstr ""
-#, fuzzy
msgctxt "field:product.template-supplier-account.tax,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-supplier-account.tax,tax:"
msgid "Tax"
@@ -423,10 +449,9 @@ msgctxt "field:product.template.account,id:"
msgid "ID"
msgstr "编号"
-#, fuzzy
msgctxt "field:product.template.account,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template.account,template:"
msgid "Template"
@@ -526,6 +551,10 @@ msgctxt "model:product.template-customer-account.tax,name:"
msgid "Product Template - Customer Tax"
msgstr ""
+msgctxt "model:product.template-product.category.account,name:"
+msgid "Template - Account Category"
+msgstr ""
+
msgctxt "model:product.template-supplier-account.tax,name:"
msgid "Product Template - Supplier Tax"
msgstr ""
@@ -542,6 +571,14 @@ msgctxt "view:account.configuration:"
msgid "Product"
msgstr ""
+msgctxt "view:account.create_chart.properties:"
+msgid "Category"
+msgstr ""
+
+msgctxt "view:account.create_chart.properties:"
+msgid "Product"
+msgstr ""
+
msgctxt "view:product.category:"
msgid "Accounting"
msgstr ""
diff --git a/product.py b/product.py
index 722148d..0ea26eb 100644
--- a/product.py
+++ b/product.py
@@ -1,6 +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 functools import wraps
+
+from sql import Null
from trytond.model import ModelSQL, fields
from trytond.pyson import Eval, Or, Bool
@@ -15,32 +17,32 @@ __all__ = ['Category', 'CategoryAccount',
'CategoryCustomerTax', 'CategorySupplierTax',
'Template', 'TemplateAccount',
'TemplateCustomerTax', 'TemplateSupplierTax',
- 'Product', 'MissingFunction']
-
-
-class MissingFunction(fields.Function):
- '''Function field that will raise the error
- when the value is accessed and is None'''
-
- def __init__(self, field, error, getter, setter=None, searcher=None,
- loading='lazy'):
- super(MissingFunction, self).__init__(field, getter, setter=setter,
- searcher=searcher, loading=loading)
- self.error = error
-
- def __copy__(self):
- return MissingFunction(copy.copy(self._field), self.error, self.getter,
- setter=self.setter, searcher=self.searcher)
-
- def __deepcopy__(self, memo):
- return MissingFunction(copy.deepcopy(self._field, memo), self.error,
- self.getter, setter=self.setter, searcher=self.searcher)
-
- def __get__(self, inst, cls):
- value = super(MissingFunction, self).__get__(inst, cls)
- if inst is not None and value is None:
- inst.raise_user_error(self.error, (inst.name, inst.id))
- return value
+ 'Product', 'account_used', 'template_property',
+ 'TemplateAccountCategory', 'TemplateCategoryAll']
+
+
+def account_used(field_name):
+ def decorator(func):
+ @wraps(func)
+ def wrapper(self):
+ account = func(self)
+ if not account:
+ account = self.get_account(field_name + '_used')
+ if not account:
+ self.raise_user_error('missing_account', {
+ 'name': self.name,
+ 'id': self.id,
+ })
+ return account
+ return wrapper
+ return decorator
+
+
+def template_property(field_name):
+ @property
+ def prop(self):
+ return getattr(self.template, field_name)
+ return prop
class Category(CompanyMultiValueMixin):
@@ -82,10 +84,6 @@ class Category(CompanyMultiValueMixin):
| ~Eval('accounting', False)),
},
depends=['account_parent', 'accounting']))
- account_expense_used = MissingFunction(fields.Many2One('account.account',
- 'Account Expense Used'), 'missing_account', 'get_account')
- account_revenue_used = MissingFunction(fields.Many2One('account.account',
- 'Account Revenue Used'), 'missing_account', 'get_account')
taxes_parent = fields.Boolean('Use the Parent\'s Taxes',
states={
'invisible': ~Eval('accounting', False),
@@ -131,7 +129,7 @@ class Category(CompanyMultiValueMixin):
cls._error_messages.update({
'missing_account': ('There is no account '
'expense/revenue defined on the category '
- '%s (%d)'),
+ '%(name)s (%(id)d)'),
})
cls.parent.domain = [
('accounting', '=', Eval('accounting', False)),
@@ -175,8 +173,7 @@ class Category(CompanyMultiValueMixin):
if self.account_parent:
return self.parent.get_account(name, **pattern)
else:
- account = self.get_multivalue(name[:-5], **pattern)
- return account.id if account else None
+ return self.get_multivalue(name[:-5], **pattern)
def get_taxes(self, name):
if self.taxes_parent:
@@ -212,6 +209,16 @@ class Category(CompanyMultiValueMixin):
}),
]
+ @property
+ @account_used('account_expense')
+ def account_expense_used(self):
+ pass
+
+ @property
+ @account_used('account_revenue')
+ def account_revenue_used(self):
+ pass
+
class CategoryAccount(ModelSQL, CompanyValueMixin):
"Category Account"
@@ -333,10 +340,6 @@ class Template(CompanyMultiValueMixin):
},
help=("The account to use instead of the one defined on the "
"account category."), depends=['accounts_category']))
- account_expense_used = MissingFunction(fields.Many2One('account.account',
- 'Account Expense Used'), 'missing_account', 'get_account')
- account_revenue_used = MissingFunction(fields.Many2One('account.account',
- 'Account Revenue Used'), 'missing_account', 'get_account')
taxes_category = fields.Boolean('Use Category\'s Taxes',
help="Check to use the taxes defined on the account category.")
customer_taxes = fields.Many2Many('product.template-customer-account.tax',
@@ -444,8 +447,7 @@ class Template(CompanyMultiValueMixin):
if self.accounts_category:
return self.account_category.get_account(name, **pattern)
else:
- account = self.get_multivalue(name[:-5], **pattern)
- return account.id if account else None
+ return self.get_multivalue(name[:-5], **pattern)
def get_taxes(self, name):
if self.taxes_category:
@@ -469,6 +471,16 @@ class Template(CompanyMultiValueMixin):
else:
self.customer_taxes = []
+ @property
+ @account_used('account_expense')
+ def account_expense_used(self):
+ pass
+
+ @property
+ @account_used('account_revenue')
+ def account_revenue_used(self):
+ pass
+
class TemplateAccount(ModelSQL, CompanyValueMixin):
"Product Template Account"
@@ -533,12 +545,41 @@ class TemplateSupplierTax(ModelSQL):
class Product:
__metaclass__ = PoolMeta
__name__ = 'product.product'
- # Avoid raise of UserError from MissingFunction
- account_expense_used = fields.Function(fields.Many2One('account.account',
- 'Account Expense Used'), 'get_template')
- account_revenue_used = fields.Function(fields.Many2One('account.account',
- 'Account Revenue Used'), 'get_template')
+ account_expense_used = template_property('account_expense_used')
+ account_revenue_used = template_property('account_revenue_used')
customer_taxes_used = fields.Function(fields.One2Many('account.tax', None,
'Customer Taxes Used'), 'get_template')
supplier_taxes_used = fields.Function(fields.One2Many('account.tax', None,
'Supplier Taxes Used'), 'get_template')
+
+
+class TemplateAccountCategory(ModelSQL):
+ "Template - Account Category"
+ __name__ = 'product.template-product.category.account'
+ template = fields.Many2One('product.template', 'Template')
+ category = fields.Many2One('product.category', 'Category')
+
+ @classmethod
+ def table_query(cls):
+ pool = Pool()
+ Template = pool.get('product.template')
+ template = Template.__table__()
+ return template.select(
+ template.id.as_('id'),
+ template.create_uid.as_('create_uid'),
+ template.create_date.as_('create_date'),
+ template.write_uid.as_('write_uid'),
+ template.write_date.as_('write_date'),
+ template.id.as_('template'),
+ template.account_category.as_('category'),
+ where=template.account_category != Null)
+
+
+class TemplateCategoryAll:
+ __metaclass__ = PoolMeta
+ __name__ = 'product.template-product.category.all'
+
+ @classmethod
+ def union_models(cls):
+ return super(TemplateCategoryAll, cls).union_models() + [
+ 'product.template-product.category.account']
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff --git a/setup.py b/setup.py
index 0297c07..6eb890a 100644
--- a/setup.py
+++ b/setup.py
@@ -96,9 +96,9 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
diff --git a/tests/test_account_product.py b/tests/test_account_product.py
index efb5469..86e4563 100644
--- a/tests/test_account_product.py
+++ b/tests/test_account_product.py
@@ -40,8 +40,8 @@ class AccountProductTestCase(ModuleTestCase):
template = ProductTemplate(
name='test account used',
list_price=Decimal(10),
- cost_price=Decimal(3),
default_uom=unit.id,
+ products=[],
)
template.save()
@@ -54,9 +54,9 @@ class AccountProductTestCase(ModuleTestCase):
template = ProductTemplate(
name='test account used',
list_price=Decimal(10),
- cost_price=Decimal(3),
default_uom=unit.id,
account_expense=account_expense.id,
+ products=[],
)
template.save()
@@ -92,15 +92,15 @@ class AccountProductTestCase(ModuleTestCase):
templates = ProductTemplate.create([{
'name': 'test with account',
'list_price': Decimal(10),
- 'cost_price': Decimal(3),
'default_uom': unit.id,
'account_expense': account_expense.id,
+ 'products': [],
}, {
'name': 'test without account',
'list_price': Decimal(10),
- 'cost_price': Decimal(3),
'default_uom': unit.id,
'account_expense': None,
+ 'products': [],
}])
self.assertEqual(templates[0].account_expense_used.id,
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..527d859
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,18 @@
+[tox]
+envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+ {py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
+ pypy-postgresql: psycopg2cffi >= 2.5
+ mysql: MySQL-python
+ sqlite: sqlitebck
+setenv =
+ sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
+ postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
+ mysql: TRYTOND_DATABASE_URI={env:MYSQL_URI:mysql://}
+ sqlite: DB_NAME={env:SQLITE_NAME::memory:}
+ postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
+ mysql: DB_NAME={env:MYSQL_NAME:test}
+install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages}
diff --git a/tryton.cfg b/tryton.cfg
index 10518b1..92d6313 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.0
+version=4.6.0
depends:
account
company
@@ -8,3 +8,4 @@ depends:
xml:
product.xml
configuration.xml
+ account.xml
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
index 515502e..9d448a0 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: 4.4.0
+Version: 4.6.0
Summary: Tryton module to add accounting on product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
Description: trytond_account_product
=======================
@@ -69,9 +69,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_account_product.egg-info/SOURCES.txt b/trytond_account_product.egg-info/SOURCES.txt
index 6fc62c8..41457ea 100644
--- a/trytond_account_product.egg-info/SOURCES.txt
+++ b/trytond_account_product.egg-info/SOURCES.txt
@@ -1,14 +1,24 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
+account.py
+account.xml
+configuration.py
configuration.xml
+product.py
product.xml
setup.py
+tox.ini
tryton.cfg
./__init__.py
+./account.py
+./account.xml
./configuration.py
./configuration.xml
./product.py
@@ -36,6 +46,7 @@ tryton.cfg
./tests/test_account_product.py
./view/category_form.xml
./view/configuration_form.xml
+./view/create_chart_properties_form.xml
./view/product_configuration_form.xml
./view/template_form.xml
./view/template_tree.xml
@@ -57,6 +68,8 @@ locale/pt_BR.po
locale/ru.po
locale/sl.po
locale/zh_CN.po
+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
@@ -66,6 +79,7 @@ trytond_account_product.egg-info/requires.txt
trytond_account_product.egg-info/top_level.txt
view/category_form.xml
view/configuration_form.xml
+view/create_chart_properties_form.xml
view/product_configuration_form.xml
view/template_form.xml
view/template_tree.xml
\ No newline at end of file
diff --git a/trytond_account_product.egg-info/requires.txt b/trytond_account_product.egg-info/requires.txt
index c1464a9..7471ae2 100644
--- a/trytond_account_product.egg-info/requires.txt
+++ b/trytond_account_product.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_account >= 4.4, < 4.5
-trytond_company >= 4.4, < 4.5
-trytond_product >= 4.4, < 4.5
-trytond >= 4.4, < 4.5
+trytond_account >= 4.6, < 4.7
+trytond_company >= 4.6, < 4.7
+trytond_product >= 4.6, < 4.7
+trytond >= 4.6, < 4.7
diff --git a/view/create_chart_properties_form.xml b/view/create_chart_properties_form.xml
new file mode 100644
index 0000000..b2932bc
--- /dev/null
+++ b/view/create_chart_properties_form.xml
@@ -0,0 +1,17 @@
+<?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/field[@name='account_payable']" position="after">
+ <separator id="product" string="Product" colspan="4"/>
+ <label name="product_account_revenue"/>
+ <field name="product_account_revenue"/>
+ <label name="product_account_expense"/>
+ <field name="product_account_expense"/>
+ <separator id="category" string="Category" colspan="4"/>
+ <label name="category_account_revenue"/>
+ <field name="category_account_revenue"/>
+ <label name="category_account_expense"/>
+ <field name="category_account_expense"/>
+ </xpath>
+</data>
--
tryton-modules-account-product
More information about the tryton-debian-vcs
mailing list