[tryton-debian-vcs] tryton-modules-account-asset branch upstream updated. upstream/3.2.1-1-gfd1d7f1
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:11:46 UTC 2014
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-asset.git;a=commitdiff;h=upstream/3.2.1-1-gfd1d7f1
commit fd1d7f1909268316422dee8c8b32b77a4e5cff09
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 21 11:29:03 2014 +0200
Adding upstream version 3.4.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 36c79db..7405999 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 3.2.1 - 2014-08-03
+Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
Version 3.2.0 - 2014-04-21
diff --git a/COPYRIGHT b/COPYRIGHT
index f5633cb..f3f7030 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright (C) 2012 Nicolas Évrard.
+Copyright (C) 2012-2014 Nicolas Évrard.
Copyright (C) 2012-2014 Cédric Krier.
Copyright (C) 2012-2013 Bertrand Chenal.
Copyright (C) 2012-2014 B2CK SPRL.
diff --git a/PKG-INFO b/PKG-INFO
index 4953f87..c01f446 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_asset
-Version: 3.2.1
+Version: 3.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/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_account_asset
=====================
diff --git a/asset.py b/asset.py
index 684f642..f9a04ee 100644
--- a/asset.py
+++ b/asset.py
@@ -11,6 +11,7 @@ from trytond.pyson import Eval, Bool, If
from trytond.pool import Pool
from trytond.transaction import Transaction
from trytond.wizard import Wizard, StateView, StateTransition, Button
+from trytond.tools import grouped_slice
__all__ = ['Asset', 'AssetLine', 'AssetUpdateMove',
'CreateMovesStart', 'CreateMoves',
@@ -107,13 +108,15 @@ class Asset(Workflow, ModelSQL, ModelView):
'readonly': (Eval('lines', [0]) | (Eval('state') != 'draft')),
},
required=True,
- depends=['state'])
+ domain=[('start_date', '<=', Eval('end_date', None))],
+ depends=['state', 'end_date'])
end_date = fields.Date('End Date',
states={
'readonly': (Eval('lines', [0]) | (Eval('state') != 'draft')),
},
required=True,
- depends=['state'])
+ domain=[('end_date', '>=', Eval('start_date', None))],
+ depends=['state', 'start_date'])
depreciation_method = fields.Selection([
('linear', 'Linear'),
], 'Depreciation Method',
@@ -302,7 +305,7 @@ class Asset(Workflow, ModelSQL, ModelView):
# dateutil >= 2.0 has replace __nonzero__ by __bool__ which doesn't
# work in Python < 3
if delta == relativedelta.relativedelta():
- return []
+ return [self.end_date]
if self.frequency == 'monthly':
rule = rrule.rrule(rrule.MONTHLY, dtstart=self.start_date,
bymonthday=-1)
@@ -326,7 +329,10 @@ class Asset(Workflow, ModelSQL, ModelView):
- relativedelta.relativedelta(days=1)]
+ [l.date for l in self.lines])
first_delta = dates[0] - start_date
- last_delta = dates[-1] - dates[-2]
+ if len(dates) > 1:
+ last_delta = dates[-1] - dates[-2]
+ else:
+ last_delta = first_delta
if self.frequency == 'monthly':
_, first_ndays = calendar.monthrange(
dates[0].year, dates[0].month)
@@ -360,11 +366,10 @@ class Asset(Workflow, ModelSQL, ModelView):
asset_line = None
for date in dates:
depreciation = self.compute_depreciation(date, dates)
- with Transaction().set_user(0, set_context=True):
- amounts[date] = asset_line = Line(
- acquired_value=self.value,
- depreciable_basis=amount,
- )
+ amounts[date] = asset_line = Line(
+ acquired_value=self.value,
+ depreciable_basis=amount,
+ )
if depreciation > residual_value:
asset_line.depreciation = residual_value
asset_line.accumulated_depreciation = (
@@ -424,25 +429,24 @@ class Asset(Workflow, ModelSQL, ModelView):
MoveLine = pool.get('account.move.line')
period_id = Period.find(self.company.id, line.date)
- with Transaction().set_user(0, set_context=True):
- expense_line = MoveLine(
- credit=0,
- debit=line.depreciation,
- account=self.product.account_expense_used,
- )
- depreciation_line = MoveLine(
- debit=0,
- credit=line.depreciation,
- account=self.product.account_depreciation_used,
- )
+ expense_line = MoveLine(
+ credit=0,
+ debit=line.depreciation,
+ account=self.product.account_expense_used,
+ )
+ depreciation_line = MoveLine(
+ debit=0,
+ credit=line.depreciation,
+ account=self.product.account_depreciation_used,
+ )
- return Move(
- origin=line,
- period=period_id,
- journal=self.account_journal,
- date=line.date,
- lines=[expense_line, depreciation_line],
- )
+ return Move(
+ origin=line,
+ period=period_id,
+ journal=self.account_journal,
+ date=line.date,
+ lines=[expense_line, depreciation_line],
+ )
@classmethod
def create_moves(cls, assets, date):
@@ -452,14 +456,12 @@ class Asset(Workflow, ModelSQL, ModelView):
pool = Pool()
Move = pool.get('account.move')
Line = pool.get('account.asset.line')
- cursor = Transaction().cursor
moves = []
lines = []
- for i in range(0, len(assets), cursor.IN_MAX):
- asset_ids = [a.id for a in assets[i:i + cursor.IN_MAX]]
+ for asset_ids in grouped_slice(assets):
lines += Line.search([
- ('asset', 'in', asset_ids),
+ ('asset', 'in', list(asset_ids)),
('date', '<=', date),
('move', '=', None),
])
@@ -470,8 +472,7 @@ class Asset(Workflow, ModelSQL, ModelView):
Line.write([line], {
'move': move.id,
})
- with Transaction().set_user(0, set_context=True):
- Move.post(moves)
+ Move.post(moves)
def get_closing_move(self, account):
"""
@@ -490,37 +491,34 @@ class Asset(Workflow, ModelSQL, ModelView):
else:
account_asset = self.product.account_asset_used
- with Transaction().set_user(0, set_context=True):
- asset_line = MoveLine(
- debit=0,
- credit=self.value,
- account=account_asset,
- )
- depreciation_line = MoveLine(
- debit=self.get_depreciated_amount(),
- credit=0,
- account=self.product.account_depreciation_used,
- )
+ asset_line = MoveLine(
+ debit=0,
+ credit=self.value,
+ account=account_asset,
+ )
+ depreciation_line = MoveLine(
+ debit=self.get_depreciated_amount(),
+ credit=0,
+ account=self.product.account_depreciation_used,
+ )
lines = [asset_line, depreciation_line]
square_amount = asset_line.credit - depreciation_line.debit
if square_amount:
if not account:
account = self.product.account_revenue_used
- with Transaction().set_user(0, set_context=True):
- counter_part_line = MoveLine(
- debit=square_amount if square_amount > 0 else 0,
- credit=-square_amount if square_amount < 0 else 0,
- account=account,
- )
- lines.append(counter_part_line)
- with Transaction().set_user(0, set_context=True):
- return Move(
- origin=self,
- period=period_id,
- journal=self.account_journal,
- date=date,
- lines=lines,
+ counter_part_line = MoveLine(
+ debit=square_amount if square_amount > 0 else 0,
+ credit=-square_amount if square_amount < 0 else 0,
+ account=account,
)
+ lines.append(counter_part_line)
+ return Move(
+ origin=self,
+ period=period_id,
+ journal=self.account_journal,
+ date=date,
+ lines=lines,
+ )
@classmethod
def set_reference(cls, assets):
@@ -566,8 +564,7 @@ class Asset(Workflow, ModelSQL, ModelView):
cls.write([asset], {
'move': move.id,
})
- with Transaction().set_user(0, set_context=True):
- Move.post(moves)
+ Move.post(moves)
def get_rec_name(self, name):
return '%s - %s' % (self.reference, self.product.rec_name)
@@ -670,7 +667,17 @@ class UpdateAssetShowDepreciation(ModelView):
'Update Asset Show Depreciation'
__name__ = 'account.asset.update.show_depreciation'
amount = fields.Numeric('Amount', readonly=True)
- date = fields.Date('Date', required=True)
+ date = fields.Date('Date', required=True,
+ domain=[
+ ('date', '>', Eval('latest_move_date')),
+ ('date', '<', Eval('next_depreciation_date')),
+ ],
+ depends=['latest_move_date', 'next_depreciation_date'],
+ help=('The date must be between the last update/depreciation date '
+ 'and the next depreciation date.'))
+ latest_move_date = fields.Date('Latest Move Date', readonly=True)
+ next_depreciation_date = fields.Date('Next Depreciation Date',
+ readonly=True)
depreciation_account = fields.Many2One('account.account',
'Depreciation Account', readonly=True)
counterpart_account = fields.Many2One('account.account',
@@ -710,6 +717,21 @@ class UpdateAsset(Wizard):
return 'show_move'
return 'create_lines'
+ def get_latest_move_date(self, asset):
+ previous_dates = [datetime.date.min]
+ previous_dates += [m.date for m in asset.update_moves
+ if m.state == 'posted']
+ previous_dates += [l.date for l in asset.lines
+ if l.move and l.move.state == 'posted']
+ return max(previous_dates)
+
+ def get_next_depreciation_date(self, asset):
+ next_dates = [datetime.date.max]
+ next_dates += [l.date for l in asset.lines
+ if not l.move or l.move.state != 'posted']
+
+ return min(next_dates)
+
def default_show_move(self, fields):
Asset = Pool().get('account.asset')
asset = Asset(Transaction().context['active_id'])
@@ -718,6 +740,8 @@ class UpdateAsset(Wizard):
'date': datetime.date.today(),
'depreciation_account': asset.product.account_depreciation_used.id,
'counterpart_account': asset.product.account_expense_used.id,
+ 'latest_move_date': self.get_latest_move_date(asset),
+ 'next_depreciation_date': self.get_next_depreciation_date(asset),
}
def get_move(self, asset):
@@ -752,6 +776,10 @@ class UpdateAsset(Wizard):
Asset = pool.get('account.asset')
asset = Asset(Transaction().context['active_id'])
+ latest_move_date = self.show_move.latest_move_date
+ next_date = self.show_move.next_depreciation_date
+ if not (latest_move_date < self.show_move.date < next_date):
+ raise ValueError('The update move date is invalid')
move = self.get_move(asset)
move.lines = self.get_move_lines(asset)
move.save()
diff --git a/invoice.py b/invoice.py
index d2fc606..3e342e5 100644
--- a/invoice.py
+++ b/invoice.py
@@ -32,14 +32,17 @@ class InvoiceLine:
'Asset can be used only once on invoice line!'),
]
- @fields.depends('product', 'invoice')
+ @fields.depends('product', 'invoice', 'invoice_type')
def on_change_product(self):
new_values = super(InvoiceLine, self).on_change_product()
- if (not self.product
- or self.invoice.type not in ('in_invoice', 'in_credit_note')):
- return new_values
+ if self.invoice and self.invoice.type:
+ type_ = self.invoice.type
+ else:
+ type_ = self.invoice_type
- if self.product.type == 'assets' and self.product.depreciable:
+ if (self.product and type_ in ('in_invoice', 'in_credit_note')
+ and self.product.type == 'assets'
+ and self.product.depreciable):
new_values['account'] = self.product.account_asset_used.id
new_values['account.rec_name'] = \
self.product.account_asset_used.rec_name
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index d069e1c..98a36c7 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -247,6 +247,14 @@ msgctxt "field:account.asset.update.show_depreciation,id:"
msgid "ID"
msgstr "ID"
+msgctxt "field:account.asset.update.show_depreciation,latest_move_date:"
+msgid "Latest Move Date"
+msgstr "Data últim assentament"
+
+msgctxt "field:account.asset.update.show_depreciation,next_depreciation_date:"
+msgid "Next Depreciation Date"
+msgstr "Següent data amortització"
+
msgctxt "field:account.asset.update.start,end_date:"
msgid "End Date"
msgstr "Data final"
@@ -315,6 +323,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Durada de l'amortització"
+msgctxt "help:account.asset.update.show_depreciation,date:"
+msgid ""
+"The date must be between the last update/depreciation date and the next "
+"depreciation date."
+msgstr ""
+"La data ha d'estar compresa entre l'últim dia de la data de "
+"amortització/actualització i la següent data de amortització."
+
msgctxt "help:product.template,depreciation_duration:"
msgid "In months"
msgstr "En mesos"
@@ -333,7 +349,7 @@ msgstr "Actiu"
msgctxt "model:account.asset-update-account.move,name:"
msgid "Asset - Update - Move"
-msgstr "Actiu - Actualitza - Moviment"
+msgstr "Actiu - Actualitza - Assentament"
msgctxt "model:account.asset.create_moves.start,name:"
msgid "Create Moves Start"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index ec6bc8f..f7bd8b0 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -250,6 +250,14 @@ msgctxt "field:account.asset.update.show_depreciation,id:"
msgid "ID"
msgstr "ID"
+msgctxt "field:account.asset.update.show_depreciation,latest_move_date:"
+msgid "Latest Move Date"
+msgstr "Datum letzter Buchungssatz"
+
+msgctxt "field:account.asset.update.show_depreciation,next_depreciation_date:"
+msgid "Next Depreciation Date"
+msgstr "Nächstes Abschreibungsdatum"
+
msgctxt "field:account.asset.update.start,end_date:"
msgid "End Date"
msgstr "Enddatum"
@@ -318,6 +326,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Abschreibungsdauer"
+msgctxt "help:account.asset.update.show_depreciation,date:"
+msgid ""
+"The date must be between the last update/depreciation date and the next "
+"depreciation date."
+msgstr ""
+"Das Datum muss zwischen dem letztem Aktualisierungs- bzw Abschreibungsdatum "
+"und dem nächsten Abschreibungsdatum liegen."
+
msgctxt "help:product.template,depreciation_duration:"
msgid "In months"
msgstr "In Monaten"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 0f75a76..2d253ab 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -247,6 +247,14 @@ msgctxt "field:account.asset.update.show_depreciation,id:"
msgid "ID"
msgstr "ID"
+msgctxt "field:account.asset.update.show_depreciation,latest_move_date:"
+msgid "Latest Move Date"
+msgstr "Última fecha de asiento"
+
+msgctxt "field:account.asset.update.show_depreciation,next_depreciation_date:"
+msgid "Next Depreciation Date"
+msgstr "Próxima fecha de amortización"
+
msgctxt "field:account.asset.update.start,end_date:"
msgid "End Date"
msgstr "Fecha final"
@@ -315,6 +323,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Duración de la amortización"
+msgctxt "help:account.asset.update.show_depreciation,date:"
+msgid ""
+"The date must be between the last update/depreciation date and the next "
+"depreciation date."
+msgstr ""
+"La fecha debe estar entre la última fecha de actualización/amortización y la"
+" siguiente fecha de amortización."
+
msgctxt "help:product.template,depreciation_duration:"
msgid "In months"
msgstr "En meses"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 7b8a865..f48f0ff 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -246,6 +246,14 @@ msgctxt "field:account.asset.update.show_depreciation,id:"
msgid "ID"
msgstr "ID"
+msgctxt "field:account.asset.update.show_depreciation,latest_move_date:"
+msgid "Latest Move Date"
+msgstr "Última Fecha de Asiento"
+
+msgctxt "field:account.asset.update.show_depreciation,next_depreciation_date:"
+msgid "Next Depreciation Date"
+msgstr "Siguiente Fecha de Depreciación"
+
msgctxt "field:account.asset.update.start,end_date:"
msgid "End Date"
msgstr "Fecha Final"
@@ -314,6 +322,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Duración de la Depreciación"
+msgctxt "help:account.asset.update.show_depreciation,date:"
+msgid ""
+"The date must be between the last update/depreciation date and the next "
+"depreciation date."
+msgstr ""
+"La fecha debe estar entre la ultima fecha de actualización/depreciación y la"
+" siguiente fecha de depreciación."
+
msgctxt "help:product.template,depreciation_duration:"
msgid "In months"
msgstr "En meses."
diff --git a/locale/es_CO.po b/locale/es_EC.po
similarity index 81%
copy from locale/es_CO.po
copy to locale/es_EC.po
index 7b8a865..ca9f151 100644
--- a/locale/es_CO.po
+++ b/locale/es_EC.po
@@ -4,23 +4,25 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.asset:"
msgid "Asset \"%s\" must be in draft to be deleted!"
-msgstr "El activo fijo \"%s\" debe estar en borrador antes de ser eliminado!"
+msgstr "¡El activo \"%s\" debe estar en borrador para poder ser eliminado!"
msgctxt "error:account.asset:"
msgid "Supplier Invoice Line can be used only once on asset!"
-msgstr "Línea de factura de proveedor puede ser usada solo una vez en activo!"
+msgstr ""
+"¡La línea de factura de proveedor sólo se puede utilizar una vez en el "
+"activo!"
msgctxt "error:account.invoice.line:"
msgid "Asset can be used only once on invoice line!"
-msgstr "El activo solo puede ser usado una vez en línea de factura!"
+msgstr "¡El activo sólo se puede utilizar una vez en la línea de factura!"
msgctxt "error:purchase.line:"
msgid "It misses an \"Account Asset\" on product \"%s\"!"
-msgstr "Falta la \"Cuenta de Activo Fijo\" en el producto \"%s\"!"
+msgstr "¡Falta una \"Cuenta de Activo\" en el producto \"%s\"!"
msgctxt "field:account.asset,account_journal:"
msgid "Journal"
-msgstr "Libro Contable"
+msgstr "Libro Diario"
msgctxt "field:account.asset,comment:"
msgid "Comment"
@@ -28,7 +30,7 @@ msgstr "Comentario"
msgctxt "field:account.asset,company:"
msgid "Company"
-msgstr "Compañía"
+msgstr "Empresa"
msgctxt "field:account.asset,create_date:"
msgid "Create Date"
@@ -48,7 +50,7 @@ msgstr "Línea de Factura de Cliente"
msgctxt "field:account.asset,depreciation_method:"
msgid "Depreciation Method"
-msgstr "Método de la Depreciación"
+msgstr "Método de Amortización"
msgctxt "field:account.asset,end_date:"
msgid "End Date"
@@ -96,7 +98,7 @@ msgstr "Valor Residual"
msgctxt "field:account.asset,start_date:"
msgid "Start Date"
-msgstr "Fecha Inicio"
+msgstr "Fecha Inicial"
msgctxt "field:account.asset,state:"
msgid "State"
@@ -104,7 +106,7 @@ msgstr "Estado"
msgctxt "field:account.asset,supplier_invoice_line:"
msgid "Supplier Invoice Line"
-msgstr "Línea Factura de Proveedor"
+msgstr "Línea de Factura de Proveedor"
msgctxt "field:account.asset,unit:"
msgid "Unit"
@@ -132,7 +134,7 @@ msgstr "Modificado por Usuario"
msgctxt "field:account.asset-update-account.move,asset:"
msgid "Asset"
-msgstr "Activo Fijo"
+msgstr "Activo"
msgctxt "field:account.asset-update-account.move,create_date:"
msgid "Create Date"
@@ -172,7 +174,7 @@ msgstr "ID"
msgctxt "field:account.asset.line,accumulated_depreciation:"
msgid "Accumulated Depreciation"
-msgstr "Depreciación Acumulada"
+msgstr "Amortización Acumulada"
msgctxt "field:account.asset.line,acquired_value:"
msgid "Acquired Value"
@@ -180,11 +182,11 @@ msgstr "Valor de Adquisición"
msgctxt "field:account.asset.line,actual_value:"
msgid "Actual Value"
-msgstr "Valor Actual"
+msgstr "Valor Real"
msgctxt "field:account.asset.line,asset:"
msgid "Asset"
-msgstr "Activo Fijo"
+msgstr "Activo"
msgctxt "field:account.asset.line,create_date:"
msgid "Create Date"
@@ -200,11 +202,11 @@ msgstr "Fecha"
msgctxt "field:account.asset.line,depreciable_basis:"
msgid "Depreciable Basis"
-msgstr "Base Depreciable"
+msgstr "Base Amortizable"
msgctxt "field:account.asset.line,depreciation:"
msgid "Depreciation"
-msgstr "Depreciación"
+msgstr "Amortización"
msgctxt "field:account.asset.line,id:"
msgid "ID"
@@ -232,7 +234,7 @@ msgstr "Valor"
msgctxt "field:account.asset.update.show_depreciation,counterpart_account:"
msgid "Counterpart Account"
-msgstr "Cuenta Equivalente"
+msgstr "Cuenta de Contrapartida"
msgctxt "field:account.asset.update.show_depreciation,date:"
msgid "Date"
@@ -240,12 +242,20 @@ msgstr "Fecha"
msgctxt "field:account.asset.update.show_depreciation,depreciation_account:"
msgid "Depreciation Account"
-msgstr "Cuenta de la Depreciación"
+msgstr "Cuenta de Amortización"
msgctxt "field:account.asset.update.show_depreciation,id:"
msgid "ID"
msgstr "ID"
+msgctxt "field:account.asset.update.show_depreciation,latest_move_date:"
+msgid "Latest Move Date"
+msgstr "Última Fecha de Amortización"
+
+msgctxt "field:account.asset.update.show_depreciation,next_depreciation_date:"
+msgid "Next Depreciation Date"
+msgstr "Siguiente Fecha de Amortización"
+
msgctxt "field:account.asset.update.start,end_date:"
msgid "End Date"
msgstr "Fecha Final"
@@ -260,63 +270,71 @@ msgstr "Valor Residual"
msgctxt "field:account.asset.update.start,value:"
msgid "Asset Value"
-msgstr "Valor de Activo Fijo"
+msgstr "Valor de Activo"
msgctxt "field:account.configuration,asset_sequence:"
msgid "Asset Reference Sequence"
-msgstr "Secuencia de Activo Fijo"
+msgstr "Secuencia de Referencia de Activo"
msgctxt "field:account.invoice.line,asset:"
msgid "Asset"
-msgstr "Activo Fijo"
+msgstr "Activo"
msgctxt "field:account.invoice.line,is_assets_depreciable:"
msgid "Is Assets depreciable"
-msgstr "Es activo fijo depreciable."
+msgstr "Es Activo amortizable"
msgctxt "field:product.category,account_asset:"
msgid "Account Asset"
-msgstr "Cuenta de Activos"
+msgstr "Cuenta de Activo"
msgctxt "field:product.category,account_asset_used:"
msgid "Account Asset Used"
-msgstr "Cuenta de Activos Usada"
+msgstr "Cuenta de Activo Utilizada"
msgctxt "field:product.category,account_depreciation:"
msgid "Account Depreciation"
-msgstr "Cuenta de Depreciación"
+msgstr "Cuenta de Amortización"
msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
-msgstr "Cuenta de Depreciación Usada"
+msgstr "Cuenta de Amortización Utilizada"
msgctxt "field:product.template,account_asset:"
msgid "Account Asset"
-msgstr "Cuenta de Activos"
+msgstr "Cuenta de Activo"
msgctxt "field:product.template,account_asset_used:"
msgid "Account Asset Used"
-msgstr "Cuenta de Activos Usada"
+msgstr "Cuenta de Activo Utilizada"
msgctxt "field:product.template,account_depreciation:"
msgid "Account Depreciation"
-msgstr "Cuenta de Depreciación"
+msgstr "Cuenta de Amortización"
msgctxt "field:product.template,account_depreciation_used:"
msgid "Account Depreciation Used"
-msgstr "Cuenta de Depreciación Usada"
+msgstr "Cuenta de Amortización Utilizada"
msgctxt "field:product.template,depreciable:"
msgid "Depreciable"
-msgstr "Depreciable"
+msgstr "Amortizable"
msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
-msgstr "Duración de la Depreciación"
+msgstr "Duración de la Amortización"
+
+msgctxt "help:account.asset.update.show_depreciation,date:"
+msgid ""
+"The date must be between the last update/depreciation date and the next "
+"depreciation date."
+msgstr ""
+"La fecha debe estar entre la última fecha de actualización/amortización y la"
+" siguiente fecha de amortización."
msgctxt "help:product.template,depreciation_duration:"
msgid "In months"
-msgstr "En meses."
+msgstr "En meses"
msgctxt "model:account.account.template,name:account_template_assets"
msgid "Assets"
@@ -324,19 +342,19 @@ msgstr "Activos"
msgctxt "model:account.account.template,name:account_template_depretiation"
msgid "Depreciation"
-msgstr "Depreciación"
+msgstr "Amortización"
msgctxt "model:account.asset,name:"
msgid "Asset"
-msgstr "Activo Fijo"
+msgstr "Activo"
msgctxt "model:account.asset-update-account.move,name:"
msgid "Asset - Update - Move"
-msgstr "Activo Fijo - Actualizar - Asiento"
+msgstr "Activo - Actualizar - Asiento"
msgctxt "model:account.asset.create_moves.start,name:"
msgid "Create Moves Start"
-msgstr "Crear Asientos Iniciales"
+msgstr "Crear Asientos - Inicio"
msgctxt "model:account.asset.line,name:"
msgid "Asset Line"
@@ -344,31 +362,31 @@ msgstr "Línea de Activo"
msgctxt "model:account.asset.update.show_depreciation,name:"
msgid "Update Asset Show Depreciation"
-msgstr "Actualizar Depreciación Mostrada del Activo"
+msgstr "Actualizar Activo - Mostrar Amortización"
msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
-msgstr "Empezar a Actualizar Activo"
+msgstr "Actualizar Activo - Inicio"
msgctxt "model:account.journal,name:journal_asset"
msgid "Asset"
-msgstr "Activo Fijo"
+msgstr "Activo"
msgctxt "model:account.journal.type,name:journal_type_asset"
msgid "Asset"
-msgstr "Activo Fijo"
+msgstr "Activo"
msgctxt "model:ir.action,name:act_asset_form"
msgid "Assets"
-msgstr "Activos Fijos"
+msgstr "Activos"
msgctxt "model:ir.action,name:wizard_create_moves"
msgid "Create Assets Moves"
-msgstr "Crear Asiento de Activos Fijos"
+msgstr "Crear Asientos de Activos"
msgctxt "model:ir.action,name:wizard_update"
msgid "Update Asset"
-msgstr "Actualizar Activo Fijo"
+msgstr "Actualizar Activo"
msgctxt "model:ir.action.act_window.domain,name:act_asset_form_domain_all"
msgid "All"
@@ -388,27 +406,27 @@ msgstr "En ejecución"
msgctxt "model:ir.sequence,name:sequence_asset"
msgid "Asset"
-msgstr "Activo Fijo"
+msgstr "Activo"
msgctxt "model:ir.sequence.type,name:sequence_type_asset"
msgid "Asset"
-msgstr "Activo Fijo"
+msgstr "Activo"
msgctxt "model:ir.ui.menu,name:menu_asset"
msgid "Assets"
-msgstr "Activos Fijos"
+msgstr "Activos"
msgctxt "model:ir.ui.menu,name:menu_asset_form"
msgid "Assets"
-msgstr "Activos Fijos"
+msgstr "Activos"
msgctxt "model:ir.ui.menu,name:menu_create_moves"
msgid "Create Assets Moves"
-msgstr "Crear Asiento de Activos Fijos"
+msgstr "Crear Asientos de Activos"
msgctxt "selection:account.asset,depreciation_method:"
msgid "Linear"
-msgstr "Linear"
+msgstr "Lineal"
msgctxt "selection:account.asset,frequency:"
msgid "Monthly"
@@ -432,11 +450,11 @@ msgstr "En ejecución"
msgctxt "view:account.asset.create_moves.start:"
msgid "Create Assets Moves"
-msgstr "Crear Asiento de Activos Fijos"
+msgstr "Crear Asientos de Activos"
msgctxt "view:account.asset.create_moves.start:"
msgid "Create Assets Moves up to"
-msgstr "Crear Asientos de Activos Fijos Hasta"
+msgstr "Crear Asientos de Activos hasta"
msgctxt "view:account.asset.line:"
msgid "Asset Line"
@@ -448,19 +466,19 @@ msgstr "Líneas de Activo"
msgctxt "view:account.asset.update.show_depreciation:"
msgid "Asset Depreciation Move"
-msgstr "Asiento de Depreciación de Activo Fijo"
+msgstr "Asiento de Amortización de Activo"
msgctxt "view:account.asset.update.start:"
msgid "Update Asset"
-msgstr "Actualizar Activo Fijo"
+msgstr "Actualizar Activo"
msgctxt "view:account.asset:"
msgid "Are you sure to close the asset?"
-msgstr "Está seguro que quiere cerrar el año fiscal?"
+msgstr "¿Está seguro que quiere cerrar el activo?"
msgctxt "view:account.asset:"
msgid "Asset"
-msgstr "Activo Fijo"
+msgstr "Activo"
msgctxt "view:account.asset:"
msgid "Assets"
@@ -468,7 +486,7 @@ msgstr "Activos"
msgctxt "view:account.asset:"
msgid "Clear Lines"
-msgstr "Limpiar Líneas"
+msgstr "Borrar Líneas"
msgctxt "view:account.asset:"
msgid "Close"
@@ -484,7 +502,7 @@ msgstr "Líneas"
msgctxt "view:account.asset:"
msgid "Other Info"
-msgstr "Info Adicional"
+msgstr "Información Adicional"
msgctxt "view:account.asset:"
msgid "Run"
@@ -492,11 +510,11 @@ msgstr "Ejecutar"
msgctxt "view:account.asset:"
msgid "Update Asset"
-msgstr "Actualizar Activo Fijo"
+msgstr "Actualizar Activo"
msgctxt "view:product.template:"
msgid "Depreciation"
-msgstr "Depreciación"
+msgstr "Amortización"
msgctxt "wizard_button:account.asset.create_moves,start,create_moves:"
msgid "OK"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index fded50b..7bec039 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -247,6 +247,14 @@ msgctxt "field:account.asset.update.show_depreciation,id:"
msgid "ID"
msgstr "ID"
+msgctxt "field:account.asset.update.show_depreciation,latest_move_date:"
+msgid "Latest Move Date"
+msgstr "Fecha último asiento"
+
+msgctxt "field:account.asset.update.show_depreciation,next_depreciation_date:"
+msgid "Next Depreciation Date"
+msgstr "Siguiente fecha amortización"
+
msgctxt "field:account.asset.update.start,end_date:"
msgid "End Date"
msgstr "Fecha final"
@@ -315,6 +323,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Duración de la amortización"
+msgctxt "help:account.asset.update.show_depreciation,date:"
+msgid ""
+"The date must be between the last update/depreciation date and the next "
+"depreciation date."
+msgstr ""
+"La fecha debe estar comprendida entre el último día de la fecha de "
+"amortización/actualización y la siguiente fecha de amortización."
+
msgctxt "help:product.template,depreciation_duration:"
msgid "In months"
msgstr "En meses"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index f289986..b065e19 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -4,13 +4,13 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.asset:"
msgid "Asset \"%s\" must be in draft to be deleted!"
-msgstr "L'actif \"%s\" doit être en brouillon pour pouvoir être supprimé."
+msgstr "L'actif « %s » doit être en brouillon pour pouvoir être supprimé."
msgctxt "error:account.asset:"
msgid "Supplier Invoice Line can be used only once on asset!"
msgstr ""
"Une ligne de facture fournisseur ne peut être utilisée qu'une seule fois sur"
-" un actif !"
+" un actif !"
msgctxt "error:account.invoice.line:"
msgid "Asset can be used only once on invoice line!"
@@ -18,7 +18,7 @@ msgstr "Un actif ne peut être utilisé qu'une seule fois par ligne."
msgctxt "error:purchase.line:"
msgid "It misses an \"Account Asset\" on product \"%s\"!"
-msgstr "Le compte d'actif est manquant sur le produit \"%s\"."
+msgstr "Le compte d'actif est manquant sur le produit « %s »."
msgctxt "field:account.asset,account_journal:"
msgid "Journal"
@@ -50,7 +50,7 @@ msgstr "Ligne de facture client"
msgctxt "field:account.asset,depreciation_method:"
msgid "Depreciation Method"
-msgstr "Méthode de dépréciation"
+msgstr "Méthode d'amortissement"
msgctxt "field:account.asset,end_date:"
msgid "End Date"
@@ -174,7 +174,7 @@ msgstr "ID"
msgctxt "field:account.asset.line,accumulated_depreciation:"
msgid "Accumulated Depreciation"
-msgstr "Dépréciation cumulée"
+msgstr "Amortissement cumulé"
msgctxt "field:account.asset.line,acquired_value:"
msgid "Acquired Value"
@@ -206,7 +206,7 @@ msgstr "Base de dépréciation"
msgctxt "field:account.asset.line,depreciation:"
msgid "Depreciation"
-msgstr "Depréciation"
+msgstr "Amortissement"
msgctxt "field:account.asset.line,id:"
msgid "ID"
@@ -242,12 +242,20 @@ msgstr "Date"
msgctxt "field:account.asset.update.show_depreciation,depreciation_account:"
msgid "Depreciation Account"
-msgstr "Compte de dépréciation"
+msgstr "Compte d'amortissement"
msgctxt "field:account.asset.update.show_depreciation,id:"
msgid "ID"
msgstr "ID"
+msgctxt "field:account.asset.update.show_depreciation,latest_move_date:"
+msgid "Latest Move Date"
+msgstr "Dernière date d'amortissement"
+
+msgctxt "field:account.asset.update.show_depreciation,next_depreciation_date:"
+msgid "Next Depreciation Date"
+msgstr "Prochaine date d'amortissement"
+
msgctxt "field:account.asset.update.start,end_date:"
msgid "End Date"
msgstr "Date de fin"
@@ -286,11 +294,11 @@ msgstr "Compte d'actif utilisé"
msgctxt "field:product.category,account_depreciation:"
msgid "Account Depreciation"
-msgstr "Compte de dépréciation"
+msgstr "Compte d'amortissement"
msgctxt "field:product.category,account_depreciation_used:"
msgid "Account Depreciation Used"
-msgstr "Compte de dépréciation utilisé"
+msgstr "Compte d'amortissement utilisé"
msgctxt "field:product.template,account_asset:"
msgid "Account Asset"
@@ -302,11 +310,11 @@ msgstr "Compte d'actif utilisé"
msgctxt "field:product.template,account_depreciation:"
msgid "Account Depreciation"
-msgstr "Compte de dépréciation"
+msgstr "Compte d'amortissement"
msgctxt "field:product.template,account_depreciation_used:"
msgid "Account Depreciation Used"
-msgstr "Compte de dépréciation utilisé"
+msgstr "Compte d'amortissement utilisé"
msgctxt "field:product.template,depreciable:"
msgid "Depreciable"
@@ -314,7 +322,15 @@ msgstr "Dépréciable"
msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
-msgstr "Durée de dépréciation"
+msgstr "Durée d'amortissement"
+
+msgctxt "help:account.asset.update.show_depreciation,date:"
+msgid ""
+"The date must be between the last update/depreciation date and the next "
+"depreciation date."
+msgstr ""
+"La date doit être comprise entre la dernière mise à jour / date "
+"d'amortissement et la prochaine date d'amortissement."
msgctxt "help:product.template,depreciation_duration:"
msgid "In months"
@@ -326,7 +342,7 @@ msgstr "Actifs"
msgctxt "model:account.account.template,name:account_template_depretiation"
msgid "Depreciation"
-msgstr "Depréciation"
+msgstr "Amortissement"
msgctxt "model:account.asset,name:"
msgid "Asset"
@@ -346,7 +362,7 @@ msgstr "Ligne d'actif"
msgctxt "model:account.asset.update.show_depreciation,name:"
msgid "Update Asset Show Depreciation"
-msgstr "Mise à jour des actifs - Affichage dépréciation"
+msgstr "Mise à jour des actifs - Affichage des amortissements"
msgctxt "model:account.asset.update.start,name:"
msgid "Update Asset Start"
@@ -378,7 +394,7 @@ msgstr "Tous"
msgctxt "model:ir.action.act_window.domain,name:act_asset_form_domain_closed"
msgid "Closed"
-msgstr "Fermé"
+msgstr "Clôturé"
msgctxt "model:ir.action.act_window.domain,name:act_asset_form_domain_draft"
msgid "Draft"
@@ -422,7 +438,7 @@ msgstr "Annuel"
msgctxt "selection:account.asset,state:"
msgid "Closed"
-msgstr "Fermé"
+msgstr "Clôturé"
msgctxt "selection:account.asset,state:"
msgid "Draft"
@@ -450,7 +466,7 @@ msgstr "Lignes d'actif"
msgctxt "view:account.asset.update.show_depreciation:"
msgid "Asset Depreciation Move"
-msgstr "Mouvement dépréciation d'actif"
+msgstr "Mouvement d'amortissement d'actif"
msgctxt "view:account.asset.update.start:"
msgid "Update Asset"
@@ -458,7 +474,7 @@ msgstr "Mise à jour des actifs"
msgctxt "view:account.asset:"
msgid "Are you sure to close the asset?"
-msgstr "Êtes-vous sûr de cloturer l'actif ?"
+msgstr "Êtes-vous sûr de clôturer l'actif ?"
msgctxt "view:account.asset:"
msgid "Asset"
@@ -474,7 +490,7 @@ msgstr "Nettoyer les lignes"
msgctxt "view:account.asset:"
msgid "Close"
-msgstr "Fermer"
+msgstr "Clôturer"
msgctxt "view:account.asset:"
msgid "Create Lines"
@@ -498,7 +514,7 @@ msgstr "Mise à jour des actifs"
msgctxt "view:product.template:"
msgid "Depreciation"
-msgstr "Depréciation"
+msgstr "Amortissement"
msgctxt "wizard_button:account.asset.create_moves,start,create_moves:"
msgid "OK"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index a036fbf..240274f 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -32,11 +32,11 @@ msgstr "Družba"
msgctxt "field:account.asset,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.asset,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.asset,currency_digits:"
msgid "Currency Digits"
@@ -136,11 +136,11 @@ msgstr "Sredstvo"
msgctxt "field:account.asset-update-account.move,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.asset-update-account.move,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.asset-update-account.move,id:"
msgid "ID"
@@ -188,11 +188,11 @@ msgstr "Sredstvo"
msgctxt "field:account.asset.line,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.asset.line,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.asset.line,date:"
msgid "Date"
@@ -246,6 +246,14 @@ msgctxt "field:account.asset.update.show_depreciation,id:"
msgid "ID"
msgstr "ID"
+msgctxt "field:account.asset.update.show_depreciation,latest_move_date:"
+msgid "Latest Move Date"
+msgstr "Datum zadnje knjižbe"
+
+msgctxt "field:account.asset.update.show_depreciation,next_depreciation_date:"
+msgid "Next Depreciation Date"
+msgstr "Datum naslednje amortizacije"
+
msgctxt "field:account.asset.update.start,end_date:"
msgid "End Date"
msgstr "Konec amortizacije"
@@ -314,6 +322,14 @@ msgctxt "field:product.template,depreciation_duration:"
msgid "Depreciation Duration"
msgstr "Trajanje amortizacije"
+msgctxt "help:account.asset.update.show_depreciation,date:"
+msgid ""
+"The date must be between the last update/depreciation date and the next "
+"depreciation date."
+msgstr ""
+"Naslednji datum mora biti med datumom zadnje amortizacije in datumom "
+"naslednje amortizacije."
+
msgctxt "help:product.template,depreciation_duration:"
msgid "In months"
msgstr "V mesecih"
@@ -476,7 +492,7 @@ msgstr "Zaključitev"
msgctxt "view:account.asset:"
msgid "Create Lines"
-msgstr "Ustvari postavke"
+msgstr "Izdelava postavk"
msgctxt "view:account.asset:"
msgid "Lines"
diff --git a/product.py b/product.py
index ac38c61..ca7d20a 100644
--- a/product.py
+++ b/product.py
@@ -3,6 +3,7 @@
from trytond.model import fields
from trytond.pyson import Eval
from trytond.pool import PoolMeta
+from trytond.modules.account_product import MissingFunction
__all__ = ['Category', 'Template']
__metaclass__ = PoolMeta
@@ -19,9 +20,9 @@ class Category:
'invisible': (~Eval('context', {}).get('company')
| Eval('account_parent')),
}))
- account_depreciation_used = fields.Function(
+ account_depreciation_used = MissingFunction(
fields.Many2One('account.account', 'Account Depreciation Used'),
- 'get_account')
+ 'missing_account', 'get_account')
account_asset = fields.Property(fields.Many2One('account.account',
'Account Asset',
domain=[
@@ -32,9 +33,9 @@ class Category:
'invisible': (~Eval('context', {}).get('company')
| Eval('account_parent')),
}))
- account_asset_used = fields.Function(
+ account_asset_used = MissingFunction(
fields.Many2One('account.account', 'Account Asset Used'),
- 'get_account')
+ 'missing_account', 'get_account')
class Template:
@@ -57,9 +58,9 @@ class Template:
| Eval('account_category')),
},
depends=['active', 'depreciable', 'type', 'account_category']))
- account_depreciation_used = fields.Function(
+ account_depreciation_used = MissingFunction(
fields.Many2One('account.account', 'Account Depreciation Used'),
- 'get_account')
+ 'missing_account', 'get_account')
account_asset = fields.Property(fields.Many2One('account.account',
'Account Asset',
domain=[
@@ -75,9 +76,9 @@ class Template:
| Eval('account_category')),
},
depends=['active', 'depreciable', 'type', 'account_category']))
- account_asset_used = fields.Function(
+ account_asset_used = MissingFunction(
fields.Many2One('account.account', 'Account Asset Used'),
- 'get_account')
+ 'missing_account', 'get_account')
depreciation_duration = fields.Property(fields.Numeric(
'Depreciation Duration', digits=(16, 0),
states={
diff --git a/tests/scenario_account_asset.rst b/tests/scenario_account_asset.rst
index 6cede80..e8f30a8 100644
--- a/tests/scenario_account_asset.rst
+++ b/tests/scenario_account_asset.rst
@@ -243,6 +243,21 @@ Update the asset::
>>> update.execute('update_asset')
>>> update.form.amount
Decimal('100.00')
+ >>> update.form.date = (supplier_invoice.invoice_date
+ ... + relativedelta(months=2))
+ >>> update.form.latest_move_date == (supplier_invoice.invoice_date
+ ... + relativedelta(months=3, days=-1))
+ True
+ >>> update.form.next_depreciation_date == (supplier_invoice.invoice_date
+ ... + relativedelta(months=4, days=-1))
+ True
+ >>> update.execute('create_move') # doctest: +IGNORE_EXCEPTION_DETAIL
+ Traceback (most recent call last):
+ ...
+ ValueError: ...
+
+ >>> update.form.date = (supplier_invoice.invoice_date
+ ... + relativedelta(months=3))
>>> update.execute('create_move')
>>> asset.reload()
>>> asset.value
diff --git a/tests/test_account_asset.py b/tests/test_account_asset.py
index fda4bce..c763703 100644
--- a/tests/test_account_asset.py
+++ b/tests/test_account_asset.py
@@ -3,7 +3,8 @@
import unittest
import doctest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends, doctest_dropdb
+from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import doctest_setup, doctest_teardown
class AccountAssetTestCase(unittest.TestCase):
@@ -26,6 +27,6 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
AccountAssetTestCase))
suite.addTests(doctest.DocFileSuite('scenario_account_asset.rst',
- setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8',
+ setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 82f1661..bb92cd6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,9 +1,10 @@
[tryton]
-version=3.2.1
+version=3.4.0
depends:
ir
res
account
+ account_product
product
account_invoice
extras_depend:
diff --git a/trytond_account_asset.egg-info/PKG-INFO b/trytond_account_asset.egg-info/PKG-INFO
index fa65d44..f1d64ac 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: 3.2.1
+Version: 3.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/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_account_asset
=====================
diff --git a/trytond_account_asset.egg-info/SOURCES.txt b/trytond_account_asset.egg-info/SOURCES.txt
index 887f0e3..ffc284f 100644
--- a/trytond_account_asset.egg-info/SOURCES.txt
+++ b/trytond_account_asset.egg-info/SOURCES.txt
@@ -12,17 +12,43 @@ setup.py
tryton.cfg
./__init__.py
./account.py
+./account.xml
./asset.py
+./asset.xml
./invoice.py
+./invoice.xml
./product.py
+./product.xml
./purchase.py
+./tryton.cfg
+./locale/ca_ES.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_EC.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/sl_SI.po
./tests/__init__.py
+./tests/scenario_account_asset.rst
./tests/test_account_asset.py
+./view/asset_create_moves_start_form.xml
+./view/asset_form.xml
+./view/asset_line_form.xml
+./view/asset_line_tree.xml
+./view/asset_tree.xml
+./view/asset_update_show_depreciation_form.xml
+./view/asset_update_start_form.xml
+./view/category_form.xml
+./view/configuration_form.xml
+./view/invoice_line_form.xml
+./view/template_form.xml
doc/index.rst
locale/ca_ES.po
locale/de_DE.po
locale/es_AR.po
locale/es_CO.po
+locale/es_EC.po
locale/es_ES.po
locale/fr_FR.po
locale/sl_SI.po
diff --git a/trytond_account_asset.egg-info/requires.txt b/trytond_account_asset.egg-info/requires.txt
index 0e16497..7e0ef41 100644
--- a/trytond_account_asset.egg-info/requires.txt
+++ b/trytond_account_asset.egg-info/requires.txt
@@ -1,4 +1,5 @@
-trytond_account >= 3.2, < 3.3
-trytond_product >= 3.2, < 3.3
-trytond_account_invoice >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond_account >= 3.4, < 3.5
+trytond_account_product >= 3.4, < 3.5
+trytond_product >= 3.4, < 3.5
+trytond_account_invoice >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
\ No newline at end of file
diff --git a/view/asset_update_show_depreciation_form.xml b/view/asset_update_show_depreciation_form.xml
index 3ebaafc..a3ad4d0 100644
--- a/view/asset_update_show_depreciation_form.xml
+++ b/view/asset_update_show_depreciation_form.xml
@@ -6,6 +6,10 @@
<field name="amount"/>
<label name="date"/>
<field name="date"/>
+ <label name="latest_move_date"/>
+ <field name="latest_move_date"/>
+ <label name="next_depreciation_date"/>
+ <field name="next_depreciation_date"/>
<label name="depreciation_account"/>
<field name="depreciation_account"/>
<label name="counterpart_account"/>
--
tryton-modules-account-asset
More information about the tryton-debian-vcs
mailing list