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

[jftempo]

=== modified file 'bin/addons/account/report/account_liquidity_balance.py'
--- bin/addons/account/report/account_liquidity_balance.py	2018-02-23 13:03:07 +0000
+++ bin/addons/account/report/account_liquidity_balance.py	2018-09-20 14:23:21 +0000
@@ -57,6 +57,7 @@
                   period.date_stop, tuple(self.instance_ids))
         self.cr.execute(self.liquidity_sql, params)
         cash_bank_res = self.cr.dictfetchall()
+        cash_bank_res = reportvi.hq_report_ocb.postprocess_liquidity_balances(self, self.cr, self.uid, cash_bank_res, context=self.context)
         res.extend(cash_bank_res)
         # Cheque registers
         cheque_sql = """

=== modified file 'bin/addons/vertical_integration/report/hq_report_ocb.py'
--- bin/addons/vertical_integration/report/hq_report_ocb.py	2018-07-20 12:48:55 +0000
+++ bin/addons/vertical_integration/report/hq_report_ocb.py	2018-09-20 14:23:21 +0000
@@ -247,10 +247,16 @@
             new_data.append(self.line_to_utf8(tmp_line))
         return self.postprocess_selection_columns(cr, uid, new_data, [('account.bank.statement', 'state', 6)], column_deletion=column_deletion)
 
-
-# request used for OCB, OCP, and OCG VI and for Liquidity Balances report
+    def postprocess_liquidity_balances(self, cr, uid, data, context=None, column_deletion=False):
+        """
+        Note that the param "column_deletion" is needed (see def archive in finance_export) but NOT used here.
+        """
+        return postprocess_liquidity_balances(self, cr, uid, data, context=context)
+
+
+# request & postprocess method used for OCB, OCP, and OCG VI and for Liquidity Balances report
 liquidity_sql = """
