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

[jftempo]

=== modified file 'bin/addons/account/account.py'
--- bin/addons/account/account.py	2022-02-01 15:56:05 +0000
+++ bin/addons/account/account.py	2022-02-14 09:44:29 +0000
@@ -1069,6 +1069,33 @@
 class account_period(osv.osv):
     _name = "account.period"
     _description = "Account period"
+
+    def _get_false(self, cr, uid, ids, *a, **b):
+        """
+        Returns False for all ids (cf. only the search method is used for the field)
+        """
+        return {}.fromkeys(ids, False)
+
+    def _search_period_visible(self, cr, uid, obj, name, args, context=None):
+        """
+        Returns a domain with the periods to display, based on args looking like:
+        [('period_visible', '=', [fiscalyear_id, instance_id, all_missions])]
+        """
+        if context is None:
+            context = {}
+        period_dom = []
+        if args:
+            if len(args[0]) < 3 or args[0][1] != '=' or not isinstance(args[0][2], list) or len(args[0][2]) < 3:
+                raise osv.except_osv(_('Error'), _('Filter not implemented.'))
+            fy_id = args[0][2][0]
+            inst_id = args[0][2][1]
+            all_missions = args[0][2][2]
+            if all_missions:
+                period_dom = [('number', '!=', 16), ('fiscalyear_id', '=', fy_id), ('state', '!=', 'created')]
+            else:
+                period_dom = [('number', '!=', 16), ('child_mission_closed', '=', [inst_id, fy_id])]
+        return period_dom
+
     _columns = {
         'name': fields.char('Period Name', size=64, required=True),
         'code': fields.char('Code', size=24),
@@ -1079,8 +1106,12 @@
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
         'state': fields.selection([('draft','Open'), ('done','Closed')], 'State', readonly=True,
                                   help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
-        'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
+        'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company',
+                                     string='Company', store=True, readonly=True),
+        'period_visible': fields.function(_get_false, method=True, type='boolean', string='Display the period', store=False,
+                                          fnct_search=_search_period_visible),
     }
+
     _defaults = {
         'state': 'draft',
     }

=== modified file 'bin/addons/analytic_distribution/analytic_distribution_wizard_view.xml'
--- bin/addons/analytic_distribution/analytic_distribution_wizard_view.xml	2020-09-24 13:33:19 +0000
+++ bin/addons/analytic_distribution/analytic_distribution_wizard_view.xml	2022-02-14 09:44:29 +0000
@@ -112,7 +112,7 @@
                             </p>
 
                          <script language="javascript">
-                            var invalid_small_amount = $('#invalid_small_amount').val() || $('invalid_small_amount').text();
+                            var invalid_small_amount = $('#invalid_small_amount').val() || $('#invalid_small_amount').text();
                             if (invalid_small_amount) {
                                 $('#label_invalid_small_amount').show();
                             }

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2022-02-08 14:19:11 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2022-02-14 09:44:29 +0000
@@ -65335,7 +65335,8 @@
 msgid "wizard.import.mapping"
 msgstr "wizard.import.mapping"
 
-#. modules: register_accounting, analytic_override
+#. modules: account, register_accounting, analytic_override
+#: code:addons/account/account.py:1089
 #: code:addons/analytic_override/analytic_line.py:80
 #: code:addons/register_accounting/account_move_line.py:52
 #, python-format
@@ -113720,6 +113721,36 @@
 msgid "Impossible to create a register on an inactive journal."
 msgstr "Impossible de créer un registre sur un journal inactif."
 
