diff --git a/addons/account/project/report/analytic_balance.rml b/addons/account/project/report/analytic_balance.rml
index 0d1c7d53ad1..598937b29aa 100644
--- a/addons/account/project/report/analytic_balance.rml
+++ b/addons/account/project/report/analytic_balance.rml
@@ -128,16 +128,16 @@
|
- [[ sum_debit(objects,data['form']['date1'],data['form']['date2']) or '0.0' ]]
+ [[ formatLang(sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]
|
- [[ sum_credit(objects,data['form']['date1'],data['form']['date2']) or '0.0' ]]
+ [[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]]
|
- [[ sum_balance(objects,data['form']['date1'],data['form']['date2']) or '0.0' ]]
+ [[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]]
|
- [[ sum_quantity(objects,data['form']['date1'],data['form']['date2']) or '0.0' ]]
+ [[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]
|
@@ -153,16 +153,16 @@
[[ o.complete_name ]]
- [[ move_sum_debit(o.id,data['form']['date1'],data['form']['date2']) or '0.0' ]]
+ [[ formatLang(move_sum_debit(o.id,data['form']['date1'],data['form']['date2'])) ]]
|
- [[ move_sum_credit(o.id,data['form']['date1'],data['form']['date2']) or '0.0' ]]
+ [[ formatLang(move_sum_credit(o.id,data['form']['date1'],data['form']['date2'])) ]]
|
- [[ move_sum_balance(o.id,data['form']['date1'],data['form']['date2']) or '0.0' ]]
+ [[ formatLang(move_sum_balance(o.id,data['form']['date1'],data['form']['date2'])) ]]
|
- [[ move_sum_quantity(o.id,data['form']['date1'],data['form']['date2']) or '0.0']]
+ [[ formatLang(move_sum_quantity(o.id,data['form']['date1'],data['form']['date2'])) ]]
|
@@ -174,16 +174,16 @@
[[ move_g['name'] ]]
|
- [[ move_g['debit'] or '0.0']]
+ [[ formatLang(move_g['debit'])]]
|
- [[ move_g['credit'] or '0.0']]
+ [[ formatLang(move_g['credit']) ]]
|
- [[ move_g['balance'] or '0.0']]
+ [[ formatLang(move_g['balance'])]]
|
- [[ (move_g['quantity'] or '0.0') ]]
+ [[ formatLang(move_g['quantity']) ]]
|
diff --git a/addons/account/project/report/quantity_cost_ledger.rml b/addons/account/project/report/quantity_cost_ledger.rml
index 42fb7330a07..5c7e9331078 100644
--- a/addons/account/project/report/quantity_cost_ledger.rml
+++ b/addons/account/project/report/quantity_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,7 +45,10 @@
@@ -78,29 +57,28 @@
-
-
-
+
+
+
+
-
-
+
+
-
-
@@ -114,13 +92,13 @@
-
+
-
-
+
+
@@ -132,30 +110,30 @@
-
-
-
-
-
-
+
+
+
+
-
+
@@ -181,13 +159,13 @@
|
- [[ 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) ]]
|
@@ -197,11 +175,10 @@
-
-
+
|
- Code/Date
+ Code/Date
|
J.C./Move name
@@ -213,92 +190,105 @@
Total
|
-
-
-
-
-
- |
- Total:
- |
-
-
- |
-
- [[ '%.2f' % (sum_quantity(objects,data['form']['date1'],data['form']['date2'], data['form']['journal']) or 0.0) ]]
- |
-
-
- |
-
-
+
+
+
+
+
-
- [[ repeatIn(objects,'o') ]]
-
-
- |
- [[ o.code ]]
- |
-
- [[ o.complete_name ]]
- |
-
- Max.qty:[[ '%.2f' % (o.quantity_max or 0.0)]]
- |
-
- [[ '%.2f' % (account_sum_quantity(o.id,data['form']['date1'],data['form']['date2'], data['form']['journal']) or 0.0 )]]
- |
-
-
-
-
- [[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_g') ]]
-
-
- |
- [[ move_g['code'] ]]
- |
-
- [[ move_g['name'] ]]
- |
-
-
-
-
- |
-
- [[ '%.2f' % (move_g['quantity'] or 0.0) ]]
- |
-
-
-
-
-
-
- |
- [[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_a') ]][[ move_a['date'] ]]
- |
-
- [[ move_a['cj'] ]] / [[ move_a['name'] ]]
- |
-
- [[ '%.2f' % (move_a['quantity'] or 0.0 )]]
- |
-
-
- |
-
-
- |
-
-
- |
-
-
-
-
-
+
+ Total:
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+ [[ formatLang (sum_quantity(objects,data['form']['date1'],data['form']['date2'], data['form']['journal']) ) ]]
+ |
+
+
+
+
+
+
+ [[ repeatIn(objects,'o') ]]
+
+
+
+
+
+ |
+ [[ o.code ]]
+ |
+
+ [[ o.complete_name ]]
+ |
+
+ Max Qty: [[ formatLang (o.quantity_max )]]
+ |
+
+ [[ formatLang (account_sum_quantity(o.id,data['form']['date1'],data['form']['date2'], data['form']['journal']) )]]
+ |
+
+
+
+
+
+
+ [[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_g') ]]
+
+
+
+
+
+ |
+ [[ move_g['code'] ]]
+ |
+
+ [[ move_g['name'] ]]
+ |
+
+ [[ formatLang (move_g['quantity']) ]]
+ |
+
+
+
+
+ |
+ [[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_a') ]]
+ [[ formatLang(move_a['date'],date = True) ]]
+ |
+
+ [[ move_a['cj'] ]]
+ |
+
+ [[ move_a['name'] ]]
+ |
+
+ [[ formatLang (move_a['quantity'] )]]
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+