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

Proposed by jftempo on 2021-01-12
Status: Merged
Merged at revision: 5912
Proposed branch: lp:~julie-w/unifield-server/US-7979
Merge into: lp:unifield-server
Diff against target: 130 lines (+44/-8)
4 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+6/-0)
bin/addons/vertical_integration/report/hq_report_ocb_matching.py (+5/-0)
bin/addons/vertical_integration/report/hq_report_ocp_matching.py (+11/-2)
bin/addons/vertical_integration/vertical_integration_wizard.xml (+22/-6)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-7979
Reviewer Review Type Date Requested Status
UniField Reviewer Team 2021-01-12 Pending
Review via email: mp+396133@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
2--- bin/addons/msf_profile/i18n/fr_MF.po 2020-11-12 16:19:32 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2021-01-12 10:43:18 +0000
4@@ -67301,6 +67301,12 @@
5 msgid "OCB matching export"
6 msgstr "OCB matching export"
7
8+#. module: vertical_integration
9+#: model:ir.actions.act_window,name:vertical_integration.action_hq_ocb_matching_export_old
10+#: model:ir.ui.menu,name:vertical_integration.menu_action_hq_ocb_matching_export_old
11+msgid "OCB matching export Access Interface"
12+msgstr "Interface d'accès de OCB matching export"
13+
14 #. module: stock
15 #: model:ir.ui.menu,name:stock.menu_stock_configuration
16 msgid "Warehouse Configuration"
17
18=== modified file 'bin/addons/vertical_integration/report/hq_report_ocb_matching.py'
19--- bin/addons/vertical_integration/report/hq_report_ocb_matching.py 2018-05-03 08:19:43 +0000
20+++ bin/addons/vertical_integration/report/hq_report_ocb_matching.py 2021-01-12 10:43:18 +0000
21@@ -28,6 +28,11 @@
22
23 from report import report_sxw
24
25+
26+##### WARNING #####
27+### This file is for OCB matching export Access Interface. For the standard OCB matching, see hq_report_ocp_matching.py ###
28+
29+
30 class finance_archive(finance_export.finance_archive):
31 def postprocess_reconciliable(self, cr, uid, data, model, column_deletion=False):
32 """
33
34=== modified file 'bin/addons/vertical_integration/report/hq_report_ocp_matching.py'
35--- bin/addons/vertical_integration/report/hq_report_ocp_matching.py 2018-05-03 08:30:05 +0000
36+++ bin/addons/vertical_integration/report/hq_report_ocp_matching.py 2021-01-12 10:43:18 +0000
37@@ -32,6 +32,11 @@
38
39 from report import report_sxw
40
41+
42+##### WARNING #####
43+### IN CASE CHANGES ARE MADE TO THIS FILE, keep in mind that it is used for OCB matching export as well. ###
44+
45+
46 class finance_archive(finance_export.finance_archive):
47 """
48 Extends existing class with new methods for OCP Matching Export.
49@@ -130,7 +135,12 @@
50 pool = pooler.get_pool(cr.dbname)
51 instance_obj = pool.get('msf.instance')
52 period_obj = pool.get('account.period')
53- excluded_journal_types = ['hq', 'migration']
54+ if context.get('ocb_matching'):
55+ # OCB VI
56+ excluded_journal_types = ['cur_adj', 'hq', 'inkind', 'migration', 'extra', 'system']
57+ else:
58+ # OCP VI
59+ excluded_journal_types = ['hq', 'migration']
60 # Fetch data from wizard
61 if not data.get('form', False):
62 raise osv.except_osv(_('Error'), _('No data retrieved. Check that the wizard is filled in.'))
63@@ -143,7 +153,6 @@
64 raise osv.except_osv(_('Warning'), _('Some information is missing: either fiscal year or period or instance.'))
65 # Prepare SQL requests and PROCESS requests for finance_archive object (CF. account_tools/finance_export.py)
66 sqlrequests = {
67- # Do not take lines that come from a HQ or MIGRATION journal
68 # This request returns:
69 # - entries where posting date are within the selected period or before
70 # - that have either been reconciled OR unreconciled within the period or after
71
72=== modified file 'bin/addons/vertical_integration/vertical_integration_wizard.xml'
73--- bin/addons/vertical_integration/vertical_integration_wizard.xml 2020-08-26 09:28:33 +0000
74+++ bin/addons/vertical_integration/vertical_integration_wizard.xml 2021-01-12 10:43:18 +0000
75@@ -141,6 +141,9 @@
76
77 <!-- OCB matching export -->
78
79+ <!-- see below for standard OCB matching (to be loaded after OCP matching export on which it is based) -->
80+
81+ <!-- OCB matching export Access Interface -->
82 <record id="ocb_matching_export_wizard" model="ir.ui.view">
83 <field name="name">OCB matching export</field>
84 <field name="model">ocb.matching.export.wizard</field>
85@@ -156,9 +159,8 @@
86 </form>
87 </field>
88 </record>
89-
90- <record id="action_hq_ocb_matching_export" model="ir.actions.act_window">
91- <field name="name">OCB matching export</field>
92+ <record id="action_hq_ocb_matching_export_old" model="ir.actions.act_window">
93+ <field name="name">OCB matching export Access Interface</field>
94 <field name="type">ir.actions.act_window</field>
95 <field name="res_model">ocb.matching.export.wizard</field>
96 <field name="view_type">form</field>
97@@ -166,10 +168,9 @@
98 <field name="view_id" ref="ocb_matching_export_wizard"/>
99 <field name="target">new</field>
100 </record>
101-
102 <menuitem parent="account.menu_finance_generic_reporting"
103- action="action_hq_ocb_matching_export"
104- id="menu_action_hq_ocb_matching_export" sequence="40"/>
105+ action="action_hq_ocb_matching_export_old"
106+ id="menu_action_hq_ocb_matching_export_old" sequence="42"/>
107
108
109 <!-- OCBA export -->
110@@ -279,5 +280,20 @@
111 action="action_hq_ocp_matching_export"
112 id="menu_action_hq_ocp_matching_export" sequence="70"/>
113
114+ <!-- OCB matching export BASED ON OCP MATCHING EXPORT -->
115+ <record id="action_hq_ocb_matching_export" model="ir.actions.act_window">
116+ <field name="name">OCB matching export</field>
117+ <field name="type">ir.actions.act_window</field>
118+ <field name="res_model">ocp.matching.export.wizard</field>
119+ <field name="view_type">form</field>
120+ <field name="view_mode">form</field>
121+ <field name="view_id" ref="ocp_matching_export_wizard"/>
122+ <field name="context">{'ocb_matching': True}</field>
123+ <field name="target">new</field>
124+ </record>
125+ <menuitem parent="account.menu_finance_generic_reporting"
126+ action="action_hq_ocb_matching_export"
127+ id="menu_action_hq_ocb_matching_export" sequence="40"/>
128+
129 </data>
130 </openerp>

Subscribers

People subscribed via source and target branches