+#. module: account
+#: field:account.period,period_visible:0
+msgid "Display the period"
+msgstr "Afficher la période"
+
+#. module: vertical_integration
+#: view:ocp.export.wizard:0
+msgid "The database name is not OCP_HQ. This will impact the DB ID column."
+msgstr "Le nom de la base de données n'est pas OCP_HQ. Cela impactera la colonne DB ID."
+
+#. module: vertical_integration
+#: field:ocp.export.wizard,all_missions:0
+msgid "All Missions"
+msgstr "Toutes les Missions"
+
+#. module: vertical_integration
+#: view:ocp.export.wizard:0
+msgid "or All Missions"
+msgstr "ou Toutes les Missions"
+
+#. module: vertical_integration
+#: help:ocp.export.wizard,all_missions:0
+msgid "Generate the Monthly Export (only) for all missions at once"
+msgstr "Génère le \"Monthly Export\" (uniquement) pour toutes les missions à la fois"
+
+#. module: vertical_integration
+#: field:ocp.export.wizard,warning_db_name:0
+msgid "Display a warning on database name"
+msgstr "Affiche un avertissement sur le nom de la base de données"
+
 #. module: sync_client
 #: field:sync_client.survey.user.detailed,answer_later:0
 msgid "Answer later"

=== modified file 'bin/addons/vertical_integration/report/hq_report_ocp.py'
--- bin/addons/vertical_integration/report/hq_report_ocp.py	2019-12-13 15:56:37 +0000
+++ bin/addons/vertical_integration/report/hq_report_ocp.py	2022-02-14 09:44:29 +0000
@@ -53,7 +53,7 @@
 
     def _get_journal_type_value(self, cr, uid, journal_type_key):
         """
-        Returns the value of the Journal Type corresponding to the key in parameter (ex: inkind => In-kind Donation...)
+        Returns the value of the Journal Type corresponding to the key in parameter (e.g. inkind => In-kind Donation...)
         If no corresponding value is found, returns the key.
         """
         journal_types = self._get_journal_types(cr, uid)
@@ -62,7 +62,7 @@
     def _handle_od_ji_entries(self, cr, uid, data):
         """
         Takes data in parameter corresponding to ACCOUNT MOVE LINES (results from 'bs_entries' or 'plresult' requests)
-        1) Replaces the journal type "key" by its corresponding "value" (ex: inkind => In-kind Donation)
+        1) Replaces the journal type "key" by its corresponding "value" (e.g. inkind => In-kind Donation)
         2) Modifies it for all entries that originate from HQ entry corrections:
         - instance: 'EAUD' or 'SIEG' if this matches the first 4 characters of the original HQ entry (if not: 'SIEG' by default)
         - journal: the journal name corresponds to the 9-to-11 characters of the reference field of the original HQ entry
@@ -106,7 +106,7 @@
     def _handle_od_aji_entries(self, cr, uid, data):
         """
         Takes data in parameter corresponding to ACCOUNT ANALYTIC LINES (results from 'rawdata' request)
-        1) Replaces the journal type "key" by its corresponding "value" (ex: inkind => In-kind Donation)
+        1) Replaces the journal type "key" by its corresponding "value" (e.g. inkind => In-kind Donation)
         2) Modifies it for all entries that originate from HQ entry corrections:
         - instance: 'EAUD' or 'SIEG' if this matches the first 4 characters of the original HQ entry (if not: 'SIEG' by default)
         - journal: the journal name corresponds to the 9-to-11 characters of the reference field of the original HQ entry
@@ -187,7 +187,7 @@
             instance_code = line[instance_code_col][:3]
             line[instance_code_col] = instance_code
             line[cc_col] = instance_code
-            # Replaces the journal type "key" by its corresponding "value" (ex: inkind => In-kind Donation)
+            # Replaces the journal type "key" by its corresponding "value" (e.g. inkind => In-kind Donation)
             line[journal_type_col] = self._get_journal_type_value(cr, uid, line[journal_type_col])
         return new_data
 
@@ -285,7 +285,6 @@
         m_obj = pool.get('account.move')
         ml_obj = pool.get('account.move.line')
         excluded_journal_types = ['hq', 'migration', 'inkind', 'extra']  # journal types that should not be used to take lines
-        reg_types = ('cash', 'bank', 'cheque')
         # Fetch data from wizard
         if not data.get('form', False):
             raise osv.except_osv(_('Error'), _('No data retrieved. Check that the wizard is filled in.'))
