@@ -126,13 +158,16 @@
-
+
+
+
+ [[repeatIn(getLines(o), 'cur_lines') ]]
|
Invoice Date
|
- Description
+ Description
|
Ref
@@ -141,31 +176,21 @@
Maturity Date
|
- Currency
- |
-
- Due
- |
-
- Paid
- |
-
- Maturity
+ Amount
|
Li.
|
-
- [[repeatIn(getLines(o), 'line') ]]
-
-
+
+
+ [[repeatIn(cur_lines['line'], 'line') ]]
|
- [[ formatLang(line['date'],date = True) ]]
+ [[ formatLang(line['date'],date = True) ]]
|
- [[ line['name'] ]]
+ [[ line['name'] ]]
|
[[ line['ref'] ]]
@@ -174,24 +199,14 @@
[[ line['date_maturity'] and formatLang(line['date_maturity'], date=True) ]]
|
- [[ formatLang(line['amount_currency'] )]] [[ line['amount_currency'] and line['currency_id'][1] or '' ]]
- |
-
- [[ formatLang(line['debit']) ]]
- |
-
- [[ formatLang(line['credit']) ]]
- |
-
- [[ (line['date_maturity'] < time.strftime('%Y-%m-%d')) and formatLang(line['debit'] -line['credit']) or formatLang(0.0) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(line['balance']) ]] [[ line['currency_id'] ]]
|
[[ line['blocked'] and 'X' or '' ]]
|
-
-
+
|
@@ -199,16 +214,10 @@
|
- Sub-Total:
+ Total:
|
- [[formatLang(reduce(lambda x,y: x+y['debit'], getLines(o), 0.00)) ]]
- |
-
- [[formatLang(reduce(lambda x,y: x+y['credit'], getLines(o), 0.00)) ]]
- |
-
- [[ formatLang(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.symbol ]]
+ [[formatLang(reduce(lambda x,y: x+y['balance'], cur_lines['line'], 0.00)) ]] [[ line['currency_id'] ]]
|
@@ -217,25 +226,18 @@
|
-
-
- |
-
-
-
- |
-
- Balance:
- |
-
- [[ formatLang((reduce(lambda x,y: x+(y['debit'] - y['credit']), getLines(o), 0.00))) ]] [[ company.currency_id.symbol]]
- |
-
-
-
-
- |
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
|