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
=== modified file 'bin/addons/account_mcdb/account_period_state.py'
--- bin/addons/account_mcdb/account_period_state.py 2017-07-25 08:09:47 +0000
+++ bin/addons/account_mcdb/account_period_state.py 2018-05-17 08:40:30 +0000
@@ -63,7 +63,7 @@
63 'type': 'ir.actions.act_window',63 'type': 'ir.actions.act_window',
64 'res_model': 'account.period.state',64 'res_model': 'account.period.state',
65 'view_type': 'form',65 'view_type': 'form',
66 'view_mode': 'tree',66 'view_mode': 'tree,form',
67 'search_view_id': search_id,67 'search_view_id': search_id,
68 'view_id': [view_id],68 'view_id': [view_id],
69 'context': context,69 'context': context,
@@ -209,7 +209,7 @@
209 'type': 'ir.actions.act_window',209 'type': 'ir.actions.act_window',
210 'res_model': 'account.fiscalyear.state',210 'res_model': 'account.fiscalyear.state',
211 'view_type': 'form',211 'view_type': 'form',
212 'view_mode': 'tree',212 'view_mode': 'tree,form',
213 'search_view_id': search_id,213 'search_view_id': search_id,
214 'view_id': [view_id],214 'view_id': [view_id],
215 'context': context,215 'context': context,
216216
=== modified file 'bin/addons/account_mcdb/account_period_state_view.xml'
--- bin/addons/account_mcdb/account_period_state_view.xml 2016-02-08 08:37:05 +0000
+++ bin/addons/account_mcdb/account_period_state_view.xml 2018-05-17 08:40:30 +0000
@@ -25,11 +25,11 @@
25 <field name="model">account.period.state</field>25 <field name="model">account.period.state</field>
26 <field name="type">tree</field>26 <field name="type">tree</field>
27 <field name="arch" type="xml">27 <field name="arch" type="xml">
28 <data >28 <tree noteditable="1" hide_new_button="1" hide_delete_button="1">
29 <field name="instance_id" />29 <field name="instance_id" />
30 <field name="period_id" />30 <field name="period_id" />
31 <field name="state" />31 <field name="state" />
32 </data>32 </tree>
33 </field>33 </field>
34 </record>34 </record>
3535
@@ -47,6 +47,20 @@
47 </field>47 </field>
48 </record>48 </record>
4949
50 <!-- READ-ONLY FORM FOR PERIOD STATES -->
51 <record id="account_period_state_form" model="ir.ui.view">
52 <field name="name">account.period.state.form</field>
53 <field name="model">account.period.state</field>
54 <field name="type">form</field>
55 <field name="arch" type="xml">
56 <form noteditable="1" hide_new_button="1" hide_save_button="1" hide_duplicate_button="1" hide_delete_button="1">
57 <field name="instance_id"/>
58 <field name="period_id"/>
59 <field name="state"/>
60 </form>
61 </field>
62 </record>
63
50 <!-- _______________________________________________________________-->64 <!-- _______________________________________________________________-->
51 <!-- US-822 account fiscal year state -->65 <!-- US-822 account fiscal year state -->
52 <record id="action_server_fiscalyear_state" model="ir.actions.server">66 <record id="action_server_fiscalyear_state" model="ir.actions.server">
@@ -70,11 +84,11 @@
70 <field name="model">account.fiscalyear.state</field>84 <field name="model">account.fiscalyear.state</field>
71 <field name="type">tree</field>85 <field name="type">tree</field>
72 <field name="arch" type="xml">86 <field name="arch" type="xml">
73 <data >87 <tree noteditable="1" hide_new_button="1" hide_delete_button="1">
74 <field name="instance_id" />88 <field name="instance_id" />
75 <field name="fy_id" />89 <field name="fy_id" />
76 <field name="state" />90 <field name="state" />
77 </data>91 </tree>
78 </field>92 </field>
79 </record>93 </record>
8094
@@ -92,5 +106,19 @@
92 </field>106 </field>
93 </record>107 </record>
94108
109 <!-- READ-ONLY FORM FOR FISCAL YEAR STATES -->
110 <record id="account_fiscalyear_state_form" model="ir.ui.view">
111 <field name="name">account.fiscalyear.state.form</field>
112 <field name="model">account.fiscalyear.state</field>
113 <field name="type">form</field>
114 <field name="arch" type="xml">
115 <form noteditable="1" hide_new_button="1" hide_save_button="1" hide_duplicate_button="1" hide_delete_button="1">
116 <field name="instance_id"/>
117 <field name="fy_id"/>
118 <field name="state"/>
119 </form>
120 </field>
121 </record>
122
95 </data>123 </data>
96</openerp>124</openerp>
97125
=== modified file 'bin/addons/sync_client/hq_monitor_view.xml'
--- bin/addons/sync_client/hq_monitor_view.xml 2018-02-22 14:23:17 +0000
+++ bin/addons/sync_client/hq_monitor_view.xml 2018-05-17 08:40:30 +0000
@@ -41,7 +41,7 @@
41 <field name="name">Synchronisation Instances Monitor</field>41 <field name="name">Synchronisation Instances Monitor</field>
42 <field name="res_model">sync.monitor</field>42 <field name="res_model">sync.monitor</field>
43 <field name="view_type">form</field>43 <field name="view_type">form</field>
44 <field name="view_mode">tree</field>44 <field name="view_mode">tree,form</field>
45 <field name="domain">[('my_instance', '=', False)]</field>45 <field name="domain">[('my_instance', '=', False)]</field>
46 <field name="search_view_id" ref="sync_hq_monitor_search" />46 <field name="search_view_id" ref="sync_hq_monitor_search" />
47 <field name="view_id" ref="sync_hq_monitor_tree" />47 <field name="view_id" ref="sync_hq_monitor_tree" />
@@ -57,7 +57,7 @@
57 <field name="type">tree</field>57 <field name="type">tree</field>
58 <field name="priority" eval="200" />58 <field name="priority" eval="200" />
59 <field name="arch" type="xml">59 <field name="arch" type="xml">
60 <tree hide_edit_button="1" hide_delete_button="1">60 <tree hide_new_button="1" hide_edit_button="1" hide_delete_button="1">
61 <field name="instance_id" />61 <field name="instance_id" />
62 <field name="version" />62 <field name="version" />
63 <field name="backup_date" />63 <field name="backup_date" />
@@ -73,11 +73,33 @@
73 </field>73 </field>
74 </record>74 </record>
7575
76 <!-- READ-ONLY FORM FOR VERSION INSTANCES MONITOR -->
77 <record id="sync_version_instance_monitor_form" model="ir.ui.view">
78 <field name="name">sync.version.instance.monitor.form</field>
79 <field name="model">sync.version.instance.monitor</field>
80 <field name="type">form</field>
81 <field name="arch" type="xml">
82 <form noteditable="1" hide_new_button="1" hide_save_button="1" hide_duplicate_button="1" hide_delete_button="1">
83 <field name="instance_id"/>
84 <field name="version"/>
85 <field name="backup_date"/>
86 <field name="backup_path"/>
87 <field name="backup_size"/>
88 <field name="cloud_date"/>
89 <field name="cloud_backup"/>
90 <field name="cloud_size"/>
91 <field name="postgresql_disk_space"/>
92 <field name="unifield_disk_space"/>
93 <field name="instance_state"/>
94 </form>
95 </field>
96 </record>
97
76 <record model="ir.actions.act_window" id="sync_hq_instance_version_action">98 <record model="ir.actions.act_window" id="sync_hq_instance_version_action">
77 <field name="name">Version Instances Monitor</field>99 <field name="name">Version Instances Monitor</field>
78 <field name="res_model">sync.version.instance.monitor</field>100 <field name="res_model">sync.version.instance.monitor</field>
79 <field name="view_type">form</field>101 <field name="view_type">form</field>
80 <field name="view_mode">tree</field>102 <field name="view_mode">tree,form</field>
81 <field name="domain">[('instance_id', '!=', False)]</field>103 <field name="domain">[('instance_id', '!=', False)]</field>
82 <field name="view_id" ref="sync_hq_instance_version_tree" />104 <field name="view_id" ref="sync_hq_instance_version_tree" />
83 </record>105 </record>
84106
=== modified file 'bin/addons/sync_client/monitor_view.xml'
--- bin/addons/sync_client/monitor_view.xml 2017-09-18 13:36:03 +0000
+++ bin/addons/sync_client/monitor_view.xml 2018-05-17 08:40:30 +0000
@@ -20,7 +20,7 @@
20 <field name="model">sync.monitor</field>20 <field name="model">sync.monitor</field>
21 <field name="type">form</field>21 <field name="type">form</field>
22 <field name="arch" type="xml">22 <field name="arch" type="xml">
23 <form hide_edit_button="1" hide_delete_button="1" hide_new_button="1" hide_duplicate_button="1" >23 <form noteditable="1" hide_new_button="1" hide_save_button="1" hide_duplicate_button="1" hide_delete_button="1">
24 <field name="sequence_number"/>24 <field name="sequence_number"/>
25 <field name="status"/>25 <field name="status"/>
26 <separator string="Synchronization date and time" colspan="4"/>26 <separator string="Synchronization date and time" colspan="4"/>

Subscribers

People subscribed via source and target branches