Merge lp:~jfb-tempo-consulting/unifield-server/US-11456 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/report/account_liquidity_balance.py'
--- bin/addons/account/report/account_liquidity_balance.py	2023-02-28 11:11:15 +0000
+++ bin/addons/account/report/account_liquidity_balance.py	2024-05-07 10:18:00 +0000
@@ -44,7 +44,7 @@
             'get_register_data': self._get_register_data,
         })
 
-    def _filter_journal_status(self, reg_data):
+    def _filter_journal_status(self, reg_data, date_to):
         """
         Applies the following changes to the reg_data:
         - adds the journal status
@@ -53,9 +53,9 @@
         journal_obj = self.pool.get('account.journal')
         new_reg_data = []
         for reg in reg_data:
-            journal_active = journal_obj.read(self.cr, self.uid, reg['id'], ['is_active'])['is_active']
-            if journal_active or reg['opening'] or reg['calculated'] or reg['closing']:
-                reg['journal_status'] = journal_active and _('Active') or _('Inactive')
+            j_info = journal_obj.read(self.cr, self.uid, reg['id'], ['is_active', 'inactivation_date'])
+            if j_info['is_active'] or (j_info['inactivation_date'] and j_info['inactivation_date'] > date_to) or reg['opening'] or reg['calculated'] or reg['closing']:
+                reg['journal_status'] = j_info['is_active'] and _('Active') or _('Inactive')
                 new_reg_data.append(reg)
         return new_reg_data
 
@@ -82,15 +82,22 @@
                                        fields_to_fetch=['date_start', 'date_stop'])
             date_from = period.date_start
             date_to = period.date_stop
+
         if not date_from or not date_to:
             raise osv.except_osv(_('Error'), _('Start date and/or End date missing.'))
         period_title = self.period_title or ''
         # Cash and Bank registers
         reg_types = ('cash', 'bank')
-        params = (period_title, reg_types, date_from, reg_types, date_from, date_to, reg_types, date_to, tuple(self.instance_ids))
+        params = {
+            'period_title': period_title,
+            'j_type': reg_types,
+            'date_from': date_from,
+            'date_to': date_to,
+            'instance_ids': tuple(self.instance_ids),
+        }
         self.cr.execute(self.liquidity_sql, params)
         cash_bank_res = self.cr.dictfetchall()
-        cash_bank_res = self._filter_journal_status(cash_bank_res)
+        cash_bank_res = self._filter_journal_status(cash_bank_res, date_to)
         cash_bank_res = reportvi.hq_report_ocb.postprocess_liquidity_balances(self, self.cr, self.uid, cash_bank_res,
                                                                               encode=False, context=self.context)
         res.extend(cash_bank_res)
@@ -134,6 +141,32 @@
                         SELECT journal_id, account_id, SUM(col1) AS opening, SUM(col2) AS calculated, SUM(col3) AS closing
                         FROM (
                             (
+                            -- coo: export chq register empty
+                                SELECT j.id AS journal_id, j.default_debit_account_id  AS account_id, 0 as col1, 0 as col2, 0 as col3
+                                FROM account_bank_statement st, account_journal j, account_period p
+                                WHERE
+                                    st.journal_id = j.id
+                                    AND st.period_id = p.id
+                                    AND j.type = 'cheque'
+                                    AND p.date_start >= %s
+                                    AND p.date_stop <= %s
+                                GROUP BY j.id, j.default_debit_account_id
+                            )
+                        UNION
+                            (
+                            -- hq: export cheque register if at least 1 line exists
+                                SELECT aml.journal_id AS journal_id, aml.account_id AS account_id, 0.00 as col1, 0.00 as col2, 0.00 as col3
+                                FROM account_move_line AS aml, account_journal j 
+                                WHERE
+                                aml.journal_id = j.id
+                                AND j.type = 'cheque'
+                                AND aml.date >= %s
+                                AND aml.date <= %s
+                                AND aml.account_id IN (j.default_debit_account_id, j.default_credit_account_id)
+                                GROUP BY aml.journal_id, aml.account_id
+                            )
+                        UNION
+                            (
                                 SELECT journal_id, account_id, ROUND(SUM(amount_currency), 2) as col1, 0.00 as col2, 0.00 as col3
                                 FROM account_move_line
                                 WHERE id IN %s
@@ -158,10 +191,10 @@
         # ensure not to have empty arrays to avoid crash at query execution...
         pending_chq_starting_bal_ids = pending_chq_starting_bal_ids or [-1]
         pending_chq_closing_bal_ids = pending_chq_closing_bal_ids or [-1]
-        cheque_params = (period_title, tuple(pending_chq_starting_bal_ids), tuple(pending_chq_closing_bal_ids), tuple(self.instance_ids))
+        cheque_params = (period_title, date_from, date_to, date_from, date_to, tuple(pending_chq_starting_bal_ids), tuple(pending_chq_closing_bal_ids), tuple(self.instance_ids))
         self.cr.execute(cheque_sql, cheque_params)
         cheque_res = self.cr.dictfetchall()
-        cheque_res = self._filter_journal_status(cheque_res)
+        cheque_res = self._filter_journal_status(cheque_res, date_to)
         cheque_res = reportvi.hq_report_ocb.postprocess_liquidity_balances(self, self.cr, self.uid, cheque_res, encode=False, context=self.context)
         res.extend(cheque_res)
         # sort result by instance code and by journal code

=== modified file 'bin/addons/register_accounting/report/report_liquidity_position.py'
--- bin/addons/register_accounting/report/report_liquidity_position.py	2023-11-03 15:04:29 +0000
+++ bin/addons/register_accounting/report/report_liquidity_position.py	2024-05-07 10:18:00 +0000
@@ -106,7 +106,7 @@
         reg_obj = pool.get('account.bank.statement')
         journal_obj = pool.get('account.journal')
         # bank and cash journals (for cheques, see getPendingCheques)
-        journal_ids = journal_obj.search(self.cr, self.uid, [('type', 'in', ['bank', 'cash']), ('is_active', '=', True)], order='NO_ORDER')
+        journal_ids = journal_obj.search(self.cr, self.uid, [('type', 'in', ['bank', 'cash'])], order='NO_ORDER')
         args = [('period_id', '=', self.period_id), ('journal_id', 'in', journal_ids)]
         reg_ids = reg_obj.search(self.cr, self.uid, args, order='journal_id')
         regs = reg_obj.browse(self.cr, self.uid, reg_ids, context={'lang': self.localcontext.get('lang')})
@@ -301,7 +301,7 @@
 
         # get the cheque registers for the selected period and previous ones IF the one of the selected period exists
         journal_ids = []
-        for j_id in journal_obj.search(self.cr, self.uid, [('type', '=', 'cheque'), ('is_active', '=', True)], order='NO_ORDER'):
+        for j_id in journal_obj.search(self.cr, self.uid, [('type', '=', 'cheque')], order='NO_ORDER'):
             if reg_obj.search_exist(self.cr, self.uid, [('journal_id', '=', j_id), ('period_id', '=', self.period_id)]):
                 journal_ids.append(j_id)
         period_ids = period_obj.search(self.cr, self.uid,

=== modified file 'bin/addons/vertical_integration/report/hq_report_ocb.py'
--- bin/addons/vertical_integration/report/hq_report_ocb.py	2024-03-15 10:42:56 +0000
+++ bin/addons/vertical_integration/report/hq_report_ocb.py	2024-05-07 10:18:00 +0000
@@ -321,18 +321,31 @@
 # request & postprocess method used for OCP VI, and for Liquidity Balances report
 # NOTE: the Liquidity Bal. report is actually not included in OCB VI anymore, so all liquidity-related code in this file could sometime be moved
 liquidity_sql = """