@@ -294,17 +293,14 @@
         period_id = form.get('period_id', False)
         instance_ids = form.get('instance_ids', False)
         instance_id = form.get('instance_id', False)
-        if not fy_id or not period_id or not instance_ids or not instance_id:
+        all_missions = form.get('all_missions', False)
+        if not fy_id or not period_id or not instance_ids or (not instance_id and not all_missions):
             raise osv.except_osv(_('Warning'), _('Some information is missing: either fiscal year or period or instance.'))
         period = pool.get('account.period').browse(cr, uid, period_id, context=context,
                                                    fields_to_fetch=['date_start', 'date_stop', 'number'])
         first_day_of_period = period.date_start
-        last_day_of_period = period.date_stop
         tm = strptime(first_day_of_period, '%Y-%m-%d')
         year_num = tm.tm_year
-        year = str(year_num)
-        month = '%02d' % (tm.tm_mon)
-        period_yyyymm = "{0}{1}".format(year, month)
 
         # US-822: if December is picked should:
         # - include Period 16 action 2 Year end PL RESULT entries
@@ -471,14 +467,22 @@
         # + If you cannot do a SQL request to create the content of the file, do a simple request (with key) and add a postprocess function that returns the result you want
 
         # Define the file name according to the following format:
-        # First3DigitsOfInstanceCode_chosenPeriod_currentDatetime_Monthly_Export.csv (ex: KE1_201609_171116110306_Monthly_Export.csv)
-        inst = mi_obj.browse(cr, uid, instance_id, context=context, fields_to_fetch=['code'])
-        instance_code = inst and inst.code[:3] or ''
+        # AllinstancesORFirst3CharactersOfInstanceCode_chosenPeriod_currentDatetime_Monthly_Export.csv
+        # (e.g. KE1_201609_171116110306_Monthly_Export.csv)
+        if all_missions:
+            prefix = 'Allinstances'
+        elif instance_id:
+            inst = mi_obj.browse(cr, uid, instance_id, context=context, fields_to_fetch=['code'])
+            prefix = inst and inst.code[:3] or ''
+        else:
+            prefix = ''
         selected_period = strftime('%Y%m', strptime(first_day_of_period, '%Y-%m-%d')) or ''
         current_time = time.strftime('%d%m%y%H%M%S')
