Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-735965-mra into lp:openobject-addons

  1. trunk-bug-735965-mra
  2. Merge into trunk
Proposed by Mustufa Rangwala (Open ERP)
Status: Merged
Merged at revision: 4545
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-735965-mra
Merge into: lp:openobject-addons
Diff against target: 21 lines (+2/-2)
1 file modified
account/installer.py (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-735965-mra
Reviewer Review Type Date Requested Status
qdp (OpenERP) Pending
Review via email: mp+53593@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/installer.py'
2--- account/installer.py 2011-03-03 14:59:00 +0000
3+++ account/installer.py 2011-03-16 09:55:51 +0000
4@@ -213,7 +213,7 @@
5 }, context=context)
6
7 if 'date_start' in res and 'date_stop' in res:
8- f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'])], context=context)
9+ f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'][0])], context=context)
10 if not f_ids:
11 name = code = res['date_start'][:4]
12 if int(name) != int(res['date_stop'][:4]):
13@@ -224,7 +224,7 @@
14 'code': code,
15 'date_start': res['date_start'],
16 'date_stop': res['date_stop'],
17- 'company_id': res['company_id']
18+ 'company_id': res['company_id'][0]
19 }
20 fiscal_id = fy_obj.create(cr, uid, vals, context=context)
21 if res['period'] == 'month':

Subscribers

People subscribed via source and target branches

to all changes: