diff options
| author | rpa (Open ERP) <rpa@openerp.co.in> | 2010-02-23 10:45:13 +0530 |
|---|---|---|
| committer | rpa (Open ERP) <rpa@openerp.co.in> | 2010-02-23 10:45:13 +0530 |
| commit | 6ed597b37cbac8cd3853d46e0c19fd8f2ea8229b (patch) | |
| tree | b00338aa7d28cabc3ecffefb73e54fb435a22df4 | |
| parent | 134979d1d1c2e462328da19e01fddf91746c10a1 (diff) | |
| parent | 222ab7cd116bfbee0f4f7b0bb80bd8239a89e863 (diff) | |
[MERGE]: Merge with trunk addons
bzr revid: rpa@openerp.co.in-20100223051513-l29rsag83mkaf6ow
| -rw-r--r-- | addons/account/account_move_line.py | 5 | ||||
| -rw-r--r-- | addons/crm/crm_phonecall_menu.xml | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 9470c6fc01e..8355cf6be3c 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -283,7 +283,10 @@ class account_move_line(osv.osv): result.append((line.id, line.name)) return result - def _balance_search(self, cursor, user, obj, name, args): + def _balance_search(self, cursor, user, obj, name, args, domain=None, context=None): + if context is None: + context = {} + if not len(args): return [] where = ' and '.join(map(lambda x: '(abs(sum(debit-credit))'+x[1]+str(x[2])+')',args)) diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml index 07dfb5b89e7..b67fb2b97ee 100644 --- a/addons/crm/crm_phonecall_menu.xml +++ b/addons/crm/crm_phonecall_menu.xml @@ -56,7 +56,7 @@ <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming0"> <field name="sequence" eval="1"/> <field name="view_mode">tree</field> - <field name="view_id" ref="crm_case_phone_incomming_tree_view"/> + <field name="view_id" ref="crm_case_phone_tree_view"/> <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/> </record> <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_incoming0"> |