[MERGE]merge with parent branch

bzr revid: sgo@tinyerp.com-20120604121955-3127jgv602ddhlyu

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 79afea7..11b2b67 100644 (file)
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -109,8 +109,8 @@
                        </table>
                    </group>
                    <group colspan="4" class="oe_form_group_label_border">
-                               <field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','!=',True),('charge_expenses','!=',True)]}"/>
-                           <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
+                       <field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','!=',True),('charge_expenses','!=',True)]}"/>
+                       <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
                    </group>
                 </xpath>
             </field>

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9559481..8d34084 100644 (file)
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -633,8 +633,10 @@
                     <separator colspan="2" string="Project" name="project_sep"/>
                 </xpath>
                 <xpath expr='//separator[@name="description"]' position='before'>
-                    <separator colspan="4" string="Team"/>
-                    <field name="members" colspan="4" nolabel="1" attrs="{'invisible': [('use_tasks','!=',1)]}"/>
+                    <group colspan="4" attrs="{'invisible': [('use_tasks','!=',1)]}" name="members">
+                        <separator colspan="4" string="Team"/>
+                        <field name="members" colspan="4" nolabel="1"/>
+                    </group>
                 </xpath>
                <xpath expr='//group[@name="project"]' position='inside'>
                     <field name="use_tasks" />

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index d580607..eb8ebd5 100644 (file)
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -405,8 +405,11 @@
                <group name="project" position="inside">
                    <field name="use_issues"/>
                </group>
-               <xpath expr='//field[@name="members"]' position='replace'>
-                    <field name="members" colspan="4" nolabel="1" attrs="{'invisible': [('use_tasks','!=',1),('use_issues','!=',1)]}"/>
+               <xpath expr='//group[@name="members"]' position='replace'>
+                    <group colspan="4" attrs="{'invisible': [('use_tasks','!=',1),('use_issues','!=',1)]}" name="members">
+                        <separator colspan="4" string="Team"/>
+                        <field name="members" colspan="4" nolabel="1"/>
+                    </group>
                 </xpath>
             </field>
         </record>