From b103f989dbae49ebc677569acb89552e118d50a4 Mon Sep 17 00:00:00 2001 From: fp Date: Sun, 10 Oct 2010 21:48:41 +0200 Subject: [PATCH] fix bzr revid: fp@fp-laptop-20101010194841-wcmfw8c955iqu6ng --- addons/account/installer.py | 2 -- addons/account/partner.py | 5 ----- addons/crm/report/crm_phonecall_report.py | 3 --- addons/crm/wizard/crm_lead_to_opportunity.py | 2 -- addons/crm/wizard/crm_lead_to_partner.py | 1 - 5 files changed, 13 deletions(-) diff --git a/addons/account/installer.py b/addons/account/installer.py index 7371012b417..60251a673ae 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -241,7 +241,6 @@ class account_installer(osv.osv_memory): view_id_cash = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal View')])[0] #why fixed name here? view_id_cur = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #Why Fixed name here? - ref_acc_bank = obj_multi.bank_account_view_id cash_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_cash') cash_type_id = mod_obj.read(cr, uid, [cash_result], ['res_id'])[0]['res_id'] @@ -445,7 +444,6 @@ class account_installer(osv.osv_memory): # Bank Journals view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: Why put fixed name ? view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #TOFIX: why put fixed name? - ref_acc_bank = obj_multi.bank_account_view_id #create the properties diff --git a/addons/account/partner.py b/addons/account/partner.py index d32a8750c9e..8b0f1057c52 100644 --- a/addons/account/partner.py +++ b/addons/account/partner.py @@ -21,7 +21,6 @@ from operator import itemgetter from osv import fields, osv -import ir class account_fiscal_position(osv.osv): _name = 'account.fiscal.position' @@ -102,10 +101,6 @@ class res_partner(osv.osv): GROUP BY l.partner_id, a.type """, (tuple(ids),)) - tinvert = { - 'credit': 'receivable', - 'debit': 'payable' - } maps = {'receivable':'credit', 'payable':'debit' } res = {} for id in ids: diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py index 9502c39ad06..0e4fb4a7df5 100644 --- a/addons/crm/report/crm_phonecall_report.py +++ b/addons/crm/report/crm_phonecall_report.py @@ -140,7 +140,4 @@ class crm_phonecall_report(osv.osv): from crm_phonecall c )""") - crm_phonecall_report() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py index c34bedf15a2..7046034afaf 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity.py +++ b/addons/crm/wizard/crm_lead_to_opportunity.py @@ -56,7 +56,6 @@ class crm_lead2opportunity(osv.osv_memory): lead_obj = self.pool.get('crm.lead') data_obj = self.pool.get('ir.model.data') - model_obj = self.pool.get('ir.model') # Get Opportunity views result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter') @@ -209,7 +208,6 @@ class crm_lead2opportunity_partner(osv.osv_memory): partner_ids = self._create_partner(cr, uid, ids, context) mod_obj = self.pool.get('ir.model.data') - result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter') value = {} data_obj = self.pool.get('ir.model.data') data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_action') diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py index b0b20243030..229850c6855 100644 --- a/addons/crm/wizard/crm_lead_to_partner.py +++ b/addons/crm/wizard/crm_lead_to_partner.py @@ -67,7 +67,6 @@ class crm_lead2partner(osv.osv_memory): lead_obj = self.pool.get('crm.lead') partner_obj = self.pool.get('res.partner') contact_obj = self.pool.get('res.partner.address') - rec_ids = context and context.get('active_ids', []) partner_id = False data = context and context.get('active_ids', []) or []