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

[jftempo]

=== modified file 'bin/addons/account/account_invoice_view.xml'
--- bin/addons/account/account_invoice_view.xml	2020-01-21 14:01:11 +0000
+++ bin/addons/account/account_invoice_view.xml	2020-02-04 10:20:45 +0000
@@ -358,6 +358,7 @@
                                                                     ('from_supply', '=', True),
                                                                     ('partner_type', 'in', ('intermission', 'section'))]}"/>
                             <field name="payment_term" widget="selection"/>
+<<<<<<< TREE
                             <field colspan="4" name="invoice_line" nolabel="1" context="{'fake': 1, 'from_inv_form': True}">
                                 <tree string="Invoice Line"
                                       colors="red:inactive_product == True or analytic_distribution_state in ('invalid', 'invalid_small_amount');blue:inactive_product == False and analytic_distribution_state in ('valid');black:inactive_product == False and analytic_distribution_state in ('none')"
@@ -397,6 +398,47 @@
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>
+=======
+                            <field colspan="4" name="invoice_line" nolabel="1" context="{'fake': 1, 'from_inv_form': True}">
+                                <tree string="Invoice Line"
+                                      colors="red:inactive_product == True or analytic_distribution_state in ('invalid');blue:inactive_product == False and analytic_distribution_state in ('valid');black:inactive_product == False and analytic_distribution_state in ('none')"
+                                      editable="both">
+                                    <field name="invoice_type" invisible="1"/>
+                                    <field name="line_synced" invisible="1"/>
+                                    <field name="from_supply" invisible="1"/>
+                                    <field name="partner_type" invisible="1"/>
+                                    <field name="line_number" displayon="noteditable"/>
+                                    <field name="is_corrected" invisible="1"/>
+                                    <button name="button_open_analytic_lines" string="Have been corrected" type="object"
+                                            icon="terp-mail-" attrs="{'invisible': [('is_corrected', '=', False)]}"/>
+                                    <field name="name"/>
+                                    <field name="inactive_product" invisible="1"/>
+                                    <field name="account_id"
+                                           domain="[('journal_id', '=', parent.journal_id), ('restricted_area', '=', 'invoice_lines')]"
+                                           context="{'type': parent.type, 'journal_type': parent.journal_type}"
+                                    />
+                                    <button name="button_analytic_distribution" string="Analytical Distribution" type="object"
+                                            icon="terp-stock_symbol-selection" context="context"
+                                            attrs="{'invisible': [('is_allocatable', '=', False)]}"/>
+                                    <field name="analytic_distribution_state_recap" readonly="1"/>
+                                    <field name="analytic_distribution_state" invisible="1"/>
+                                    <field name="is_allocatable" invisible="1"/>
+                                    <field name="quantity"
+                                           attrs="{'readonly': ['|',
+                                                                '&amp;', ('invoice_type', '=', 'in_invoice'), '|', ('line_synced', '=', True), ('from_supply', '=', True),
+                                                                '&amp;', '&amp;', ('invoice_type', '=', 'out_invoice'), ('from_supply', '=', True), ('partner_type', 'in', ('intermission', 'section'))]}"/>
+                                    <field name="product_id" invisible="1"/>
+                                    <field name="uos_id" string="UoM"
+                                           on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"
+                                           attrs="{'readonly': ['|',
+                                                                '&amp;', ('invoice_type', '=', 'in_invoice'), '|', ('line_synced', '=', True), ('from_supply', '=', True),
+                                                                '&amp;', '&amp;', ('invoice_type', '=', 'out_invoice'), ('from_supply', '=', True), ('partner_type', 'in', ('intermission', 'section'))]}"/>
+                                    <field name="price_unit"
+                                           attrs="{'readonly': [('invoice_type', '=', 'in_invoice'), ('line_synced', '=', True)]}"/>
+                                    <field name="price_subtotal"/>
+                                </tree>
+                            </field>
+>>>>>>> MERGE-SOURCE
                             <group col="1" colspan="2">
                                 <field name="tax_line" nolabel="1">
                                     <tree editable="bottom" string="Taxes">
 
=== modified file 'bin/addons/account_corrections/wizard/analytic_distribution_wizard.py'
=== modified file 'bin/addons/account_override/account_invoice_view.xml'
--- bin/addons/account_override/account_invoice_view.xml	2020-01-21 14:01:11 +0000
+++ bin/addons/account_override/account_invoice_view.xml	2020-02-04 10:20:45 +0000
@@ -390,9 +390,14 @@
                             <label string="" colspan="2"/>
                             <field name="check_total" required="2"/>
                             <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list">
+<<<<<<< TREE
                                 <tree string="Donation Lines" editable="both"
                                       colors="red:analytic_distribution_state in ('invalid', 'invalid_small_amount') or inactive_product == True;black:analytic_distribution_state in ('none','valid') and inactive_product == False">
                                     <field name="line_number" readonly="1" displayon="noteditable"/>
+=======
+                                <tree string="Donation Lines" editable="both">
+                                    <field name="line_number" readonly="1" displayon="noteditable"/>
+>>>>>>> MERGE-SOURCE
                                     <field name="is_corrected" invisible="1"/>
                                     <button name="button_open_analytic_lines" string="Have been corrected" type="object" icon="terp-mail-" attrs="{'invisible': [('is_corrected', '=', False)]}"/>
                                     <field name="product_id"
@@ -533,12 +538,21 @@
                             </group>
                             <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" context="{'is_intermission': True, 'from_inv_form': True}">
                                 <tree string="Intermission Voucher Lines"
+<<<<<<< TREE
                                       editable="both"
                                       colors="red:analytic_distribution_state in ('invalid', 'invalid_small_amount') or inactive_product == True;black:inactive_product == False and analytic_distribution_state in ('none', 'valid')">
                                     <field name="from_supply" invisible="1"/>
                                     <field name="line_synced" invisible="1"/>
                                     <field name="invoice_type" invisible="1"/>
                                     <field name="line_number" displayon="noteditable"/>
+=======
+                                      editable="both"
+                                      colors="red:analytic_distribution_state == 'invalid' or inactive_product == True;black:inactive_product == False and analytic_distribution_state in ('none', 'valid')">
+                                    <field name="from_supply" invisible="1"/>
+                                    <field name="line_synced" invisible="1"/>
+                                    <field name="invoice_type" invisible="1"/>
+                                    <field name="line_number" displayon="noteditable"/>
+>>>>>>> MERGE-SOURCE
                                     <field name="is_corrected" invisible="1"/>
                                     <button name="button_open_analytic_lines" string="Have been corrected" type="object" icon="terp-mail-" attrs="{'invisible': [('is_corrected', '=', False)]}"/>
                                     <field name="name"/>
 
