@@ -335,7 +349,7 @@
Sales total(Revenue)
|
- [[ formatLang(getsalestotal2(data['form'],user), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsalestotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
|
@@ -343,7 +357,7 @@
Qty of product
- [[ formatLang(getqtytotal2(data['form'],user)) ]]
+ [[ formatLang(getqtytotal2()) ]]
|
@@ -351,7 +365,7 @@
Total invoiced
- [[ formatLang(getsuminvoice2(data['form'],user), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsuminvoice2(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
|
@@ -359,7 +373,7 @@
Total discount
- [[ formatLang(getsumdisc(data['form'],user), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsumdisc(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
|
@@ -367,7 +381,7 @@
Total paid
- [[ formatLang(getpaidtotal2(data['form'],user), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getpaidtotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
|
diff --git a/addons/point_of_sale/test/point_of_sale_report.yml b/addons/point_of_sale/test/point_of_sale_report.yml
index c7583b1549c..0ede21fcb6c 100644
--- a/addons/point_of_sale/test/point_of_sale_report.yml
+++ b/addons/point_of_sale/test/point_of_sale_report.yml
@@ -41,7 +41,7 @@
import time
ctx={}
ctx.update({'model': 'ir.ui.menu','active_ids': []})
- data_dict = {'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d')}
+ data_dict = {'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d'), 'user_ids': [(6,0,[ref('base.user_root')])]}
from tools import test_reports
test_reports.try_report_action(cr, uid, 'action_report_pos_details',wiz_data=data_dict, context=ctx, our_module='point_of_sale')
diff --git a/addons/point_of_sale/wizard/pos_details.py b/addons/point_of_sale/wizard/pos_details.py
index c6793b7b437..ee1d753a9ad 100644
--- a/addons/point_of_sale/wizard/pos_details.py
+++ b/addons/point_of_sale/wizard/pos_details.py
@@ -29,7 +29,8 @@ class pos_details(osv.osv_memory):
_columns = {
'date_start': fields.date('Date Start', required=True),
- 'date_end': fields.date('Date End', required=True)
+ 'date_end': fields.date('Date End', required=True),
+ 'user_ids': fields.many2many('res.users', 'pos_details_report_user_rel', 'user_id', 'wizard_id', 'Salesmen'),
}
_defaults = {
'date_start': lambda *a: time.strftime('%Y-%m-%d'),
@@ -48,7 +49,7 @@ class pos_details(osv.osv_memory):
if context is None:
context = {}
datas = {'ids': context.get('active_ids', [])}
- res = self.read(cr, uid, ids, ['date_start', 'date_end'], context=context)
+ res = self.read(cr, uid, ids, ['date_start', 'date_end', 'user_ids'], context=context)
res = res and res[0] or {}
datas['form'] = res
if res.get('id',False):
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index f283139b058..0b70b3ae2eb 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -1,23 +1,29 @@
-
+
-
+
POS Details
pos.details
form
-
@@ -32,6 +38,6 @@
new
-
+
-
\ No newline at end of file
+
\ No newline at end of file