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

[Dhruti Shastri(OpenERP)]

[Vinay Rana (OpenERP) (vra-openerp)]

review: Approve

Unmerged revisions

9674. By Dhruti Shastri(OpenERP) on 2013-12-04

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

=== modified file 'account_followup/wizard/account_followup_print.py'
--- account_followup/wizard/account_followup_print.py	2013-02-18 17:45:48 +0000
+++ account_followup/wizard/account_followup_print.py	2013-12-04 10:34:20 +0000
@@ -186,9 +186,13 @@
 
     def do_update_followup_level(self, cr, uid, to_update, partner_list, date, context=None):
         #update the follow-up level on account.move.line
+        move_line_obj = self.pool.get('account.move.line')
         for id in to_update.keys():
+            line = move_line_obj.browse(cr, uid, int(id), context)
+            if line.journal_id.type == 'situation' and line.journal_id.centralisation and line.move_id.state == 'posted' :
+                continue
             if to_update[id]['partner_id'] in partner_list:
-                self.pool.get('account.move.line').write(cr, uid, [int(id)], {'followup_line_id': to_update[id]['level'], 
+                move_line_obj.write(cr, uid, [int(id)], {'followup_line_id': to_update[id]['level'], 
                                                                               'followup_date': date})
 
     def clear_manual_actions(self, cr, uid, partner_list, context=None):