Date
@@ -255,7 +255,7 @@
- [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+ [[ display_currency(data) == False or removeParentNode('blockTable') ]]
Balance Brought Forward
@@ -274,19 +274,19 @@
- [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
- [[ data['form']['initial_balance'] and get_intial_balance(p,data) or removeParentNode('tr') ]]
-
-
+ [[ display_currency(data) == False or removeParentNode('blockTable') ]]
+
+ | [[ data['form']['initial_balance'] or removeParentNode('tr') ]]
+ Initial Balance
|
-
+ [[ get_intial_balance(p,data)[0][0] or 0.0 ]]
|
-
+ [[ get_intial_balance(p,data)[0][1] or 0.0 ]]
|
-
+ [[ get_intial_balance(p,data)[0][2] or 0.0 ]]
|
@@ -309,7 +309,7 @@
[[ repeatIn(lines(p,data), 'line') ]]
- [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+ [[ display_currency(data) == False or removeParentNode('blockTable') ]]
[[ formatLang(line['date'],date=True) ]]
@@ -338,7 +338,7 @@
- [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+ [[ display_currency(data) == True or removeParentNode('blockTable') ]]
Date
@@ -369,7 +369,7 @@
- [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+ [[ display_currency(data) == True or removeParentNode('blockTable') ]]
Balance Brought Forward
@@ -390,25 +390,23 @@
- [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
- [[ data['form']['initial_balance'] and get_intial_balance(p,data) or removeParentNode('tr') ]]
-
-
+ [[ display_currency(data) == True or removeParentNode('blockTable') ]]
+
+ | [[display_initial_balance(data) or removeParentNode('tr') ]]
+ Initial Balance
+ |
+
+ [[ get_intial_balance(p,data)[0][0] or 0.0 ]]
|
-
+ [[ get_intial_balance(p,data)[0][1] or 0.0 ]]
|
+ [[ get_intial_balance(p,data)[0][2] or 0.0 ]]
+ |
+
- |
-
-
- |
-
-
-
-
- |
+
@@ -435,7 +433,7 @@
[[ repeatIn(lines(p,data), 'line') ]]
- [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+ [[ display_currency(data) == True or removeParentNode('blockTable') ]]
[[ formatLang(line['date'],date=True) ]]
diff --git a/addons/account/report/third_party_ledger_other.rml b/addons/account/report/third_party_ledger_other.rml
index dc93a06d2dd..8be4c0f2e9b 100644
--- a/addons/account/report/third_party_ledger_other.rml
+++ b/addons/account/report/third_party_ledger_other.rml
@@ -410,7 +410,7 @@
- [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+ [[ display_currency(data) == False or removeParentNode('blockTable') ]]
|
Date
@@ -435,7 +435,7 @@
|
- [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+ [[ display_currency(data) == False or removeParentNode('blockTable') ]]
Balance Brought Forward
@@ -454,19 +454,19 @@
[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]
- [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
- [[ data['form']['initial_balance'] and get_intial_balance(p,data) or removeParentNode('tr') ]]
-
-
+ [[ display_currency(data) == False or removeParentNode('blockTable') ]]
+
+ | [[ display_initial_balance(data) or removeParentNode('tr') ]]
+ Initial Balance
|
-
+ [[ get_intial_balance(p,data)[0][0] or 0.0 ]]
|
-
+ [[ get_intial_balance(p,data)[0][1] or 0.0 ]]
|
-
+ [[ get_intial_balance(p,data)[0][2] or 0.0 ]]
|
@@ -486,7 +486,7 @@
[[ repeatIn(lines(p,data), 'line') ]]
- [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+ [[ display_currency(data) == False or removeParentNode('blockTable') ]]
[[ formatLang(line['date'],date=True) ]]
@@ -513,7 +513,7 @@
- [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+ [[ display_currency(data) == True or removeParentNode('blockTable') ]]
|
Date
@@ -542,7 +542,7 @@
|
- [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+ [[ display_currency(data) == True or removeParentNode('blockTable') ]]
Balance Brought Forward
@@ -565,25 +565,27 @@
[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]
- [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
-
-
+ [[ display_currency(data) == True or removeParentNode('blockTable') ]]
+
+ | [[ data['form']['initial_balance'] or removeParentNode('tr') ]]
+ Initial Balance
+ |
+
+ [[ get_intial_balance(p,data)[0][0] or 0.0 ]]
|
-
+ [[ get_intial_balance(p,data)[0][1] or 0.0 ]]
|
-
- |
-
-
+ [[ get_intial_balance(p,data)[0][2] or 0.0 ]]
|
- |
+
+
|
- [[ p.ref ]] - [[ p.name ]]
+ [[ p.ref ]] - [[ p.name ]]
|
[[ formatLang((sum_debit_partner(p,data))) ]]
@@ -603,7 +605,7 @@
[[ repeatIn(lines(p,data), 'line') ]]
- [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+ [[ display_currency(data) == True or removeParentNode('blockTable') ]]
|
[[ formatLang(line['date'],date=True) ]]
| | | | | | | | | | | | | | | |