odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] staging branch 

bzr revid: qdp-launchpad@openerp.com-20121220084357-3ae9icaqihfxpmcs
This commit is contained in:
Quentin (OpenERP) 2012-12-20 09:43:57 +01:00
parent 2315050bab 319908f1f6
commit 4d7a6ac69f
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/crm_partner_assign/res_partner_view.xml
View File

@ -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>

3
addons/project/project.py
View File

@ -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)