Merge lp:~jfb-tempo-consulting/unifield-server/us-5912 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-07-26 15:23:04 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-07-30 10:04:55 +0000
@@ -107371,6 +107371,7 @@
 msgid "Stop report"
 msgstr "Arrêter le rapport"
 
+<<<<<<< TREE
 #. module: stock
 #: code:addons/stock/stock.py:1780
 #, python-format
@@ -107481,3 +107482,16 @@
 #: report:addons/sale/report/sale_loan_stock_moves_report_xls.mako:175
 msgid "Line State"
 msgstr "État de la Ligne"
+=======
+#. module: sales_followup
+#: code:sales_followup/wizard/sale_followup_multi_wizard.py:190
+#, python-format
+msgid "The requested report is too heavy to generate: requested %d lines, maximum allowed %d. Please apply further filters so that report can be generated."
+msgstr "Le rapport demandé est trop volumineux pour être généré, %d lignes demandées, %d autorisées. Veuillez utiliser plus de filtres pour que ce rapport puisse être généré"
+
+#. module: msf_supply_doc_export
+#: code:addons/msf_supply_doc_export/wizard/po_follow_up.py:297
+#, python-format
+msgid "The requested report is too heavy to generate. Please apply further filters so that report can be generated."
+msgstr "Le rapport demandé est trop volumineux pour être généré. Veuillez utiliser plus de filtres pour que ce rapport puisse être généré"
+>>>>>>> MERGE-SOURCE
 
=== 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-07-22 12:08:20 +0000
+++ bin/addons/msf_supply_doc_export/wizard/po_follow_up.py	2019-07-30 10:04:55 +0000
@@ -298,8 +298,24 @@
         po_ids = po_obj.search(cr, uid, domain)
 
         if not po_ids:
-            raise osv.except_osv(_('Error'), _('No Purchase Orders match the specified criteria.'))
-            return True
+            raise osv.except_osv(_('Warning'), _('No Purchase Orders match the specified criteria.'))
+
+        cr.execute("""SELECT COUNT(id) FROM purchase_order_line WHERE order_id IN %s""", (tuple(po_ids),))
+        nb_lines = 0
+        for x in cr.fetchall():
+            nb_lines = x[0]
+
+        # Parameter to define the maximum number of lines. For a custom number:
+        # "INSERT INTO ir_config_parameter (key, value) VALUES ('FOLLOWUP_MAX_LINE', 'chosen_number');"
+        # Or update the existing one
+        config_line = self.pool.get('ir.config_parameter').get_param(cr, 1, 'FOLLOWUP_MAX_LINE')
+        if config_line:
+            max_line = int(config_line)
+        else:
+            max_line = 20000
+
+        if nb_lines > max_line:
+            raise osv.except_osv(_('Error'), _('The requested report is too heavy to generate. Please apply further filters so that report can be generated.'))
 
         if wiz.pending_only_ok and report_name == 'po.follow.up_rml':
             filtered_po_ids = []
 
=== modified file 'bin/addons/sales_followup/wizard/sale_followup_multi_wizard.py'
--- bin/addons/sales_followup/wizard/sale_followup_multi_wizard.py	2018-04-05 08:43:22 +0000
+++ bin/addons/sales_followup/wizard/sale_followup_multi_wizard.py	2019-07-30 10:04:55 +0000
@@ -178,6 +178,23 @@
                         _('No data found with these parameters'),
                     )
 
+                cr.execute("""SELECT COUNT(id) FROM sale_order_line WHERE order_id IN %s""", (tuple(fo_ids),))
+                nb_lines = 0
+                for x in cr.fetchall():
+                    nb_lines = x[0]
+
+                # Parameter to define the maximum number of lines. For a custom number:
+                # "INSERT INTO ir_config_parameter (key, value) VALUES ('FOLLOWUP_MAX_LINE', 'chosen_number');"
+                # Or update the existing one
+                config_line = self.pool.get('ir.config_parameter').get_param(cr, 1, 'FO_FOLLOWUP_MAX_LINE')
+                if config_line:
+                    max_line = int(config_line)
+                else:
+                    max_line = 5000
+
+                if nb_lines > max_line:
+                    raise osv.except_osv(_('Error'), _('The requested report is too heavy to generate: requested %d lines, maximum allowed %d. Please apply further filters so that report can be generated.') % (nb_lines, max_line))
+
             self.write(cr, uid, [wizard.id], {'order_ids': fo_ids}, context=context)
 
         return True
@@ -228,7 +245,7 @@
             'report_name': 'sales.follow.up.multi.report_pdf',
         }, context=context)
         context['background_id'] = background_id
-        context['background_time'] = 20
+        context['background_time'] = 3
 
         data = {'ids': ids, 'context': context}
         return {