[MERGE] forward port of branch 7.0 up to 937b957
This commit is contained in:
commit
4b1496fdd3
|
@ -305,7 +305,7 @@ class account_cash_statement(osv.osv):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
for item_label, item_account in TABLES:
|
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!'),
|
raise osv.except_osv(_('Error!'),
|
||||||
_('There is no %s Account on the journal %s.') % (item_label, obj.journal_id.name,))
|
_('There is no %s Account on the journal %s.') % (item_label, obj.journal_id.name,))
|
||||||
|
|
||||||
|
|
|
@ -74,7 +74,7 @@
|
||||||
<group col="4">
|
<group col="4">
|
||||||
<field name="name"/>
|
<field name="name"/>
|
||||||
<field name="code"/>
|
<field name="code"/>
|
||||||
<field name="plan_id"/>
|
<field name="plan_id" required="1"/>
|
||||||
<field name="journal_id"/>
|
<field name="journal_id"/>
|
||||||
</group>
|
</group>
|
||||||
<field name="account_ids">
|
<field name="account_ids">
|
||||||
|
|
|
@ -159,7 +159,6 @@
|
||||||
<field name="priority"/>
|
<field name="priority"/>
|
||||||
<field name="categ_ids"
|
<field name="categ_ids"
|
||||||
widget="many2many_tags"
|
widget="many2many_tags"
|
||||||
domain="[('object_id.model','=','crm.lead')]"
|
|
||||||
context="{'object_name': 'crm.lead'}"
|
context="{'object_name': 'crm.lead'}"
|
||||||
/>
|
/>
|
||||||
</group>
|
</group>
|
||||||
|
@ -436,9 +435,7 @@
|
||||||
<group>
|
<group>
|
||||||
<field name="categ_ids"
|
<field name="categ_ids"
|
||||||
string="Categories" widget="many2many_tags"
|
string="Categories" widget="many2many_tags"
|
||||||
context="{'object_name': 'crm.lead'}"
|
context="{'object_name': 'crm.lead'}"/>
|
||||||
domain="[('object_id.model', '=', 'crm.lead')]"/>
|
|
||||||
|
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ class make_invoice(osv.osv_memory):
|
||||||
form_res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
|
form_res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
|
||||||
form_id = form_res and form_res[1] or False
|
form_id = form_res and form_res[1] or False
|
||||||
tree_res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree')
|
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 {
|
return {
|
||||||
'domain': [('id','in', newinv.values())],
|
'domain': [('id','in', newinv.values())],
|
||||||
|
|
Loading…
Reference in New Issue