-            SELECT i.code AS instance, j.code, j.name, %s AS period, req.opening, req.calculated, req.closing, c.name AS currency
+            SELECT i.code AS instance, j.code, j.id, %s AS period, req.opening, req.calculated, req.closing, c.name AS currency
             FROM res_currency c,
             (
                 SELECT journal_id, account_id, SUM(col1) AS opening, SUM(col2) AS calculated, SUM(col3) AS closing
@@ -298,6 +304,41 @@
             """
 
 
+def postprocess_liquidity_balances(self, cr, uid, data, context=None):
+    """
+    Returns data after having replaced the Journal ID by the Journal Name in the current language
+    (the language code should be stored in context['lang']).
+    """
+    # number and name of the column containing the journal id
+    col_nbr = 2
+    col_name = 'id'
+    col_new_name = 'name'
+    if context is None or 'lang' not in context:
+        context = {'lang': 'en_MF'}  # English by default
+    pool = pooler.get_pool(cr.dbname)
+    journal_obj = pool.get('account.journal')
+    new_data = []
+    for line in data:
+        tmp_l = line
+        # list
+        if isinstance(tmp_l, list):
+            if tmp_l[col_nbr]:
+                tmp_l[col_nbr] = journal_obj.read(cr, uid, tmp_l[col_nbr], ['name'], context=context)['name']
+        # tuple
+        elif isinstance(tmp_l, tuple):
+            tmp_l = list(tmp_l)
+            if tmp_l[col_nbr]:
+                tmp_l[col_nbr] = journal_obj.read(cr, uid, tmp_l[col_nbr], ['name'], context=context)['name']
+            tmp_l = tuple(tmp_l)  # restore back the initial format
+        # dictionary
+        elif isinstance(tmp_l, dict):
+            if tmp_l[col_name]:
+                tmp_l[col_new_name] = journal_obj.read(cr, uid, tmp_l[col_name], ['name'], context=context)['name']
+                del tmp_l[col_name]
+        new_data.append(tmp_l)
+    return new_data
+
+
 class hq_report_ocb(report_sxw.report_sxw):
 
     def __init__(self, name, table, rml=False, parser=report_sxw.rml_parse, header='external', store=False):
@@ -641,6 +682,8 @@
                 'filename': instance_name + '_' + year + month + '_Liquidity Balances.csv',
                 'key': 'liquidity',
                 'query_params': (tuple([period_yyyymm]), reg_types, first_day_of_period, reg_types, period.id, reg_types, last_day_of_period, tuple(instance_ids)),
+                'function': 'postprocess_liquidity_balances',
+                'fnct_params': context,
             },
             {
                 'headers': ['Name', 'Code', 'Donor code', 'Grant amount', 'Reporting CCY', 'State'],

=== modified file 'bin/addons/vertical_integration/report/hq_report_ocg.py'
--- bin/addons/vertical_integration/report/hq_report_ocg.py	2018-08-16 15:41:51 +0000
+++ bin/addons/vertical_integration/report/hq_report_ocg.py	2018-09-20 14:23:21 +0000
@@ -92,10 +92,12 @@
                      line_debit > 0 and "0.00" or round(-line_debit, 2),
                      currency.name]]
 
-    def _get_liquidity_balances(self, cr, instance_ids, period, period_yyyymm):
+    def _get_liquidity_balances(self, cr, uid, instance_ids, period, period_yyyymm, context=None):
         """
         Returns the content of the Liquidity Balances Report as a list of lists
         """
+        if context is None:
+            context = {}
         reg_types = ('cash', 'bank', 'cheque')
         liquidity_balance_header = ['Instance',
                                     'Code',
@@ -110,6 +112,7 @@
                             period.date_stop, tuple(instance_ids))
         cr.execute(liquidity_sql, liquidity_params)
         liquidity_balance_lines = [list(lbl) for lbl in cr.fetchall()]
+        liquidity_balance_lines = hq_report_ocb.postprocess_liquidity_balances(self, cr, uid, liquidity_balance_lines, context=context)
         return [liquidity_balance_header] + liquidity_balance_lines
 
     def _get_account_balances(self, cr, instance_ids, period, period_yyyymm):
@@ -132,6 +135,8 @@
         return [acc_balance_header] + acc_balance_lines
 
     def create(self, cr, uid, ids, data, context=None):
+        if context is None:
+            context = {}
         pool = pooler.get_pool(cr.dbname)
         # Create the header
         first_header = ['Proprietary Instance',
@@ -362,8 +367,8 @@
 
         second_report = [second_header] + second_result_lines
 
-        liquidity_report = self._get_liquidity_balances(cr, data['form'].get('instance_ids', False),
-                                                        period, period_yyyymm)
+        liquidity_report = self._get_liquidity_balances(cr, uid, data['form'].get('instance_ids', False),
+                                                        period, period_yyyymm, context=context)
         liquidity_share = 0.05  # 5% of the process
         self.shared_update_percent(cr, uid, pool, [bg_id],
                                    share=liquidity_share, finished=True,

=== modified file 'bin/addons/vertical_integration/report/hq_report_ocp.py'
--- bin/addons/vertical_integration/report/hq_report_ocp.py	2018-08-16 15:55:30 +0000
+++ bin/addons/vertical_integration/report/hq_report_ocp.py	2018-09-20 14:23:21 +0000
@@ -191,6 +191,12 @@
             line[journal_type_col] = self._get_journal_type_value(cr, uid, line[journal_type_col])
         return new_data
 
+    def postprocess_liquidity_balances(self, cr, uid, data, context=None, column_deletion=False):
+        """
+        Note that the param "column_deletion" is needed (see def archive in finance_export) but NOT used here.
+        """
+        return hq_report_ocb.postprocess_liquidity_balances(self, cr, uid, data, context=context)
+
 
 # request used for OCP and OCG VI
 # Journals excluded from the Account Balances: Migration, In-kind Donation, OD-Extra Accounting
@@ -510,6 +516,8 @@
                 'key': 'liquidity',
                 'query_params': (tuple([period_yyyymm]), reg_types, first_day_of_period, reg_types, period.id,
                                  reg_types, last_day_of_period, tuple(instance_ids)),
+                'function': 'postprocess_liquidity_balances',
+                'fnct_params': context,
             },
             {
                 'headers': ['Instance', 'Account', 'Account Name', 'Period', 'Opening balance', 'Calculated balance',