-        monthly_export_filename = '%s_%s_%s_Monthly_Export.csv' % (instance_code, selected_period, current_time)
-        liquidity_balance_filename = '%s_%s_%s_Liquidity_Balances.csv' % (instance_code, selected_period, current_time)
-        account_balance_filename = '%s_%s_%s_Account_Balances.csv' % (instance_code, selected_period, current_time)
+        monthly_export_filename = '%s_%s_%s_Monthly_Export.csv' % (prefix, selected_period, current_time)
+        liquidity_balance_filename = account_balance_filename = ''
+        if not all_missions:
+            liquidity_balance_filename = '%s_%s_%s_Liquidity_Balances.csv' % (prefix, selected_period, current_time)
+            account_balance_filename = '%s_%s_%s_Account_Balances.csv' % (prefix, selected_period, current_time)
 
         processrequests = [
             {
@@ -509,25 +513,37 @@
                 'id': 0,
                 'object': 'account.move.line',
             },
-            {
-                'headers': ['Instance', 'Code', 'Name', 'Period', 'Starting balance', 'Calculated balance',
-                            '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)),
-                'function': 'postprocess_liquidity_balances',
-                'fnct_params': context,
-            },
-            {
-                'headers': ['Instance', 'Account', 'Account Name', 'Period', 'Starting balance', 'Calculated balance',
-                            'Closing balance', 'Booking Currency'],
-                'filename': account_balance_filename,
-                'key': 'account_balances_per_currency',
-                'query_params': (tuple([period_yyyymm]), first_day_of_period, tuple(instance_ids), period.id,
-                                 tuple(instance_ids), last_day_of_period, tuple(instance_ids)),
-            },
         ]
+        if not all_missions:
+            year = str(year_num)
+            month = '%02d' % (tm.tm_mon)
+            period_yyyymm = "{0}{1}".format(year, month)
+            last_day_of_period = period.date_stop
+            reg_types = ('cash', 'bank', 'cheque')
+            # Liquidity Balances
+            processrequests.append(
+                {
+                    'headers': ['Instance', 'Code', 'Name', 'Period', 'Starting balance', 'Calculated balance',
+                                '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)),
+                    'function': 'postprocess_liquidity_balances',
+                    'fnct_params': context,
+                }
+            )
+            # Account Balances
+            processrequests.append(
+                {
+                    'headers': ['Instance', 'Account', 'Account Name', 'Period', 'Starting balance',
+                                'Calculated balance', 'Closing balance', 'Booking Currency'],
+                    'filename': account_balance_filename,
+                    'key': 'account_balances_per_currency',
+                    'query_params': (tuple([period_yyyymm]), first_day_of_period, tuple(instance_ids), period.id,
+                                     tuple(instance_ids), last_day_of_period, tuple(instance_ids)),
+                },
+            )
         if plresult_ji_in_ids:
             processrequests.append({
                 'filename': monthly_export_filename,

=== modified file 'bin/addons/vertical_integration/vertical_integration_wizard.xml'
--- bin/addons/vertical_integration/vertical_integration_wizard.xml	2021-01-07 13:19:21 +0000
+++ bin/addons/vertical_integration/vertical_integration_wizard.xml	2022-02-14 09:44:29 +0000
@@ -217,11 +217,34 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Export to HQ system">
-                <field name="instance_id" domain="['&amp;', ('level', '=', 'coordo'), ('instance_to_display_ids','=',True)]"
-                       on_change="onchange_instance_id()"/>
+                <field name="warning_db_name"/>
+                <group colspan="6" col="2">
+                    <html>
+                        <p id="label_warning_db_name"
+                           style="text-align: center; color: red; font-weight: bold; font-size: 1.1em; display: none">
+                            <translate>The database name is not OCP_HQ. This will impact the DB ID column.</translate>
+                        </p>
+                        <script language="javascript">
+                            var warning_db_name = $('#warning_db_name').val() || $('#warning_db_name').text();
+                            if (warning_db_name) {
+                                $('#label_warning_db_name').show();
+                            }
+                        </script>
+                    </html>
+                </group>
+                <field name="instance_id"
+                       domain="['&amp;', ('level', '=', 'coordo'), ('instance_to_display_ids', '=', True)]"
+                       on_change="onchange_instance_id(instance_id)"
+                       attrs="{'required': [('all_missions', '=', False)]}"
+                />
                 <field name="fiscalyear_id"/>
-                <field name="period_id" domain="[('child_mission_closed', '=', [instance_id, fiscalyear_id]), ('number', '&lt;', 16)]"/>
-                <newline/>
+                <field name="all_missions"
+                       string="or All Missions"
+                       on_change="onchange_all_missions(all_missions)"
+                />
+                <field name="period_id"
+                       domain="[('period_visible', '=', [fiscalyear_id, instance_id, all_missions])]"
+                 />
                 <group colspan="6" col="4">
                     <label string="" colspan="2"/>
                     <button special="cancel" string="Cancel" colspan="1" icon="gtk-cancel"/>

=== modified file 'bin/addons/vertical_integration/wizard/ocp_export.py'
--- bin/addons/vertical_integration/wizard/ocp_export.py	2021-05-10 10:08:17 +0000
+++ bin/addons/vertical_integration/wizard/ocp_export.py	2022-02-14 09:44:29 +0000
@@ -32,23 +32,41 @@
     _name = "ocp.export.wizard"
 
     _columns = {
-        'instance_id': fields.many2one('msf.instance', 'Top proprietary instance', required=True),
+        'instance_id': fields.many2one('msf.instance', 'Top proprietary instance'),
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal year', required=True),
         'period_id': fields.many2one('account.period', 'Period', required=True),
+        'all_missions': fields.boolean('All Missions', help="Generate the Monthly Export (only) for all missions at once"),
+        # a warning is displayed in case the DB name is not "OCP_HQ" (export done from a coordo or from a test environment),
+        # as this impacts the DB ID column
+        'warning_db_name': fields.boolean('Display a warning on database name', invisible=True, readonly=True),
     }
 
     _defaults = {
         'fiscalyear_id': lambda self, cr, uid, c: self.pool.get('account.fiscalyear').find(cr, uid, strftime('%Y-%m-%d'), context=c),
+        'all_missions': False,
+        'warning_db_name': lambda self, cr, uid, c: cr.dbname != 'OCP_HQ',
     }
 
-    def onchange_instance_id(self, cr, uid, ids, context=None):
-        '''
-        Reset the period field when another prop. instance is selected.
-        Cover the case when in HQ the user selects a period mission-closed in a coordo,
-        and then select another coordo in which the period previously selected is not mission-closed
-        '''
+    def onchange_instance_id(self, cr, uid, ids, instance_id, context=None):
+        """
+        - Resets the period field when another prop. instance is selected.
+          Covers the case when in HQ the user selects a period mission-closed in a coordo,
+          and then select another coordo in which the period previously selected is not mission-closed.
+        - Also resets the tick box "All Missions" as soon as a Prop. Instance is selected.
+        """
         res = {}
         res['value'] = {'period_id': False}
+        if instance_id:
+            res['value'].update({'all_missions': False})
+        return res
+
+    def onchange_all_missions(self, cr, uid, ids, all_missions, context=None):
+        """
+        Resets the Prop. Instance field when "All Missions" is ticked
+        """
+        res = {}
+        if all_missions:
+            res['value'] = {'instance_id': False}
         return res
 
     def button_ocp_export_to_hq(self, cr, uid, ids, context=None):
@@ -67,27 +85,40 @@
         # add parameters
         data['form'] = {}
         inst = None
+        all_missions = False
+        instance_ids = []
         period = None
-        if wizard.instance_id:
+        if wizard.all_missions:
+            all_missions = True
+            instance_ids = self.pool.get('msf.instance').search(cr, uid, [('level', '!=', 'section')], order='NO_ORDER', context=context)
+        elif wizard.instance_id:
             # Get projects below instance
             inst = wizard.instance_id
-            data['form'].update({'instance_id': inst.id, })
-            data['form'].update(
-                {'instance_ids': [inst.id] + [x.id for x in inst.child_ids]})
+            instance_ids = [inst.id] + [x.id for x in inst.child_ids]
+        data['form'].update({
+            'instance_id': inst and inst.id or None,
+            'instance_ids': instance_ids,
+            'all_missions': all_missions,
+        })
         if wizard.period_id:
             period = wizard.period_id
             data['form'].update({'period_id': period.id})
         if wizard.fiscalyear_id:
             data['form'].update({'fiscalyear_id': wizard.fiscalyear_id.id})
         # The file name is composed of:
-        # - the first 3 digits of the Prop. Instance code
+        # - the first 3 characters of the Prop. Instance code or "Allinstances"
         # - the year and month of the selected period
         # - the current datetime
         # Ex: KE1_201609_171116110306_Formatted_data_UF_to_OCP_HQ_System
-        instance_code = inst and inst.code[:3] or ''
+        if all_missions:
+            prefix = 'Allinstances'
+        elif inst:
+            prefix = inst.code[:3]
+        else:
+            prefix = ''
         selected_period = period and strftime('%Y%m', strptime(period.date_start, '%Y-%m-%d')) or ''
         current_time = time.strftime('%d%m%y%H%M%S')
-        data['target_filename'] = '%s_%s_%s_Formatted_data_UF_to_OCP_HQ_System' % (instance_code, selected_period, current_time)
+        data['target_filename'] = '%s_%s_%s_Formatted_data_UF_to_OCP_HQ_System' % (prefix, selected_period, current_time)
 
         background_id = self.pool.get('memory.background.report').create(cr, uid, {
             'file_name': data['target_filename'],