=== modified file 'bin/addons/account_override/period.py'
--- bin/addons/account_override/period.py	2018-11-08 09:39:41 +0000
+++ bin/addons/account_override/period.py	2020-02-04 10:20:45 +0000
@@ -103,6 +103,22 @@
         period_id = period_id and get_next_period_id(self, cr, uid, period_id, context=context)
     return period_id or False
 
+
+def get_previous_period_id(self, cr, uid, period_id, context=None):
+    """
+    Returns the id of the previous regular period if it exists (no special period), else returns False.
+    For the special periods, its returns the related regular period (Period 13 to 16 N ==> Dec. N).
+    """
+    if context is None:
+        context = {}
+    period = self.browse(cr, uid, period_id, fields_to_fetch=['date_start'], context=context)
+    previous_period_ids = self.search(cr, uid, [('date_start', '<=', period.date_start),
+                                                ('special', '=', False),
+                                                ('id', '!=', period_id)],
+                                      order='date_start DESC', limit=1, context=context)
+    return previous_period_ids and previous_period_ids[0] or False
+
+
 def _get_middle_years(self, cr, uid, fy1, fy2, context=None):
     """
     Returns the list of the FY ids included between both Fiscal Years in parameter.
@@ -189,6 +205,9 @@
     def get_next_period_id_at_index(self, cr, uid, period_id, index, context=None):
         return get_next_period_id_at_index(self, cr, uid, period_id, index, context)
 
+    def get_previous_period_id(self, cr, uid, period_id, context=None):
+        return get_previous_period_id(self, cr, uid, period_id, context)
+
     def get_period_range(self, cr, uid, period_from_id, period_to_id, context=None):
         return get_period_range(self, cr, uid, period_from_id, period_to_id, context=context)
 
 
=== modified file 'bin/addons/analytic_distribution/analytic_distribution_wizard_view.xml'
=== modified file 'bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py'
=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2020-01-28 10:17:39 +0000
+++ bin/addons/msf_profile/data/patches.xml	2020-02-04 10:20:45 +0000
@@ -477,6 +477,7 @@
             <field name="method">us_6768_trigger_FP_sync</field>
         </record>
 
+<<<<<<< TREE
         <!-- UF15.1 -->
         <record id="us_6930_gen_unreconcile" model="patch.scripts">
             <field name="method">us_6930_gen_unreconcile</field>
@@ -496,5 +497,25 @@
             <field name="method">us_6692_new_od_journals</field>
         </record>
 
+=======
+        <!-- UF15.1 -->
+        <record id="us_6930_gen_unreconcile" model="patch.scripts">
+            <field name="method">us_6930_gen_unreconcile</field>
+        </record>
+
+        <record id="us_6905_manage_bned_switch" model="patch.scripts">
+            <field name="method">us_6905_manage_bned_switch</field>
+        </record>
+
+        <record id="rec_entries_uf14_1_uf15" model="patch.scripts">
+            <field name="method">rec_entries_uf14_1_uf15</field>
+        </record>
+
+        <!-- UF16.0 -->
+        <record id="us_6692_new_od_journals" model="patch.scripts">
+            <field name="method">us_6692_new_od_journals</field>
+        </record>
+
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-01-28 11:28:56 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-02-04 10:20:45 +0000
@@ -106598,6 +106598,7 @@
 msgid "Funding Pool not found."
 msgstr "Funding Pool non trouvé."
 
+<<<<<<< TREE
 #. modules: account_override, account, register_accounting, msf_instance, finance
 #: selection:account.analytic.journal,type:0
 #: selection:account.journal,type:0
@@ -106732,3 +106733,106 @@
 #: view:analytic.distribution.wizard:0
 msgid "Make sure that there is only one Analytic Distribution line for the entries having a booking amount inferior or equal to 1."
 msgstr "Assurez-vous de n'avoir qu'une seule ligne de Distribution Analytique pour les écritures ayant un montant d'enregistrement inférieur ou égal à 1."
+=======
+#. modules: account_override, account, register_accounting, msf_instance, finance
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
+#: selection:account.analytic.line,journal_type:0
+#: selection:account.move,journal_type:0
+#: selection:account.move.line,journal_type:0
+#: selection:cash.request.liquidity,type:0
+#: selection:cash.request.liquidity.bank,type:0
+#: selection:cash.request.liquidity.cash,type:0
+#: selection:cash.request.liquidity.cheque,type:0
+#: selection:account.analytic.journal.fake,type:0
+#: selection:account.journal.fake,type:0
+#: selection:wizard.register.opening.confirmation,register_type:0
+msgid "Correction Auto"
+msgstr "Correction Auto"
+
+#. modules: account_override, account, register_accounting, msf_instance, finance
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
+#: selection:account.analytic.line,journal_type:0
+#: selection:account.move,journal_type:0
+#: selection:account.move.line,journal_type:0
+#: selection:cash.request.liquidity,type:0
+#: selection:cash.request.liquidity.bank,type:0
+#: selection:cash.request.liquidity.cash,type:0
+#: selection:cash.request.liquidity.cheque,type:0
+#: selection:account.analytic.journal.fake,type:0
+#: selection:account.journal.fake,type:0
+#: selection:wizard.register.opening.confirmation,register_type:0
+msgid "Correction Manual"
+msgstr "Correction Manuelle"
+
+#. modules: account_override, account, register_accounting, msf_instance, finance
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
+#: selection:account.analytic.line,journal_type:0
+#: selection:account.move,journal_type:0
+#: selection:account.move.line,journal_type:0
+#: selection:cash.request.liquidity,type:0
+#: selection:cash.request.liquidity.bank,type:0
+#: selection:cash.request.liquidity.cash,type:0
+#: selection:cash.request.liquidity.cheque,type:0
+#: selection:account.analytic.journal.fake,type:0
+#: selection:account.journal.fake,type:0
+#: selection:wizard.register.opening.confirmation,register_type:0
+msgid "Correction HQ"
+msgstr "Correction HQ"
+
+#. module: account_journal
+#: constraint:account.journal:0
+msgid "The analytic journal selected must have the same type and prop. instance as this journal."
+msgstr "Le journal analytique sélectionné doit avoir le même type et la même instance prop. que ce journal."
+
+#. module: account_journal
+#: constraint:account.journal:0
+msgid "A journal with this type already exists for this instance."
+msgstr "Un journal de ce type existe déjà pour cette instance."
+
+#. module: account
+#: constraint:account.analytic.journal:0
+msgid "An analytic journal with this type already exists for this instance."
+msgstr "Un journal analytique de ce type existe déjà pour cette instance."
+
+#. module: account_journal
+#: constraint:account.journal:0
+msgid "The prop. instance of the \"Correction HQ\" journal must be a coordination."
+msgstr "L'instance prop. du journal de type \"Correction HQ\" doit être une coordination."
+
+#. module: account
+#: constraint:account.analytic.journal:0
+msgid "The prop. instance of the \"Correction HQ\" analytic journal must be a coordination."
+msgstr "L'instance prop. du journal analytique de type \"Correction HQ\" doit être une coordination."
+
+#. module: account_override
+#: code:addons/account_override/account.py:1198
+#, python-format
+msgid "The journal %s is forbidden in manual entries."
+msgstr "Le journal %s est interdit dans les écritures manuelles."
+
+#. modules: account_hq_entries, account_corrections, analytic_distribution
+#: code:addons/account_hq_entries/wizard/hq_entries_validation.py:269
+#: code:addons/account_hq_entries/wizard/hq_entries_validation.py:568
+#: code:addons/account_corrections/account_move_line.py:731
+#: code:addons/analytic_distribution/analytic_line.py:354
+#, python-format
+msgid "No \"correction HQ\" journal found!"
+msgstr "Aucun journal de type \"correction HQ\" n'a été trouvé !"
+
+#. modules: account_hq_entries, analytic_distribution
+#: code:addons/account_hq_entries/wizard/hq_entries_validation.py:350
+#: code:addons/account_hq_entries/wizard/hq_entries_validation.py:531
+#: code:addons/analytic_distribution/analytic_line.py:359
+#, python-format
+msgid "No \"correction HQ\" analytic journal found!"
+msgstr "Aucun journal analytique de type \"correction HQ\" n'a été trouvé !"
+
+#. module: vertical_integration
+#: model:ir.actions.act_window,name:vertical_integration.action_hq_export_ocb_old
+#: model:ir.ui.menu,name:vertical_integration.menu_action_hq_export_ocb_old
+msgid "Export to HQ system (OCB) Access Interface"
+msgstr "Interface d'accès de l'Export vers le système HQ (OCB)"
+>>>>>>> MERGE-SOURCE
 
=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2020-01-28 10:17:39 +0000
+++ bin/addons/msf_profile/msf_profile.py	2020-02-04 10:20:45 +0000
@@ -52,154 +52,304 @@
         'model': lambda *a: 'patch.scripts',
     }
 
-    # UF16.0
-    def us_6692_new_od_journals(self, cr, uid, *a, **b):
-        """
-        1. Change the type of the existing correction journals (except OD) to "Correction Manual" so they remain usable
-
-        2. Create:
-        - ODM journals in all existing instances
-        - ODHQ journals in existing coordo instances
-
-        Notes:
-        - creations are done in Python as the objects created must sync normally
-        - none of these journals already exists in prod. DB.
-        """
-        user_obj = self.pool.get('res.users')
-        analytic_journal_obj = self.pool.get('account.analytic.journal')
-        journal_obj = self.pool.get('account.journal')
-        current_instance = user_obj.browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
-        if current_instance:  # existing instances only
-            # existing correction journals
-            cr.execute("""
-                       UPDATE account_analytic_journal
-                       SET type = 'correction_manual'
-                       WHERE type = 'correction'
-                       AND code != 'OD';
-                       """)
-            self._logger.warn('%s correction analytic journal(s) updated.' % (cr.rowcount,))
-            cr.execute("""
-                       UPDATE account_journal
-                       SET type = 'correction_manual'
-                       WHERE type = 'correction'
-                       AND code != 'OD';
-                       """)
-            self._logger.warn('%s correction journal(s) updated.' % (cr.rowcount,))
-            # ODM analytic journal
-            odm_analytic_vals = {
-                # Prop. Instance: by default the current one is used
-                'code': 'ODM',
-                'name': 'Correction manual',
-                'type': 'correction_manual',
-            }
-            odm_analytic_journal_id = analytic_journal_obj.create(cr, uid, odm_analytic_vals)
-            # ODM G/L journal
-            odm_vals = {
-                # Prop. Instance: by default the current one is used
-                'code': 'ODM',
-                'name': 'Correction manual',
-                'type': 'correction_manual',
-                'analytic_journal_id': odm_analytic_journal_id,
-            }
-            journal_obj.create(cr, uid, odm_vals)
-            if current_instance.level == 'coordo':
-                # ODHQ analytic journal
-                odhq_analytic_vals = {
-                    # Prop. Instance: by default the current one is used
-                    'code': 'ODHQ',
-                    'name': 'Correction automatic HQ',
-                    'type': 'correction_hq',
-                }
-                odhq_analytic_journal_id = analytic_journal_obj.create(cr, uid, odhq_analytic_vals)
-                # ODHQ G/L journal
-                odhq_vals = {
-                    # Prop. Instance: by default the current one is used
-                    'code': 'ODHQ',
-                    'name': 'Correction automatic HQ',
-                    'type': 'correction_hq',
-                    'analytic_journal_id': odhq_analytic_journal_id,
-                }
-                journal_obj.create(cr, uid, odhq_vals)
-        return True
-
-    # UF15.2
-    def rec_entries_uf14_1_uf15(self, cr, uid, *a, **b):
-        current_instance = self.pool.get('res.users').browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
-        if current_instance:
-            trigger_obj = self.pool.get('sync.trigger.something.target')
-            cr.execute('''
-                select sdref, values, source from sync_client_update_received where model='account.move.reconcile' and execution_date > ( select applied from sync_client_version where name='UF15.0') and fields not like '%action_date%'
-            ''')
-
-            for update in cr.fetchall():
-                rec_number = False
-                try:
-                    rec_number = eval(update[1])
-                except:
-                    self._logger.warn('Unable to parse values, sdref: %s' % update[0])
-
-                if rec_number:
-                    trigger_obj.create(cr, uid, {'name': 'trigger_rec', 'destination': update[2] , 'args': rec_number[0], 'local': True})
-
-        return True
-
-    # UF15.1
-    def us_6930_gen_unreconcile(self, cr, uid, *a, **b):
-        # generate updates to delete reconcile done after UF15.0
-        current_instance = self.pool.get('res.users').browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
-        if current_instance:
-            unrec_obj = self.pool.get('account.move.unreconcile')
-            cr.execute('''
-                select d.name from ir_model_data d
-                left join
-                    account_move_reconcile rec on d.model='account.move.reconcile' and d.res_id = rec.id
-                where d.model='account.move.reconcile' and rec.id is null and touched like '%action_date%'
-            ''')
-            for sdref_rec in cr.fetchall():
-                unrec_obj.create(cr, uid, {'reconcile_sdref': sdref_rec[0]})
-        return True
-
-    def us_6905_manage_bned_switch(self, cr, uid, *a, **b):
-        fake_ed = '2999-12-31'
-        fake_bn = 'TO-BE-REPLACED'
-
-        lot_obj = self.pool.get('stock.production.lot')
-
-        # old move with BN or ED if product is no_bn no_ed
-        # set no on bn or en moves
-        cr.execute('''
-            update stock_move set prodlot_id=NULL, expired_date=NULL, hidden_batch_management_mandatory='f', hidden_perishable_mandatory='f', old_lot_info=(select name||'#'||life_date from stock_production_lot where id=stock_move.prodlot_id)||E'\n'||COALESCE(old_lot_info, '') where id in
-                (select m.id from stock_move m, product_product p where p.id = m.product_id and p.perishable='f' and p.batch_management='f' and m.prodlot_id is not null and m.state in ('done', 'cancel'))
-        ''')
-        self._logger.warn('%d done/cancel moves set from ED or BN to no' % (cr.rowcount, ))
-
-
-        # set bn on no moves
-        cr.execute('''select distinct(product_id) from stock_move m, product_product p where p.id = m.product_id and p.perishable='t' and p.batch_management='t' and m.prodlot_id is null and m.state = 'done' and m.product_qty!=0 and m.location_dest_id != m.location_id''')
-        self._logger.warn('%d done/cancel moves set from NO to BN' % (cr.rowcount, ))
-        for prod_id in cr.fetchall():
-            batch_id = lot_obj._get_or_create_lot(cr, uid, name=fake_bn, expiry_date=fake_ed, product_id=prod_id)
-            cr.execute("update stock_move set hidden_batch_management_mandatory='t', hidden_perishable_mandatory='f', prodlot_id=%s, expired_date=%s, old_lot_info='US-6905 BN set'||E'\n'||COALESCE(old_lot_info, '') where product_id=%s and prodlot_id is null and state = 'done' and product_qty!=0 and location_dest_id != location_id", (batch_id, fake_ed, prod_id))
-
-        # set ed on no moves
-        cr.execute('''select distinct(product_id) from stock_move m, product_product p where p.id = m.product_id and p.perishable='t' and p.batch_management='f' and m.prodlot_id is null and m.state = 'done' and m.product_qty!=0 and m.location_dest_id != m.location_id''')
-        self._logger.warn('%d done/cancel moves set from NO to ED' % (cr.rowcount, ))
-        for prod_id in cr.fetchall():
-            batch_id = lot_obj._get_or_create_lot(cr, uid, name=False, expiry_date=fake_ed, product_id=prod_id)
-            cr.execute("update stock_move set hidden_batch_management_mandatory='f', hidden_perishable_mandatory='t', prodlot_id=%s, expired_date=%s, old_lot_info='US-6905 EN set'||E'\n'||COALESCE(old_lot_info, '') where product_id=%s and prodlot_id is null and state = 'done' and product_qty!=0 and location_dest_id != location_id", (batch_id, fake_ed, prod_id))
-
-        # set ed on bn moves
-        cr.execute("update stock_production_lot set name='MSFBN/'||name, type='internal' where id in (select lot.id from stock_production_lot lot, product_product p where p.id = lot.product_id and type='standard' and p.perishable='t' and p.batch_management='f') returning name")
-        for lot in cr.fetchall():
-            self._logger.warn('BN %s from standard to internal' % (lot[0], ))
-
-        # set bn on ed moves
-        cr.execute("update stock_production_lot set type='standard', name='S'||name where id in (select lot.id from stock_production_lot lot, product_product p where p.id = lot.product_id and type='internal' and p.perishable='t' and p.batch_management='t') returning name")
-        for lot in cr.fetchall():
-            self._logger.warn('BN %s from internal to standard' % (lot[0], ))
-
-        return True
-
+<<<<<<< TREE
+    # UF16.0
+    def us_6692_new_od_journals(self, cr, uid, *a, **b):
+        """
+        1. Change the type of the existing correction journals (except OD) to "Correction Manual" so they remain usable
+
+        2. Create:
+        - ODM journals in all existing instances
+        - ODHQ journals in existing coordo instances
+
+        Notes:
+        - creations are done in Python as the objects created must sync normally
+        - none of these journals already exists in prod. DB.
+        """
+        user_obj = self.pool.get('res.users')
+        analytic_journal_obj = self.pool.get('account.analytic.journal')
+        journal_obj = self.pool.get('account.journal')
+        current_instance = user_obj.browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
+        if current_instance:  # existing instances only
+            # existing correction journals
+            cr.execute("""
+                       UPDATE account_analytic_journal
+                       SET type = 'correction_manual'
+                       WHERE type = 'correction'
+                       AND code != 'OD';
+                       """)
+            self._logger.warn('%s correction analytic journal(s) updated.' % (cr.rowcount,))
+            cr.execute("""
+                       UPDATE account_journal
+                       SET type = 'correction_manual'
+                       WHERE type = 'correction'
+                       AND code != 'OD';
+                       """)
+            self._logger.warn('%s correction journal(s) updated.' % (cr.rowcount,))
+            # ODM analytic journal
+            odm_analytic_vals = {
+                # Prop. Instance: by default the current one is used
+                'code': 'ODM',
+                'name': 'Correction manual',
+                'type': 'correction_manual',
+            }
+            odm_analytic_journal_id = analytic_journal_obj.create(cr, uid, odm_analytic_vals)
+            # ODM G/L journal
+            odm_vals = {
+                # Prop. Instance: by default the current one is used
+                'code': 'ODM',
+                'name': 'Correction manual',
+                'type': 'correction_manual',
+                'analytic_journal_id': odm_analytic_journal_id,
+            }
+            journal_obj.create(cr, uid, odm_vals)
+            if current_instance.level == 'coordo':
+                # ODHQ analytic journal
+                odhq_analytic_vals = {
+                    # Prop. Instance: by default the current one is used
+                    'code': 'ODHQ',
+                    'name': 'Correction automatic HQ',
+                    'type': 'correction_hq',
+                }
+                odhq_analytic_journal_id = analytic_journal_obj.create(cr, uid, odhq_analytic_vals)
+                # ODHQ G/L journal
+                odhq_vals = {
+                    # Prop. Instance: by default the current one is used
+                    'code': 'ODHQ',
+                    'name': 'Correction automatic HQ',
+                    'type': 'correction_hq',
+                    'analytic_journal_id': odhq_analytic_journal_id,
+                }
+                journal_obj.create(cr, uid, odhq_vals)
+        return True
+
+    # UF15.2
+    def rec_entries_uf14_1_uf15(self, cr, uid, *a, **b):
+        current_instance = self.pool.get('res.users').browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
+        if current_instance:
+            trigger_obj = self.pool.get('sync.trigger.something.target')
+            cr.execute('''
+                select sdref, values, source from sync_client_update_received where model='account.move.reconcile' and execution_date > ( select applied from sync_client_version where name='UF15.0') and fields not like '%action_date%'
+            ''')
+
+            for update in cr.fetchall():
+                rec_number = False
+                try:
+                    rec_number = eval(update[1])
+                except:
+                    self._logger.warn('Unable to parse values, sdref: %s' % update[0])
+
+                if rec_number:
+                    trigger_obj.create(cr, uid, {'name': 'trigger_rec', 'destination': update[2] , 'args': rec_number[0], 'local': True})
+
+        return True
+
+    # UF15.1
+    def us_6930_gen_unreconcile(self, cr, uid, *a, **b):
+        # generate updates to delete reconcile done after UF15.0
+        current_instance = self.pool.get('res.users').browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
+        if current_instance:
+            unrec_obj = self.pool.get('account.move.unreconcile')
+            cr.execute('''
+                select d.name from ir_model_data d
+                left join
+                    account_move_reconcile rec on d.model='account.move.reconcile' and d.res_id = rec.id
+                where d.model='account.move.reconcile' and rec.id is null and touched like '%action_date%'
+            ''')
+            for sdref_rec in cr.fetchall():
+                unrec_obj.create(cr, uid, {'reconcile_sdref': sdref_rec[0]})
+        return True
+
+    def us_6905_manage_bned_switch(self, cr, uid, *a, **b):
+        fake_ed = '2999-12-31'
+        fake_bn = 'TO-BE-REPLACED'
+
+        lot_obj = self.pool.get('stock.production.lot')
+
+        # old move with BN or ED if product is no_bn no_ed
+        # set no on bn or en moves
+        cr.execute('''
+            update stock_move set prodlot_id=NULL, expired_date=NULL, hidden_batch_management_mandatory='f', hidden_perishable_mandatory='f', old_lot_info=(select name||'#'||life_date from stock_production_lot where id=stock_move.prodlot_id)||E'\n'||COALESCE(old_lot_info, '') where id in
+                (select m.id from stock_move m, product_product p where p.id = m.product_id and p.perishable='f' and p.batch_management='f' and m.prodlot_id is not null and m.state in ('done', 'cancel'))
+        ''')
+        self._logger.warn('%d done/cancel moves set from ED or BN to no' % (cr.rowcount, ))
+
+
+        # set bn on no moves
+        cr.execute('''select distinct(product_id) from stock_move m, product_product p where p.id = m.product_id and p.perishable='t' and p.batch_management='t' and m.prodlot_id is null and m.state = 'done' and m.product_qty!=0 and m.location_dest_id != m.location_id''')
+        self._logger.warn('%d done/cancel moves set from NO to BN' % (cr.rowcount, ))
+        for prod_id in cr.fetchall():
+            batch_id = lot_obj._get_or_create_lot(cr, uid, name=fake_bn, expiry_date=fake_ed, product_id=prod_id)
+            cr.execute("update stock_move set hidden_batch_management_mandatory='t', hidden_perishable_mandatory='f', prodlot_id=%s, expired_date=%s, old_lot_info='US-6905 BN set'||E'\n'||COALESCE(old_lot_info, '') where product_id=%s and prodlot_id is null and state = 'done' and product_qty!=0 and location_dest_id != location_id", (batch_id, fake_ed, prod_id))
+
+        # set ed on no moves
+        cr.execute('''select distinct(product_id) from stock_move m, product_product p where p.id = m.product_id and p.perishable='t' and p.batch_management='f' and m.prodlot_id is null and m.state = 'done' and m.product_qty!=0 and m.location_dest_id != m.location_id''')
+        self._logger.warn('%d done/cancel moves set from NO to ED' % (cr.rowcount, ))
+        for prod_id in cr.fetchall():
+            batch_id = lot_obj._get_or_create_lot(cr, uid, name=False, expiry_date=fake_ed, product_id=prod_id)
+            cr.execute("update stock_move set hidden_batch_management_mandatory='f', hidden_perishable_mandatory='t', prodlot_id=%s, expired_date=%s, old_lot_info='US-6905 EN set'||E'\n'||COALESCE(old_lot_info, '') where product_id=%s and prodlot_id is null and state = 'done' and product_qty!=0 and location_dest_id != location_id", (batch_id, fake_ed, prod_id))
+
+        # set ed on bn moves
+        cr.execute("update stock_production_lot set name='MSFBN/'||name, type='internal' where id in (select lot.id from stock_production_lot lot, product_product p where p.id = lot.product_id and type='standard' and p.perishable='t' and p.batch_management='f') returning name")
+        for lot in cr.fetchall():
+            self._logger.warn('BN %s from standard to internal' % (lot[0], ))
+
+        # set bn on ed moves
+        cr.execute("update stock_production_lot set type='standard', name='S'||name where id in (select lot.id from stock_production_lot lot, product_product p where p.id = lot.product_id and type='internal' and p.perishable='t' and p.batch_management='t') returning name")
+        for lot in cr.fetchall():
+            self._logger.warn('BN %s from internal to standard' % (lot[0], ))
+
+        return True
+
+=======
+    # UF16.0
+    def us_6692_new_od_journals(self, cr, uid, *a, **b):
+        """
+        1. Change the type of the existing correction journals (except OD) to "Correction Manual" so they remain usable
+
+        2. Create:
+        - ODM journals in all existing instances
+        - ODHQ journals in existing coordo instances
+
+        Notes:
+        - creations are done in Python as the objects created must sync normally
+        - none of these journals already exists in prod. DB.
+        """
+        user_obj = self.pool.get('res.users')
+        analytic_journal_obj = self.pool.get('account.analytic.journal')
+        journal_obj = self.pool.get('account.journal')
+        current_instance = user_obj.browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
+        if current_instance:  # existing instances only
+            # existing correction journals
+            cr.execute("""
+                       UPDATE account_analytic_journal
+                       SET type = 'correction_manual'
+                       WHERE type = 'correction'
+                       AND code != 'OD';              
+                       """)
+            self._logger.warn('%s correction analytic journal(s) updated.' % (cr.rowcount,))
+            cr.execute("""
+                       UPDATE account_journal
+                       SET type = 'correction_manual'
+                       WHERE type = 'correction'
+                       AND code != 'OD';              
+                       """)
+            self._logger.warn('%s correction journal(s) updated.' % (cr.rowcount,))
+            # ODM analytic journal
+            odm_analytic_vals = {
+                # Prop. Instance: by default the current one is used
+                'code': 'ODM',
+                'name': 'Correction manual',
+                'type': 'correction_manual',
+            }
+            odm_analytic_journal_id = analytic_journal_obj.create(cr, uid, odm_analytic_vals)
+            # ODM G/L journal
+            odm_vals = {
+                # Prop. Instance: by default the current one is used
+                'code': 'ODM',
+                'name': 'Correction manual',
+                'type': 'correction_manual',
+                'analytic_journal_id': odm_analytic_journal_id,
+            }
+            journal_obj.create(cr, uid, odm_vals)
+            if current_instance.level == 'coordo':
+                # ODHQ analytic journal
+                odhq_analytic_vals = {
+                    # Prop. Instance: by default the current one is used
+                    'code': 'ODHQ',
+                    'name': 'Correction automatic HQ',
+                    'type': 'correction_hq',
+                }
+                odhq_analytic_journal_id = analytic_journal_obj.create(cr, uid, odhq_analytic_vals)
+                # ODHQ G/L journal
+                odhq_vals = {
+                    # Prop. Instance: by default the current one is used
+                    'code': 'ODHQ',
+                    'name': 'Correction automatic HQ',
+                    'type': 'correction_hq',
+                    'analytic_journal_id': odhq_analytic_journal_id,
+                }
+                journal_obj.create(cr, uid, odhq_vals)
+        return True
+
+    # UF15.2
+    def rec_entries_uf14_1_uf15(self, cr, uid, *a, **b):
+        current_instance = self.pool.get('res.users').browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
+        if current_instance:
+            trigger_obj = self.pool.get('sync.trigger.something.target')
+            cr.execute('''
+                select sdref, values, source from sync_client_update_received where model='account.move.reconcile' and execution_date > ( select applied from sync_client_version where name='UF15.0') and fields not like '%action_date%'
+            ''')
+
+            for update in cr.fetchall():
+                rec_number = False
+                try:
+                    rec_number = eval(update[1])
+                except:
+                    self._logger.warn('Unable to parse values, sdref: %s' % update[0])
+
+                if rec_number:
+                    trigger_obj.create(cr, uid, {'name': 'trigger_rec', 'destination': update[2] , 'args': rec_number[0], 'local': True})
+
+        return True
+
+    # UF15.1
+    def us_6930_gen_unreconcile(self, cr, uid, *a, **b):
+        # generate updates to delete reconcile done after UF15.0
+        current_instance = self.pool.get('res.users').browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
+        if current_instance:
+            unrec_obj = self.pool.get('account.move.unreconcile')
+            cr.execute('''
+                select d.name from ir_model_data d
+                left join
+                    account_move_reconcile rec on d.model='account.move.reconcile' and d.res_id = rec.id
+                where d.model='account.move.reconcile' and rec.id is null and touched like '%action_date%'
+            ''')
+            for sdref_rec in cr.fetchall():
+                unrec_obj.create(cr, uid, {'reconcile_sdref': sdref_rec[0]})
+        return True
+
+    def us_6905_manage_bned_switch(self, cr, uid, *a, **b):
+        fake_ed = '2999-12-31'
+        fake_bn = 'TO-BE-REPLACED'
+
+        lot_obj = self.pool.get('stock.production.lot')
+
+        # old move with BN or ED if product is no_bn no_ed
+        # set no on bn or en moves
+        cr.execute('''
+            update stock_move set prodlot_id=NULL, expired_date=NULL, hidden_batch_management_mandatory='f', hidden_perishable_mandatory='f', old_lot_info=(select name||'#'||life_date from stock_production_lot where id=stock_move.prodlot_id)||E'\n'||COALESCE(old_lot_info, '') where id in
+                (select m.id from stock_move m, product_product p where p.id = m.product_id and p.perishable='f' and p.batch_management='f' and m.prodlot_id is not null and m.state in ('done', 'cancel'))
+        ''')
+        self._logger.warn('%d done/cancel moves set from ED or BN to no' % (cr.rowcount, ))
+
+
+        # set bn on no moves
+        cr.execute('''select distinct(product_id) from stock_move m, product_product p where p.id = m.product_id and p.perishable='t' and p.batch_management='t' and m.prodlot_id is null and m.state = 'done' and m.product_qty!=0 and m.location_dest_id != m.location_id''')
+        self._logger.warn('%d done/cancel moves set from NO to BN' % (cr.rowcount, ))
+        for prod_id in cr.fetchall():
+            batch_id = lot_obj._get_or_create_lot(cr, uid, name=fake_bn, expiry_date=fake_ed, product_id=prod_id)
+            cr.execute("update stock_move set hidden_batch_management_mandatory='t', hidden_perishable_mandatory='f', prodlot_id=%s, expired_date=%s, old_lot_info='US-6905 BN set'||E'\n'||COALESCE(old_lot_info, '') where product_id=%s and prodlot_id is null and state = 'done' and product_qty!=0 and location_dest_id != location_id", (batch_id, fake_ed, prod_id))
+
+        # set ed on no moves
+        cr.execute('''select distinct(product_id) from stock_move m, product_product p where p.id = m.product_id and p.perishable='t' and p.batch_management='f' and m.prodlot_id is null and m.state = 'done' and m.product_qty!=0 and m.location_dest_id != m.location_id''')
+        self._logger.warn('%d done/cancel moves set from NO to ED' % (cr.rowcount, ))
+        for prod_id in cr.fetchall():
+            batch_id = lot_obj._get_or_create_lot(cr, uid, name=False, expiry_date=fake_ed, product_id=prod_id)
+            cr.execute("update stock_move set hidden_batch_management_mandatory='f', hidden_perishable_mandatory='t', prodlot_id=%s, expired_date=%s, old_lot_info='US-6905 EN set'||E'\n'||COALESCE(old_lot_info, '') where product_id=%s and prodlot_id is null and state = 'done' and product_qty!=0 and location_dest_id != location_id", (batch_id, fake_ed, prod_id))
+
+        # set ed on bn moves
+        cr.execute("update stock_production_lot set name='MSFBN/'||name, type='internal' where id in (select lot.id from stock_production_lot lot, product_product p where p.id = lot.product_id and type='standard' and p.perishable='t' and p.batch_management='f') returning name")
+        for lot in cr.fetchall():
+            self._logger.warn('BN %s from standard to internal' % (lot[0], ))
+
+        # set bn on ed moves
+        cr.execute("update stock_production_lot set type='standard', name='S'||name where id in (select lot.id from stock_production_lot lot, product_product p where p.id = lot.product_id and type='internal' and p.perishable='t' and p.batch_management='t') returning name")
+        for lot in cr.fetchall():
+            self._logger.warn('BN %s from internal to standard' % (lot[0], ))
+        return True
+
+>>>>>>> MERGE-SOURCE
     # UF15.0
     def us_6768_trigger_FP_sync(self, cr, uid, *a, **b):
         """
 
