diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py index 262f2528480..baf4fe612e2 100644 --- a/addons/point_of_sale/__terp__.py +++ b/addons/point_of_sale/__terp__.py @@ -53,7 +53,8 @@ Main features : 'wizard/pos_box_entries.xml', 'wizard/pos_box_out.xml', 'wizard/pos_sales_user.xml', - 'wizard/all_closed_cashbox_of_the_day.xml', + #'wizard/all_closed_cashbox_of_the_day.xml', + 'wizard/pos_sale_user_today.xml', 'pos_report.xml', 'pos_wizard.xml', 'pos_view.xml', diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml index ddf769f41f6..fdbddfe460a 100644 --- a/addons/point_of_sale/pos_view.xml +++ b/addons/point_of_sale/pos_view.xml @@ -985,8 +985,8 @@ invoiced id="menu_pos_sales_user" parent="menu_trans_pos_tree" sequence="3" groups="base.group_extended" /> - + @@ -997,7 +997,7 @@ invoiced id="menu_pos_sales_user_today_current_user" parent="menu_cashboxes_by_day" type="wizard" sequence="7"/> + id="menu_pos_details" parent="menu_cashboxes_by_day" /> diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml index 93a31d1b77d..86b0ca86974 100644 --- a/addons/point_of_sale/pos_wizard.xml +++ b/addons/point_of_sale/pos_wizard.xml @@ -40,8 +40,8 @@ --> - + diff --git a/addons/point_of_sale/report/pos_sales_user_today.py b/addons/point_of_sale/report/pos_sales_user_today.py index 4e06a936116..a5caf899069 100644 --- a/addons/point_of_sale/report/pos_sales_user_today.py +++ b/addons/point_of_sale/report/pos_sales_user_today.py @@ -36,7 +36,7 @@ class pos_sales_user_today(report_sxw.rml_parse): def _get_data(self,form): data={} - ids = form['user_id'][0][-1] + ids = form['user_id'] idss = map(str, ids) self.cr.execute("select po.name as pos,po.date_order,ru.name as user,po.state,rc.name " \ diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py index 3be282bc0a4..05bbc0f1f92 100644 --- a/addons/point_of_sale/wizard/__init__.py +++ b/addons/point_of_sale/wizard/__init__.py @@ -26,7 +26,7 @@ import wizard_scan_product import wizard_receipt import wizard_return import wizard_pos_payment_report -import wizard_pos_sales_user_today + import wizard_pos_payment_report_date import wizard_pos_payment_report_user import wizard_pos_sales_user_current_user @@ -42,6 +42,8 @@ import pos_close_statement import pos_box_entries import pos_box_out import pos_details +import pos_sales_user +import pos_sales_user_today # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml index 3268e90733c..7d6dd346c12 100644 --- a/addons/point_of_sale/wizard/pos_details.xml +++ b/addons/point_of_sale/wizard/pos_details.xml @@ -15,7 +15,7 @@