[IMP] report, form view hide paperformat when not needed

bzr revid: al@openerp.com-20140307011359-nyj794c9pzkg64fh

diff --git a/addons/report/views/res_company_view.xml b/addons/report/views/res_company_view.xml
deleted file mode 100644 (file)
index 97abd9f..0000000
--- a/addons/report/views/res_company_view.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="reporting_settings_form_inherited" model="ir.ui.view">
-            <field name="name">view_company_form_inherited</field>
-            <field name="inherit_id" ref="base.view_company_form" />
-            <field name="model">res.company</field>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//group[@string='Footer Configuration']" position="after">
-                        <group string="QWeb PDF Configuration">
-                            <field name="paperformat_id" />
-                        </group>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-    </data>
-</openerp>
\ No newline at end of file

diff --git a/addons/report/views/views.xml b/addons/report/views/views.xml
index 6de16c8..c5d07f5 100644 (file)
--- a/addons/report/views/views.xml
+++ b/addons/report/views/views.xml
@@ -78,8 +78,8 @@
             <field name="model">ir.actions.report.xml</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//field[@name='multi']" position="after">
-                        <field name="paperformat_id"/>
+                    <xpath expr="//field[@name='attachment']" position="after">
+                        <field name="paperformat_id" attrs="{'invisible':[('report_type','not in',['qweb-pdf'])]}"/>
                         <button
                             type="object"
                             class="oe_link"