Merge lp:~pedro.baeza/openerp-spain/6.1-l10n_es_bank_statement-fy_fix into lp:~openerp-spain-team/openerp-spain/6.1

Proposed by Pedro Manuel Baeza on 2014-04-10
Status: Merged
Merged at revision: 394
Proposed branch: lp:~pedro.baeza/openerp-spain/6.1-l10n_es_bank_statement-fy_fix
Merge into: lp:~openerp-spain-team/openerp-spain/6.1
Diff against target: 11 lines (+1/-1)
1 file modified
l10n_es_bank_statement/account_bank_statement.py (+1/-1)
To merge this branch: bzr merge lp:~pedro.baeza/openerp-spain/6.1-l10n_es_bank_statement-fy_fix
Reviewer Review Type Date Requested Status
Ignacio Ibeas (www.acysos.com) 2014-04-10 Approve on 2014-04-10
Review via email: mp+215119@code.launchpad.net

Description of the change

[FIX] account_bank_statement: Si no hay periodo definido (ocurre con el módulo account_statement_base_import), que no dé error la creación del asiento

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

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_bank_statement/account_bank_statement.py'
2--- l10n_es_bank_statement/account_bank_statement.py 2013-07-18 16:08:37 +0000
3+++ l10n_es_bank_statement/account_bank_statement.py 2014-04-10 09:37:23 +0000
4@@ -229,7 +229,7 @@
5 raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (st.journal_id.name,))
6 if not st_line.amount:
7 continue
8- c = {'fiscalyear_id': st.period_id.fiscalyear_id.id}
9+ c = {'fiscalyear_id': st.period_id and st.period_id.fiscalyear_id.id or False}
10 st_line_number = obj_seq.get_id(cr, uid, st.journal_id.sequence_id.id, context=c)
11 self.create_move_from_st_line(cr, uid, st_line.id, company_currency_id, st_line_number, context)
12