Server Environment And Tools

Merge lp:~josemoralesp/server-env-tools/server-env-tools into lp:~server-env-tools-core-editors/server-env-tools/7.0

  1. server-env-tools
  2. Merge into 7.0
Status: Merged
Approved by: Guewen Baconnier @ Camptocamp
Approved revision: 58
Merged at revision: 60
Proposed branch: lp:~josemoralesp/server-env-tools/server-env-tools
Merge into: lp:~server-env-tools-core-editors/server-env-tools/7.0
Diff against target: 77 lines (+2/-8)
4 files modified
email_template_template/view/email_template.xml (+0/-1)
ir_config_parameter_viewer/ir_config_parameter_view.xml (+1/-3)
mail_environment/mail_view.xml (+1/-2)
mass_editing/mass_editing_view.xml (+0/-2)
To merge this branch: bzr merge lp:~josemoralesp/server-env-tools/server-env-tools
Reviewer Review Type Date Requested Status
Leonardo Pistone code review Approve
Guewen Baconnier @ Camptocamp Approve
Pedro Manuel Baeza code review Approve
Alexandre Fayolle - camptocamp Pending
Review via email: mp+206644@code.launchpad.net

Description of the change

In 7.0 version of OpenERP it is unnecessary put the type of view when we define it, is why that I remove the tag type in the view to avoid that server shows us a warning

To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM

Thanks!

review: Approve (code review)
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

LGTM

Thanks

review: Approve
Revision history for this message
Leonardo Pistone (lepistone) wrote :

thanks

review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'email_template_template/view/email_template.xml'
2--- email_template_template/view/email_template.xml 2013-05-31 07:53:13 +0000
3+++ email_template_template/view/email_template.xml 2014-02-17 00:46:30 +0000
4@@ -5,7 +5,6 @@
5 <field name="name">email.template.form</field>
6 <field name="model">email.template</field>
7 <field name="inherit_id" ref="email_template.email_template_form" />
8- <field name="type">form</field>
9 <field name="arch" type="xml">
10 <data>
11 <field name="name" position="after">
12
13=== modified file 'ir_config_parameter_viewer/ir_config_parameter_view.xml'
14--- ir_config_parameter_viewer/ir_config_parameter_view.xml 2012-05-29 07:45:33 +0000
15+++ ir_config_parameter_viewer/ir_config_parameter_view.xml 2014-02-17 00:46:30 +0000
16@@ -3,7 +3,6 @@
17 <record model="ir.ui.view" id="view_config_list">
18 <field name="name">ir.config_parameter.list</field>
19 <field name="model">ir.config_parameter</field>
20- <field name="type">tree</field>
21 <field name="priority" eval="6"/>
22 <field name="arch" type="xml">
23 <tree string="Technical configuration parameters">
24@@ -15,7 +14,6 @@
25 <record model="ir.ui.view" id="view_config_form">
26 <field name="name">ir.config_parameter.form</field>
27 <field name="model">ir.config_parameter</field>
28- <field name="type">form</field>
29 <field name="priority" eval="6"/>
30 <field name="arch" type="xml">
31 <form string="Technical configuration parameters">
32@@ -35,4 +33,4 @@
33 <menuitem name="Technical config parameters" id="technical_config_parameters"
34 parent="base.next_id_15" action="view_config_action" groups="base.group_extended"/>
35 </data>
36-</openerp>
37\ No newline at end of file
38+</openerp>
39
40=== modified file 'mail_environment/mail_view.xml'
41--- mail_environment/mail_view.xml 2011-11-22 08:48:20 +0000
42+++ mail_environment/mail_view.xml 2014-02-17 00:46:30 +0000
43@@ -8,7 +8,6 @@
44 <!--parent python entity -->
45 <field name="inherit_id" ref="fetchmail.view_email_server_form"/>
46 <!-- modulename.view -->
47- <field name="type">form</field>
48 <field name="arch" type="xml">
49 <field name="server" attrs="{'required' : [('type', '!=', 'local')]}" position="replace">
50 <field name="server" />
51@@ -25,4 +24,4 @@
52 </field>
53 </record>
54 </data>
55-</openerp>
56\ No newline at end of file
57+</openerp>
58
59=== modified file 'mass_editing/mass_editing_view.xml'
60--- mass_editing/mass_editing_view.xml 2013-06-13 04:17:19 +0000
61+++ mass_editing/mass_editing_view.xml 2014-02-17 00:46:30 +0000
62@@ -5,7 +5,6 @@
63 <record model="ir.ui.view" id="view_mass_object_form">
64 <field name="name">mass.object.form</field>
65 <field name="model">mass.object</field>
66- <field name="type">form</field>
67 <field name="arch" type="xml">
68 <form string="Object">
69 <field name="name"/>
70@@ -35,7 +34,6 @@
71 <record model="ir.ui.view" id="view_mass_object_tree">
72 <field name="name">mass.object.tree</field>
73 <field name="model">mass.object</field>
74- <field name="type">form</field>
75 <field name="arch" type="xml">
76 <tree string="Object">
77 <field name="name"/>