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

[MERGE] forward port of branch saas-3 up to 4b1496f

This commit is contained in:
Christophe Simonis 2015-08-13 15:18:26 +02:00
parent cdb9000449 4b1496fdd3
commit 09ceb9cb8a
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account_analytic_plans/account_analytic_plans_view.xml
View File

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

5
addons/crm/crm_lead_view.xml
View File

@ -159,7 +159,6 @@
<field name="priority" widget="priority"/>
<field name="categ_ids"
widget="many2many_tags"
domain="[('object_id.model','=','crm.lead')]"
context="{'object_name': 'crm.lead'}"
/>
</group>
@ -434,9 +433,7 @@
<group>
<field name="categ_ids"
widget="many2many_tags"
context="{'object_name': 'crm.lead'}"
domain="[('object_id.model', '=', 'crm.lead')]"/>
context="{'object_name': 'crm.lead'}"/>
</group>
</group>

2
addons/mrp_repair/wizard/make_invoice.py
View File

@ -54,7 +54,7 @@ class make_invoice(osv.osv_memory):
form_res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
form_id = form_res and form_res[1] or False
tree_res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree')
tree_id = tree_res and tree_res[1] or Fals
tree_id = tree_res and tree_res[1] or False
return {
'domain': [('id','in', newinv.values())],