Merge lp:~unifield-team/unifield-wm/jfb-wm-utp-732-727 into lp:unifield-wm

[jftempo]

=== modified file 'analytic_distribution/wizard/analytic_distribution_wizard.py'
--- analytic_distribution/wizard/analytic_distribution_wizard.py	2013-08-28 07:39:30 +0000
+++ analytic_distribution/wizard/analytic_distribution_wizard.py	2013-09-06 14:28:03 +0000
@@ -943,8 +943,12 @@
         """
         if not context:
             context = {}
+
         if isinstance(ids, (int, long)):
             ids = [ids]
+        o2m_toreload = {}
+        if context.get('from_list_grid'):
+            o2m_toreload['o2m_refresh'] = context['from_list_grid']
         for wiz in self.browse(cr, uid, ids, context=context):
             # Update cost center lines
             if not self.update_cost_center_lines(cr, uid, wiz.id, context=context):
@@ -1035,7 +1039,7 @@
         # Update analytic lines
         self.update_analytic_lines(cr, uid, ids, context=context)
         
-        return_wiz =  {'type': 'ir.actions.act_window_close'}
+        return_wiz =  dict(type='ir.actions.act_window_close', **o2m_toreload)
         if context.get("from_cash_return_analytic_dist"):
             # If the wizard was called from the cash return line, the perform some actions before returning back to the caller wizard
             wizard_name = context.get('from')
@@ -1166,6 +1170,10 @@
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
+
+        o2m_toreload = {}
+        if context.get('from_list_grid'):
+            o2m_toreload['o2m_refresh'] = context['from_list_grid']
         # Retrieve some values to verify if we come from a direct invoice
         wiz = self.browse(cr, uid, ids, context=context)[0]
         if wiz and (wiz.direct_invoice_id or wiz.direct_invoice_line_id):
@@ -1194,7 +1202,8 @@
                 }
         elif wiz.from_direct_inv:
             return self.pool.get('account.bank.statement.line').button_open_invoice(cr, uid, [wiz.from_direct_inv.id], context)
-        return {'type' : 'ir.actions.act_window_close'}
+
+        return dict(type='ir.actions.act_window_close', **o2m_toreload)
 
     def update_analytic_lines(self, cr, uid, ids, context=None):
         """