=== modified file 'bin/addons/stock/physical_inventory.py'
=== modified file 'bin/addons/stock/wizard/physical_inventory_generate_counting_sheet.py'
=== modified file 'bin/addons/vertical_integration/report/hq_report_ocb.py'
--- bin/addons/vertical_integration/report/hq_report_ocb.py	2019-12-13 15:12:51 +0000
+++ bin/addons/vertical_integration/report/hq_report_ocb.py	2020-02-04 10:20:45 +0000
@@ -397,6 +397,8 @@
             context = {}
         # Prepare some values
         pool = pooler.get_pool(cr.dbname)
+        mi_obj = pool.get('msf.instance')
+        period_obj = pool.get('account.period')
         excluded_journal_types = ['hq', 'migration']  # journal types that should not be used to take lines
         # Fetch data from wizard
         if not data.get('form', False):
@@ -408,10 +410,12 @@
         instance_id = form.get('instance_id', False)
         if not fy_id or not period_id or not instance_ids or not instance_id:
             raise osv.except_osv(_('Warning'), _('Some info are missing. Either fiscalyear or period or instance.'))
+        instance_lvl = mi_obj.browse(cr, uid, instance_id, fields_to_fetch=['level'], context=context).level
         fy = pool.get('account.fiscalyear').browse(cr, uid, fy_id)
         last_fy_year = strptime(fy.date_start, '%Y-%m-%d').tm_year - 1 # Take previous year regarding given fiscalyear
         first_day_of_last_fy = '%s-01-01' % (last_fy_year)
