diff --git a/addons/account_followup/report/rappel.rml b/addons/account_followup/report/rappel.rml index 518a93649c2..f84bbba7fb4 100644 --- a/addons/account_followup/report/rappel.rml +++ b/addons/account_followup/report/rappel.rml @@ -39,27 +39,24 @@ - - - - - - + + + + + + - + - - + + - - - - + + + + - - - - + @@ -69,17 +66,17 @@ - [[ repeatIn(ids_to_objects(data['form']['partner_ids']),'o') ]] [[ setLang(o.lang) ]] + [[ repeatIn(ids_to_objects(data['form']['partner_ids']),'o') ]] [[ setLang(o.lang) ]] - + [[ o.name ]] - [[ repeatIn(adr_get(o,'invoice'),'a' )]] + [[ repeatIn(adr_get(o,'invoice'),'a' )]] [[ a['name'] ]] [[ a['street'] ]] [[ a['zip'] ]] @@ -92,7 +89,7 @@ - + Document: Customer account statement @@ -101,109 +98,102 @@ [[ time.strftime('%d/%m/%Y') ]] Customer Ref: [[ o.id ]] - + - [[ format(get_text(o)) ]] - + [[ format(get_text(o)) ]] + - + - Date + Date - Description + Description - Ref + Ref - Maturity date + Maturity date - Due + Due - Paid + Paid - Maturity + Maturity - Amount + Amount - Li. + Li. - + [[repeatIn(getLines(o), 'line') ]] [[ line['date'] ]] - [[ line['name'] ]] + [[ line['name'] ]] - [[ line['ref'] ]] + [[ line['ref'] ]] - [[ line['date_maturity'] ]] + [[ line['date_maturity'] ]] - [[ line['debit'] and '%.2f' % line['debit'] or '' ]] [[ company.currency_id.name]] + [[ line['debit'] and '%.2f' % line['debit'] or '' ]] [[ company.currency_id.name]] - [[ line['credit'] and '%.2f' % line['credit'] or '0.00' ]] [[ company.currency_id.name]] + [[ line['credit'] and '%.2f' % line['credit'] or '0.00' ]] [[ company.currency_id.name]] - [[ (line['date_maturity'] < time.strftime('%Y-%m-%d')) and (line['debit'] - line['credit']) or '' ]] [[ company.currency_id.name]] + [[ (line['date_maturity'] < time.strftime('%Y-%m-%d')) and (line['debit'] - line['credit']) or '' ]] [[ company.currency_id.name]] - [[ '%.2f' % line['amount_currency'] ]] [[ line['currency_id'] and line['currency_id'][1] or '' ]] + [[ '%.2f' % line['amount_currency'] ]] [[ line['currency_id'] and line['currency_id'][1] or '' ]] - [[ line['blocked'] and 'X' or '' ]] + [[ line['blocked'] and 'X' or '' ]] - + - Sub-Total: + Sub-Total: - [[ '%.2f' % (reduce(lambda x,y: x+y['debit'], getLines(o), 0)) ]] [[ company.currency_id.name]] + [[ '%.2f' % (reduce(lambda x,y: x+y['debit'], getLines(o), 0)) ]] [[ company.currency_id.name]] - - [[ '%.2f' % (reduce(lambda x,y: x+y['credit'], getLines(o), 0)) ]] [[ company.currency_id.name]] - + [[ '%.2f' % (reduce(lambda x,y: x+y['credit'], getLines(o), 0)) ]] [[ company.currency_id.name]] - [[ reduce(lambda x,y: x+(y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0) ]] [[ company.currency_id.name]] + [[ reduce(lambda x,y: x+(y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0) ]] [[ company.currency_id.name]] - + - Balance: + Balance: - [[ '%.2f' % (reduce(lambda x,y: x+(y['debit'] - y['credit']), getLines(o), 0)) ]] [[ company.currency_id.name]] - - - - - + [[ '%.2f' % (reduce(lambda x,y: x+(y['debit'] - y['credit']), getLines(o), 0)) ]] [[ company.currency_id.name]] @@ -211,7 +201,12 @@ - + + + + + + @@ -220,8 +215,8 @@ - - + +