From 3f94a66d1ef9f74b5bf173c2bfe363393eb700fe Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 30 Nov 2012 17:24:01 +0100 Subject: [PATCH] [REF] account_followup: code review bzr revid: qdp-launchpad@openerp.com-20121130162401-7g0xm5p7nrbz026e --- addons/account_followup/account_followup.py | 16 +--- .../security/account_followup_security.xml | 3 +- .../wizard/account_followup_print.py | 75 +++++++++---------- 3 files changed, 40 insertions(+), 54 deletions(-) diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py index 5f7f3ba3f8e..55903c85f92 100644 --- a/addons/account_followup/account_followup.py +++ b/addons/account_followup/account_followup.py @@ -40,13 +40,12 @@ class followup(osv.osv): _sql_constraints = [('company_uniq', 'unique(company_id)', 'Only one follow-up per company is allowed')] - class followup_line(osv.osv): def _get_default_template(self, cr, uid, ids, context=None): dummy, templ = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_followup', 'email_template_account_followup_default') return templ - + _name = 'account_followup.followup.line' _description = 'Follow-up Criteria' _columns = { @@ -124,7 +123,6 @@ class email_template(osv.osv): return super(email_template, self).render_template(cr, uid, template, model, res_id, context=context) - class res_partner(osv.osv): def fields_view_get(self, cr, uid, view_id=None, view_type=None, context=None, toolbar=False, submenu=False): @@ -138,9 +136,6 @@ class res_partner(osv.osv): res['arch'] = etree.tostring(doc) return res - - - def _get_latest(self, cr, uid, ids, names, arg, context=None, company_id=None): res={} if company_id == None: @@ -169,7 +164,6 @@ class res_partner(osv.osv): 'latest_followup_level_id_without_lit': latest_level_without_lit} return res - def do_partner_manual_action(self, cr, uid, partner_ids, context=None): #partner_ids -> res.partner for partner in self.browse(cr, uid, partner_ids, context=context): @@ -179,11 +173,11 @@ class res_partner(osv.osv): action_text = (partner.payment_next_action or '') + "\n" + (partner.latest_followup_level_id_without_lit.manual_action_note or '') else: action_text = partner.latest_followup_level_id_without_lit.manual_action_note or '' - + #Check date: put the minimum date if it existed already action_date = (partner.payment_next_action_date and min(partner.payment_next_action_date, fields.date.context_today(cr, uid, context)) ) or fields.date.context_today(cr, uid, context) - + # Check responsible: if partner has not got a responsible already, take from follow-up responsible_id = False if partner.payment_responsible_id: @@ -195,7 +189,6 @@ class res_partner(osv.osv): 'payment_next_action': action_text, 'payment_responsible_id': responsible_id}) - def do_partner_print(self, cr, uid, wizard_partner_ids, data, context=None): #wizard_partner_ids are ids from special view, not from res.partner if not wizard_partner_ids: @@ -260,8 +253,6 @@ class res_partner(osv.osv): } - - _inherit = "res.partner" _columns = { 'payment_responsible_id':fields.many2one('res.users', ondelete='set null', string='Follow-up Responsible', @@ -287,7 +278,6 @@ class res_partner(osv.osv): help="The maximum follow-up level without taking into account the account move lines with litigation", store=False, multi="latest"), - 'payment_amount_due':fields.related('credit', type='float', string="Total amount due", readonly=True), } diff --git a/addons/account_followup/security/account_followup_security.xml b/addons/account_followup/security/account_followup_security.xml index 106aa5a8c42..fd90e16fec8 100644 --- a/addons/account_followup/security/account_followup_security.xml +++ b/addons/account_followup/security/account_followup_security.xml @@ -15,7 +15,6 @@ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - - + diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py index 1de7e9bfe76..db93b3c63a8 100644 --- a/addons/account_followup/wizard/account_followup_print.py +++ b/addons/account_followup/wizard/account_followup_print.py @@ -78,37 +78,35 @@ account_followup_stat_by_partner() class account_followup_sending_results(osv.osv_memory): def do_report(self, cr, uid, ids, context=None): - return context['report_data'] - + if context is None: + context = {} + return context.get('report_data') + def do_done(self, cr, uid, ids, context=None): return {} - + def _get_description(self, cr, uid, context=None): - res = "" - if context!=None: - res = context['description'] - return res - + if context is None: + context = {} + return context.get('description') + def _get_need_printing(self, cr, uid, context=None): - res = False - if context!=None: - if context['needprinting']: - res = context['needprinting'] - return res - + if context is None: + context = {} + return context.get('needprinting') + _name = 'account_followup.sending.results' _description = 'Results from the sending of the different letters and emails' _columns = { - 'description':fields.text("Description", required=False, readonly=True), - 'needprinting':fields.boolean("Needs printing") - } + 'description': fields.text("Description", readonly=True), + 'needprinting': fields.boolean("Needs Printing") + } _defaults = { - 'needprinting':_get_need_printing, - 'description':_get_description, - - } - -account_followup_sending_results() + 'needprinting':_get_need_printing, + 'description':_get_description, + } + +account_followup_sending_results() class account_followup_print(osv.osv_memory): @@ -120,16 +118,16 @@ class account_followup_print(osv.osv_memory): 'followup_id': fields.many2one('account_followup.followup', 'Follow-Up', required=True, readonly = True), 'partner_ids': fields.many2many('account_followup.stat.by.partner', 'partner_stat_rel', 'osv_memory_id', 'partner_id', 'Partners', required=True), - 'company_id':fields.related('followup_id', 'company_id', type='many2one', - relation='res.company', store=True, readonly=True), + 'company_id':fields.related('followup_id', 'company_id', type='many2one', + relation='res.company', store=True, readonly=True), 'email_conf': fields.boolean('Send Email Confirmation'), 'email_subject': fields.char('Email Subject', size=64), - 'partner_lang': fields.boolean('Send Email in Partner Language', + 'partner_lang': fields.boolean('Send Email in Partner Language', help='Do not change message text, if you want to send email in partner language, or configure from company'), 'email_body': fields.text('Email Body'), 'summary': fields.text('Summary', readonly=True), 'test_print': fields.boolean('Test Print', - help='Check if you want to print follow-ups without changing follow-ups level.'), + help='Check if you want to print follow-ups without changing follow-ups level.'), } def _get_followup(self, cr, uid, context=None): @@ -141,9 +139,6 @@ class account_followup_print(osv.osv_memory): followp_id = self.pool.get('account_followup.followup').search(cr, uid, [('company_id', '=', company_id)], context=context) return followp_id and followp_id[0] or False - - - def process_partners(self, cr, uid, partner_ids, data, context=None): partner_obj = self.pool.get('res.partner') partner_ids_to_print = [] @@ -196,7 +191,6 @@ class account_followup_print(osv.osv_memory): self.pool.get('account.move.line').write(cr, uid, [int(id)], {'followup_line_id': to_update[id]['level'], 'followup_date': date}) - def clear_manual_actions(self, cr, uid, partner_list, context=None): # Partnerlist is list to exclude # Will clear the actions of partners that have no due payments anymore @@ -216,6 +210,9 @@ class account_followup_print(osv.osv_memory): return len(ids) def do_process(self, cr, uid, ids, context=None): + if context is None: + context = {} + #Get partners tmp = self._get_partners_followp(cr, uid, ids, context=context) partner_list = tmp['partner_ids'] @@ -223,17 +220,19 @@ class account_followup_print(osv.osv_memory): date = self.browse(cr, uid, ids, context=context)[0].date data = self.read(cr, uid, ids, [], context=context)[0] data['followup_id'] = data['followup_id'][0] - #Update and process partners + + #Update partners self.do_update_followup_level(cr, uid, to_update, partner_list, date, context=context) + #process the partners (send mails...) restot = self.process_partners(cr, uid, partner_list, data, context=context) + #clear the manual actions if nothing is due anymore nbactionscleared = self.clear_manual_actions(cr, uid, partner_list, context=context) if nbactionscleared > 0: - restot['resulttext'] = restot['resulttext'] + "
  • " + str(nbactionscleared) + " " + _("partners have no credits and as such the action is cleared") + "
    • " + restot['resulttext'] = restot['resulttext'] + "
  • " + _("%s partners have no credits and as such the action is cleared") %(str(nbactionscleared)) + "
    • " res = restot['action'] + + #return the next action mod_obj = self.pool.get('ir.model.data') - if context is None: - context = {} - data = self.browse(cr, uid, ids, context=context)[0] model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_sending_results')], context=context) resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id'] context.update({'description': restot['resulttext'], 'needprinting': restot['needprinting'], 'report_data': res}) @@ -257,7 +256,6 @@ class account_followup_print(osv.osv_memory): 'email_body': "", 'email_subject': _('Invoices Reminder'), 'partner_lang': True, - #'partner_ids': _get_partners, } def _get_partners_followp(self, cr, uid, ids, context=None): @@ -298,8 +296,7 @@ class account_followup_print(osv.osv_memory): delay = datetime.timedelta(days=result['delay']) fups[old] = (current_date - delay, result['id']) old = result['id'] - #fups[old] = (datetime.date(datetime.MAXYEAR, 12, 31), old) --> By commenting this, last level won't be printed again and again - fups + partner_list = [] to_update = {}