Merge lp:~julie-w/unifield-server/US-6554 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/report/account_balance_sheet.py'
--- bin/addons/account/report/account_balance_sheet.py	2017-06-08 16:00:51 +0000
+++ bin/addons/account/report/account_balance_sheet.py	2020-02-04 10:20:46 +0000
@@ -285,6 +285,7 @@
         return self.result.get(group, [])
 
     def get_display_info(self, data):
+        # reminder: in case other items are added in the "Display" col., truncate the text with the truncate_list method
         info_data = []
         all_str = _('All')
 
@@ -325,6 +326,7 @@
         return infos and ", \n".join(infos) or _('No Filter')
 
     def get_prop_instances(self, data):
+        data_tools_obj = self.pool.get('data.tools')
         instances = []
         if data.get('form', False):
             if data['form'].get('instance_ids', False):
@@ -335,7 +337,7 @@
                 # US-1166: mission only instances if none provided
                 instances = self._get_instances(get_code=True,
                                                 mission_filter=True)
-        return ', '.join(instances)
+        return data_tools_obj.truncate_list(instances)
 
 report_sxw.report_sxw('report.account.balancesheet.horizontal', 'account.account',
                       'addons/account/report/account_balance_sheet_horizontal.rml',parser=report_balancesheet_horizontal,
 
=== modified file 'bin/addons/account/report/account_general_ledger.py'
--- bin/addons/account/report/account_general_ledger.py	2019-07-31 15:26:10 +0000
+++ bin/addons/account/report/account_general_ledger.py	2020-02-04 10:20:46 +0000
@@ -495,15 +495,18 @@
         return amount
 
     def _get_prop_instances_str(self):
-        return ', '.join([ i.code \
-                           for i in self.pool.get('msf.instance').browse(self.cr, self.uid, self.selected_instance_ids) \
-                           if i.code ])
+        data_tools_obj = self.pool.get('data.tools')
+        inst_list = [ i.code \
+                      for i in self.pool.get('msf.instance').browse(self.cr, self.uid, self.selected_instance_ids) \
+                      if i.code ]
+        return data_tools_obj.truncate_list(inst_list)
 
     def _get_journals_str(self, data):
+        data_tools_obj = self.pool.get('data.tools')
         if 'all_journals' in data['form']:
             return _('All Journals')
-        return ', '.join(list(set(self._get_journal(data,
-                                                    instance_ids=self.selected_instance_ids))))
+        journal_list = list(set(self._get_journal(data, instance_ids=self.selected_instance_ids)))
+        return data_tools_obj.truncate_list(journal_list)
 
     # internal filter functions
     def _get_data_form(self, data, key, default=False):
@@ -512,6 +515,7 @@
         return data['form'].get(key, default)
 
     def _get_display_info(self, data):
+        data_tools_obj = self.pool.get('data.tools')
         info_data = []
         yes_str = _('Yes')
         no_str = _('No')
@@ -550,7 +554,7 @@
                   if a.type != 'view' ], )))
 
         res = [ "%s: %s" % (label, val, ) for label, val in info_data ]
