From 3c8de333a4e648fc3d827e69379990217ee5c792 Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Wed, 6 Jul 2011 17:36:44 +0530 Subject: [PATCH] [IMP] add boolean field on account_followup wizard and fix partner_id many2many fields gives error bzr revid: ara@tinyerp.com-20110706120644-etqtptxkmjer6qsa --- addons/account_followup/wizard/account_followup_print.py | 7 ++++--- .../wizard/account_followup_print_view.xml | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py index a8608c2fdd0..c1b5247dec2 100644 --- a/addons/account_followup/wizard/account_followup_print.py +++ b/addons/account_followup/wizard/account_followup_print.py @@ -115,12 +115,13 @@ class account_followup_print_all(osv.osv_memory): _name = 'account.followup.print.all' _description = 'Print Followup & Send Mail to Customers' _columns = { - 'partner_ids': fields.many2many('account_followup.stat.by.partner', 'partner_stat_rel', 'osv_memory_id', 'partner_id', 'Partners', required=True, domain="[('account_id.type', '=', 'receivable'), ('account_id.reconcile', '=', True), ('reconcile_id','=', False), ('state', '!=', 'draft'), ('account_id.active', '=', True), ('debit', '>', 0)]"), + 'partner_ids': fields.many2many('account_followup.stat.by.partner', 'partner_stat_rel', 'osv_memory_id', 'partner_id', 'Partners', required=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', 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', required=True, readonly=True) + 'summary': fields.text('Summary', required=True, readonly=True), + 'test': fields.boolean('Test File') } def _get_summary(self, cr, uid, context=None): if context is None: @@ -316,7 +317,7 @@ class account_followup_print_all(osv.osv_memory): data['followup_id'] = 'followup_id' in context and context['followup_id'] or False date = 'date' in context and context['date'] or data['date'] for id in to_update.keys(): - if to_update[id]['partner_id'] in data['partner_ids']: + if to_update[id]['partner_id'] in data['partner_ids'] and not data['test']: cr.execute( "UPDATE account_move_line "\ "SET followup_line_id=%s, followup_date=%s "\ diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml index af105b17c55..1ece8ea2959 100644 --- a/addons/account_followup/wizard/account_followup_print_view.xml +++ b/addons/account_followup/wizard/account_followup_print_view.xml @@ -86,6 +86,7 @@ +