Merge remote-tracking branch 'odoo/7.0' into 7.0

OCA · Aug 12, 2015 · 82d3600 · 82d3600
2 parents 2fc6748 + 85b2e60
commit 82d3600
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -74,7 +74,7 @@
                 <group col="4">
                     <field name="name"/>
                     <field name="code"/>
-                    <field name="plan_id"/>
+                    <field name="plan_id" required="1"/>
                     <field name="journal_id"/>
                 </group>
                 <field name="account_ids">

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
@@ -168,7 +168,6 @@
                             <field name="priority"/>
                             <field name="categ_ids"
                                 widget="many2many_tags"
-                                domain="[('object_id.model','=','crm.lead')]"
                                 context="{'object_name': 'crm.lead'}"
                             />
                         </group>
@@ -440,9 +439,7 @@
                             <group>
                                 <field name="categ_ids"
                                     string="Categories" widget="many2many_tags"
-                                    context = "{'object_name': 'crm.lead'}"
-                                    domain="[('object_id.model', '=', 'crm.lead')]"/>
-
+                                    context="{'object_name': 'crm.lead'}"/>
                             </group>
                         </group>