Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/7.0-opw-598909-dhs into lp:openobject-addons/7.0

  1. 7.0-opw-598909-dhs
  2. Merge into 7.0
Proposed by Dhruti Shastri(OpenERP)
Status: Approved
Approved by: Vinay Rana (OpenERP)
Approved revision: 9674
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-598909-dhs
Merge into: lp:openobject-addons/7.0
Diff against target: 18 lines (+5/-1)
1 file modified
account_followup/wizard/account_followup_print.py (+5/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-598909-dhs
Reviewer Review Type Date Requested Status
Vinay Rana (OpenERP) (community) Approve
Naresh(OpenERP) Pending
Review via email: mp+197676@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Vinay Rana (OpenERP) (vra-openerp) :
review: Approve
Reply

Unmerged revisions

9674. By Dhruti Shastri(OpenERP)

[account_followup]:Follow up gives error for moves created in Centralized Journal(Case:598909)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_followup/wizard/account_followup_print.py'
2--- account_followup/wizard/account_followup_print.py 2013-02-18 17:45:48 +0000
3+++ account_followup/wizard/account_followup_print.py 2013-12-04 10:34:20 +0000
4@@ -186,9 +186,13 @@
5
6 def do_update_followup_level(self, cr, uid, to_update, partner_list, date, context=None):
7 #update the follow-up level on account.move.line
8+ move_line_obj = self.pool.get('account.move.line')
9 for id in to_update.keys():
10+ line = move_line_obj.browse(cr, uid, int(id), context)
11+ if line.journal_id.type == 'situation' and line.journal_id.centralisation and line.move_id.state == 'posted' :
12+ continue
13 if to_update[id]['partner_id'] in partner_list:
14- self.pool.get('account.move.line').write(cr, uid, [int(id)], {'followup_line_id': to_update[id]['level'],
15+ move_line_obj.write(cr, uid, [int(id)], {'followup_line_id': to_update[id]['level'],
16 'followup_date': date})
17
18 def clear_manual_actions(self, cr, uid, partner_list, context=None):