diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py
index 64ee26229f8..af193620eb0 100644
--- a/addons/account/report/general_ledger.py
+++ b/addons/account/report/general_ledger.py
@@ -314,8 +314,8 @@ class general_ledger(rml_parse.rml_parse):
else :
l['partner'] = ''
sum = l['debit'] - l ['credit']
- c = time.strptime(l['date'],"%Y-%m-%d")
- l['date'] = time.strftime("%d-%m-%Y",c)
+# c = time.strptime(l['date'],"%Y-%m-%d")
+# l['date'] = time.strftime("%d-%m-%Y",c)
l['progress'] = sum
l['line_corresp'] = self._calc_contrepartie(self.cr,self.uid,[l['id']])[l['id']]
# Modification du amount Currency
diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml
index a18e1777617..c2a5fc7828b 100644
--- a/addons/account/report/general_ledger.rml
+++ b/addons/account/report/general_ledger.rml
@@ -111,22 +111,22 @@
| [[ o.code or '']] [[ o.name or '']] |
|
- [[ sum_debit_account(o, data['form']) or '0.0' ]] |
- [[sum_credit_account(o, data['form']) or '0.0' ]] |
- [[sum_solde_account(o, data['form']) or '0.0' ]] |
+ [[formatLang(sum_debit_account(o, data['form'])) ]] |
+ [[formatLang(sum_credit_account(o, data['form'])) ]] |
+ [[formatLang(sum_solde_account(o, data['form'])) ]] |
[[ repeatIn(lines(o, data['form']), 'line') ]]
- | [[ line['date'] or '' ]] |
+ [[ formatLang(line['date'],date=True) ]] |
[[ line['partner'] or '']] |
[[ line['ref'] or '']] |
[[ line['move'] or '']] |
[[ line['name'] or '' ]] |
- [[ line['debit'] or '0.0' ]] |
- [[ line['credit'] or '0.0' ]] |
- [[ line['progress'] or '0.0' ]] |
+ [[ formatLang(line['debit']) ]] |
+ [[ formatLang(line['credit']) ]] |
+ [[ formatLang(line['progress']) ]] |
|
@@ -159,24 +159,24 @@
| [[ o.code or '' ]] [[ o.name or '' ]] |
|
- [[ sum_debit_account(o, data['form']) or '0.0' ]] |
- [[sum_credit_account(o, data['form']) or '0.0' ]] |
- [[sum_solde_account(o, data['form']) or '0.0' ]] |
- [[ sum_currency_amount_account(a, data['form']) or '0.0' ]] |
+ [[ formatLang(sum_debit_account(o, data['form'])) ]] |
+ [[formatLang(sum_credit_account(o, data['form'])) ]] |
+ [[formatLang(sum_solde_account(o, data['form'])) ]] |
+ [[ formatLang(sum_currency_amount_account(a, data['form'])) ]] |
[[ repeatIn(lines(o, data['form']), 'line') ]]
- | [[ line['date'] or '' ]] |
+ [[ formatLang(line['date'],date=True) ]] |
[[ line['partner'] or '' ]] |
[[ line['ref'] or '']] |
[[ line['move'] or '' ]] |
[[ line['name'] or '' ]] |
- [[ line['debit'] and line['debit'] or '0.0' ]] |
- [[ line['credit'] and line['credit'] or '0.0' ]] |
- [[ line['progress'] and line['progress'] or '0.0' ]] |
- [[ line['amount_currency'] or '0.0' ]] [[ line['currency_code'] or '']] |
+ [[ formatLang(line['debit']) ]] |
+ [[ formatLang(line['credit']) ]] |
+ [[ formatLang(line['progress']) ]] |
+ [[ formatLang(line['amount_currency'] or 0.00) ]] [[ line['currency_code'] or '']] |
|