[MERGE] Forward-port saas-5 up to d9cda97

[odoo/odoo.git] / openerp / addons / base / res / res_partner_view.xml

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 3be3b94..4e25279 100644 (file)
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -27,7 +27,7 @@
             <field name="name">res.partner.title.form</field>
             <field name="model">res.partner.title</field>
             <field name="arch" type="xml">
-                <form string="Partner Titles" version="7.0">
+                <form string="Partner Titles">
                     <group col="4">
                         <field name="name"/>
                         <field name="shortcut"/>
@@ -83,7 +83,6 @@
                     <field name="email"/>
                     <field name="user_id" invisible="1"/>
                     <field name="is_company" invisible="1"/>
-                    <field name="country" invisible="1"/>
                     <field name="country_id" invisible="1"/>
                     <field name="parent_id" invisible="1"/>
                 </tree>
@@ -94,7 +93,7 @@
             <field name="name">res.partner.simplified.form</field>
             <field name="model">res.partner</field>
             <field name="arch" type="xml">
-                <form string="Contact" version="7.0">
+                <form string="Contact">
                     <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
                     <div class="oe_title">
                         <div class="oe_edit_only">
@@ -126,7 +125,7 @@
             <field name="model">res.partner</field>
             <field eval="1" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Partners" version="7.0">
+                <form string="Partners">
                 <sheet>
                     <field name="image" widget='image' class="oe_left oe_avatar" options='{"preview_image": "image_medium", "size": [90, 90]}'/>
                     <div class="oe_title oe_left">
@@ -159,8 +158,8 @@
                                 <div class="oe_edit_only">
                                     <field name="use_parent_address" class="oe_inline"
                                            on_change="onchange_address(use_parent_address, parent_id)"
-                                           attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
-                                    <label for="use_parent_address" attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
+                                           attrs="{'invisible': ['|', ('is_company', '=', True),('parent_id', '=', False)]}"/>
+                                    <label for="use_parent_address" attrs="{'invisible': ['|', ('is_company', '=', True), ('parent_id', '=', False)]}"/>
                                 </div>
                                 <button name="open_parent" type="object" string="(edit company address)" class="oe_link oe_edit_only"
                                         attrs="{'invisible': ['|',('parent_id','=', False),('use_parent_address','=',False)]}"/>
@@ -255,7 +254,7 @@
                                         </t>
                                     </templates>
                                 </kanban>
-                                <form string="Contact" version="7.0">
+                                <form string="Contact">
                                     <sheet>
                                         <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
                                         <div class="oe_title">
@@ -399,9 +398,9 @@
                                         <li t-if="record.parent_id.raw_value and !record.function.raw_value"><field name="parent_id"/></li>
                                         <li t-if="!record.parent_id.raw_value and record.function.raw_value"><field name="function"/></li>
                                         <li t-if="record.parent_id.raw_value and record.function.raw_value"><field name="function"/> at <field name="parent_id"/></li>
-                                        <li t-if="record.city.raw_value and !record.country.raw_value"><field name="city"/></li>
-                                        <li t-if="!record.city.raw_value and record.country.raw_value"><field name="country"/></li>
-                                        <li t-if="record.city.raw_value and record.country.raw_value"><field name="city"/>, <field name="country"/></li>
+                                        <li t-if="record.city.raw_value and !record.country_id.raw_value"><field name="city"/></li>
+                                        <li t-if="!record.city.raw_value and record.country_id.raw_value"><field name="country_id"/></li>
+                                        <li t-if="record.city.raw_value and record.country_id.raw_value"><field name="city"/>, <field name="country_id"/></li>
                                         <li t-if="record.email.raw_value"><a t-attf-href="mailto:#{record.email.raw_value}"><field name="email"/></a></li>
                                     </ul>
                                 </div>
@@ -515,7 +514,7 @@
             <field name="name">Partner Tags</field>
             <field name="model">res.partner.category</field>
             <field name="arch" type="xml">
-                <form string="Partner Tag" version="7.0">
+                <form string="Partner Tag">
                     <group col="4">
                         <field name="name"/>
                         <field name="active"/>