From 0d565d8882c50555677fd9cbece509796e44e1e5 Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Tue, 15 Sep 2009 11:14:50 +0530 Subject: [PATCH 1/5] [ADD]: add new data file which will add over due payment message to company bzr revid: mga@tinyerp.com-20090915054450-1ju59ok5ev4pw8yg --- addons/account_followup/__terp__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/account_followup/__terp__.py b/addons/account_followup/__terp__.py index 00e86ef2d96..5122204fa68 100644 --- a/addons/account_followup/__terp__.py +++ b/addons/account_followup/__terp__.py @@ -53,6 +53,7 @@ 'wizard/wizard_view.xml', 'followup_report_view.xml', 'followup_view.xml', + 'followup_data.xml' ], 'demo_xml': ['followup_demo.xml'], 'installable': True, From d16353aad85dd6c66005f972b8f2ac108823b86a Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Tue, 15 Sep 2009 11:15:34 +0530 Subject: [PATCH 2/5] [IMP]: add new filed to company object which will store the mesages bzr revid: mga@tinyerp.com-20090915054534-7ancl4t5bcqsif7q --- addons/account_followup/followup.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/addons/account_followup/followup.py b/addons/account_followup/followup.py index 459e3e38e3c..9efd1d0a1ff 100644 --- a/addons/account_followup/followup.py +++ b/addons/account_followup/followup.py @@ -55,6 +55,29 @@ class account_move_line(osv.osv): } account_move_line() +class res_company(osv.osv): + _inherit = "res.company" + _columns = { + 'follow_up_msg' : fields.text('Follow-up Message', translate=True), + } + + _defaults = { + 'overdue_msg': lambda *a: ''' +Date : %(date)s + +Dear %(partner_name)s, + +Please find in attachment a reminder of all your unpaid invoices, for a total amount due of: + +%(followup_amount).2f %(company_currency)s + +Thanks, +-- +%(user_signature)s +%(company_name)s + ''' + } +res_company() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 2168cad83e586daa9d0b5d1694812fd0dc0794b8 Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Tue, 15 Sep 2009 11:16:21 +0530 Subject: [PATCH 3/5] [IMP]: add inherited view for company bzr revid: mga@tinyerp.com-20090915054621-7iyfnle7otqkday3 --- addons/account_followup/followup_view.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/followup_view.xml index 1b2d40a7cd9..cd02355dc7e 100644 --- a/addons/account_followup/followup_view.xml +++ b/addons/account_followup/followup_view.xml @@ -125,7 +125,6 @@ - @@ -136,6 +135,17 @@ - + + res.company.followup.form.inherit + + res.company + form + + + + + + + From 24233606a20a6422abc6f0b5c3aae895f4320401 Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Tue, 15 Sep 2009 11:16:42 +0530 Subject: [PATCH 4/5] [CHANGE]: change a logic to read the message from company configuration bzr revid: mga@tinyerp.com-20090915054642-qg0zz31wkgdv24u8 --- addons/account_followup/wizard/wizard_followup_print.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/account_followup/wizard/wizard_followup_print.py b/addons/account_followup/wizard/wizard_followup_print.py index e271d1dbd27..9d1f4c6deef 100644 --- a/addons/account_followup/wizard/wizard_followup_print.py +++ b/addons/account_followup/wizard/wizard_followup_print.py @@ -256,8 +256,10 @@ class followup_all_print(wizard.interface): if partner_id not in partner_list: partner_list.append(partner_id) to_update[str(id)] = fups[followup_line_id][1] - - return {'partner_ids': partner_list, 'to_update': to_update} + + message = pool.get('res.users').browse(cr, uid, uid).company_id.follow_up_msg + + return {'partner_ids': partner_list, 'to_update': to_update, 'email_body':message} def _get_screen1_values(self, cr, uid, data, context): pool = pooler.get_pool(cr.dbname)