diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml
index 6c4b1edf992..a407fb82fc5 100644
--- a/addons/account/project/report/cost_ledger.rml
+++ b/addons/account/project/report/cost_ledger.rml
@@ -3,30 +3,6 @@
-
-
-
-
-
-
- [[ company.name ]]
- Cost Ledger - [[ company.currency_id.name ]]
-
-
-
-
-
- [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]
- Page
-
-
-
-
- 1cm 27.7cm 20cm 27.7cm
-
-
-
-
@@ -69,29 +45,35 @@
-
+
+
-
+
+
+
+
+
-
-
+
+
+
+
+
-
-
+
+
@@ -113,49 +95,48 @@
-
+
-
-
+
+
-
-
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
-
+
@@ -165,7 +146,7 @@
-
+
|
Period from
@@ -178,30 +159,29 @@
|
-
+
|
- [[ data['form']['date1'] ]]
+ [[ formatLang(data['form']['date1'],date = True) ]]
|
- [[ data['form']['date2'] ]]
+ [[ formatLang(data['form']['date2'],date = True) ]]
|
- [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]
+ [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]
|
-
-
+
|
- Code / Date
+ Date or Code
|
- J.C. / Move name
+ J.C. or Move name
|
Debit
@@ -213,109 +193,117 @@
Balance
|
+
+
+
+
+
-
-
-
- |
- Total :
- |
-
-
- |
-
- [[ '%.2f' % (sum_debit(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]]
- |
-
- [[ '%.2f' % (sum_credit(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]]
- |
-
- [[ '%.2f' % (sum_balance(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]]
- |
-
-
- |
+
+ Total:
+ |
+
+
+
+
+ |
+
+ [[ formatLang (sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]
+ |
+
+ [[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]]
+ |
+
+ [[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]]
+ |
-
-
- [[ repeatIn(objects,'o') ]]
-
-
- |
- [[ o.code ]]
- |
-
- [[ o.complete_name ]]
- |
-
- [[ '%.2f' % (account_sum_debit(o.id,data['form']['date1'],data['form']['date2']) or 0.0) ]]
- |
-
- [[ '%.2f' % (account_sum_credit(o.id,data['form']['date1'],data['form']['date2']) or 0.0) ]]
- |
-
- [[ '%.2f' % (account_sum_balance(o.id,data['form']['date1'],data['form']['date2']) or 0.0)]]
- |
-
-
-
-
- [[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]
-
-
- |
- [[ move_g['code'] ]]
- |
-
- [[ move_g['name'] ]]
- |
-
- [[ '%.2f' % move_g['debit'] ]]
- |
-
- [[ '%.2f' % move_g['credit'] ]]
- |
-
- [[ '%.2f' % move_g['balance'] ]]
- |
-
-
-
- [[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]
-
-
- |
- [[ move_a['date'] ]]
- |
-
- [[ move_a['cj'] ]] / [[ move_a['name'] ]]
- |
-
- [[ '%.2f' % move_a['debit'] ]]
- |
-
- [[ '%.2f' % move_a['credit'] ]]
- |
-
- [[ '%.2f' % move_a['balance'] ]]
- |
-
-
- |
-
-
- |
-
-
- |
-
-
-
-
-
+
+
+
+
+
+ [[ repeatIn(objects,'o') ]]
+
+
+ |
+ [[ o.code ]]
+ |
+
+ [[ o.complete_name ]]
+ |
+
+ [[ formatLang (account_sum_debit(o.id,data['form']['date1'],data['form']['date2'])) ]]
+ |
+
+ [[ formatLang (account_sum_credit(o.id,data['form']['date1'],data['form']['date2'])) ]]
+ |
+
+ [[ formatLang (account_sum_balance(o.id,data['form']['date1'],data['form']['date2']))]]
+ |
+
+
+
+
+
+
+ [[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]
+
+
+ |
+ [[ move_g['code'] ]]
+ |
+
+ [[ move_g['name'] ]]
+ |
+
+ [[ formatLang( move_g['debit']) ]]
+ |
+
+ [[ formatLang( move_g['credit']) ]]
+ |
+
+ [[ formatLang( move_g['balance']) ]]
+ |
+
+
+
+
+
+
+ [[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]
+
+
+ |
+ [[ formatLang(move_a['date'],date = True) ]]
+ |
+
+ [[ move_a['cj'] ]]
+ |
+
+ [[ move_a['name'] ]]
+ |
+
+ [[ formatLang( move_a['debit'] )]]
+ |
+
+ [[ formatLang( move_a['credit']) ]]
+ |
+
+ [[ formatLang( move_a['balance']) ]]
+ |
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/addons/account/project/report/inverted_analytic_balance.rml b/addons/account/project/report/inverted_analytic_balance.rml
index 3453e8f009b..1f3850d2439 100644
--- a/addons/account/project/report/inverted_analytic_balance.rml
+++ b/addons/account/project/report/inverted_analytic_balance.rml
@@ -132,17 +132,17 @@
|
- [[ '%.2f' % (sum_debit(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]]
+ [[ formatLang(sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]
|
- [[ '%.2f' % (sum_credit(objects,data['form']['date1'],data['form']['date2']) or 0.0)]]
+ [[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]]
|
- [[ '%.2f' % (sum_balance(objects,data['form']['date1'],data['form']['date2']) or 0.0)]]
+ [[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]]
|
- [[ '%.2f' % (sum_quantity(objects,data['form']['date1'],data['form']['date2']) or 0.0) ]]
+ [[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]
|
@@ -160,16 +160,16 @@
[[ move_g['name'] ]]
- [[ '%.2f' % (move_g['debit'] or 0.0)]]
+ [[ formatLang(move_g['debit'])]]
|
- [[ '%.2f' % (move_g['credit'] or 0.0)]]
+ [[formatLang(move_g['credit'])]]
|
- [[ '%.2f' % (move_g['balance'] or 0.0)]]
+ [[ formatLang(move_g['balance'])]]
|
- [[ '%.2f' % (move_g['quantity'] or 0.0) ]]
+ [[formatLang(move_g['quantity']) ]]
|
@@ -182,16 +182,16 @@
|
- [[ '%.2f' % move_a['debit'] ]]
+ [[ formatLang(move_a['debit']) ]]
|
- [[ '%.2f' % move_a['credit'] ]]
+ [[ formatLang(move_a['credit']) ]]
|
- [[ '%.2f' % move_a['balance'] ]]
+ [[ formatLang(move_a['balance']) ]]
|
- [[ '%.2f' % (move_a['quantity'] or 0.0) ]]
+ [[ formatLang(move_a['quantity'] or 0.00) ]]
|