From 8999b298a76cf63b49e2637e21097e1d937159ed Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Wed, 10 Nov 2010 13:42:44 +0530 Subject: [PATCH 1/6] [REF] base_vat: remove unused import partial bzr revid: mra@mra-laptop-20101110081244-v7j4hlssp1vpqf0z --- addons/base_vat/base_vat.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py index 84624c6bba6..a6b396fd506 100644 --- a/addons/base_vat/base_vat.py +++ b/addons/base_vat/base_vat.py @@ -22,7 +22,6 @@ import string from osv import osv, fields -from tools.func import partial from tools.translate import _ _ref_vat = { From ba66baf2be69ad5d91d7a85514b9bb17256c7c3a Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Wed, 10 Nov 2010 13:50:11 +0530 Subject: [PATCH 2/6] [REF] account: Removed wanrings from buildbot bzr revid: mra@mra-laptop-20101110082011-k7iwkgopgv5lbbix --- addons/account/account.py | 2 +- addons/account/account_bank_statement.py | 2 -- addons/account/wizard/account_report_aged_partner_balance.py | 1 - addons/account_followup/wizard/account_followup_print.py | 4 +--- addons/account_payment/wizard/account_payment_order.py | 2 +- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 1033f02f841..eb5b227979b 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -20,7 +20,7 @@ ############################################################################## import time -from datetime import datetime, timedelta +from datetime import datetime from dateutil.relativedelta import relativedelta from operator import itemgetter diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index aa4f45bad58..1859d055e78 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -423,8 +423,6 @@ account_bank_statement() class account_bank_statement_line(osv.osv): def onchange_type(self, cr, uid, line_id, partner_id, type, context=None): - res_users_obj = self.pool.get('res.users') - res_currency_obj = self.pool.get('res.currency') res = {'value': {}} obj_partner = self.pool.get('res.partner') if context is None: diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py index 8c7e6988b5a..5eb1f0f5a2e 100644 --- a/addons/account/wizard/account_report_aged_partner_balance.py +++ b/addons/account/wizard/account_report_aged_partner_balance.py @@ -45,7 +45,6 @@ class account_aged_trial_balance(osv.osv_memory): } def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): - mod_obj = self.pool.get('ir.model.data') res = super(account_aged_trial_balance, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False) doc = etree.XML(res['arch']) nodes = doc.xpath("//field[@name='journal_ids']") diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py index 6b58cebdae1..18c455ac07a 100644 --- a/addons/account_followup/wizard/account_followup_print.py +++ b/addons/account_followup/wizard/account_followup_print.py @@ -107,7 +107,7 @@ class account_followup_stat_by_partner(osv.osv): l.reconcile_id is NULL AND l.partner_id IS NOT NULL GROUP BY - l.partner_id, l.company_id + l.partner_id, l.company_id )""") account_followup_stat_by_partner() @@ -212,10 +212,8 @@ class account_followup_print_all(osv.osv_memory): model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all_msg')], context=context) resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id'] if data['email_conf']: - mail_notsent = '' msg_sent = '' msg_unsent = '' - count = 0 data_user = user_obj.browse(cr, uid, uid) move_lines = line_obj.browse(cr, uid, data['partner_ids']) partners = [] diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py index aedef85de5e..aaec72e37f7 100644 --- a/addons/account_payment/wizard/account_payment_order.py +++ b/addons/account_payment/wizard/account_payment_order.py @@ -100,7 +100,7 @@ class payment_order_create(osv.osv_memory): context = {} data = self.read(cr, uid, ids, [], context=context)[0] search_due_date = data['duedate'] - payment = order_obj.browse(cr, uid, context['active_id'], context=context) +# payment = order_obj.browse(cr, uid, context['active_id'], context=context) # Search for move line to pay: domain = [('reconcile_id', '=', False), ('account_id.type', '=', 'payable'), ('amount_to_pay', '>', 0)] From 5af938368710a7d617b6b187776cf532770ca48c Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Wed, 10 Nov 2010 13:58:46 +0530 Subject: [PATCH 3/6] [REF] HR payroll and holidays: Removed wanrings from buildbot bzr revid: mra@mra-laptop-20101110082846-z59nb73g5gttkelw --- addons/hr_holidays/wizard/hr_holidays_summary_employees.py | 1 - addons/hr_payroll/wizard/hr_payroll_employees_detail.py | 1 - addons/hr_payroll/wizard/hr_payroll_year_salary.py | 1 - 3 files changed, 3 deletions(-) diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py index 1dc96afedb9..984a1f51e4b 100644 --- a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py +++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py @@ -21,7 +21,6 @@ import time from osv import osv, fields -from tools.translate import _ class hr_holidays_summary_employee(osv.osv_memory): _name = 'hr.holidays.summary.employee' diff --git a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py index edac1dde3f4..2bb36b6f282 100755 --- a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py +++ b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py @@ -22,7 +22,6 @@ import time from osv import fields, osv -from tools.translate import _ class hr_payroll_employees_detail(osv.osv_memory): diff --git a/addons/hr_payroll/wizard/hr_payroll_year_salary.py b/addons/hr_payroll/wizard/hr_payroll_year_salary.py index 240f21c3582..41caf5f4109 100755 --- a/addons/hr_payroll/wizard/hr_payroll_year_salary.py +++ b/addons/hr_payroll/wizard/hr_payroll_year_salary.py @@ -22,7 +22,6 @@ import time from osv import fields, osv -from tools.translate import _ class hr_payroll_year_salary(osv.osv_memory): _name = "hr.payroll.year.salary" From bc2db516c82318e853ed20df8fdb4c3b4dcde24c Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Wed, 10 Nov 2010 14:31:10 +0530 Subject: [PATCH 4/6] [FIX] Account: move line => tab analytic line with proper group set bzr revid: mra@mra-laptop-20101110090110-tl59lqhfz6kvco6o --- addons/account/account_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index acbe5071088..5ef08efc5bb 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1358,7 +1358,7 @@ - + From 7aa80843f94d2bc2b40eda7a140c7f725ea3a403 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Wed, 10 Nov 2010 14:33:41 +0530 Subject: [PATCH 5/6] [FIX] Account: move line => tab analytic line with proper group set bzr revid: mra@mra-laptop-20101110090341-f6xnqk61xmr5g6mu --- addons/account/account_view.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 5ef08efc5bb..aaabc86d865 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1065,8 +1065,8 @@ - - + + @@ -1112,8 +1112,8 @@ - - + + @@ -1359,7 +1359,7 @@ - + From 099cb32b51f626cfc07a8ec3224a28fc227f2180 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Wed, 10 Nov 2010 14:49:28 +0530 Subject: [PATCH 6/6] [REM] Account: Bank statement: button_import_invoice unused function removed bzr revid: mra@mra-laptop-20101110091928-md56a5yxxb85l4l0 --- addons/account/account_bank_statement.py | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 1859d055e78..0b03f52a1e9 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -46,26 +46,6 @@ class account_bank_statement(osv.osv): account_bank_statement_line_obj.write(cr, uid, [line.id], {'sequence': seq}, context=context) return res - def button_import_invoice(self, cr, uid, ids, context=None): - mod_obj = self.pool.get('ir.model.data') - if context is None: - context = {} - model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_statement_from_invoice')], context=context) - resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id'] - context.update({'statement_id': ids[0]}) - - return { - 'name': _('Import Invoice'), - 'context': context, - 'view_type': 'form', - 'view_mode': 'tree,form', - 'res_model': 'account.statement.from.invoice', - 'views': [(resource_id,'form')], - 'type': 'ir.actions.act_window', - 'target': 'new', - 'nodestroy': True - } - def _default_journal_id(self, cr, uid, context={}): journal_pool = self.pool.get('account.journal') journal_type = context.get('journal_type', False)