diff --git a/addons/account_followup/__terp__.py b/addons/account_followup/__terp__.py
index 5c58289f215..ba384eb5360 100644
--- a/addons/account_followup/__terp__.py
+++ b/addons/account_followup/__terp__.py
@@ -45,8 +45,8 @@
'update_xml': [
'security/ir.model.access.csv',
'wizard/wizard_view.xml',
+ 'followup_report_view.xml',
'followup_view.xml',
- 'followup_report_view.xml'
],
'demo_xml': ['followup_demo.xml'],
'installable': True,
diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/followup_view.xml
index 5b0bbb7dd34..1b2d40a7cd9 100644
--- a/addons/account_followup/followup_view.xml
+++ b/addons/account_followup/followup_view.xml
@@ -31,13 +31,9 @@
-
-
+
-
-
-
@@ -134,11 +130,11 @@
-
+
-
+
diff --git a/addons/account_followup/report/report_followup_print.py b/addons/account_followup/report/report_followup_print.py
index f77c6ff7239..b6c89b074b8 100644
--- a/addons/account_followup/report/report_followup_print.py
+++ b/addons/account_followup/report/report_followup_print.py
@@ -61,7 +61,7 @@ class report_rappel(report_sxw.rml_parse):
movelines = moveline_obj.read(self.cr, self.uid, movelines)
return movelines
- def _get_text(self, partner, followup_id):
+ def _get_text(self, partner, followup_id, context={}):
fp_obj = pooler.get_pool(self.cr.dbname).get('account_followup.followup')
fp_line = fp_obj.browse(self.cr, self.uid, followup_id).followup_line
li_delay = []
@@ -82,7 +82,12 @@ class report_rappel(report_sxw.rml_parse):
partner_delay.append(delay)
text = partner_delay and a[max(partner_delay)] or ''
if text:
- text = text % {'partner_name':partner.name}
+ text = text % {
+ 'partner_name': partner.name,
+ 'date': time.strftime('%Y-%m-%d'),
+ 'company_name': fp_obj.browse(self.cr, self.uid, followup_id).company_id.name,
+ 'user_signature': pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr, self.uid, self.uid, context).signature,
+ }
return text
diff --git a/addons/account_followup/wizard/wizard_followup_print.py b/addons/account_followup/wizard/wizard_followup_print.py
index 8344914fbd6..e271d1dbd27 100644
--- a/addons/account_followup/wizard/wizard_followup_print.py
+++ b/addons/account_followup/wizard/wizard_followup_print.py
@@ -204,7 +204,7 @@ class followup_all_print(wizard.interface):
summary = msg_unsent + line + msg_sent
return {'summary' : summary}
else:
- return {'summary' : '\n\n\nMain not sent to any partner if you want to sent it please tick send email confirmation on wizard'}
+ return {'summary' : '\n\n\nMail not sent to any partner if you want to sent it please tick send email confirmation on wizard'}
def _get_partners(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)