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

Proposed by jftempo on 2018-05-17
Status: Merged
Merged at revision: 4912
Proposed branch: lp:~julie-w/unifield-server/US-3509
Merge into: lp:unifield-server
Diff against target: 164 lines (+60/-10)
4 files modified
bin/addons/account_mcdb/account_period_state.py (+2/-2)
bin/addons/account_mcdb/account_period_state_view.xml (+32/-4)
bin/addons/sync_client/hq_monitor_view.xml (+25/-3)
bin/addons/sync_client/monitor_view.xml (+1/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-3509
Reviewer Review Type Date Requested Status
UniField Reviewer Team 2018-05-17 Pending
Review via email: mp+345731@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/account_mcdb/account_period_state.py'
2--- bin/addons/account_mcdb/account_period_state.py 2017-07-25 08:09:47 +0000
3+++ bin/addons/account_mcdb/account_period_state.py 2018-05-17 08:40:30 +0000
4@@ -63,7 +63,7 @@
5 'type': 'ir.actions.act_window',
6 'res_model': 'account.period.state',
7 'view_type': 'form',
8- 'view_mode': 'tree',
9+ 'view_mode': 'tree,form',
10 'search_view_id': search_id,
11 'view_id': [view_id],
12 'context': context,
13@@ -209,7 +209,7 @@
14 'type': 'ir.actions.act_window',
15 'res_model': 'account.fiscalyear.state',
16 'view_type': 'form',
17- 'view_mode': 'tree',
18+ 'view_mode': 'tree,form',
19 'search_view_id': search_id,
20 'view_id': [view_id],
21 'context': context,
22
23=== modified file 'bin/addons/account_mcdb/account_period_state_view.xml'
24--- bin/addons/account_mcdb/account_period_state_view.xml 2016-02-08 08:37:05 +0000
25+++ bin/addons/account_mcdb/account_period_state_view.xml 2018-05-17 08:40:30 +0000
26@@ -25,11 +25,11 @@
27 <field name="model">account.period.state</field>
28 <field name="type">tree</field>
29 <field name="arch" type="xml">
30- <data >
31+ <tree noteditable="1" hide_new_button="1" hide_delete_button="1">
32 <field name="instance_id" />
33 <field name="period_id" />
34 <field name="state" />
35- </data>
36+ </tree>
37 </field>
38 </record>
39
40@@ -47,6 +47,20 @@
41 </field>
42 </record>
43
44+ <!-- READ-ONLY FORM FOR PERIOD STATES -->
45+ <record id="account_period_state_form" model="ir.ui.view">
46+ <field name="name">account.period.state.form</field>
47+ <field name="model">account.period.state</field>
48+ <field name="type">form</field>
49+ <field name="arch" type="xml">
50+ <form noteditable="1" hide_new_button="1" hide_save_button="1" hide_duplicate_button="1" hide_delete_button="1">
51+ <field name="instance_id"/>
52+ <field name="period_id"/>
53+ <field name="state"/>
54+ </form>
55+ </field>
56+ </record>
57+
58 <!-- _______________________________________________________________-->
59 <!-- US-822 account fiscal year state -->
60 <record id="action_server_fiscalyear_state" model="ir.actions.server">
61@@ -70,11 +84,11 @@
62 <field name="model">account.fiscalyear.state</field>
63 <field name="type">tree</field>
64 <field name="arch" type="xml">
65- <data >
66+ <tree noteditable="1" hide_new_button="1" hide_delete_button="1">
67 <field name="instance_id" />
68 <field name="fy_id" />
69 <field name="state" />
70- </data>
71+ </tree>
72 </field>
73 </record>
74
75@@ -92,5 +106,19 @@
76 </field>
77 </record>
78
79+ <!-- READ-ONLY FORM FOR FISCAL YEAR STATES -->
80+ <record id="account_fiscalyear_state_form" model="ir.ui.view">
81+ <field name="name">account.fiscalyear.state.form</field>
82+ <field name="model">account.fiscalyear.state</field>
83+ <field name="type">form</field>
84+ <field name="arch" type="xml">
85+ <form noteditable="1" hide_new_button="1" hide_save_button="1" hide_duplicate_button="1" hide_delete_button="1">
86+ <field name="instance_id"/>
87+ <field name="fy_id"/>
88+ <field name="state"/>
89+ </form>
90+ </field>
91+ </record>
92+
93 </data>
94 </openerp>
95
96=== modified file 'bin/addons/sync_client/hq_monitor_view.xml'
97--- bin/addons/sync_client/hq_monitor_view.xml 2018-02-22 14:23:17 +0000
98+++ bin/addons/sync_client/hq_monitor_view.xml 2018-05-17 08:40:30 +0000
99@@ -41,7 +41,7 @@
100 <field name="name">Synchronisation Instances Monitor</field>
101 <field name="res_model">sync.monitor</field>
102 <field name="view_type">form</field>
103- <field name="view_mode">tree</field>
104+ <field name="view_mode">tree,form</field>
105 <field name="domain">[('my_instance', '=', False)]</field>
106 <field name="search_view_id" ref="sync_hq_monitor_search" />
107 <field name="view_id" ref="sync_hq_monitor_tree" />
108@@ -57,7 +57,7 @@
109 <field name="type">tree</field>
110 <field name="priority" eval="200" />
111 <field name="arch" type="xml">
112- <tree hide_edit_button="1" hide_delete_button="1">
113+ <tree hide_new_button="1" hide_edit_button="1" hide_delete_button="1">
114 <field name="instance_id" />
115 <field name="version" />
116 <field name="backup_date" />
117@@ -73,11 +73,33 @@
118 </field>
119 </record>
120
121+ <!-- READ-ONLY FORM FOR VERSION INSTANCES MONITOR -->
122+ <record id="sync_version_instance_monitor_form" model="ir.ui.view">
123+ <field name="name">sync.version.instance.monitor.form</field>
124+ <field name="model">sync.version.instance.monitor</field>
125+ <field name="type">form</field>
126+ <field name="arch" type="xml">
127+ <form noteditable="1" hide_new_button="1" hide_save_button="1" hide_duplicate_button="1" hide_delete_button="1">
128+ <field name="instance_id"/>
129+ <field name="version"/>
130+ <field name="backup_date"/>
131+ <field name="backup_path"/>
132+ <field name="backup_size"/>
133+ <field name="cloud_date"/>
134+ <field name="cloud_backup"/>
135+ <field name="cloud_size"/>
136+ <field name="postgresql_disk_space"/>
137+ <field name="unifield_disk_space"/>
138+ <field name="instance_state"/>
139+ </form>
140+ </field>
141+ </record>
142+
143 <record model="ir.actions.act_window" id="sync_hq_instance_version_action">
144 <field name="name">Version Instances Monitor</field>
145 <field name="res_model">sync.version.instance.monitor</field>
146 <field name="view_type">form</field>
147- <field name="view_mode">tree</field>
148+ <field name="view_mode">tree,form</field>
149 <field name="domain">[('instance_id', '!=', False)]</field>
150 <field name="view_id" ref="sync_hq_instance_version_tree" />
151 </record>
152
153=== modified file 'bin/addons/sync_client/monitor_view.xml'
154--- bin/addons/sync_client/monitor_view.xml 2017-09-18 13:36:03 +0000
155+++ bin/addons/sync_client/monitor_view.xml 2018-05-17 08:40:30 +0000
156@@ -20,7 +20,7 @@
157 <field name="model">sync.monitor</field>
158 <field name="type">form</field>
159 <field name="arch" type="xml">
160- <form hide_edit_button="1" hide_delete_button="1" hide_new_button="1" hide_duplicate_button="1" >
161+ <form noteditable="1" hide_new_button="1" hide_save_button="1" hide_duplicate_button="1" hide_delete_button="1">
162 <field name="sequence_number"/>
163 <field name="status"/>
164 <separator string="Synchronization date and time" colspan="4"/>

Subscribers

People subscribed via source and target branches