-        return ', \n'.join(res)
+        return data_tools_obj.truncate_list(res, separator=', \n')
 
     def _get_open_items_selection(self, data):
         """
 
=== modified file 'bin/addons/account/report/account_partner_ledger.py'
--- bin/addons/account/report/account_partner_ledger.py	2018-08-20 09:13:59 +0000
+++ bin/addons/account/report/account_partner_ledger.py	2020-02-04 10:20:46 +0000
@@ -484,22 +484,22 @@
         """
         Returns the list of journals as a String (cut if > 300 characters)
         """
-        journals_str = ', '.join([journal or '' for journal in self._get_journal(data)])
-        return (len(journals_str) <= 300) and journals_str or ("%s%s" % (journals_str[:297], '...'))
+        data_tools_obj = self.pool.get('data.tools')
+        return data_tools_obj.truncate_list(self._get_journal(data))
 
     def _get_instances_str(self, data):
         """
         Returns the list of instances as a String (cut if > 300 characters)
         """
-        instances_str = ', '.join([inst or '' for inst in self._get_instances_from_data(data)])
-        return (len(instances_str) <= 300) and instances_str or ("%s%s" % (instances_str[:297], '...'))
+        data_tools_obj = self.pool.get('data.tools')
+        return data_tools_obj.truncate_list(self._get_instances_from_data(data))
 
     def _get_accounts_str(self, data):
         """
         Returns the list of accounts as a String (cut if > 300 characters)
         """
-        accounts_str = ', '.join([acc or '' for acc in self._get_accounts(data)])
-        return (len(accounts_str) <= 300) and accounts_str or ("%s%s" % (accounts_str[:297], '...'))
+        data_tools_obj = self.pool.get('data.tools')
+        return data_tools_obj.truncate_list(self._get_accounts(data))
 
 # PDF report with one partner per page
 report_sxw.report_sxw('report.account.third_party_ledger', 'res.partner',
 
=== modified file 'bin/addons/account/report/account_profit_loss.py'
--- bin/addons/account/report/account_profit_loss.py	2017-04-19 12:44:30 +0000
+++ bin/addons/account/report/account_profit_loss.py	2020-02-04 10:20:46 +0000
@@ -192,6 +192,7 @@
         return self.result.get(group, [])
 
     def get_display_info(self, data):
+        # reminder: in case other items are added in the "Display" col., truncate the text with the truncate_list method
         info_data = []
         all_str = _('All')
 
@@ -232,6 +233,7 @@
         return infos and ", \n".join(infos) or _('No Filter')
 
     def get_prop_instances(self, data):
+        data_tools_obj = self.pool.get('data.tools')
         instances = []
         if data.get('form', False):
             if data['form'].get('instance_ids', False):
@@ -242,7 +244,8 @@
                 # US-1166: mission only instances if none provided
                 instances = self._get_instances(get_code=True,
                                                 mission_filter=True)
-        return ', '.join(instances)
+        return data_tools_obj.truncate_list(instances)
+
 
 report_sxw.report_sxw('report.pl.account.horizontal', 'account.account',
                       'addons/account/report/account_profit_horizontal.rml',parser=report_pl_account_horizontal, header='internal landscape')
 
=== modified file 'bin/addons/finance/report/account_partner_balance_tree.py'
--- bin/addons/finance/report/account_partner_balance_tree.py	2018-08-09 08:19:38 +0000
+++ bin/addons/finance/report/account_partner_balance_tree.py	2020-02-04 10:20:46 +0000
@@ -192,8 +192,8 @@
         """
         Returns the list of accounts as a String (cut if > 300 characters)
         """
-        accounts_str = ', '.join([acc or '' for acc in self._get_accounts(data)])
-        return (len(accounts_str) <= 300) and accounts_str or ("%s%s" % (accounts_str[:297], '...'))
+        data_tools_obj = self.pool.get('data.tools')
+        return data_tools_obj.truncate_list(self._get_accounts(data))
 
     def _get_filter(self, data):
         if data.get('form', False) and data['form'].get('filter', False):
@@ -229,8 +229,8 @@
         """
         Returns the list of journals as a String (cut if > 300 characters)
         """
-        journals_str = ', '.join([journal or '' for journal in self._get_journal(data)])
-        return (len(journals_str) <= 300) and journals_str or ("%s%s" % (journals_str[:297], '...'))
+        data_tools_obj = self.pool.get('data.tools')
+        return data_tools_obj.truncate_list(self._get_journal(data))
 
     def _get_prop_instances(self, data):
         """
@@ -245,14 +245,18 @@
         """
         Returns the list of instances as a String (cut if > 300 characters)
         """
+        display_limit = 300
         if pdf:
             # in the PDF version instances are listed one below the other and instance names are cut if > 20 characters
             instances_str = ',\n'.join([(len(inst) <= 20) and inst or ("%s%s" % (inst[:17], '...'))
                                         for inst in self._get_prop_instances(data)])
+            if len(instances_str) > display_limit:
+                instances_str = "%s%s" % (instances_str[:display_limit-3], '...')
         else:
             # otherwise instances are simply separated by a comma
-            instances_str = ', '.join([inst or '' for inst in self._get_prop_instances(data)])
-        return (len(instances_str) <= 300) and instances_str or ("%s%s" % (instances_str[:297], '...'))
+            data_tools_obj = self.pool.get('data.tools')
+            instances_str = data_tools_obj.truncate_list(self._get_prop_instances(data), limit=display_limit)
+        return instances_str
 
 
 class account_partner_balance_tree_xls(SpreadsheetReport):
 
=== modified file 'bin/addons/msf_tools/msf_tools.py'
--- bin/addons/msf_tools/msf_tools.py	2019-09-10 08:41:23 +0000
+++ bin/addons/msf_tools/msf_tools.py	2020-02-04 10:20:46 +0000
@@ -329,6 +329,17 @@
 
         return True
 
+    def truncate_list(self, item_list, limit=300, separator=', '):
+        """
+        Returns a string corresponding to the list of items in parameter, separated by the "separator".
+        If the string > "limit", cuts it and adds "..." at the end.
+        """
+        list_str = separator.join([item for item in item_list if item]) or ''
+        if len(list_str) > limit:
+            list_str = "%s%s" % (list_str[:limit-3], '...')
+        return list_str
+
+
 data_tools()