-        period = pool.get('account.period').browse(cr, uid, period_id)
+        period = period_obj.browse(cr, uid, period_id, fields_to_fetch=['date_stop', 'date_start', 'number'])
+        previous_period_id = period_obj.get_previous_period_id(cr, uid, period_id, context=context)
         last_day_of_period = period.date_stop
         first_day_of_period = period.date_start
         selection = form.get('selection', False)
@@ -436,7 +440,6 @@
         plresult_ji_in_ids = []
         if period.number == 12:
             ayec_obj = pool.get("account.year.end.closing")
-            mi_obj = pool.get('msf.instance')
             m_obj = pool.get('account.move')
             ml_obj = pool.get('account.move.line')
 
@@ -466,13 +469,33 @@
         # SQLREQUESTS DICTIONNARY
         # - key: name of the SQL request
         # - value: the SQL request to use
-        sqlrequests = {
-            'partner': """
-                SELECT id, name, ref, partner_type, CASE WHEN active='t' THEN 'True' WHEN active='f' THEN 'False' END AS active
+        partner_sql = """
+                SELECT id, name, ref, partner_type, CASE WHEN active='t' THEN 'True' WHEN active='f' THEN 'False' END AS active%s
                 FROM res_partner 
                 WHERE partner_type != 'internal'
                   and name != 'To be defined';
-                """,
+                """ % (not context.get("old_vi") and ", comment" or "")
+        if not previous_period_id or instance_lvl == 'section':
+            # empty report in case there is no previous period or an HQ instance is selected
+            balance_previous_month_sql = "SELECT '' AS no_line;"
+        else:
+            # note: even balances with zero amount are displayed in the report
+            balance_previous_month_sql = """
+                            SELECT acc.code, curr.name, SUM(COALESCE(aml.debit_currency,0) - COALESCE(aml.credit_currency,0))
+                            FROM account_move_line aml
+                            INNER JOIN account_journal j ON aml.journal_id = j.id
+                            INNER JOIN account_account acc ON aml.account_id = acc.id
+                            INNER JOIN res_currency curr ON aml.currency_id = curr.id
+                            INNER JOIN account_move m ON aml.move_id = m.id
+                            WHERE aml.period_id = %s
+                            AND j.type NOT IN %s
+                            AND aml.instance_id IN %s
+                            AND m.state = 'posted'
+                            GROUP BY acc.code, curr.name
+                            ORDER BY acc.code, curr.name;
+                        """
+        sqlrequests = {
+            'partner': partner_sql,
             'employee': """
                 SELECT r.name, e.identification_id, r.active, e.employee_type
                 FROM hr_employee AS e, resource_resource AS r
@@ -634,6 +657,7 @@
                 AND m.state = 'posted'
                 ORDER BY aml.id;
                 """,
+            'balance_previous_month': balance_previous_month_sql,
         }
         if plresult_ji_in_ids:
             # NOTE: for these entries: booking and fonctional ccy are same
@@ -676,9 +700,12 @@
         # + 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
         instance_name = 'OCB'  # since US-949
         reg_types = ('cash', 'bank', 'cheque')
+        partner_header = ['XML_ID', 'Name', 'Reference', 'Partner type', 'Active/inactive']
+        if not context.get('old_vi'):
+            partner_header.append('Notes')
         processrequests = [
             {
-                'headers': ['XML_ID', 'Name', 'Reference', 'Partner type', 'Active/inactive'],
+                'headers': partner_header,
                 'filename': instance_name + '_' + year + month + '_Partners.csv',
                 'key': 'partner',
                 'function': 'postprocess_partners',
@@ -699,37 +726,6 @@
                 'fnct_params': ([('account.journal', 'type', 3)], context),
             },
             {
-                'headers': ['Name', 'Code', 'Type', 'Status'],
-                'filename': instance_name + '_' + year + month + '_Cost Centres.csv',
-                'key': 'costcenter',
-                'query_params': (last_day_of_period, last_day_of_period, tuple(instance_ids),last_day_of_period, last_day_of_period, tuple(instance_ids)),
-                'function': 'postprocess_selection_columns',
-                'fnct_params': [('account.analytic.account', 'type', 2)],
-            },
-            {
-                'headers': ['CCY name', 'CCY code', 'Rate', 'Month'],
-                'filename': instance_name + '_' + year + month + '_FX rates.csv',
-                'key': 'fxrate',
-                'query_params': (first_day_of_last_fy, last_day_of_period),
-            },
-            {
-                'headers': ['Instance', 'Code', 'Name', 'Period', 'Starting balance', 'Calculated balance', 'Closing balance', 'Currency'],
-                'filename': instance_name + '_' + year + month + '_Liquidity Balances.csv',
-                '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': ['Name', 'Code', 'Donor code', 'Grant amount', 'Reporting CCY', 'State'],
-                'filename': instance_name + '_' + year + month + '_Financing contracts.csv',
-                'key': 'contract',
-                'query_params': (tuple(instance_ids),),
-                'function': 'postprocess_selection_columns',
-                'fnct_params': [('financing.contract.contract', 'state', 5)],
-            },
-            {
                 'headers': ['DB ID', 'Instance', 'Journal', 'Entry sequence', 'Description', 'Reference', 'Document date', 'Posting date', 'G/L Account', 'Third party', 'Destination', 'Cost centre', 'Funding pool', 'Booking debit', 'Booking credit', 'Booking currency', 'Functional debit', 'Functional credit',  'Functional CCY', 'Emplid', 'Partner DB ID'],
                 'filename': instance_name + '_' + year + month + '_Monthly Export.csv',
                 'key': 'rawdata',
@@ -758,6 +754,57 @@
                 'object': 'account.move.line',
             },
         ]
+        if context.get('old_vi'):
+            processrequests.extend([
+                {
+                    'headers': ['Name', 'Code', 'Type', 'Status'],
+                    'filename': instance_name + '_' + year + month + '_Cost Centres.csv',
+                    'key': 'costcenter',
+                    'query_params': (
+                        last_day_of_period, last_day_of_period, tuple(instance_ids), last_day_of_period,
+                        last_day_of_period,
+                        tuple(instance_ids)),
+                    'function': 'postprocess_selection_columns',
+                    'fnct_params': [('account.analytic.account', 'type', 2)],
+                },
+                {
+                    'headers': ['Name', 'Code', 'Donor code', 'Grant amount', 'Reporting CCY', 'State'],
+                    'filename': instance_name + '_' + year + month + '_Financing contracts.csv',
+                    'key': 'contract',
+                    'query_params': (tuple(instance_ids),),
+                    'function': 'postprocess_selection_columns',
+                    'fnct_params': [('financing.contract.contract', 'state', 5)],
+                },
+                {
+                    'headers': ['CCY name', 'CCY code', 'Rate', 'Month'],
+                    'filename': instance_name + '_' + year + month + '_FX rates.csv',
+                    'key': 'fxrate',
+                    'query_params': (first_day_of_last_fy, last_day_of_period),
+                },
+                {
+                    'headers': ['Instance', 'Code', 'Name', 'Period', 'Starting balance', 'Calculated balance',
+                                'Closing balance', 'Currency'],
+                    'filename': instance_name + '_' + year + month + '_Liquidity Balances.csv',
+                    '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,
+                },
+            ])
+        if not context.get('old_vi'):
+            processrequests.extend([
+                {
+                    'headers': ['G/L Account', 'Booking currency', 'Balance'],
+                    'filename': instance_name + '_' + year + month + '_Balance_previous_month.csv',
+                    'key': 'balance_previous_month',
+                    'query_params': (previous_period_id,
+                                     # note: engagements are also excluded since there are no ENG/ENGI "G/L" journals
+                                     tuple(excluded_journal_types + ['cur_adj']),
+                                     tuple(instance_ids)),
+                }
+            ])
         if plresult_ji_in_ids:
             processrequests.append({
                 'filename': instance_name + '_' + year + month + '_Monthly Export.csv',
 
=== modified file 'bin/addons/vertical_integration/vertical_integration_wizard.xml'
--- bin/addons/vertical_integration/vertical_integration_wizard.xml	2017-10-17 09:57:39 +0000
+++ bin/addons/vertical_integration/vertical_integration_wizard.xml	2020-02-04 10:20:45 +0000
@@ -109,6 +109,21 @@
             action="action_hq_export_ocb"
             id="menu_action_hq_export_ocb"  sequence="30"/>
 
+        <!-- OLD OCB VI (to be deleted once this version will be dropped) -->
+        <record id="action_hq_export_ocb_old" model="ir.actions.act_window">
+            <field name="name">Export to HQ system (OCB) Access Interface</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">ocb.export.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="ocb_export_wizard"/>
+            <field name="context">{'old_vi': True}</field>
+            <field name="target">new</field>
+        </record>
+        <menuitem parent="account.menu_finance_generic_reporting"
+            action="action_hq_export_ocb_old"
+            id="menu_action_hq_export_ocb_old" sequence="32"/>
+
     <!-- OCB matching export -->
 
         <record id="ocb_matching_export_wizard" model="ir.ui.view">