Merge lp:~dani-ds/openerp-spain/6.1 into lp:~openerp-spain-team/openerp-spain/6.1

Proposed by Daniel Campos (Avanzosc) on 2014-05-26
Status: Merged
Merged at revision: 395
Proposed branch: lp:~dani-ds/openerp-spain/6.1
Merge into: lp:~openerp-spain-team/openerp-spain/6.1
Diff against target: 19 lines (+1/-1)
1 file modified
l10n_es_account_asset/account_asset.py (+1/-1)
To merge this branch: bzr merge lp:~dani-ds/openerp-spain/6.1
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza code review 2014-05-26 Approve on 2014-05-26
Review via email: mp+220968@code.launchpad.net

Description of the change

Arreglado Bug que cerraba los activos con lineas aún para ser asentadas al ejecutar el asistente de Calcular Activos.

To post a comment you must log in.
Pedro Manuel Baeza (pedro.baeza) wrote :

Dani, muchas gracias por arreglar este problema. Me lo encontré justamente en una instalación la semana pasada.

Un saludo.

review: Approve (code review)
Pedro Manuel Baeza (pedro.baeza) wrote :

Puesto que el bug es importante, paso a hacer el merge.

Un saludo.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_es_account_asset/account_asset.py'
2--- l10n_es_account_asset/account_asset.py 2014-03-18 23:58:19 +0000
3+++ l10n_es_account_asset/account_asset.py 2014-05-26 14:31:58 +0000
4@@ -363,7 +363,6 @@
5 }
6
7 def create_move(self, cr, uid, ids, context=None):
8- can_close = False
9 if context is None:
10 context = {}
11 asset_obj = self.pool.get('account.asset.asset')
12@@ -373,6 +372,7 @@
13 currency_obj = self.pool.get('res.currency')
14 created_move_ids = []
15 for line in self.browse(cr, uid, ids, context=context):
16+ can_close = False
17 if currency_obj.is_zero(cr, uid, line.asset_id.currency_id, line.remaining_value):
18 can_close = True
19 depreciation_date = line.depreciation_date