[tryton-debian-vcs] tryton-modules-account-asset branch debian updated. debian/4.2.0-1-2-g8c645aa
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:31:08 UTC 2017
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-asset.git;a=commitdiff;h=debian/4.2.0-1-2-g8c645aa
commit 8c645aa4deb59aa45ca842bb76c0c76a782ec32e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 7 15:25:49 2017 +0200
Merging upstream version 4.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 1890049..a910ef5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.4.0 - 2017-05-01
+* Bug fixes (see mercurial logs for details)
+* Change depreciation_duration into Integer on the template
+
Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 43a5077..e6978f8 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2012-2016 Nicolas Évrard.
-Copyright (C) 2012-2016 Cédric Krier.
+Copyright (C) 2012-2017 Nicolas Évrard.
+Copyright (C) 2012-2017 Cédric Krier.
Copyright (C) 2012-2013 Bertrand Chenal.
-Copyright (C) 2012-2016 B2CK SPRL.
+Copyright (C) 2012-2017 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index d1f23b4..698ef3c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_asset
-Version: 4.2.0
+Version: 4.4.0
Summary: Tryton module for assets management
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.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_account_asset
=====================
@@ -51,7 +51,7 @@ Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/__init__.py b/__init__.py
index cb1b0db..d6dd4a7 100644
--- a/__init__.py
+++ b/__init__.py
@@ -18,10 +18,13 @@ def register():
UpdateAssetShowDepreciation,
PrintDepreciationTableStart,
Category,
+ CategoryAccount,
Template,
+ TemplateAccount,
Product,
InvoiceLine,
Configuration,
+ ConfigurationAssetSequence,
Move,
PurchaseLine,
module='account_asset', type_='model')
diff --git a/account.py b/account.py
index 8b58bb8..12bfd65 100644
--- a/account.py
+++ b/account.py
@@ -1,21 +1,69 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
-from trytond.model import fields
+from trytond import backend
+from trytond.model import ModelSQL, fields
from trytond.pyson import Eval
-from trytond.pool import PoolMeta
+from trytond.pool import PoolMeta, Pool
+from trytond.tools.multivalue import migrate_property
+from trytond.modules.company.model import CompanyValueMixin
-__all__ = ['Configuration', 'Move']
+__all__ = ['Configuration', 'ConfigurationAssetSequence', 'Move']
class Configuration:
__metaclass__ = PoolMeta
__name__ = 'account.configuration'
- asset_sequence = fields.Property(fields.Many2One('ir.sequence',
- 'Asset Reference Sequence', domain=[
- ('company', 'in', [Eval('context', {}).get('company', -1),
- None]),
+ asset_sequence = fields.MultiValue(fields.Many2One(
+ 'ir.sequence', "Asset Reference Sequence", required=True,
+ domain=[
+ ('company', 'in', [
+ Eval('context', {}).get('company', -1), None]),
('code', '=', 'account.asset'),
- ], required=True))
+ ]))
+
+ @classmethod
+ def default_asset_sequence(cls, **pattern):
+ return cls.multivalue_model('asset_sequence').default_asset_sequence()
+
+
+class ConfigurationAssetSequence(ModelSQL, CompanyValueMixin):
+ "Account Configuration Asset Sequence"
+ __name__ = 'account.configuration.asset_sequence'
+ asset_sequence = fields.Many2One(
+ 'ir.sequence', "Asset Reference Sequence", required=True,
+ domain=[
+ ('company', 'in', [Eval('company', -1), None]),
+ ('code', '=', 'account.asset'),
+ ],
+ depends=['company'])
+
+ @classmethod
+ def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
+ exist = TableHandler.table_exist(cls._table)
+
+ super(ConfigurationAssetSequence, cls).__register__(module_name)
+
+ if not exist:
+ cls._migrate_property([], [], [])
+
+ @classmethod
+ def _migrate_property(cls, field_names, value_names, fields):
+ field_names.append('asset_sequence')
+ value_names.append('asset_sequence')
+ fields.append('company')
+ migrate_property(
+ 'account.configuration', field_names, cls, value_names,
+ fields=fields)
+
+ @classmethod
+ def default_asset_sequence(cls):
+ pool = Pool()
+ ModelData = pool.get('ir.model.data')
+ try:
+ return ModelData.get_id('account_asset', 'sequence_asset')
+ except KeyError:
+ return None
class Move:
diff --git a/account.xml b/account.xml
index 2347bec..0eb9b87 100644
--- a/account.xml
+++ b/account.xml
@@ -9,11 +9,4 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">configuration_form</field>
</record>
</data>
- <data noupdate="1">
- <record model="ir.property" id="property_asset_sequence">
- <field name="field"
- search="[('model.model', '=', 'account.configuration'), ('name', '=', 'asset_sequence')]"/>
- <field name="value" eval="'ir.sequence,' + str(ref('sequence_asset'))"/>
- </record>
- </data>
</tryton>
diff --git a/asset.py b/asset.py
index ee39365..1a0d92c 100644
--- a/asset.py
+++ b/asset.py
@@ -275,7 +275,7 @@ class Asset(Workflow, ModelSQL, ModelView):
self.start_date = invoice.invoice_date
if invoice_line.product.depreciation_duration:
duration = relativedelta.relativedelta(
- months=int(invoice_line.product.depreciation_duration),
+ months=invoice_line.product.depreciation_duration,
days=-1)
self.end_date = self.start_date + duration
diff --git a/locale/bg.po b/locale/bg.po
index b824a78..854aefc 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -335,6 +335,45 @@ msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
msgstr ""
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr "Фирма"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr "Условие за плащане"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
#, fuzzy
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
@@ -360,6 +399,14 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr ""
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr ""
@@ -408,6 +455,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr ""
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -451,6 +506,10 @@ msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr ""
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr ""
+
#, fuzzy
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
diff --git a/locale/ca.po b/locale/ca.po
index 2531c1b..a30d703 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -287,6 +287,38 @@ msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
msgstr "Seqüència de referència d'actiu"
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr "Seqüència de referència d'actiu"
+
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr "Data de creació"
+
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr "Usuari de creació"
+
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr "Data de modificació"
+
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
+msgstr "Usuari de modificació"
+
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
msgstr "Actiu"
@@ -311,6 +343,14 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Compte d'amortització utilitzat"
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr "Compte d'actiu"
+
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "Compte d'amortització"
+
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Compte d'actiu"
@@ -359,6 +399,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Durada de l'amortització"
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr "Compte d'actiu"
+
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "Compte d'amortització"
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -403,6 +451,10 @@ msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr "Actualitza actius - Inici"
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr "Configuració de la seqüencia dels actius"
+
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
msgstr "Actiu"
diff --git a/locale/cs.po b/locale/cs.po
index 0b70c6b..e79e3e2 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -289,6 +289,39 @@ msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
msgstr ""
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr "Namu"
+
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
+msgstr ""
+
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
msgstr ""
@@ -313,6 +346,14 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr ""
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr ""
@@ -361,6 +402,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr ""
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -403,6 +452,10 @@ msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr ""
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr ""
+
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
msgstr ""
diff --git a/locale/de.po b/locale/de.po
index f92f601..23a4ced 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -65,7 +65,7 @@ msgstr "ID"
msgctxt "field:account.asset,lines:"
msgid "Lines"
-msgstr "Zeilen"
+msgstr "Positionen"
msgctxt "field:account.asset,move:"
msgid "Account Move"
@@ -287,6 +287,38 @@ msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
msgstr "Nummernkreis Anlagenbelege"
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr "Nummernkreis Anlagenbelege"
+
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr "Unternehmen"
+
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
msgstr "Anlage"
@@ -311,6 +343,14 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Verwendetes Abschreibungskonto"
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr "Anlagenkonto"
+
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "Abschreibungskonto"
+
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Anlagenkonto"
@@ -359,6 +399,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Abschreibungsdauer"
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr "Anlagenkonto"
+
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "Abschreibungskonto"
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -403,6 +451,10 @@ msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr "Aktualisierung Anlage Start"
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr "Einstellungen Buchhaltung Nummernkreis Anlagen"
+
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
msgstr "Anlage"
diff --git a/locale/es.po b/locale/es.po
index 1c9a50c..4fe11cb 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -82,7 +82,7 @@ msgstr "Producto"
msgctxt "field:account.asset,purchase_date:"
msgid "Purchase Date"
-msgstr "Fecha compra"
+msgstr "Fecha de compra"
msgctxt "field:account.asset,quantity:"
msgid "Quantity"
@@ -288,6 +288,38 @@ msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
msgstr "Secuencia de referencia de activo"
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr "Secuencia de referencia de activo"
+
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr "Usuario de creación"
+
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
+msgstr "Usuario de modificación"
+
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
msgstr "Activo"
@@ -312,6 +344,14 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Cuenta de amortización utilizada"
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr "Cuenta de activo"
+
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "Cuenta de amortización"
+
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Cuenta de activo"
@@ -360,6 +400,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Duración de la amortización"
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr "Cuenta de activo"
+
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "Cuenta de amortización"
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -404,6 +452,10 @@ msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr "Actualizar activo - Inicio"
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr "Configuración de la secuencia de activos"
+
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
msgstr "Activo"
diff --git a/locale/es_419.po b/locale/es_419.po
index 828a44e..05122e6 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -12,7 +12,7 @@ msgstr ""
msgctxt "error:account.invoice.line:"
msgid "Asset can be used only once on invoice line!"
-msgstr "¡El activo sólo se puede utilizar una vez en la línea de factura!"
+msgstr ""
msgctxt "error:purchase.line:"
msgid "It misses an \"Account Asset\" on product \"%s\"."
@@ -36,7 +36,7 @@ msgstr ""
msgctxt "field:account.asset,create_uid:"
msgid "Create User"
-msgstr "Creado por usuario"
+msgstr ""
msgctxt "field:account.asset,currency_digits:"
msgid "Currency Digits"
@@ -80,7 +80,7 @@ msgstr ""
msgctxt "field:account.asset,purchase_date:"
msgid "Purchase Date"
-msgstr "Fecha de compra"
+msgstr ""
msgctxt "field:account.asset,quantity:"
msgid "Quantity"
@@ -128,11 +128,11 @@ msgstr ""
msgctxt "field:account.asset,write_uid:"
msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
msgctxt "field:account.asset-update-account.move,asset:"
msgid "Asset"
-msgstr ""
+msgstr "Activo Fijo"
msgctxt "field:account.asset-update-account.move,create_date:"
msgid "Create Date"
@@ -140,7 +140,7 @@ msgstr ""
msgctxt "field:account.asset-update-account.move,create_uid:"
msgid "Create User"
-msgstr "Creado por usuario"
+msgstr ""
msgctxt "field:account.asset-update-account.move,id:"
msgid "ID"
@@ -160,7 +160,7 @@ msgstr ""
msgctxt "field:account.asset-update-account.move,write_uid:"
msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
msgctxt "field:account.asset.create_moves.start,date:"
msgid "Date"
@@ -180,11 +180,11 @@ msgstr "Valor de adquisición"
msgctxt "field:account.asset.line,actual_value:"
msgid "Actual Value"
-msgstr ""
+msgstr "Valor actual"
msgctxt "field:account.asset.line,asset:"
msgid "Asset"
-msgstr ""
+msgstr "Activo fijo"
msgctxt "field:account.asset.line,create_date:"
msgid "Create Date"
@@ -192,7 +192,7 @@ msgstr ""
msgctxt "field:account.asset.line,create_uid:"
msgid "Create User"
-msgstr "Creado por usuario"
+msgstr ""
msgctxt "field:account.asset.line,date:"
msgid "Date"
@@ -224,7 +224,7 @@ msgstr ""
msgctxt "field:account.asset.line,write_uid:"
msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
msgctxt "field:account.asset.print_depreciation_table.start,end_date:"
msgid "End Date"
@@ -280,27 +280,60 @@ msgstr ""
msgctxt "field:account.asset.update.start,value:"
msgid "Asset Value"
-msgstr ""
+msgstr "Valor de activo fijo"
msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
+msgstr "Secuencia de activo fijo"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr "Secuencia de activo fijo"
+
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
msgstr ""
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
-msgstr ""
+msgstr "Activo Fijo"
msgctxt "field:account.invoice.line,is_assets_depreciable:"
msgid "Is Assets depreciable"
-msgstr "Es activo depreciable"
+msgstr "Es activo fijo depreciable"
msgctxt "field:product.category,account_asset:"
msgid "Account Asset"
-msgstr ""
+msgstr "Cuenta de activo fijo"
msgctxt "field:product.category,account_asset_used:"
msgid "Account Asset Used"
-msgstr ""
+msgstr "Cuenta de activo fijo utilizada"
msgctxt "field:product.category,account_depreciation:"
msgid "Account Depreciation"
@@ -310,13 +343,25 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Cuenta de depreciación utilizada"
+#, fuzzy
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr "Cuenta de activo fijo"
+
+#, fuzzy
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "Cuenta de depreciación"
+
+#, fuzzy
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
-msgstr ""
+msgstr "Cuenta de activo fijo"
+#, fuzzy
msgctxt "field:product.product,account_asset_used:"
msgid "Account Asset Used"
-msgstr ""
+msgstr "Cuenta de activo fijo utilizada"
msgctxt "field:product.product,account_depreciation:"
msgid "Account Depreciation"
@@ -336,11 +381,11 @@ msgstr "Duración de la depreciación"
msgctxt "field:product.template,account_asset:"
msgid "Account Asset"
-msgstr ""
+msgstr "Cuenta de activo fijo"
msgctxt "field:product.template,account_asset_used:"
msgid "Account Asset Used"
-msgstr ""
+msgstr "Cuenta de activo fijo"
msgctxt "field:product.template,account_depreciation:"
msgid "Account Depreciation"
@@ -358,6 +403,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Duración de la depreciación"
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr "Cuenta de activo fijo"
+
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "Cuenta de depreciación"
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -376,11 +429,11 @@ msgstr ""
msgctxt "model:account.asset,name:"
msgid "Asset"
-msgstr ""
+msgstr "Activo fijo"
msgctxt "model:account.asset-update-account.move,name:"
msgid "Asset - Update - Move"
-msgstr "Activo - Actualizar - Asiento"
+msgstr "Activo fijo - Actualizar - Asiento"
msgctxt "model:account.asset.create_moves.start,name:"
msgid "Create Moves Start"
@@ -388,31 +441,35 @@ msgstr ""
msgctxt "model:account.asset.line,name:"
msgid "Asset Line"
-msgstr ""
+msgstr "Línea de activo fijo"
msgctxt "model:account.asset.print_depreciation_table.start,name:"
msgid "Asset Depreciation Table Start"
-msgstr "Tabla de depreciación de activo - Inicio"
+msgstr "Tabla de depreciación de activo fijo - Inicio"
msgctxt "model:account.asset.update.show_depreciation,name:"
msgid "Update Asset Show Depreciation"
-msgstr "Actualizar activo - Mostrar depreciación"
+msgstr "Actualizar activo fijo - Mostrar depreciación"
msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr ""
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr ""
+
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
-msgstr ""
+msgstr "Activo fijo"
msgctxt "model:account.journal.type,name:journal_type_asset"
msgid "Asset"
-msgstr ""
+msgstr "Activo fijo"
msgctxt "model:ir.action,name:act_asset_form"
msgid "Assets"
-msgstr ""
+msgstr "Activo fijo"
msgctxt "model:ir.action,name:report_depreciation_table"
msgid "Depreciation Table"
@@ -420,7 +477,7 @@ msgstr "Tabla de depreciación"
msgctxt "model:ir.action,name:wizard_create_moves"
msgid "Create Assets Moves"
-msgstr ""
+msgstr "Crear asientos de activos fijos"
msgctxt "model:ir.action,name:wizard_print_depreciation_table"
msgid "Print Depreciation Table"
@@ -428,7 +485,7 @@ msgstr "Imprimir tabla de depreciación"
msgctxt "model:ir.action,name:wizard_update"
msgid "Update Asset"
-msgstr ""
+msgstr "Actualizar activo fijo"
msgctxt "model:ir.action.act_window.domain,name:act_asset_form_domain_all"
msgid "All"
@@ -448,19 +505,19 @@ msgstr ""
msgctxt "model:ir.sequence,name:sequence_asset"
msgid "Asset"
-msgstr ""
+msgstr "Activo fijo"
msgctxt "model:ir.sequence.type,name:sequence_type_asset"
msgid "Asset"
-msgstr ""
+msgstr "Activo fijo"
msgctxt "model:ir.ui.menu,name:menu_asset"
msgid "Assets"
-msgstr ""
+msgstr "Activo fijo"
msgctxt "model:ir.ui.menu,name:menu_asset_form"
msgid "Assets"
-msgstr ""
+msgstr "Activos fijos"
msgctxt "model:ir.ui.menu,name:menu_create_depreciation_table"
msgid "Print Depreciation Table"
@@ -468,7 +525,7 @@ msgstr "Imprimir tabla de depreciación"
msgctxt "model:ir.ui.menu,name:menu_create_moves"
msgid "Create Assets Moves"
-msgstr ""
+msgstr "Crear asientos de activos fijos"
msgctxt "report:account.asset.depreciation_table:"
msgid "("
@@ -504,7 +561,7 @@ msgstr "Tabla de depreciación"
msgctxt "report:account.asset.depreciation_table:"
msgid "Assets"
-msgstr ""
+msgstr "Activo fijo"
msgctxt "report:account.asset.depreciation_table:"
msgid "Closing Value"
@@ -524,7 +581,7 @@ msgstr ""
msgctxt "report:account.asset.depreciation_table:"
msgid "Print Date:"
-msgstr "Fecha de impresión:"
+msgstr ""
msgctxt "report:account.asset.depreciation_table:"
msgid "To:"
@@ -568,7 +625,7 @@ msgstr ""
msgctxt "view:account.asset.create_moves.start:"
msgid "Create Assets Moves up to"
-msgstr ""
+msgstr "Crear asientos de activo fijo hasta"
msgctxt "view:account.asset:"
msgid "Are you sure to close the asset?"
@@ -600,11 +657,11 @@ msgstr ""
msgctxt "view:account.asset:"
msgid "Update Asset"
-msgstr ""
+msgstr "Actuzalizar activo fijo"
msgctxt "view:account.configuration:"
msgid "Asset"
-msgstr ""
+msgstr "Activo fijo"
msgctxt "view:account.configuration:"
msgid "Sequence"
diff --git a/locale/fr.po b/locale/fr.po
index 6d8fbcc..940c450 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -288,6 +288,38 @@ msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
msgstr "Séquence de référence d'actif"
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr "Séquence de référence d'actif"
+
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr "Société"
+
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
msgstr "Actif"
@@ -312,6 +344,14 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Compte d'amortissement utilisé"
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr "Compte d'actif"
+
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "Compte d'amortissement"
+
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Compte d'actif"
@@ -360,6 +400,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Durée d'amortissement"
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr "Compte d'actif"
+
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "Compte d'amortissement"
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -404,6 +452,10 @@ msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr "Mise à jour des actifs - début"
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr "Configuration comptable séquence d'actif"
+
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
msgstr "Actif"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index c62d635..55b1da7 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -32,7 +32,6 @@ msgctxt "field:account.asset,company:"
msgid "Company"
msgstr "Társaság"
-#, fuzzy
msgctxt "field:account.asset,create_date:"
msgid "Create Date"
msgstr "Létrehozás détuma"
@@ -62,7 +61,6 @@ msgctxt "field:account.asset,frequency:"
msgid "Frequency"
msgstr ""
-#, fuzzy
msgctxt "field:account.asset,id:"
msgid "ID"
msgstr "ID"
@@ -76,7 +74,6 @@ msgctxt "field:account.asset,move:"
msgid "Account Move"
msgstr ""
-#, fuzzy
msgctxt "field:account.asset,number:"
msgid "Number"
msgstr "Szám"
@@ -90,7 +87,6 @@ msgctxt "field:account.asset,purchase_date:"
msgid "Purchase Date"
msgstr ""
-#, fuzzy
msgctxt "field:account.asset,quantity:"
msgid "Quantity"
msgstr "Mennyiség"
@@ -324,6 +320,45 @@ msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
msgstr ""
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr "Társaság"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr "Létrehozás détuma"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr "Által létrehozva "
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr "Név"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr "utolsó módosítás dátuma"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
+msgstr "Által módosítva"
+
#, fuzzy
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
@@ -349,6 +384,14 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr ""
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr ""
@@ -397,6 +440,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr ""
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -440,6 +491,10 @@ msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr ""
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr ""
+
#, fuzzy
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 7d31b0b..1fddbdf 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -288,6 +288,46 @@ msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
msgstr "Sequenza riferimento immobilizzazione"
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr "Sequenza riferimento immobilizzazione"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr "Azienda"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr "Crea data"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr "Crea Utente"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr "Data scrittura"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
+msgstr "Utente scrittura"
+
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
msgstr "Immobilizzazione"
@@ -312,6 +352,16 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Conto ammortamento usato"
+#, fuzzy
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr "Conto immobilizzazione"
+
+#, fuzzy
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "Conto ammortamento"
+
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Conto Immobilizzazione"
@@ -360,6 +410,16 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Durata ammortamento"
+#, fuzzy
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr "Conto immobilizzazione"
+
+#, fuzzy
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "Conto ammortamento"
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -404,6 +464,10 @@ msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr "Aggiornamento entrata in funzione "
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr ""
+
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
msgstr "Immobilizzazione"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index f4a5dd5..2186991 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -288,6 +288,38 @@ msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
msgstr ""
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
+msgstr ""
+
#, fuzzy
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
@@ -313,6 +345,14 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr ""
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr ""
@@ -361,6 +401,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr ""
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -404,6 +452,10 @@ msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr ""
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr ""
+
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
msgstr "Asset"
diff --git a/locale/lo.po b/locale/lo.po
index a0cb94a..949a262 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -286,6 +286,38 @@ msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
msgstr "ລໍາດັບ ເອກະສານອ້າງອີງ ຊັບສິນ"
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr "ລໍາດັບ ເອກະສານອ້າງອີງ ຊັບສິນ"
+
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr "ບໍລິສັດ"
+
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr "ວັນທີສ້າງ"
+
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr "ຜູ້ສ້າງ"
+
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr "ເລກລໍາດັບ"
+
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr "ຊື່"
+
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr "ວັນທີຂຽນ"
+
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
+msgstr "ຜູ້ຂຽນ"
+
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
msgstr "ຊັບສິນ"
@@ -310,6 +342,14 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "ບັນຊີຄ່າຫຼຸ້ຍຫ້ຽນທີ່ໃຊ້ແລ້ວ"
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr "ບັນຊີຊັບສິນ"
+
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "ບັນຊີຄ່າຫຼຸ້ຍຫ້ຽນ"
+
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "ບັນຊີຊັບສິນ"
@@ -358,6 +398,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "ກຳນົດຫັກຄ່າຫຼຸ້ຍຫ້ຽນ"
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr "ບັນຊີຊັບສິນ"
+
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "ບັນຊີຄ່າຫຼຸ້ຍຫ້ຽນ"
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -402,6 +450,10 @@ msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr "ເລີ່ມປັບປຸງຊັບສິນ"
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr "ລຳດັບ ການກຳນົດຄ່າບັນຊີຊັບສິນ"
+
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
msgstr "ຊັບສິນ"
diff --git a/locale/lt.po b/locale/lt.po
index 0b70c6b..e79e3e2 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -289,6 +289,39 @@ msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
msgstr ""
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr "Namu"
+
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
+msgstr ""
+
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
msgstr ""
@@ -313,6 +346,14 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr ""
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr ""
@@ -361,6 +402,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr ""
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -403,6 +452,10 @@ msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr ""
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr ""
+
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 50db9d0..e0fe503 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -334,6 +334,45 @@ msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
msgstr ""
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr "Bedrijf"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr "Datum"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr "Gebruiker"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr "Naam bijlage"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr "Schrijfdatum"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
+msgstr "Gebruiker"
+
#, fuzzy
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
@@ -359,6 +398,14 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr ""
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr ""
@@ -407,6 +454,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr ""
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -450,6 +505,10 @@ msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr ""
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr ""
+
#, fuzzy
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
diff --git a/locale/pl.po b/locale/pl.po
index 7859d48..c7f33f9 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -288,6 +288,45 @@ msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
msgstr ""
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr "Firma"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr "Data utworzenia"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr "Utworzył"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr "Nazwa"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr "Data zapisu"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
+msgstr "Zapisał"
+
#, fuzzy
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
@@ -313,6 +352,14 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr ""
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr ""
@@ -361,6 +408,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr ""
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -404,6 +459,10 @@ msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr ""
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr ""
+
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
msgstr "Asset"
@@ -614,7 +673,7 @@ msgstr "Asset"
msgctxt "view:account.configuration:"
msgid "Sequence"
-msgstr "Kolejność"
+msgstr "Sekwencja"
msgctxt "view:product.template:"
msgid "Depreciation"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index b9f6760..109e706 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -287,6 +287,38 @@ msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
msgstr "Sequência de Referência do Ativo"
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr "Sequência de Referência do Ativo"
+
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr "Data de criação"
+
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr "Criado por"
+
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr "Nome"
+
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr "Data de edição"
+
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
+msgstr "Editado por"
+
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
msgstr "Ativo"
@@ -311,6 +343,14 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Conta de Depreciação Utilizada"
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr "Conta de Ativos"
+
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "Conta de Depreciação"
+
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Conta de Ativos"
@@ -359,6 +399,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Duração da Depreciação"
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr "Conta de Ativos"
+
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "Conta de Depreciação"
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -403,6 +451,10 @@ msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr "Atualiza Ativos - Início"
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr "Configuração de Contas Sequência de Ativo"
+
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
msgstr "Ativo"
diff --git a/locale/ru.po b/locale/ru.po
index 43e57a6..d3bf42a 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -336,6 +336,45 @@ msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
msgstr ""
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr "Учет.орг."
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr "Дата создания"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr "Создано пользователем"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr "Правило оплаты"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr "Дата изменения"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
+msgstr "Изменено пользователем"
+
#, fuzzy
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
@@ -361,6 +400,14 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr ""
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr ""
@@ -409,6 +456,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr ""
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -452,6 +507,10 @@ msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr ""
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr ""
+
#, fuzzy
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
diff --git a/locale/sl.po b/locale/sl.po
index 309e7b4..3a6c813 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -286,6 +286,38 @@ msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
msgstr "Štetje sredstev"
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr "Štetje sredstev"
+
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr "Družba"
+
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr "Izdelano"
+
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr "Izdelal"
+
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr "Ime"
+
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
msgstr "Sredstvo"
@@ -310,6 +342,14 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr "Uporabljen konto amortizacije"
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr "Konto sredstev"
+
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "Amortizacija"
+
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr "Konto sredstev"
@@ -358,6 +398,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Trajanje amortizacije"
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr "Konto sredstev"
+
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr "Amortizacija"
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -402,6 +450,10 @@ msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr "Popravek sredstev"
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr "Konfiguracija štetja sredstev"
+
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
msgstr "Sredstvo"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index a10188a..5353ed7 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -313,6 +313,44 @@ msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
msgstr ""
+msgctxt "field:account.configuration.asset_sequence,asset_sequence:"
+msgid "Asset Reference Sequence"
+msgstr ""
+
+msgctxt "field:account.configuration.asset_sequence,company:"
+msgid "Company"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,create_date:"
+msgid "Create Date"
+msgstr "创建日期:"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,create_uid:"
+msgid "Create User"
+msgstr "添加用户"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,id:"
+msgid "ID"
+msgstr "编号"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,rec_name:"
+msgid "Name"
+msgstr "纳木"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,write_date:"
+msgid "Write Date"
+msgstr "写入日期"
+
+#, fuzzy
+msgctxt "field:account.configuration.asset_sequence,write_uid:"
+msgid "Write User"
+msgstr "写入帐号"
+
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
msgstr ""
@@ -337,6 +375,14 @@ msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
msgstr ""
+msgctxt "field:product.category.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.category.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "field:product.product,account_asset:"
msgid "Account Asset"
msgstr ""
@@ -385,6 +431,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr ""
+msgctxt "field:product.template.account,account_asset:"
+msgid "Account Asset"
+msgstr ""
+
+msgctxt "field:product.template.account,account_depreciation:"
+msgid "Account Depreciation"
+msgstr ""
+
msgctxt "help:account.asset.update.show_depreciation,date:"
msgid ""
"The date must be between the last update/depreciation date and the next "
@@ -427,6 +481,10 @@ msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
msgstr ""
+msgctxt "model:account.configuration.asset_sequence,name:"
+msgid "Account Configuration Asset Sequence"
+msgstr ""
+
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
msgstr ""
diff --git a/product.py b/product.py
index f972212..f6b538f 100644
--- a/product.py
+++ b/product.py
@@ -1,17 +1,19 @@
# 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 import backend
from trytond.model import fields
from trytond.pyson import Eval
-from trytond.pool import PoolMeta
+from trytond.pool import PoolMeta, Pool
from trytond.modules.account_product import MissingFunction
-__all__ = ['Category', 'Template', 'Product']
+__all__ = ['Category', 'CategoryAccount', 'Template', 'TemplateAccount',
+ 'Product']
class Category:
__metaclass__ = PoolMeta
__name__ = 'product.category'
- account_depreciation = fields.Property(fields.Many2One('account.account',
+ account_depreciation = fields.MultiValue(fields.Many2One('account.account',
'Account Depreciation', domain=[
('kind', '=', 'other'),
('company', '=', Eval('context', {}).get('company', -1)),
@@ -25,7 +27,7 @@ class Category:
account_depreciation_used = MissingFunction(
fields.Many2One('account.account', 'Account Depreciation Used'),
'missing_account', 'get_account')
- account_asset = fields.Property(fields.Many2One('account.account',
+ account_asset = fields.MultiValue(fields.Many2One('account.account',
'Account Asset',
domain=[
('kind', '=', 'expense'),
@@ -41,6 +43,54 @@ class Category:
fields.Many2One('account.account', 'Account Asset Used'),
'missing_account', 'get_account')
+ @classmethod
+ def multivalue_model(cls, field):
+ pool = Pool()
+ if field in {'account_depreciation', 'account_asset'}:
+ return pool.get('product.category.account')
+ return super(Category, cls).multivalue_model(field)
+
+
+class CategoryAccount:
+ __metaclass__ = PoolMeta
+ __name__ = 'product.category.account'
+ account_depreciation = fields.Many2One(
+ 'account.account', "Account Depreciation",
+ domain=[
+ ('kind', '=', 'other'),
+ ('company', '=', Eval('company', -1)),
+ ],
+ depends=['company'])
+ account_asset = fields.Many2One(
+ 'account.account', "Account Asset",
+ domain=[
+ ('kind', '=', 'expense'),
+ ('company', '=', Eval('company', -1)),
+ ],
+ depends=['company'])
+
+ @classmethod
+ def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
+ exist = TableHandler.table_exist(cls._table)
+ if exist:
+ table = TableHandler(cls, module_name)
+ exist &= (table.column_exist('account_depreciation')
+ and table.column_exist('account_asset'))
+
+ super(CategoryAccount, cls).__register__(module_name)
+
+ if not exist:
+ # Re-migration
+ cls._migrate_property([], [], [])
+
+ @classmethod
+ def _migrate_property(cls, field_names, value_names, fields):
+ field_names.extend(['account_depreciation', 'account_asset'])
+ value_names.extend(['account_depreciation', 'account_asset'])
+ super(CategoryAccount, cls)._migrate_property(
+ field_names, value_names, fields)
+
class Template:
__metaclass__ = PoolMeta
@@ -49,7 +99,7 @@ class Template:
'readonly': ~Eval('active', True),
'invisible': Eval('type', '') != 'assets',
}, depends=['active', 'type'])
- account_depreciation = fields.Property(fields.Many2One('account.account',
+ account_depreciation = fields.MultiValue(fields.Many2One('account.account',
'Account Depreciation', domain=[
('kind', '=', 'other'),
('company', '=', Eval('context', {}).get('company', -1)),
@@ -66,7 +116,7 @@ class Template:
account_depreciation_used = MissingFunction(
fields.Many2One('account.account', 'Account Depreciation Used'),
'missing_account', 'get_account')
- account_asset = fields.Property(fields.Many2One('account.account',
+ account_asset = fields.MultiValue(fields.Many2One('account.account',
'Account Asset',
domain=[
('kind', '=', 'expense'),
@@ -84,16 +134,63 @@ class Template:
account_asset_used = MissingFunction(
fields.Many2One('account.account', 'Account Asset Used'),
'missing_account', 'get_account')
- depreciation_duration = fields.Property(fields.Numeric(
- 'Depreciation Duration', digits=(16, 0),
- states={
- 'readonly': ~Eval('active', True),
- 'invisible': (~Eval('depreciable')
- | (Eval('type', '') != 'assets')
- | ~Eval('context', {}).get('company')),
- },
- depends=['active', 'depreciable', 'type'],
- help='In months'))
+ depreciation_duration = fields.Integer(
+ "Depreciation Duration",
+ states={
+ 'readonly': ~Eval('active', True),
+ 'invisible': (~Eval('depreciable')
+ | (Eval('type', '') != 'assets')),
+ },
+ depends=['active', 'depreciable', 'type'],
+ help='In months')
+
+ @classmethod
+ def multivalue_model(cls, field):
+ pool = Pool()
+ if field in {'account_depreciation', 'account_asset'}:
+ return pool.get('product.template.account')
+ return super(Template, cls).multivalue_model(field)
+
+
+class TemplateAccount:
+ __metaclass__ = PoolMeta
+ __name__ = 'product.template.account'
+ account_depreciation = fields.Many2One(
+ 'account.account', "Account Depreciation",
+ domain=[
+ ('kind', '=', 'other'),
+ ('company', '=', Eval('company', -1)),
+ ],
+ depends=['company'])
+ account_asset = fields.Many2One(
+ 'account.account', "Account Asset",
+ domain=[
+ ('kind', '=', 'expense'),
+ ('company', '=', Eval('company', -1)),
+ ],
+ depends=['company'])
+
+ @classmethod
+ def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
+ exist = TableHandler.table_exist(cls._table)
+ if exist:
+ table = TableHandler(cls, module_name)
+ exist &= (table.column_exist('account_depreciation')
+ and table.column_exist('account_asset'))
+
+ super(TemplateAccount, cls).__register__(module_name)
+
+ if not exist:
+ # Re-migration
+ cls._migrate_property([], [], [])
+
+ @classmethod
+ def _migrate_property(cls, field_names, value_names, fields):
+ field_names.extend(['account_depreciation', 'account_asset'])
+ value_names.extend(['account_depreciation', 'account_asset'])
+ super(TemplateAccount, cls)._migrate_property(
+ field_names, value_names, fields)
class Product:
diff --git a/setup.py b/setup.py
index 1977860..3feecea 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@ setup(name=name,
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
'Natural Language :: Chinese (Simplified)',
diff --git a/tests/scenario_account_asset.rst b/tests/scenario_account_asset.rst
index 4951f89..b96c754 100644
--- a/tests/scenario_account_asset.rst
+++ b/tests/scenario_account_asset.rst
@@ -61,7 +61,7 @@ Create an asset::
>>> asset_template.account_revenue = revenue
>>> asset_template.account_asset = asset_account
>>> asset_template.account_depreciation = depreciation_account
- >>> asset_template.depreciation_duration = Decimal(24)
+ >>> asset_template.depreciation_duration = 24
>>> asset_template.save()
>>> asset_product.template = asset_template
>>> asset_product.save()
diff --git a/tryton.cfg b/tryton.cfg
index ddc4d56..2c12c00 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.0
+version=4.4.0
depends:
ir
res
diff --git a/trytond_account_asset.egg-info/PKG-INFO b/trytond_account_asset.egg-info/PKG-INFO
index a87ad0c..0fb9800 100644
--- a/trytond_account_asset.egg-info/PKG-INFO
+++ b/trytond_account_asset.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-asset
-Version: 4.2.0
+Version: 4.4.0
Summary: Tryton module for assets management
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.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_account_asset
=====================
@@ -51,7 +51,7 @@ Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/trytond_account_asset.egg-info/requires.txt b/trytond_account_asset.egg-info/requires.txt
index 68bb9f6..8e995a9 100644
--- a/trytond_account_asset.egg-info/requires.txt
+++ b/trytond_account_asset.egg-info/requires.txt
@@ -1,7 +1,7 @@
cached-property
python-dateutil
-trytond_account >= 4.2, < 4.3
-trytond_account_product >= 4.2, < 4.3
-trytond_product >= 4.2, < 4.3
-trytond_account_invoice >= 4.2, < 4.3
-trytond >= 4.2, < 4.3
+trytond_account >= 4.4, < 4.5
+trytond_account_product >= 4.4, < 4.5
+trytond_product >= 4.4, < 4.5
+trytond_account_invoice >= 4.4, < 4.5
+trytond >= 4.4, < 4.5
diff --git a/view/asset_form.xml b/view/asset_form.xml
index f1ee39c..1bfbc8e 100644
--- a/view/asset_form.xml
+++ b/view/asset_form.xml
@@ -26,7 +26,7 @@
<group col="4" colspan="4" id="state_buttons">
<label name="state"/>
<field name="state"/>
- <group col="5" colspan="2" id="buttons">
+ <group col="-1" colspan="2" id="buttons">
<button name="clear_lines"
string="Clear Lines"
icon="tryton-clear"/>
--
tryton-modules-account-asset
More information about the tryton-debian-vcs
mailing list