[MERGE]: Merge with trunk addons

bzr revid: rpa@openerp.co.in-20100223051513-l29rsag83mkaf6ow

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

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