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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-11-12 16:19:32 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2021-01-12 10:43:18 +0000
@@ -67301,6 +67301,12 @@
 msgid "OCB matching export"
 msgstr "OCB matching export"
 
+#. module: vertical_integration
+#: model:ir.actions.act_window,name:vertical_integration.action_hq_ocb_matching_export_old
+#: model:ir.ui.menu,name:vertical_integration.menu_action_hq_ocb_matching_export_old
+msgid "OCB matching export Access Interface"
+msgstr "Interface d'accès de OCB matching export"
+
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
 msgid "Warehouse Configuration"
 
=== modified file 'bin/addons/vertical_integration/report/hq_report_ocb_matching.py'
--- bin/addons/vertical_integration/report/hq_report_ocb_matching.py	2018-05-03 08:19:43 +0000
+++ bin/addons/vertical_integration/report/hq_report_ocb_matching.py	2021-01-12 10:43:18 +0000
@@ -28,6 +28,11 @@
 
 from report import report_sxw
 
+
+##### WARNING #####
+### This file is for OCB matching export Access Interface. For the standard OCB matching, see hq_report_ocp_matching.py ###
+
+
 class finance_archive(finance_export.finance_archive):
     def postprocess_reconciliable(self, cr, uid, data, model, column_deletion=False):
         """
 
=== modified file 'bin/addons/vertical_integration/report/hq_report_ocp_matching.py'
--- bin/addons/vertical_integration/report/hq_report_ocp_matching.py	2018-05-03 08:30:05 +0000
+++ bin/addons/vertical_integration/report/hq_report_ocp_matching.py	2021-01-12 10:43:18 +0000
@@ -32,6 +32,11 @@
 
 from report import report_sxw
 
+
+##### WARNING #####
+### IN CASE CHANGES ARE MADE TO THIS FILE, keep in mind that it is used for OCB matching export as well. ###
+
+
 class finance_archive(finance_export.finance_archive):
     """
     Extends existing class with new methods for OCP Matching Export.
@@ -130,7 +135,12 @@
         pool = pooler.get_pool(cr.dbname)
         instance_obj = pool.get('msf.instance')
         period_obj = pool.get('account.period')
-        excluded_journal_types = ['hq', 'migration']
+        if context.get('ocb_matching'):
+            # OCB VI
+            excluded_journal_types = ['cur_adj', 'hq', 'inkind', 'migration', 'extra', 'system']
+        else:
+            # OCP VI
+            excluded_journal_types = ['hq', 'migration']
         # 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.'))
@@ -143,7 +153,6 @@
             raise osv.except_osv(_('Warning'), _('Some information is missing: either fiscal year or period or instance.'))
         # Prepare SQL requests and PROCESS requests for finance_archive object (CF. account_tools/finance_export.py)
         sqlrequests = {
-            # Do not take lines that come from a HQ or MIGRATION journal
             # This request returns:
             # - entries where posting date are within the selected period or before
             # - that have either been reconciled OR unreconciled within the period or after
 
=== modified file 'bin/addons/vertical_integration/vertical_integration_wizard.xml'
--- bin/addons/vertical_integration/vertical_integration_wizard.xml	2020-08-26 09:28:33 +0000
+++ bin/addons/vertical_integration/vertical_integration_wizard.xml	2021-01-12 10:43:18 +0000
@@ -141,6 +141,9 @@
 
     <!-- OCB matching export -->
 
+        <!-- see below for standard OCB matching (to be loaded after OCP matching export on which it is based) -->
+
+        <!-- OCB matching export Access Interface -->
         <record id="ocb_matching_export_wizard" model="ir.ui.view">
             <field name="name">OCB matching export</field>
             <field name="model">ocb.matching.export.wizard</field>
@@ -156,9 +159,8 @@
             </form>
             </field>
         </record>
-
-        <record id="action_hq_ocb_matching_export" model="ir.actions.act_window">
-            <field name="name">OCB matching export</field>
+        <record id="action_hq_ocb_matching_export_old" model="ir.actions.act_window">
+            <field name="name">OCB matching export Access Interface</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ocb.matching.export.wizard</field>
             <field name="view_type">form</field>
@@ -166,10 +168,9 @@
             <field name="view_id" ref="ocb_matching_export_wizard"/>
             <field name="target">new</field>
         </record>
-
         <menuitem parent="account.menu_finance_generic_reporting"
-            action="action_hq_ocb_matching_export"
-            id="menu_action_hq_ocb_matching_export" sequence="40"/>
+                  action="action_hq_ocb_matching_export_old"
+                  id="menu_action_hq_ocb_matching_export_old" sequence="42"/>
 
 
     <!-- OCBA export -->
@@ -279,5 +280,20 @@
             action="action_hq_ocp_matching_export"
             id="menu_action_hq_ocp_matching_export" sequence="70"/>
 
+        <!-- OCB matching export BASED ON OCP MATCHING EXPORT -->
+        <record id="action_hq_ocb_matching_export" model="ir.actions.act_window">
+            <field name="name">OCB matching export</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">ocp.matching.export.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="ocp_matching_export_wizard"/>
+            <field name="context">{'ocb_matching': True}</field>
+            <field name="target">new</field>
+        </record>
+        <menuitem parent="account.menu_finance_generic_reporting"
+                  action="action_hq_ocb_matching_export"
+                  id="menu_action_hq_ocb_matching_export" sequence="40"/>
+
     </data>
 </openerp>