From dcb59283db053c47ea508c86f1e450f7b9dcd99e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Najla=C3=A2?= <nel@tinyerp.com>
Date: Mon, 22 Oct 2012 14:08:19 +0200
Subject: [PATCH 1/2] [IMP] crm_partner_assign: merge
 view_res_partner_filter_group_activation and view_res_partner_filter_assign
 into one view

bzr revid: nel@tinyerp.com-20121022120819-gdr5edpaim1qk1r9
---
 addons/crm_partner_assign/res_partner_view.xml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index 3b55c70f4c7..aeafc367792 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -88,6 +88,9 @@
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="base.view_res_partner_filter"/>
         <field name="arch" type="xml">
+            <filter string="Salesperson" position="after">
+                <filter string="Activation" context="{'group_by' : 'activation'}" domain="[]" icon="terp-personal" />
+            </filter>
             <field name="category_id" position="after">
                 <field name="grade_id"/>
             </field>
@@ -165,16 +168,6 @@
         </field>
     </record>
 
-      <record id="view_res_partner_filter_group_activation" model="ir.ui.view">
-            <field name="name">res.partner.geo.inherit.search</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_res_partner_filter"/>
-            <field name="arch" type="xml">
-                <filter string="Salesperson" position="after">
-                    <filter string="Activation" context="{'group_by' : 'activation'}" domain="[]" icon="terp-personal" />
-                </filter>
-            </field>
-        </record>
 
     </data>
 </openerp>

From 319908f1f69908a8a4670760e9c9c86f753818cb Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 19 Dec 2012 14:43:53 +0100
Subject: [PATCH 2/2] [FIX] project: modifying the type of an analytic account
 wasn't working

bzr revid: qdp-launchpad@openerp.com-20121219134353-bsq71cu1ayvyn2tk
---
 addons/project/project.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index c19e7814170..3d2af3c9a92 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1388,7 +1388,8 @@ class account_analytic_account(osv.osv):
         for account in self.browse(cr, uid, ids, context=context):
             if not name:
                 vals['name'] = account.name
-            vals['type'] = account.type
+            if not vals.get('type'):
+                vals['type'] = account.type
             self.project_create(cr, uid, account.id, vals, context=context)
         return super(account_analytic_account, self).write(cr, uid, ids, vals, context=context)