From 927c47b05a57ef394880e95b5f68873c316feef9 Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Mon, 27 Sep 2010 18:20:28 +0530
Subject: [PATCH 1/2] [IMP]: Improve report 'Accounting / Periodical
Processing/Billing/Send Followups/Print Followup'.
bzr revid: rch_open_erp-20100927125028-2xxke9aww2e7vwox
---
addons/account_followup/report/report_followp_print.rml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/account_followup/report/report_followp_print.rml b/addons/account_followup/report/report_followp_print.rml
index 13230f246fd..32bd8103a1c 100644
--- a/addons/account_followup/report/report_followp_print.rml
+++ b/addons/account_followup/report/report_followp_print.rml
@@ -203,7 +203,7 @@
[[formatLang(reduce(lambda x,y: x+y['debit'], getLines(o), 0.00)) ]]
- [[formatLang(reduce(lambda x,y: x+y['credit'], getLines(o), 0.00)) ]]/para>
+ [[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 ]]
From 7e079eadb671f2555ad75a1de401db1396d08715 Mon Sep 17 00:00:00 2001
From: "SAZ (Open ERP)" <>
Date: Mon, 27 Sep 2010 18:53:17 +0530
Subject: [PATCH 2/2] [IMP]: Improve report 'POS lines'.
bzr revid: rch_open_erp-20100927132317-bxki05rjad6v33mt
---
addons/point_of_sale/report/pos_lines.rml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index 28f240c1070..fd3bbf9c43c 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -73,6 +73,7 @@
+
@@ -183,10 +184,10 @@
[[taxes(l)]]
|
- [[ formatLang(l.qty) ]]
+ [[ formatLang(l.qty) ]] [[l.product_id.uom_id.name]]
|
- [[ formatLang(l.price_unit) ]][[o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(l.price_unit) ]]
|
[[ formatLang(l.discount) ]]
@@ -220,7 +221,7 @@
|
- Net Total
+ Net Total :
|
[[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]
@@ -248,7 +249,7 @@
|
- Taxes
+ Taxes :
|
[[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]
@@ -276,7 +277,7 @@
|
- Total
+ Total :
|
[[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]
@@ -287,4 +288,4 @@
-
\ No newline at end of file
+
|