[MERGE] merged the branch of Serpent Consulting fixing bug 883160.

bzr revid: qdp-launchpad@openerp.com-20111108102918-97my5wahc8ztjlka
This commit is contained in:
Quentin (OpenERP) 2011-11-08 11:29:18 +01:00
commit 2684803fad
1 changed files with 3 additions and 2 deletions

View File

@ -86,6 +86,8 @@ class report_rappel(report_sxw.rml_parse):
def _get_text(self, partner, followup_id, context=None):
if context is None:
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 = []
@ -96,7 +98,6 @@ class report_rappel(report_sxw.rml_parse):
a = {}
partner_line = pooler.get_pool(self.cr.dbname).get('account.move.line').search(self.cr, self.uid, [('partner_id','=',partner.id),('reconcile_id','=',False)])
partner_delay = []
context={}
context.update({'lang': partner.lang})
for i in pooler.get_pool(self.cr.dbname).get('account.move.line').browse(self.cr, self.uid, partner_line, context):
for delay in li_delay:
@ -110,7 +111,7 @@ class report_rappel(report_sxw.rml_parse):
'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,
'user_signature': pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr, self.uid, self.uid, context).signature or '',
}
return text