From 757926595ac97f0ddb88db9e3c867a8ccccb9ca0 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 19 Mar 2010 17:38:32 +0530
Subject: [PATCH] [IMP] point_of_sale: convert the  pos_sale_user wizard into
 osv_memroy

bzr revid: sbh@tinyerp.com-20100319120832-hnw3y7mwzupr95sd
---
 addons/point_of_sale/__terp__.py              |  4 +-
 addons/point_of_sale/pos_view.xml             |  4 +-
 addons/point_of_sale/pos_wizard.xml           |  4 +-
 addons/point_of_sale/report/pos_sales_user.py |  2 +-
 addons/point_of_sale/wizard/__init__.py       |  1 -
 .../point_of_sale/wizard/pos_sales_user.xml   | 43 +++++++++++++++++++
 ...rd_pos_sales_user.py => pos_sales_user.py} |  0
 7 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/pos_sales_user.xml
 rename addons/{point_of_sale/wizard/wizard_pos_sales_user.py => pos_sales_user.py} (100%)

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 4de467c2028..262f2528480 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -51,7 +51,9 @@ Main features :
         'wizard/pos_open_statement.xml',
         'wizard/pos_close_statement.xml',  
         'wizard/pos_box_entries.xml',  
-        'wizard/pos_box_out.xml', 
+        'wizard/pos_box_out.xml',
+        'wizard/pos_sales_user.xml',
+        'wizard/all_closed_cashbox_of_the_day.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 1af8841817b..ddf769f41f6 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -981,8 +981,8 @@ invoiced
 <!--		<menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report"
 				id="menu_pos_payment_report" parent="menu_cashboxes_by_day" type="wizard" sequence="4"/-->
 
-		<menuitem icon="STOCK_PRINT" action="wizard_pos_sales_user"
-				id="menu_pos_sales_user" parent="menu_trans_pos_tree" type="wizard" sequence="3" groups="base.group_extended" />
+		<menuitem icon="STOCK_PRINT" action="action_report_pos_sale_user"
+				id="menu_pos_sales_user" parent="menu_trans_pos_tree" sequence="3" groups="base.group_extended" />
 
 
 		<menuitem icon="STOCK_PRINT" action="wizard_pos_sales_user_today"
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 3adc250129e..93a31d1b77d 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -36,9 +36,9 @@
 
 <!--		<wizard id="wizard_pos_payment_report" menu="False"
 				model="pos.order" name="pos.payment.report" string="All paid lines for the current User"/-->
-
+<!--
 		<wizard id="wizard_pos_sales_user" menu="False"
-				model="pos.order" name="pos.sales.user" string="Sales Report"/>
+				model="pos.order" name="pos.sales.user" string="Sales Report"/>-->
 
 		<wizard id="wizard_pos_sales_user_today" menu="False"
 				model="pos.order" name="pos.sales.user.today" string="Sales by Users"/>
diff --git a/addons/point_of_sale/report/pos_sales_user.py b/addons/point_of_sale/report/pos_sales_user.py
index 034587a8ae4..b1b7272a030 100644
--- a/addons/point_of_sale/report/pos_sales_user.py
+++ b/addons/point_of_sale/report/pos_sales_user.py
@@ -42,7 +42,7 @@ class pos_sales_user(report_sxw.rml_parse):
                         "from pos_order as po,res_users as ru,res_company as rc " \
                         "where po.date_order >= %s and po.date_order <= %s " \
                         "and po.company_id=rc.id and po.user_id=ru.id and po.user_id in %s " \
-                            ,(dt1,dt2,tuple(form['user_id'][0][-1])))
+                            ,(dt1,dt2,tuple(form['user_id'])))
 
         data = self.cr.dictfetchall()
         return data
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 7f06e28b453..3be282bc0a4 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -26,7 +26,6 @@ import wizard_scan_product
 import wizard_receipt
 import wizard_return
 import wizard_pos_payment_report
-import wizard_pos_sales_user
 import wizard_pos_sales_user_today
 import wizard_pos_payment_report_date
 import wizard_pos_payment_report_user
diff --git a/addons/point_of_sale/wizard/pos_sales_user.xml b/addons/point_of_sale/wizard/pos_sales_user.xml
new file mode 100644
index 00000000000..0fc46f81aac
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_sales_user.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--   pos.details -->
+        
+		<record id="view_pos_sale_user" model="ir.ui.view">
+            <field name="name">Sale By User</field>
+            <field name="model">pos.sale.user</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="POS Details :">
+				    <group col="2" colspan="4">
+				    	<field name="date_start"/>
+				    	<field name="date_end"/>
+				    	<field name="user_id"/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="print_report" string="Print Report"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+
+        <record id="action_report_pos_sale_user" model="ir.actions.act_window">
+            <field name="name">Sale by User</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.sale.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+<!--    <act_window name="POS Details"
+            res_model="pos.details"
+            src_model="pos.order"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_report_pos_details"/>   -->
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/wizard_pos_sales_user.py b/addons/pos_sales_user.py
similarity index 100%
rename from addons/point_of_sale/wizard/wizard_pos_sales_user.py
rename to addons/pos_sales_user.py