-            SELECT i.code AS instance, j.code, j.id, %s AS period, req.opening, req.calculated, req.closing, c.name AS currency
+            SELECT i.code AS instance, j.code, j.id, %(period_title)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
                 FROM (
                     (
+                    -- export new register with no lines
+                        SELECT j.id AS journal_id, j.default_debit_account_id  AS account_id, 0 as col1, 0 as col2, 0 as col3
+                        FROM account_bank_statement st, account_journal j, account_period p
+                        WHERE
+                            st.journal_id = j.id
+                            AND st.period_id = p.id
+                            AND j.type IN %(j_type)s
+                            AND p.date_start >= %(date_from)s
+                            AND p.date_stop <= %(date_to)s
+                        GROUP BY j.id, j.default_debit_account_id
+                    )
+                UNION
+                    (
                         SELECT aml.journal_id AS journal_id, aml.account_id AS account_id, ROUND(SUM(amount_currency), 2) as col1, 0.00 as col2, 0.00 as col3
                         FROM account_move_line AS aml 
                         LEFT JOIN account_journal j 
                             ON aml.journal_id = j.id 
-                        WHERE j.type IN %s
-                        AND aml.date < %s
+                        WHERE j.type IN %(j_type)s
+                        AND aml.date < %(date_from)s
                         AND aml.account_id IN (j.default_debit_account_id, j.default_credit_account_id)
                         GROUP BY aml.journal_id, aml.account_id
                     )
@@ -342,8 +355,8 @@
                         FROM account_move_line AS aml 
                         LEFT JOIN account_journal j 
                             ON aml.journal_id = j.id 
-                        WHERE j.type IN %s
-                        AND aml.date >= %s AND aml.date <= %s
+                        WHERE j.type IN %(j_type)s
+                        AND aml.date >= %(date_from)s AND aml.date <= %(date_to)s
                         AND aml.account_id IN (j.default_debit_account_id, j.default_credit_account_id)
                         GROUP BY aml.journal_id, aml.account_id
                     )
