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

[MERGE] forward port of branch 7.0 up to 937b957

This commit is contained in:
Christophe Simonis 2015-08-13 15:14:16 +02:00
parent d5a6380726 937b9575c0
commit 4b1496fdd3
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account_cash_statement.py
View File

@ -305,7 +305,7 @@ class account_cash_statement(osv.osv):
continue
for item_label, item_account in TABLES:
if getattr(obj.journal_id, item_account):
if not getattr(obj.journal_id, item_account):
raise osv.except_osv(_('Error!'),
_('There is no %s Account on the journal %s.') % (item_label, obj.journal_id.name,))

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"/>
<field name="categ_ids"
widget="many2many_tags"
domain="[('object_id.model','=','crm.lead')]"
context="{'object_name': 'crm.lead'}"
/>
</group>
@ -436,9 +435,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>

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())],