diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index e4c3b99b6ee..a7f2a397d8b 100644
--- a/addons/point_of_sale/report/account_statement.rml
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -1,6 +1,6 @@
-
+
@@ -238,7 +238,7 @@
Partner
- Amount ([[ company.currency_id.code ]])
+ Amount
|
@@ -253,7 +253,7 @@
[[ line_ids.partner_id.name ]]
- [[ formatLang(line_ids.amount) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(line_ids.amount) ]] [[ company.currency_id.symbol ]]
|
@@ -268,7 +268,7 @@
Total :
- [[ formatLang(get_total(statement.line_ids)) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(get_total(statement.line_ids)) ]] [[ company.currency_id.symbol ]]
|
@@ -282,4 +282,4 @@
-
\ No newline at end of file
+
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index f3bebade402..c86120779f6 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -1,6 +1,6 @@
-
+
@@ -20,9 +20,12 @@
-
+
+
+
+
@@ -34,9 +37,12 @@
-
+
+
+
+
@@ -102,19 +108,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -162,7 +175,7 @@
-
+
Company
@@ -171,11 +184,14 @@
Print Date
|
- Period
+ Start Period
+ |
+
+ End Period
|
-
+
[[ company.name ]]
@@ -184,7 +200,10 @@
[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]
|
- [[ formatLang(getperiod(data['form']),date = True) ]] - [[ formatLang(getperiod2(data['form']),date = True) ]]
+ [[ formatLang(getperiod(data['form']),date = True) ]]
+ |
+
+ [[ formatLang(getperiod2(data['form']),date = True) ]]
|
@@ -203,16 +222,16 @@
Product
- Price ([[ company.currency_id.code ]])
+ Price
|
Qty
|
- Disc ([[ company.currency_id.code ]])
+ Disc
|
- Invoiced ([[ company.currency_id.code ]])
+ Invoiced
|
@@ -306,13 +325,13 @@
-
+
Sales total
|
- [[ formatLang(getsalestotal2(data['form'],user)) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(getsalestotal2(data['form'],user)) ]] [[ company.currency_id.symbol ]]
|
@@ -320,7 +339,7 @@
Qty of product
- [[ formatLang(getqtytotal2(data['form'],user)) ]]
+ [[ formatLang(getqtytotal2(data['form'],user)) ]]
|
@@ -328,7 +347,7 @@
Total invoiced
- [[ formatLang(getsuminvoice2(data['form'],user)) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(getsuminvoice2(data['form'],user)) ]] [[ company.currency_id.symbol ]]
|
@@ -336,7 +355,7 @@
Total discount
- [[ formatLang(getsumdisc(objects)) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(getsumdisc(objects)) ]] [[ company.currency_id.symbol ]]
|
@@ -344,7 +363,7 @@
Total paid
- [[ formatLang(getpaidtotal2(data['form'],user)) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(getpaidtotal2(data['form'],user)) ]] [[ company.currency_id.symbol ]]
|
@@ -352,7 +371,7 @@
Total of the day
- [[ formatLang(gettotalofthaday(data['form'])) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(gettotalofthaday(data['form'])) ]] [[ company.currency_id.symbol ]]
|
@@ -360,4 +379,4 @@
-
\ No newline at end of file
+
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index aa559eb9961..dea0789b7be 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -1,6 +1,6 @@
-
+
@@ -80,18 +80,24 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -100,6 +106,8 @@
+
+
@@ -138,8 +146,11 @@
- Details of Sales
-
+
+
+
+ Details of Sales
+
@@ -247,7 +258,7 @@
Sales total
- [[ '%d' % getsalestotal(objects) ]]
+ [[ '%d' % getsalestotal(objects) ]] [[company.currency_id.symbol ]]
|
@@ -255,7 +266,7 @@
Qty of product
- [[ '%d' % getqtytotal(objects) ]]
+ [[ '%d' % getqtytotal(objects) ]]
|
@@ -263,7 +274,7 @@
Total invoiced
- [[ '%.2f' % getsuminvoice(objects) ]][[ company.currency_id.symbol ]]
+ [[ '%.2f' % getsuminvoice(objects) ]] [[ company.currency_id.symbol ]]
|
@@ -271,7 +282,7 @@
Total discount
- [[ '%.2f' % getsumdisc(objects) ]][[ company.currency_id.symbol ]]
+ [[ '%.2f' % getsumdisc(objects) ]] [[ company.currency_id.symbol ]]
|
@@ -279,7 +290,7 @@
Total paid
- [[ '%.2f' % getpaidtotal(objects) ]][[ company.currency_id.symbol ]]
+ [[ '%.2f' % getpaidtotal(objects) ]] [[ company.currency_id.symbol ]]
|
@@ -287,7 +298,7 @@
Total of the day
- [[ '%.2f' % gettotalofthaday(objects) ]][[ company.currency_id.symbol ]]
+ [[ '%.2f' % gettotalofthaday(objects) ]] [[ company.currency_id.symbol ]]
|
@@ -295,4 +306,4 @@
-
\ No newline at end of file
+
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index e62b4bd1290..01fcdf355e1 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -161,10 +161,10 @@
Disc. (%)
- Unit Price ([[ company.currency_id.code ]])
+ Unit Price
|
- Total ([[ company.currency_id.code ]])
+ Total
|
@@ -212,7 +212,7 @@
- Net Total
+ Net Total:
|
[[ formatLang(pos_payment_total(o)) or removeParentNode('blockTable')]] [[ 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 846eaf1f861..c994e53d933 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -1,6 +1,6 @@
-
+
@@ -98,7 +98,7 @@
- Payment
+ Sales Lines
@@ -140,10 +140,10 @@
Disc(%)
|
- Unit Price ([[ company.currency_id.code ]])
+ Unit Price
|
- Total ([[ company.currency_id.code ]])
+ Total
|
@@ -187,7 +187,7 @@
- Total
+ Total:
|
[[ formatLang(pos_payment_date_total(data['form'])) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]
@@ -198,4 +198,4 @@
-
\ No newline at end of file
+
diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml
index fc874e52dac..a88813fac1f 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.rml
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -1,8 +1,8 @@
-
+
-
+
@@ -10,35 +10,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -46,9 +40,8 @@
-
-
+
@@ -56,31 +49,26 @@
-
-
+
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
@@ -90,8 +78,8 @@
-
-
+
+
@@ -105,17 +93,21 @@
-
+
-
-
+ [[ repeatIn(objects,'order') ]]
+
-
+
-
+ Payment By User
+
+
+
+
Company
@@ -125,7 +117,7 @@
|
-
+
[[ company.name ]]
@@ -138,32 +130,31 @@
-
+
-
+
Product
|
- Qty
+ Qty
|
- Disc. (%)
+ Disc(%)
|
- Unit Price
+ Unit Price
|
- Total
+ Total
|
-
+ |
-
- [[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]
-
+ [[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]
+
[[ line_ids['name'] ]]
@@ -180,36 +171,36 @@
|
[[ formatLang(line_ids['total']) ]]
|
-
-
-
+
+
-
+
|
-
+
|
-
+
|
- Total :
+ Total
|
[[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]]
|
-
-
-
+
+
+
+
diff --git a/addons/point_of_sale/report/pos_receipt_with_remboursment.rml b/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
index 32dea8dcd48..9c25d5f4a89 100644
--- a/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
+++ b/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
@@ -125,7 +125,7 @@
|
- [[ get_journal_amt(o)[0] ]] : [[ get_journal_amt(o)[1] ]]
+ [[ get_journal_amt(o)[1] ]]
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
index 4e3b8ec64e1..44fa3bf60cc 100644
--- a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
@@ -125,14 +125,14 @@
- [[ get_journal_amt(o)[0] ]] : [[ get_journal_amt(o)[1] ]]
+ [[ get_journal_amt(o)[1] ]]
-
- [[ repeatIn((o.state=='cancel' and o.statement_ids) and [1] or [], 'p') ]]
-
- Ce bon est valide jusqu'au [[ time.strftime('%d/%m/%Y', time.strptime(o.date_validity,'%Y-%m-%d')) ]].
-
-
+
+
+
+
+
+
diff --git a/addons/point_of_sale/report/pos_sales_user.rml b/addons/point_of_sale/report/pos_sales_user.rml
index cb817035a46..9566957b4fa 100644
--- a/addons/point_of_sale/report/pos_sales_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user.rml
@@ -1,8 +1,8 @@
-
+
-
+
@@ -10,35 +10,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -46,9 +40,8 @@
-
-
+
@@ -56,32 +49,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
@@ -91,8 +73,8 @@
-
-
+
+
@@ -106,17 +88,21 @@
-
+
-
-
+ [[ repeatIn(objects,'order') ]]
+
-
+
-
+ Sales Report
+
+
+
+
Company
@@ -126,7 +112,7 @@
|
-
+
[[ company.name ]]
@@ -139,10 +125,10 @@
-
+
-
+
Name
@@ -151,23 +137,22 @@
Date Order
|
- User
+ User
|
- State
+ State
|
Company
|
-
+ |
-
-
- [[ repeatIn(get_data(data['form']), 'line_ids')]]
-
+
+ [[ repeatIn(get_data(data['form']), 'line_ids')]]
+
- [[ line_ids['pos'] ]]
+ [[ line_ids['pos'] ]]
|
[[ formatLang(line_ids['date_order'],date_time = True) ]]
@@ -176,13 +161,19 @@
[[ line_ids['user'] ]]
|
- [[ line_ids['state'] ]]
+ [[ line_ids['state'] ]]
|
[[ line_ids['name'] ]]
|
-
+
+
+
+
+
+
+
diff --git a/addons/point_of_sale/report/pos_sales_user_today.rml b/addons/point_of_sale/report/pos_sales_user_today.rml
index 39f6ddacb4c..16c8f6f0b38 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today.rml
@@ -1,8 +1,8 @@
-
+
-
+
@@ -10,35 +10,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -46,9 +40,8 @@
-
-
+
@@ -56,31 +49,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
@@ -90,8 +73,8 @@
-
-
+
+
@@ -105,17 +88,18 @@
-
+
-
-
+ [[ repeatIn(objects,'order') ]]
+
-
+
-
+ Todays Sales By User
+
Company
@@ -125,7 +109,7 @@
|
-
+
[[ company.name ]]
@@ -138,10 +122,10 @@
-
+
-
+
Name
@@ -150,23 +134,22 @@
Date Order
|
- User
+ User
|
- State
+ State
|
Company
|
-
+ |
-
-
- [[ repeatIn(get_data(data['form']), 'line_ids')]]
-
+
+ [[ repeatIn(get_data(data['form']), 'line_ids')]]
+
- [[ line_ids['pos'] ]]
+ [[ line_ids['pos'] ]]
|
[[ formatLang(line_ids['date_order'],date_time = True) ]]
@@ -175,13 +158,16 @@
[[ line_ids['user'] ]]
|
- [[ line_ids['state'] ]]
+ [[ line_ids['state'] ]]
|
[[ line_ids['name'] ]]
|
-
+
+
+
+
diff --git a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
index 475d045252b..c483fa80a65 100644
--- a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
@@ -1,8 +1,8 @@
-
+
-
+
@@ -10,76 +10,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
-
-
-
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
@@ -89,8 +84,8 @@
-
-
+
+
@@ -104,17 +99,21 @@
-
+
-
-
+ [[ repeatIn(objects,'order') ]]
+
-
+
-
+ Sales By Current User(Todays)
+
+
+
+
Company
@@ -127,7 +126,7 @@
|
-
+
[[ company.name ]]
@@ -136,17 +135,17 @@
[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]
|
- [[ (get_user(user)) ]]
+ [[ (get_user(user)) ]]
|
-
+
-
+
-
+
Name
@@ -160,12 +159,11 @@
|
Total
|
-
+
-
-
- [[ repeatIn(get_data_current_user(user), 'line_ids')]]
-
+
+ [[ repeatIn(get_data_current_user(user), 'line_ids')]]
+
[[ line_ids['name'] ]]
@@ -181,22 +179,27 @@
|
-
-
-
-
-
- |
-
- Total :
- |
-
- [[ formatLang((get_data_current_user_qty(user))) ]]
- |
-
- [[ formatLang((get_data_current_user_tot(user))) ]]
- |
-
-
+
+
+
+
+
+
+
+ |
+
+ Total :
+ |
+
+ [[ formatLang((get_data_current_user_qty(user))) ]]
+ |
+
+ [[ formatLang((get_data_current_user_tot(user))) or removeParentNode('blockTable')]]
+ |
+
+
+
+
+
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index 24059dcbb0b..60bf67f19af 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 @@
-
+
@@ -175,7 +175,7 @@
-
+
Product
@@ -184,11 +184,11 @@
Qty
|
- Amount ([[ company.currency_id.code ]])
+ Amount
|
-
+
[[ repeatIn(get_data(statement), 'line_ids') and ' ' or removeParentNode('blockTable') ]]
@@ -199,11 +199,11 @@
[[ formatLang(line_ids['qty']) ]]
|
- [[ formatLang(line_ids['amt']) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]
|
-
+
@@ -214,7 +214,7 @@
Total :
|
- [[ formatLang(get_total()) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(get_total()) ]] [[ company.currency_id.symbol ]]
|
@@ -222,4 +222,4 @@
-
\ No newline at end of file
+