@@ -353,8 +366,8 @@
                         FROM account_move_line AS aml 
                         LEFT JOIN account_journal j 
                             ON aml.journal_id = j.id 
-                        WHERE j.type IN %s
-                        AND aml.date <= %s
+                        WHERE j.type IN %(j_type)s
+                        AND aml.date <= %(date_to)s
                         AND aml.account_id IN (j.default_debit_account_id, j.default_credit_account_id)
                         GROUP BY aml.journal_id, aml.account_id
                     )
@@ -365,7 +378,7 @@
             WHERE req.journal_id = j.id
             AND j.instance_id = i.id
             AND j.currency = c.id
-            AND j.instance_id IN %s;
+            AND j.instance_id IN %(instance_ids)s;
             """
 
 

=== modified file 'bin/addons/vertical_integration/report/hq_report_ocp.py'
--- bin/addons/vertical_integration/report/hq_report_ocp.py	2023-05-10 07:56:54 +0000
+++ bin/addons/vertical_integration/report/hq_report_ocp.py	2024-05-07 10:18:00 +0000
@@ -541,8 +541,13 @@
                                 'Closing balance', 'Currency'],
                     'filename': liquidity_balance_filename,
                     'key': 'liquidity',
-                    'query_params': (tuple([period_yyyymm]), reg_types, first_day_of_period, reg_types, first_day_of_period,
-                                     last_day_of_period, reg_types, last_day_of_period, tuple(instance_ids)),
+                    'dict_query_params': {
+                        'period_title': period_yyyymm,
+                        'j_type': reg_types,
+                        'date_from': first_day_of_period,
+                        'date_to': last_day_of_period,
+                        'instance_ids': tuple(instance_ids),
+                    },
                     'function': 'postprocess_liquidity_balances',
                     'fnct_params': context,
                 }