+
|
[[ '%s' % getcompany(objects)]]
@@ -179,7 +188,10 @@
[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]
|
- [[ '%s' % getperiod(objects) ]]
+ [[ '%s' % getstartperiod(objects) ]]
+ |
+
+ [[ '%s' % getendperiod(objects) ]]
|
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index 2d25c740d77..796f60050b3 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -184,7 +184,7 @@
[[ formatLang(line_ids['discount']) ]]
- [[ formatLang(line_ids['price_unit']) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(line_ids['price_unit']) ]]
|
[[ formatLang(line_ids['total']) ]] [[ company.currency_id.symbol ]]
diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml
index 23c3f950d81..2bddb2ae4d3 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -161,7 +161,7 @@
[[ formatLang(line_ids['discount']) ]]
|
- [[ formatLang(line_ids['price_unit']) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(line_ids['price_unit']) ]]
|
[[ formatLang(line_ids['total']) ]] [[ company.currency_id.symbol ]]
diff --git a/addons/point_of_sale/report/pos_users_product.py b/addons/point_of_sale/report/pos_users_product.py
index 83a02d49832..141445bcafe 100644
--- a/addons/point_of_sale/report/pos_users_product.py
+++ b/addons/point_of_sale/report/pos_users_product.py
@@ -25,7 +25,7 @@ from report import report_sxw
class pos_user_product(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
- super(pos_user_product, self).__init__(cr, uid, name, context=context)
+ super(pos_user_product, self).__init__(cr, uid, name, context)
self.total = 0.0
self.localcontext.update({
'time': time,
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index ae15e6478e7..54c41ddf4a9 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -1,6 +1,6 @@
-
+
|