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

[jftempo]

=== modified file 'bin/addons/account/report/free_allocation_report.mako'
--- bin/addons/account/report/free_allocation_report.mako	2018-08-17 09:43:51 +0000
+++ bin/addons/account/report/free_allocation_report.mako	2019-02-06 10:02:17 +0000
@@ -266,35 +266,6 @@
             </Cell>
         </Row>
     % endfor
-    <!-- TOTAL -->
-    <% total_l = total_line(entry_seq) %>
-    % if total_l:
-        <Row>
-            <% total_str = "%s %s" % (_("Total"), entry_seq) %>
-            <Cell ss:StyleID="ssBorderBold">
-                <Data ss:Type="String">${total_str|x}</Data>
-            </Cell>
-            <Cell ss:StyleID="ssBorderBold" ss:MergeAcross="5"></Cell>
-            <Cell ss:StyleID="ssNumberBold">
-                <Data ss:Type="Number">${total_l['book_amount']}</Data>
-            </Cell>
-            <Cell ss:StyleID="ssBorderBold">
-                <Data ss:Type="String">${total_l['book_currency']|x}</Data>
-            </Cell>
-            <Cell ss:StyleID="ssNumberBold">
-                <Data ss:Type="Number">${total_l['func_amount']}</Data>
-            </Cell>
-            <Cell ss:StyleID="ssBorderBold">
-                <Data ss:Type="String">${company.currency_id.name|x}</Data>
-            </Cell>
-        </Row>
-    % endif
-    % if lines(data)[entry_seq]:
-        <!-- EMPTY LINE BETWEEN EACH ENTRY SEQ. -->
-        <Row>
-            <Cell ss:MergeAcross="10"><Data ss:Type="String"></Data></Cell>
-        </Row>
-    % endif
 % endfor
 
 </Table>
 
=== modified file 'bin/addons/account/report/free_allocation_report.py'
--- bin/addons/account/report/free_allocation_report.py	2018-08-22 12:40:42 +0000
+++ bin/addons/account/report/free_allocation_report.py	2019-02-06 10:02:17 +0000
@@ -29,10 +29,8 @@
     def __init__(self, cr, uid, name, context=None):
         super(free_allocation_report, self).__init__(cr, uid, name, context=context)
         self.lines = {}
-        self.total_lines = {}
         self.localcontext.update({
             'lines': self._get_lines,
-            'total_line': self._get_total_line,
             'get_proprietary_instance': self._get_proprietary_instance,
             'get_accounts': self._get_accounts,
             'get_journals': self._get_journals,
@@ -49,7 +47,6 @@
         """
         Returns the report lines as a dict where key = Entry Sequence,
         and value = list of dicts, each corresponding to a line to display
-        + fills in the self.total_lines for each Entry Sequence
 
         Formula for one combination with all axis:
         total_JI x (amount_DEST_CC_FP_A/total_JI) x (amount_free1A/total_JI) x (amount_free2A/total_JI)
@@ -97,9 +94,6 @@
             for move in move_obj.browse(self.cr, self.uid, move_ids, fields_to_fetch=['name'], context=context):
                 current_line_position += 1
                 self.lines[move.name] = []
-                book_total = 0.0
-                func_total = 0.0
-                book_currency = ''
                 aml_dom = [('move_id', '=', move.id)]
                 if account_ids:
                     aml_dom.append(('account_id', 'in', account_ids))
@@ -235,35 +229,10 @@
                                     'func_currency': aml.functional_currency_id and aml.functional_currency_id.name or '',
                                 }
                                 self.lines[move.name].append(line)
-                                book_total += book_amount or 0.0
-                                func_total += func_amount or 0.0
-                # create the total line for each Entry Sequence
-                if self.lines[move.name]:
-                    self.total_lines[move.name] = {
-                        'book_amount': book_total,
-                        'book_currency': book_currency,
-                        'func_amount': func_total,
-                    }
-                else:
-                    # empty total line in case there is no analytic line for this move
-                    self.total_lines[move.name] = {}
                 # update percentage of the report loading
                 bg_obj.compute_percent(self.cr, self.uid, current_line_position, len(move_ids), context=context)
         return self.lines
 
-    def _get_total_line(self, entry_sequence):
-        """
-        Returns a dict with functional amount, and booking amount & currency for the Entry Seq. in parameter
-        """
-        if entry_sequence in self.total_lines:
-            return self.total_lines[entry_sequence]
-        else:
-            return {
-                'book_amount': 0.0,
-                'book_currency': '',
-                'func_amount': 0.0,
-            }
-
     def _get_proprietary_instance(self, data):
         """
         Returns the code of the Prop. Instance selected in the wizard if any