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

[jftempo]

=== modified file 'bin/addons/register_accounting/report/cash_inventory.rml'
--- bin/addons/register_accounting/report/cash_inventory.rml	2016-04-27 17:48:12 +0000
+++ bin/addons/register_accounting/report/cash_inventory.rml	2018-01-08 14:53:35 +0000
@@ -150,9 +150,9 @@
       <spacer length="5"/>
 
       <para style="text"><b>Comments:</b></para>
-      <blockTable colWidths="180mm" rowHeights="15mm" style="table_comments">
+      <blockTable colWidths="180mm" rowHeights="20mm" style="table_comments">
         <tr>
-          <td>[[ format(o.notes or '') ]]</td>
+          <td>[[ format(formatComments(o.notes or '')) ]]</td>
         </tr>
       </blockTable>
 

=== modified file 'bin/addons/register_accounting/report/report_cash_inventory.py'
--- bin/addons/register_accounting/report/report_cash_inventory.py	2015-10-22 12:37:32 +0000
+++ bin/addons/register_accounting/report/report_cash_inventory.py	2018-01-08 14:53:35 +0000
@@ -28,6 +28,7 @@
         super(cash_inventory, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'getNow': self.get_now,
+            'formatComments': self._format_comments,
         })
 
     def get_now(self, show_datetime=False):
@@ -36,6 +37,31 @@
         return date_tools_obj.datetime2orm(res) if show_datetime \
             else date_tools_obj.date2orm(res.date())
 
+    def _format_comments(self, notes):
+        """
+        Formats the comments to print:
+        - 4 lines max
+        - 90 characters per line
+        """
+        res = ''
+        nb_lines = 4
+        strlimit = 90
+        # remove the existing line breaks from the comments
+        notes = notes.replace('\r\n', ' ').replace('\n', ' ')
+        for i in range(nb_lines):
+            begin = i * strlimit
+            end = begin + strlimit
+            is_last_line = i == nb_lines - 1
+            eol = ''
+            if not is_last_line:
+                # add an hyphen if the cut is done in the middle of a word
+                eol = len(notes) > end and notes[end-1].isalpha() and notes[end].isalpha() and '-\n-' or '\n'
+            res = '%s%s%s' % (res, notes[begin:end], eol)
+        # add an ellipsis if the comment is too long to be fully printed
+        if len(notes) > strlimit * nb_lines:
+            res = '%s%s' % (res, '...')
+        return res
+
 report_sxw.report_sxw('report.cash.inventory', 'account.bank.statement', 'addons/register_accounting/report/cash_inventory.rml', parser=cash_inventory)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: