[IMP]type invible when type is contract and template and project related issues solved

bzr revid: sgo@tinyerp.com-20120604103342-g0pnstp5cexttdb7

5 files changed, 8 insertions, 5 deletions

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index bea6d70608b..792b272ce1d 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -109,7 +109,7 @@
 			</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="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>
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index af5925829dd..4ef37e88b9b 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -15,7 +15,7 @@
                             <field name="code"/>
                             <field name="user_id"/>
                             <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
-                            <field name="type" select="2"/>
+                            <field name="type" select="2" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
                             <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
                         </group>
                         <notebook colspan="4">
diff --git a/addons/project/project.py b/addons/project/project.py
index 19275fa073c..2e86c79bddc 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1272,7 +1272,7 @@ class account_analytic_account(osv.osv):
     def project_create(self,cr,uid,analytic_account_id,vals,context=None):
         res = {}
         project_pool = self.pool.get('project.project')
-        project_id = project_pool.search(cr, uid, [('analytic_account_id','=',analytic_account_id)])
+        project_id = project_pool.search(cr, uid, [('name','=',vals.get('name'))])
         if not project_id:
             res['name'] = vals.get('name')
             res['analytic_account_id'] = analytic_account_id
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6710e455cb6..ad7474b7d40 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -625,7 +625,7 @@
                 </xpath>
                 <xpath expr='//separator[@name="description"]' position='before'>
                     <separator colspan="4" string="Team"/>
-                    <field name="members" colspan="4" nolabel="1"/>
+                    <field name="members" colspan="4" nolabel="1" attrs="{'invisible': [('use_tasks','!=',1)]}"/>
                 </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 1dfd1ed1b5e..8c5905378ec 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -395,7 +395,7 @@
             <field name="name">account.analytic.account.issue.form.inherit</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field name="inherit_id" ref="project.analytic_account_inherited_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <xpath expr='//separator[@name="project_sep"]' position='replace'>
@@ -404,6 +404,9 @@
             	<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>
             </field>
         </record>
     </data>