Merge lp:~dorian-kemps/unifield-server/US-6141 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_supply_doc_export/msf_supply_doc_export.py'
--- bin/addons/msf_supply_doc_export/msf_supply_doc_export.py	2019-05-22 11:20:42 +0000
+++ bin/addons/msf_supply_doc_export/msf_supply_doc_export.py	2019-07-15 07:18:54 +0000
@@ -759,7 +759,6 @@
         # Background
         if not self.localcontext.get('processed_pos'):
             self.localcontext['processed_pos'] = []
-        back_browse = get_back_browse(self, self.cr, self.uid, context=self.localcontext)
 
         for line in self.yieldPoLines(po_line_ids):
             analytic_lines = self.getAnalyticLines(po, line)
@@ -955,9 +954,9 @@
             if 'processed_pos' in self.localcontext and po_id not in self.localcontext['processed_pos']:
                 self._order_iterator += 1
                 self.localcontext['processed_pos'].append(po_id)
-            if back_browse:
+            if self.back_browse:
                 percent = float(self._order_iterator) / float(self._nb_orders)
-                self.pool.get('memory.background.report').update_percent(self.cr, self.uid, [back_browse.id], percent)
+                self.pool.get('memory.background.report').update_percent(self.cr, self.uid, [self.back_browse.id], percent)
 
         if pending_only_ok:
             report_lines = self.filter_pending_only(report_lines)

=== modified file 'bin/addons/msf_supply_doc_export/wizard/po_follow_up.py'
--- bin/addons/msf_supply_doc_export/wizard/po_follow_up.py	2019-05-13 09:04:11 +0000
+++ bin/addons/msf_supply_doc_export/wizard/po_follow_up.py	2019-07-15 07:18:54 +0000
@@ -61,18 +61,31 @@
         if isinstance(ids, (int,long)):
             ids = [ids]
 
+        # Create background report
+        report_name = 'po.follow.up_xls'
+        background_id = self.pool.get('memory.background.report').\
+            create(cr, uid, {'file_name': report_name, 'report_name': report_name}, context=context)
+        context['background_id'] = background_id
+        context['background_time'] = 3
+
         self.write(cr, uid, ids, {'export_format': 'xls'}, context=context)
-        return self.button_validate(cr, uid, ids, report_name='po.follow.up_xls', context=None)
-
+        return self.button_validate(cr, uid, ids, report_name=report_name, context=context)
 
     def pdf_report(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
         if isinstance(ids, (int,long)):
             ids = [ids]
+
+        report_name = 'po.follow.up_rml'
+        # Create background report
+        background_id = self.pool.get('memory.background.report').\
+            create(cr, uid, {'file_name': report_name, 'report_name': report_name}, context=context)
+        context['background_id'] = background_id
+        context['background_time'] = 3
+
         self.write(cr, uid, ids, {'export_format': 'pdf'}, context=context)
-
-        return self.button_validate(cr, uid, ids, report_name='po.follow.up_rml', context=None)
+        return self.button_validate(cr, uid, ids, report_name=report_name, context=context)
 
 
     def get_state_list(self, cr, uid, wiz, context=None):
@@ -222,8 +235,6 @@
 
         return report_lines
 
-
-
     def button_validate(self, cr, uid, ids, report_name, context=None):
         if context is None:
             context = {}
@@ -318,9 +329,7 @@
         if wiz.po_date_from:
             domain.append(('date_order', '>=', wiz.po_date_from))
 
-        background_id = self.pool.get('memory.background.report').create(cr, uid, {'file_name': report_name, 'report_name': report_name}, context=context)
-        context['background_id'] = background_id
-        context['background_time'] = wiz.background_time
+        # For background report
         context['nb_orders'] = len(po_ids)
 
         return {