diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index bc5547a3608..2189253f3ce 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 	<menuitem name="Auction Management" id="auction_menu_root" icon="terp-purchase"/>
-	<menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="1"/>
+	<menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7"/>
 
 	=======================================================
 	Auction Management/Configuration/artist
@@ -127,7 +127,7 @@
 		<field name="view_id" eval="False"/>
 	</record>
 
-	<menuitem name="Auction Dates" parent="auction_menu_root" id="auction_date_menu"/>
+	<menuitem name="Auction Dates" parent="auction_menu_root" id="auction_date_menu" sequence="1"/>
 	<menuitem name="Next Auction Dates" parent="auction_date_menu" id="menu_auction_dates_next1" action="action_auction_dates_next"/>
 	=======================================================
 	Auction Management/Auction Dates/Old Auction Dates
@@ -361,10 +361,10 @@
 		<field name="res_model">auction.lots</field>
 		<field name="view_type">form</field>
 		<field name="domain">[('state','=','sold')]</field>
-        <field name="filter" eval="True"/>		
+        <field name="filter" eval="True"/>
 	</record>
 
-	<menuitem name="Objects" parent="auction_menu_root" id="auction_objects_menu"/>
+	<menuitem name="Objects" parent="auction_menu_root" id="auction_objects_menu" sequence="2"/>
 	<menuitem name="All objects" action="action_all_objects" parent="auction_objects_menu" id="auction_all_objects_menu"/>
 
 	<record model="ir.actions.act_window" id="action_all_objects_to_sell">
@@ -373,7 +373,7 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','&lt;&gt;','sold')]</field>
-        <field name="filter" eval="True"/>		
+        <field name="filter" eval="True"/>
 	</record>
 
 	<record model="ir.actions.act_window" id="action_all_objects_unplanned">
@@ -382,7 +382,7 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('auction_id','=', False),('state','=','draft')]</field>
-        <field name="filter" eval="True"/>		
+        <field name="filter" eval="True"/>
 	</record>
 
 	<!--		for the sold object  start-->
@@ -392,7 +392,7 @@
 		<field name="res_model">auction.lots</field>
 		<field name="view_type">form</field>
 		<field name="domain">[('state','=','unsold')]</field>
-        <field name="filter" eval="True"/>		
+        <field name="filter" eval="True"/>
 	</record>
 
 	<!-- form3: simplified form meant for during the sale (action button in dates) -->
@@ -439,7 +439,7 @@
 	                    <button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
 	                    <button name="button_draft" string="Set to draft" states="sold,unsold" type="object" icon="gtk-convert"/>
 	                    <button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
-                    </group> 
+                    </group>
 				</page>
 				<page string="Statements">
 					<field name="statement_id" domain="[('state','=','draft')]" colspan="4" nolabel="1"
@@ -465,7 +465,7 @@
 		<field name="res_model">report.unclassified.objects</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
-        <field name="filter" eval="True"/>		
+        <field name="filter" eval="True"/>
 	 </record>
 
 	<record model="ir.ui.view" id="v12">
@@ -583,7 +583,7 @@
 		<field name="view_id" ref="view_deposit_border_tree2"/>
 	</record>
 
-	<menuitem name="Sellers" id="auction_seller_menu" parent="auction_menu_root"/>
+	<menuitem name="Sellers" id="auction_seller_menu" parent="auction_menu_root" sequence="3"/>
 	<menuitem name="Deposit border" parent="auction_seller_menu" action="action_deposit_border" id="menu_auction_deposit_border"/>
 
 	=======================================================
@@ -679,7 +679,7 @@
 		<field name="view_mode">tree,form</field>
 	</record>
 
-	<menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root"/>
+	<menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root" sequence="4"/>
 	<menuitem name="Bids" parent="auction_buyers_menu" action="action_bid_open" id="menu_action_bid_open"/>
 
 
@@ -728,7 +728,7 @@
 		</field>
 	</record>
 
-	<menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root"/>
+	<menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6"/>
 
 
 <record model="ir.actions.act_window" id="action_auction_report_allmonth_view1">
diff --git a/addons/auction/auction_wizard.xml b/addons/auction/auction_wizard.xml
index d98d8ae60ac..95c2ca16858 100644
--- a/addons/auction/auction_wizard.xml
+++ b/addons/auction/auction_wizard.xml
@@ -35,20 +35,20 @@
 		name="auction.pay.buy"
 		id="wizard_pay"/>
 
-		<wizard 
-			string="Gestion emporte" 
-			model="auction.dates" 
+		<wizard
+			string="Gestion emporte"
+			model="auction.dates"
 			name="auction.taken"
 			multi="1"
 			id="wizard_emporte"/>
-			
-	<menuitem name="Tools Bar Codes" 
+
+	<menuitem name="Tools Bar Codes"
 		id="auction_outils_menu"
-		parent="auction_menu_root"
+		parent="auction_menu_root" sequence="6"
 		/>
-		
-	<menuitem name="Deliveries Management" 
-		action="wizard_emporte" 
+
+	<menuitem name="Deliveries Management"
+		action="wizard_emporte"
 		type="wizard"
 		id="menu_wizard_emporte"
 		parent="auction_outils_menu"
diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index 8444193b238..0d102b18c24 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -105,10 +105,10 @@
         <field name="view_mode">tree,form</field>
     </record>
     <menuitem
-        name="Custom Reports" id="menu_custom_reports"
-        action="base_report_creator_action" parent="board.dashboard_menu" sequence="1"/>
+        name="Custom Reports" id="base.menu_custom_reports"
+        action="base_report_creator_action" parent="base.reporting_menu" sequence="1"/>
     <menuitem
-        name="Custom Reports" parent="board.next_id_50"
+        name="Custom Reports" parent="base.next_id_50"
         id="menu_base_report_creator_action_config"
         action="base_report_creator_action"/>
 
@@ -127,7 +127,7 @@
         <field name="view_type">tree</field>
     </record>
     <menuitem
-        name="Custom Reports" parent="menu_custom_reports"
+        name="Custom Reports" parent="base.menu_custom_reports"
         id="menu_base_report_creator_action"
         action="base_report_creator_action_tree"/>
 
diff --git a/addons/base_report_designer/base_report_designer_wizard.xml b/addons/base_report_designer/base_report_designer_wizard.xml
index d320df74baa..3485428fbf5 100644
--- a/addons/base_report_designer/base_report_designer_wizard.xml
+++ b/addons/base_report_designer/base_report_designer_wizard.xml
@@ -8,12 +8,20 @@
 			name="base_report_designer.modify"
 			id="wizard_report_designer_modify"/>
 
+		<menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting"/>
+    	<menuitem
+            id="base.next_id_50"
+            name="Configuration"
+            parent="base.reporting_menu"
+            groups="base.group_system"
+            sequence="3"/>
 		<menuitem
-			parent="base.menu_custom"
+			parent="base.next_id_50"
 			name="Report Designer"
 			action="wizard_report_designer_modify"
 			type="wizard"
-			id="menu_wizard_report_designer_modify"/>
+			id="menu_wizard_report_designer_modify"
+			sequence="70"/>
 
 
 
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 009d8f7348c..2b9341decd3 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-graph" id="dashboard_menu" name="Reporting"/>
-		<menuitem icon="terp-graph" id="dashboard" name="Dashboards" sequence="2" parent="dashboard_menu"/>
+        <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting"/>
+<!--		<menuitem icon="terp-graph" id="dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>-->
         <record id="view_board_note_tree" model="ir.ui.view">
             <field name="name">board.note.tree</field>
             <field name="model">board.note</field>
@@ -34,7 +34,7 @@
             <field name="view_mode">form,tree</field>
         </record>
 
-        <wizard id="wizard_board_create_menu" model="board.board" multi="True" name="board.board.menu.create" string="Create Board Menu"/>
+        <wizard id="wizard_board_create_menu" model="board.board" multi="True" name="board.board.menu.create" string="Create Board Menu" />
 
         <record id="view_board_tree" model="ir.ui.view">
             <field name="name">board.board.tree</field>
@@ -81,17 +81,17 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem
-            id="next_id_50"
+            id="base.next_id_50"
             name="Configuration"
-            parent="board.dashboard_menu"
+            parent="base.reporting_menu"
             groups="base.group_system"
             sequence="3"/>
         <menuitem
             action="action_view_board_list_form"
             id="menu_view_board_form"
-            parent="next_id_50"/>
-        <menuitem action="action_view_board_note_form" id="menu_view_board_note_form" parent="next_id_50"
-                  sequence="100"
+            parent="base.next_id_50" sequence="1"/>
+        <menuitem action="action_view_board_note_form" id="menu_view_board_note_form" parent="base.next_id_50"
+                  sequence="3"
                   groups="base.group_system" />
         <act_window context="{'view': active_id}" id="dashboard_open" multi="True" name="Open Dashboard" res_model="board.board" src_model="board.board"/>
 
diff --git a/addons/board_account/board_account_view.xml b/addons/board_account/board_account_view.xml
index 2c03279ef97..068e18bcf02 100644
--- a/addons/board_account/board_account_view.xml
+++ b/addons/board_account/board_account_view.xml
@@ -71,8 +71,8 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_account_form"/>
         </record>
-
-        <menuitem id="next_id_68" name="Accounting" parent="board.dashboard"
+		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+		<menuitem id="next_id_68" name="Accounting" parent="base.dashboard"
             groups="account.group_account_manager"/>
         <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="next_id_68" sequence="1"/>
     </data>
diff --git a/addons/board_association/board_association_view.xml b/addons/board_association/board_association_view.xml
index 2ed03e1da95..d010fee617b 100644
--- a/addons/board_association/board_association_view.xml
+++ b/addons/board_association/board_association_view.xml
@@ -53,8 +53,8 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_associations_manager_form"/>
         </record>
-
-		<menuitem id="board_associations" name="Associations" parent="board.dashboard" />
+		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+		<menuitem id="board_associations" name="Associations" parent="base.dashboard" />
         <menuitem
             name="Associations" parent="board_associations"
             action="open_board_associations_manager"
diff --git a/addons/board_auction/board_auction_manager_view.xml b/addons/board_auction/board_auction_manager_view.xml
index e77c936f861..c20a6af14fd 100644
--- a/addons/board_auction/board_auction_manager_view.xml
+++ b/addons/board_auction/board_auction_manager_view.xml
@@ -69,8 +69,8 @@
 			<field name="usage">menu</field>
 			<field name="view_id" ref="board_auction_manager_form1"/>
 		</record>
-
-		<menuitem name="Auction Manager" id="board_menu_auction_manager" parent="board.dashboard" />
+		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+		<menuitem name="Auction Manager" id="board_menu_auction_manager" parent="base.dashboard" />
 		<menuitem
 			name="Auction Manager"
 			action="open_board_auction_manager"
diff --git a/addons/board_auction/board_auction_view.xml b/addons/board_auction/board_auction_view.xml
index d94c2a329aa..0099b6bd68e 100644
--- a/addons/board_auction/board_auction_view.xml
+++ b/addons/board_auction/board_auction_view.xml
@@ -58,8 +58,8 @@
 			<field name="usage">menu</field>
 			<field name="view_id" ref="board_auction_manager_form"/>
 		</record>
-
-		<menuitem name="Auction Member" id="board_menu_auction_member" parent="board.dashboard" />
+		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+		<menuitem name="Auction Member" id="board_menu_auction_member" parent="base.dashboard" />
 		<menuitem
 			name="Auction Member"
 			action="open_board_auction"
diff --git a/addons/board_crm_configuration/board_crm_statistical_view.xml b/addons/board_crm_configuration/board_crm_statistical_view.xml
index 178d4e8488d..8e01d0d0eba 100644
--- a/addons/board_crm_configuration/board_crm_statistical_view.xml
+++ b/addons/board_crm_configuration/board_crm_statistical_view.xml
@@ -110,8 +110,9 @@
             <field name="view_id" ref="board_crm_statistical_form"/>
         </record>
 
+		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
-            name="CRM Configuration" parent="board.dashboard"
+            name="CRM Configuration" parent="base.dashboard"
             id="menu_board_crm_config"
             groups="crm.group_crm_manager"/>
         <menuitem
diff --git a/addons/board_document/board_document_view.xml b/addons/board_document/board_document_view.xml
index cb4450fae21..a35e6f9efe7 100644
--- a/addons/board_document/board_document_view.xml
+++ b/addons/board_document/board_document_view.xml
@@ -50,10 +50,11 @@
             <field name="view_id" ref="board_document_manager_form"/>
          </record>
 
+		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
          <menuitem
             name="Document"
             id="menu_board_document"
-            parent="board.dashboard"
+            parent="base.dashboard"
             groups="document.group_document_manager"/>
 
 
diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml
index 99308da7f61..7e913209c4a 100644
--- a/addons/board_manufacturing/board_manufacturing_view.xml
+++ b/addons/board_manufacturing/board_manufacturing_view.xml
@@ -36,10 +36,12 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_mrp_manager_form"/>
         </record>
+
+   		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
             id="next_id_87"
             name="Production"
-            parent="board.dashboard"
+            parent="base.dashboard"
             groups="mrp.group_mrp_manager"/>
         <menuitem
             action="open_board_manufacturing"
diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml
index c499ea987d9..ebb5f6c86b7 100644
--- a/addons/board_project/board_project_view.xml
+++ b/addons/board_project/board_project_view.xml
@@ -76,11 +76,11 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_project_form"/>
         </record>
-
+		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
             id="next_id_86"
             name="Project"
-            parent="board.dashboard"/>
+            parent="base.dashboard"/>
         <menuitem
             action="open_board_project"
             icon="terp-graph"
diff --git a/addons/board_sale/board_sale_view.xml b/addons/board_sale/board_sale_view.xml
index f373c8e502d..e5e469322c4 100644
--- a/addons/board_sale/board_sale_view.xml
+++ b/addons/board_sale/board_sale_view.xml
@@ -35,7 +35,8 @@
             <field name="view_id" ref="board_sales_manager_form"/>
         </record>
 
-        <menuitem id="next_id_88" name="Sales" parent="board.dashboard"/><menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="next_id_88" sequence="1"/>
+		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem id="next_id_88" name="Sales" parent="base.dashboard"/><menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="next_id_88" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 3789fe184eb..b93e7f658cd 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -3,11 +3,11 @@
     <data>
         <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources"/>
         <menuitem id="menu_hr_human_resources" sequence="1" name="Human Resources" parent="menu_hr_root"/>
-        <menuitem
+      <!--  <menuitem
             id="menu_hr_reporting"
             name="Reporting"
             parent="hr.menu_hr_root"
-            sequence="40" />
+            sequence="40" /> -->
         <menuitem
             id="menu_hr_configuration"
             name="Configuration"
diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py
index f84a026748b..7e11b7557e0 100644
--- a/addons/hr_holidays/__terp__.py
+++ b/addons/hr_holidays/__terp__.py
@@ -47,7 +47,7 @@
 """,
     'author': 'Tiny & Axelor',
     'website': 'http://www.openerp.com',
-    'depends': ['hr', 'crm', 'process'],
+    'depends': ['hr', 'crm', 'process','hr_attendance'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index 7759845e564..ce5014773b0 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
+	  <menuitem
+            id="hr.menu_hr_reporting"
+            name="Reporting"
+            parent="hr.menu_hr_root"
+            sequence="40" />
 	<wizard string="Print Summary of Holidays"
 		  name="hr.holidays.summary"
 		  id="holidays_summary"/>
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index aca7f2588f8..b8e6c2af47e 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-          <menuitem
+          <!--<menuitem
             id="menu_hr_reporting"
             name="Reporting"
             parent="hr.menu_hr_root"
-            sequence="40" />
+            sequence="40" />-->
         <!-- Menu Items -->
 
         <record id="view_hr_holidays_filter" model="ir.ui.view">
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index a1f430dbadd..4f6c32bbdce 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+      <menuitem
+            id="hr.menu_hr_reporting"
+            name="Reporting"
+            parent="hr.menu_hr_root"
+            sequence="40" />
         <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
 
         <wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee Timesheet"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
index 3f48aa3b642..4b6f2c3d91d 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
+        <menuitem
+            id="hr.menu_hr_reporting"
+            name="Reporting"
+            parent="hr.menu_hr_root"
+            sequence="40" />
         <report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
 
         <wizard id="account_analytic_account_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger.report" string="Cost Ledger"/>
@@ -23,8 +27,8 @@
             string="Timesheet Profit"
             groups="account.group_account_manager"/>
 
-       <menuitem action="account_analytic_profit" 
-           id="print_account_analytic_profit" 
+       <menuitem action="account_analytic_profit"
+           id="print_account_analytic_profit"
            parent="hr.menu_hr_reporting"
            type="wizard"
            groups="hr.group_hr_manager"/>
diff --git a/addons/lunch/__init__.py b/addons/lunch/__init__.py
new file mode 100644
index 00000000000..b94760a67fb
--- /dev/null
+++ b/addons/lunch/__init__.py
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import lunch
+import wizard
+import report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/__terp__.py b/addons/lunch/__terp__.py
new file mode 100644
index 00000000000..bc7dfcbfef7
--- /dev/null
+++ b/addons/lunch/__terp__.py
@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+{
+    "name": "Lunch Module",
+    "author": "Tiny",
+    "version": "0.1",
+    "depends": ["base"],
+    "category" : "Generic Modules/Others",
+    "init_xml": [],
+    "update_xml": [
+        'security/ir.model.access.csv', 
+        'lunch_wizard.xml', 
+        'lunch_view.xml', 
+        'lunch_report.xml',
+        #'process/lunch_process.xml'
+    ],
+    "demo_xml": ['lunch_demo.xml'],
+    "installable": True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/i18n/fr_BE.po b/addons/lunch/i18n/fr_BE.po
new file mode 100644
index 00000000000..03beb8e85a4
--- /dev/null
+++ b/addons/lunch/i18n/fr_BE.po
@@ -0,0 +1,347 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* lunch
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 04:56:11+0000\n"
+"PO-Revision-Date: 2009-11-26 04:56:11+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_category
+#: view:lunch.category:0
+#: field:lunch.product,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Reset cashbox"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: lunch
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+msgid "lunch.cashmove"
+msgstr ""
+
+#. module: lunch
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Are you sure you want to cancel this order ?"
+msgstr ""
+
+#. module: lunch
+#: model:ir.module.module,shortdesc:lunch.module_meta_information
+msgid "Lunch Module"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Cash Moves"
+msgstr ""
+
+#. module: lunch
+#: rml:lunch.order:0
+msgid "Printed at :"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "lunch.product"
+msgstr ""
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Are you sure you want to reset this cashbox ?"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form
+#: view:lunch.cashbox:0
+msgid "CashBox"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: lunch
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,user_cashmove:0
+#: field:lunch.order,user_id:0
+#: field:report.lunch.amount,user_id:0
+msgid "User Name"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+#: view:report.lunch.amount:0
+msgid "Box Amount by User"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Total box"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_form
+#: field:lunch.order,product:0
+msgid "Product"
+msgstr ""
+
+#. module: lunch
+#: rml:lunch.order:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,price:0
+#: field:lunch.product,price:0
+msgid "Price"
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,end:0
+msgid "No"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.category:0
+#: rml:lunch.order:0
+#: view:lunch.order:0
+msgid "Order"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,create_date:0
+msgid "Created date"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch
+msgid "Lunch"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,descript:0
+msgid "Description Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.lunch_order_confirm
+#: wizard_button:lunch.order.confirm,init,go:0
+msgid "Confirm Order"
+msgstr ""
+
+#. module: lunch
+#: wizard_view:lunch.order.confirm,init:0
+msgid "Orders Confirmation"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,active:0
+#: field:lunch.product,active:0
+msgid "Active"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_day_form
+msgid " Order of the day"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_root
+msgid "Configuration"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_id_cancel
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
+msgid " CashBox "
+msgstr ""
+
+#. module: lunch
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree
+msgid "Lunch amount"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,name:0
+#: field:lunch.cashmove,name:0
+#: field:lunch.category,name:0
+#: rml:lunch.order:0
+#: field:lunch.product,name:0
+msgid "Name"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_category_form
+msgid " Category of product "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Total amount"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox
+msgid "lunch.cashbox"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,date:0
+msgid "Date"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0
+#: field:report.lunch.amount,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_form
+#: view:lunch.product:0
+msgid "Products"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_form
+msgid "Category of product"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+msgid "Print Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_day_form
+msgid "Order of the day"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_amount
+msgid "Amount available by user and box"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.category:0
+msgid "Category related to Products"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order
+msgid "lunch.order"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,sum_remain:0
+msgid "Remained Total"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
+msgid "Make order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_clean_cashbox
+msgid "Set CashBox to Zero"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,box:0
+#: field:report.lunch.amount,box:0
+msgid "Box Name"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,manager:0
+msgid "Manager"
+msgstr ""
+
+#. module: lunch
+#: rml:lunch.order:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: lunch
+#: wizard_field:lunch.order.confirm,init,confirm_cashbox:0
+msgid "Name of box"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Total price"
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,end:0
+#: wizard_button:lunch.order.confirm,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,zero:0
+msgid "Set to Zero"
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,cancel:0
+msgid "Yes"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_tools
+msgid "Tools"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+#: view:lunch.cashmove:0
+#: field:lunch.order,cashmove:0
+msgid "CashMove"
+msgstr ""
+
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
new file mode 100644
index 00000000000..7eb6d858a3e
--- /dev/null
+++ b/addons/lunch/lunch.py
@@ -0,0 +1,191 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import osv, fields
+import time
+
+class lunch_category(osv.osv):
+    _name = 'lunch.category'
+    _description = "Category"
+
+    _columns = {
+        'name': fields.char('Name', required=True, size=50),
+    }
+
+    _order = 'name'
+
+lunch_category()
+
+class lunch_product(osv.osv):
+    _name = 'lunch.product'
+
+    def _category_name_get(self, cr, uid, context={}):
+        obj = self.pool.get('lunch.category')
+        cat_ids= obj.search(cr,uid,[])
+        res = obj.read(cr,uid,cat_ids,['name', 'category'])
+        return [(str(r['id']), r['name']) for r in res]+ [('0','')]
+
+    _columns = {
+        'name': fields.char('Name', size=50, required=True),
+        'category_id': fields.selection(_category_name_get, 'Category', size=32),
+        'description': fields.char('Description', size=128, required=False),
+        'price': fields.float('Price', digits=(16,2)),
+        'active': fields.boolean('Active'),
+    }
+
+    _defaults = {
+        'active': lambda *a : True,
+        }
+
+lunch_product()
+
+class lunch_cashbox(osv.osv):
+    _name='lunch.cashbox'
+
+    def amount_available(self, cr, uid, ids, field_name, arg, context):
+        cr.execute("SELECT box,sum(amount) from lunch_cashmove where active = 't' group by box")
+        r = dict(cr.fetchall())
+        for i in ids :
+            r.setdefault(i,0)
+        return r
+
+    _columns={
+        'manager':fields.many2one('res.users','Manager'),
+        'name':fields.char('Name',size=30,required=True, unique = True),
+        'sum_remain': fields.function(amount_available, method=True, string='Remained Total'),
+        }
+
+lunch_cashbox()
+
+
+
+
+class lunch_cashmove(osv.osv):
+    _name= 'lunch.cashmove'
+
+    _columns={
+        'name': fields.char('Name',size=128),
+        'user_cashmove': fields.many2one('res.users','User Name', required=True),
+        'amount': fields.float('Amount', digits=(16,2)),
+        'box':fields.many2one('lunch.cashbox','Box Name',size=30,required=True),
+        'active':fields.boolean('Active'),
+        'create_date': fields.datetime('Created date', readonly=True),
+        }
+
+    _defaults={
+    'active': lambda *a: True,
+    }
+
+lunch_cashmove()
+
+
+
+class lunch_order(osv.osv):
+    _name='lunch.order'
+    _rec_name= "user_id"
+
+    def _price_get(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for o in self.browse(cr, uid, ids):
+            res[o.id] = o.product.price
+        return res
+
+    _columns={
+        'user_id': fields.many2one('res.users','User Name', required=True,
+            readonly=True, states={'draft':[('readonly',False)]}),
+        'product':fields.many2one('lunch.product','Product', required=True,
+            readonly=True, states={'draft':[('readonly',False)]}, change_default=True),
+        'date': fields.date('Date',readonly=True,states={'draft':[('readonly',False)]}),
+        'cashmove':fields.many2one('lunch.cashmove', 'CashMove' , readonly=True  ),
+        'descript':fields.char('Description Order', readonly=True, size=50,
+            states={'draft':[('readonly',False)]}),
+        'state': fields.selection([('draft','Draft'), ('confirmed','Confirmed'),],
+            'State', readonly=True, select=True),
+        'price': fields.function(_price_get, method=True, string="Price"),
+    }
+
+    _defaults={
+        'user_id': lambda self,cr,uid,context: uid,
+        'date': lambda self,cr,uid,context: time.strftime('%Y-%m-%d'),
+        'state': lambda self,cr,uid,context: 'draft',
+    }
+
+    def confirm(self,cr,uid,ids,box,context):
+        cashmove_ref= self.pool.get('lunch.cashmove')
+        for order in self.browse(cr,uid,ids):
+            if order.state == 'confirmed':
+                continue
+            new_id= cashmove_ref.create(cr,uid,{'name': order.product.name+' order',
+                            'amount':-order.product.price,
+                            'user_cashmove':order.user_id.id,
+                            'box':box,
+                            'active':True,
+                            })
+            self.write(cr,uid,[order.id],{'cashmove':new_id, 'state':'confirmed'})
+        return {}
+
+    def lunch_order_cancel(self,cr,uid,ids,context):
+        orders= self.browse(cr,uid,ids)
+        for order in orders:
+            if not order.cashmove:
+                continue
+            self.pool.get('lunch.cashmove').unlink(cr, uid, [order.cashmove.id])
+        self.write(cr,uid,ids,{'state':'draft'})
+        return {}
+
+    def onchange_product(self, cr, uid, ids, product):
+        if not product:
+            return {'value': {'price': 0.0}}
+        price = self.pool.get('lunch.product').read(cr, uid, product, ['price'])['price']
+        return {'value': {'price': price}}
+
+lunch_order()
+
+class report_lunch_amount(osv.osv):
+    _name='report.lunch.amount'
+    _description = "Amount available by user and box"
+    _auto = False
+    _rec_name= "user"
+
+    _columns = {
+        'user_id': fields.many2one('res.users','User Name',readonly=True),
+        'amount': fields.float('Amount', readonly=True, digits=(16,2)),
+        'box':fields.many2one('lunch.cashbox','Box Name',size=30,readonly=True),
+        }
+
+    def init(self, cr):
+        cr.execute("""
+            create or replace view report_lunch_amount as (
+                select
+                    min(lc.id) as id,
+                    lc.user_cashmove as user_id,
+                    sum(amount) as amount,
+                    lc.box as box
+                from
+                    lunch_cashmove lc
+                where
+                    active = 't'
+                group by lc.user_cashmove, lc.box
+                )""")
+
+report_lunch_amount()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/lunch_demo.xml b/addons/lunch/lunch_demo.xml
new file mode 100644
index 00000000000..91be819d430
--- /dev/null
+++ b/addons/lunch/lunch_demo.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+        <record model="lunch.category" id="categ_sandwich">
+            <field name="name">Sandwich</field>
+        </record>
+
+        <record model="lunch.product" id="product_club">
+            <field name="name">Club</field>
+            <field name="category_id" eval="str(ref('categ_sandwich'))"/>
+            <field name="price">2.75</field>
+        </record>
+
+        <record model="lunch.cashbox" id="cashbox_cashbox">
+            <field name="name">Cashbox</field>
+            <field name="manager" ref="base.user_admin"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/lunch/lunch_report.xml b/addons/lunch/lunch_report.xml
new file mode 100644
index 00000000000..6503c99a6ea
--- /dev/null
+++ b/addons/lunch/lunch_report.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <report
+            id="report_lunch_order"
+            string="Print Order"
+            model="lunch.order"
+            name="lunch.order"
+            rml="lunch/report/order.rml"
+            auto="False"
+            />
+    </data>
+</openerp>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
new file mode 100644
index 00000000000..fa6bf02c4dd
--- /dev/null
+++ b/addons/lunch/lunch_view.xml
@@ -0,0 +1,243 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools"/>
+        <!--<menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>
+        <menuitem name="Lunch Order" parent="menu_tools" id="menu_lunch" sequence="1"/>
+        <menuitem name="Reporting" parent="menu_tools" id="menu_lunch_reporting" sequence="4"/>
+        <menuitem name="Lunch Orders" parent="menu_lunch_reporting" id="menu_lunch_reporting_order" sequence="1"/>
+        <menuitem name="Configuration" parent="menu_tools" id="menu_lunch_category_root" sequence="5"/>-->
+       <menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>-->
+
+        <menuitem name="Lunch Order" parent="base.menu_tools" id="menu_lunch" sequence="1"/>
+        <menuitem name="Reporting" parent="base.menu_tools" id="menu_lunch_reporting" sequence="4"/>
+        <menuitem name="Lunch Orders" parent="menu_lunch_reporting" id="menu_lunch_reporting_order" sequence="1"/>
+        <menuitem name="Configuration" parent="base.menu_tools" id="base.menu_lunch_survey_root" sequence="5"/>
+
+
+       <menuitem name="Lunch" parent="base.menu_lunch_survey_root" id="menu_lunch_category_root_configuration" sequence="5"/>
+        <record model="ir.ui.view" id="view_lunch_order_form">
+            <field name="name">Order</field>
+            <field name="model">lunch.order</field>
+            <field name="arch" type="xml">
+                <form string="Order">
+                    <group colspan="2" col="4">
+                        <field name="user_id" select="1"/>
+                        <field name="date" select="1"/>
+                        <field name="product" select="1" on_change="onchange_product(product)"/>
+                        <field name="price"/>
+                        <field name="descript"/>
+                        <field name="cashmove"/>
+                        <field name="state" select="2"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_lunch_order_tree">
+            <field name="name">Order</field>
+            <field name="model">lunch.order</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Order">
+                    <field name="user_id"/>
+                    <field name="product"/>
+                    <field name="date"/>
+                    <field name="cashmove"/>
+                    <field name="state"/>
+                    <field name="descript"/>
+                    <field name="price" sum="Total price"/>
+                </tree>
+            </field>
+        </record>
+
+
+
+        <record model="ir.actions.act_window" id="action_lunch_order_form">
+                <field name="name">Orders</field>
+                <field name="res_model">lunch.order</field>
+                <field name="view_mode">form,tree</field>
+        </record>
+        <menuitem name="Order" parent="menu_lunch" id="menu_lunch_order_form" action="action_lunch_order_form"/>
+
+<!--        <record model="ir.actions.act_window" id="action_lunch_order_day_form">-->
+<!--                <field name="name"> Order of the day</field>-->
+<!--                <field name="res_model">lunch.order</field>-->
+<!--                <field name="domain">[('date','=',time.strftime('%Y-%m-%d'))]</field>-->
+<!---->
+<!--        </record>-->
+<!--        <menuitem name="Order of the day" parent="menu_lunch_order_form" id="menu_lunch_order_day_form" action="action_lunch_order_day_form"/>-->
+
+        <record model="ir.ui.view" id="view_lunch_cashbox_form">
+            <field name="name">CashBox</field>
+            <field name="model">lunch.cashbox</field>
+            <field name="arch" type="xml">
+                <form string="CashBox">
+                    <field name="name" select="1"/>
+                    <field name="manager" select="1"/>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_lunch_cashbox_tree">
+            <field name="name">CashBox</field>
+            <field name="model">lunch.cashbox</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="CashBox" colors="red:sum_remain&lt;=0">
+                    <field name="name" select="1"/>
+                    <field name="manager" select="1"/>
+                    <field name="sum_remain" select="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_lunch_cashbox_form">
+                <field name="name"> CashBox </field>
+                <field name="res_model">lunch.cashbox</field>
+        </record>
+        <menuitem name="CashBox" parent="menu_lunch_category_root_configuration" id="menu_lunch_cashbox_form" action="action_lunch_cashbox_form"/>
+
+        <record model="ir.ui.view" id="view_lunch_cashmove_form">
+            <field name="name">CashMove</field>
+            <field name="model">lunch.cashmove</field>
+            <field name="arch" type="xml">
+                <form string="CashMove">
+                    <field name="name" select="1"/>
+                    <field name="user_cashmove" select="1"/>
+                    <field name="amount" select="2"/>
+                    <field name="box" select="1"/>
+                    <field name="create_date" select="1"/>
+                    <field name="active" select="1"/>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_lunch_cashmove_tree">
+            <field name="name">CashMove</field>
+            <field name="model">lunch.cashmove</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="CashMove" editable="top">
+                    <field name="name" select="1" required="1"/>
+                    <field name="user_cashmove" select="1"/>
+                    <field name="amount" select="1" sum="Total amount"/>
+                    <field name="box" select="1"/>
+                    <field name="create_date"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_lunch_cashmove_form">
+                <field name="name">CashMove</field>
+                <field name="res_model">lunch.cashmove</field>
+        </record>
+
+        <menuitem name="Cash Moves" parent="menu_lunch" id="menu_lunch_cashmove_form" action="action_lunch_cashmove_form"/>
+
+        <record model="ir.ui.view" id="view_lunch_category_form">
+            <field name="name"> Category of product </field>
+            <field name="model">lunch.category</field>
+            <field name="arch" type="xml">
+                <form string="Category">
+                    <separator string="Category related to Products" colspan="4"/>
+                    <field name="name" select="1"/>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_lunch_category_tree">
+            <field name="name">Category</field>
+            <field name="model">lunch.category</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Order">
+                    <field name="name" select="1"/>
+                </tree>
+            </field>
+        </record>
+
+
+        <record model="ir.actions.act_window" id="action_lunch_category_form">
+            <field name="name"> Category of product </field>
+            <field name="res_model">lunch.category</field>
+        </record>
+
+        <record model="ir.ui.view" id="view_lunch_product_form">
+            <field name="name">Products</field>
+            <field name="type">form</field>
+            <field name="model">lunch.product</field>
+            <field name="arch" type="xml">
+                <form string="Products">
+                    <field name="name" select="1"/>
+                    <field name="category_id" select="1"/>
+                    <field name="description" select="1"/>
+                    <field name="price" select="1"/>
+                    <field name="active" select="1"/>
+                </form>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_lunch_product_tree">
+            <field name="name">Products</field>
+            <field name="model">lunch.product</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Products">
+                    <field name="name" select="1"/>
+                    <field name="category_id" select="1"/>
+                    <field name="description" select="1"/>
+                    <field name="price" select="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_lunch_product_form">
+            <field name="name">Product</field>
+            <field name="res_model">lunch.product</field>
+        </record>
+
+        <menuitem name="Tools/Lunch/Configuration/Products" id="menu_lunch_product_form" action="action_lunch_product_form"  sequence="1"/>
+        <menuitem name="Products" parent="menu_lunch_category_root_configuration" id="menu_lunch_product_form" action="action_lunch_product_form"  sequence="2"/>
+        <menuitem name="Category of product" parent="menu_lunch_category_root_configuration" id="menu_lunch_category_form" action="action_lunch_category_form" sequence="1"/>
+
+
+        <record model="ir.ui.view" id="view_report_lunch_amount_tree">
+            <field name="name">Lunch amount</field>
+            <field name="model">report.lunch.amount</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Box Amount by User">
+                    <field name="box" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="amount" select="1" sum="Total box" />
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_lunch_amount_form">
+            <field name="name">Lunch amount</field>
+            <field name="model">report.lunch.amount</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Box Amount by User">
+                    <field name="user_id" select="1"/>
+                    <field name="box" select="1"/>
+                    <field name="amount" select="1"/>
+                </form>
+            </field>
+        </record>
+
+
+        <record model="ir.actions.act_window" id="action_report_lunch_amount_tree">
+            <field name="name">Lunch amount</field>
+            <field name="res_model">report.lunch.amount</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem name="Cash Position by User" parent="menu_lunch_reporting_order" action="action_report_lunch_amount_tree" id="menu_lunch_report_amount_tree"/>
+    </data>
+</openerp>
+
+
diff --git a/addons/lunch/lunch_wizard.xml b/addons/lunch/lunch_wizard.xml
new file mode 100644
index 00000000000..0820ae7d80c
--- /dev/null
+++ b/addons/lunch/lunch_wizard.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+        <wizard 
+            string="Confirm Order"
+            model="lunch.order"
+            name="lunch.order.confirm"
+            keyword="client_action_multi"
+            id="lunch_order_confirm"/>
+
+        <wizard
+            string="Cancel Order"
+            model="lunch.order"
+            name="lunch.order.cancel"
+            keyword="client_action_multi"
+            id="wizard_id_cancel"/>
+
+        <wizard
+            string="Set CashBox to Zero"
+            model="lunch.cashbox"
+            name="lunch.cashbox.clean"
+            keyword="client_action_multi"
+            id="wizard_clean_cashbox"/>
+    </data>
+</openerp>
diff --git a/addons/lunch/report/__init__.py b/addons/lunch/report/__init__.py
new file mode 100644
index 00000000000..acf05a0ca2a
--- /dev/null
+++ b/addons/lunch/report/__init__.py
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import order
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/report/order.py b/addons/lunch/report/order.py
new file mode 100644
index 00000000000..abb99ceb380
--- /dev/null
+++ b/addons/lunch/report/order.py
@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import time
+from report import report_sxw
+from osv import osv
+
+
+class order(report_sxw.rml_parse):
+
+    def sum_price(self, orders):
+        res = 0.0
+        for o in orders:
+            res += o.price
+        return res
+
+    def __init__(self, cr, uid, name, context):
+        super(order, self).__init__(cr, uid, name, context)
+
+        self.localcontext.update({
+        'time': time,
+        'sum_price': self.sum_price,
+        })
+
+report_sxw.report_sxw('report.lunch.order', 'lunch.order',
+        'addons/lunch/report/order.rml',parser=order, header=False)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
new file mode 100644
index 00000000000..a7bc1b32cdd
--- /dev/null
+++ b/addons/lunch/report/order.rml
@@ -0,0 +1,132 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="34.0" y1="42.0" width="527" height="758"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <blockBackground colorName="#e6e6e6" start="3,0" stop="3,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Times-Roman" fontSize="15.0" leading="19"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="16.0" leading="20"/>
+    <paraStyle name="P3" fontName="Times-Roman"/>
+    <paraStyle name="P4" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P5" fontName="Times-BoldItalic" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P6" fontName="Times-BoldItalic" fontSize="9.0" leading="11"/>
+    <paraStyle name="P7" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P8" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P9" fontName="Times-Roman" fontSize="9.0" leading="11"/>
+    <paraStyle name="P10" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P11" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P12" fontName="Times-BoldItalic" fontSize="6.0" leading="8"/>
+    <paraStyle name="P13" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P14" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Times-Roman"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Footnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="P1">
+      <font face="Times-Roman">Printed at : [[time.strftime("%Hh%M")]]</font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="149.0,135.0,103.0,140.0" repeatRows="1" style="Tableau2">
+      <tr>
+        <td>
+          <para style="P4">Name</para>
+        </td>
+        <td>
+          <para style="P4">Order</para>
+        </td>
+        <td>
+          <para style="P4">Description</para>
+        </td>
+        <td>
+          <para style="P4">Unit Price</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="P5">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <blockTable colWidths="148.0,135.0,103.0,140.0" style="Tableau1">
+      <tr>
+        <td>
+          <para style="P7">[[repeatIn(objects, 'o') ]]</para>
+          <para style="P7">[[ o.user_id.name ]]</para>
+        </td>
+        <td>
+          <para style="P8">[[o.product.name ]]</para>
+        </td>
+        <td>
+          <para style="P9">[[ o.descript ]]</para>
+          <para style="P10">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P14">[['%.2f' % o.price ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P11">[[ '%.2f' % sum_price(objects) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P6">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/lunch/security/ir.model.access.csv b/addons/lunch/security/ir.model.access.csv
new file mode 100644
index 00000000000..43490780c36
--- /dev/null
+++ b/addons/lunch/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_lunch_category","lunch.category","model_lunch_category",base.group_user,1,1,1,1
+"access_lunch_product","lunch.product","model_lunch_product",base.group_user,1,1,1,1
+"access_lunch_cashbox","lunch.cashbox","model_lunch_cashbox",base.group_user,1,1,1,1
+"access_lunch_cashmove","lunch.cashmove","model_lunch_cashmove",base.group_user,1,1,1,1
+"access_lunch_order","lunch.order","model_lunch_order",base.group_user,1,1,1,1
+"access_report_lunch_amount","report.lunch.amount","model_report_lunch_amount",base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/addons/lunch/wizard/__init__.py b/addons/lunch/wizard/__init__.py
new file mode 100644
index 00000000000..e290a2e933c
--- /dev/null
+++ b/addons/lunch/wizard/__init__.py
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import confirm
+import cancel
+import reset_box
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/wizard/cancel.py b/addons/lunch/wizard/cancel.py
new file mode 100644
index 00000000000..1acc1535a90
--- /dev/null
+++ b/addons/lunch/wizard/cancel.py
@@ -0,0 +1,53 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import wizard
+import netsvc
+import ir
+import pooler
+
+cancel_form = """<?xml version="1.0"?>
+<form string="Cancel Order">
+    <label string="Are you sure you want to cancel this order ?"/>
+</form>"""
+
+
+cancel_fields = {
+}
+
+def _cancel(self,cr,uid,data,context):
+    return pooler.get_pool(cr.dbname).get('lunch.order').lunch_order_cancel(cr,uid,data['ids'],context)
+
+class order_cancel(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'form', 'arch':cancel_form, 'fields':cancel_fields, 'state':[('end','No'),('cancel','Yes')]}
+        },
+        'cancel': {
+            'actions': [_cancel],
+            'result': {'type':'state', 'state':'end'}
+        }
+    }
+order_cancel('lunch.order.cancel')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/wizard/confirm.py b/addons/lunch/wizard/confirm.py
new file mode 100644
index 00000000000..64891098349
--- /dev/null
+++ b/addons/lunch/wizard/confirm.py
@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import wizard
+import netsvc
+import ir
+import pooler
+
+confirm_order_form = """<?xml version="1.0"?>
+<form title="Confirm">
+    <separator string="Orders Confirmation" colspan="4"/>
+    <field name="confirm_cashbox"/>
+    <newline/>
+</form>
+"""
+
+confirm_order_fields = {
+    'confirm_cashbox': {'string':'Name of box', 'type':'many2one', 'required':True, 'relation':'lunch.cashbox' },
+}
+
+def _confirm(self,cr,uid,data,context):
+    pool= pooler.get_pool(cr.dbname)
+    order_ref = pool.get('lunch.order')
+    order_ref.confirm(cr,uid,data['ids'],data['form']['confirm_cashbox'],context)
+    return {}
+
+class order_confirm(wizard.interface):
+    states = {
+        'init': {
+            'action':[],
+            'result':{'type' : 'form', 'arch' : confirm_order_form, 'fields' : confirm_order_fields, 'state' : [('end', 'Cancel'),('go', 'Confirm Order') ]},
+        },
+        'go' : {
+            'actions' : [_confirm],
+            'result' : {'type' : 'state', 'state' : 'end'}
+        },
+    }
+order_confirm('lunch.order.confirm')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/wizard/reset_box.py b/addons/lunch/wizard/reset_box.py
new file mode 100644
index 00000000000..83999fc3ba0
--- /dev/null
+++ b/addons/lunch/wizard/reset_box.py
@@ -0,0 +1,76 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import wizard
+import netsvc
+import ir
+import pooler
+
+set_to_zero_form = """<?xml version="1.0"?>
+<form string="Reset cashbox">
+    <label string="Are you sure you want to reset this cashbox ?"/>
+</form>"""
+
+
+
+confirm_setting_zero_fields = {}
+
+def _set_to_zero(self,cr,uid,data,context):
+    pool= pooler.get_pool(cr.dbname)
+    cashmove_ref = pool.get('lunch.cashmove')
+    cr.execute("select user_cashmove, box,sum(amount) from lunch_cashmove where active= 't' and box in (%s) group by user_cashmove, box"%','.join(map(str,data['ids'])))
+    res= cr.fetchall()
+    cr.execute("update lunch_cashmove set active = 'f' where active= 't' and box in (%s)"%','.join(map(str,data['ids'])))
+##    to_unactive= {}.fromkeys([r[0] for r in cr.fetchall]).keys()
+##    print to_unactive
+##    cashmove_ref.write(cr,uid,to_unactive,{'active':False})            
+##    
+    for (user_id,box_id,amount) in res:
+        cashmove_ref.create(cr,uid,{'name': 'Summary for user'+ str(user_id),
+                        'amount': amount,
+                        'user_cashmove': user_id,
+                        'box': box_id,
+                        'active': True,
+                        })
+    return {}
+
+
+class cashbox_set_to_zero(wizard.interface):
+
+    states = {
+            
+        'init': {
+                        'action':[],
+                        'result':{'type' : 'form',
+                          'arch' : set_to_zero_form,
+              'fields' : confirm_setting_zero_fields,
+                          'state' : [('end', 'Cancel'),('zero', 'Set to Zero') ]},
+    
+        },
+        'zero' : {
+            'actions' : [_set_to_zero],
+            'result' : {'type' : 'state', 'state' : 'end'}
+        },
+    }
+    
+cashbox_set_to_zero('lunch.cashbox.clean')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 78c81d77e88..2bc1ac1d48d 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -82,9 +82,12 @@
         </record>
 
         <menuitem name="Membership" id="menu_membership" icon="terp-crm"/>
+        <menuitem name="Members" parent="menu_membership"
+            id="menu_member"
+            sequence="1"/>
         <menuitem name="Configuration" parent="menu_membership"
             id="menu_conf"
-            sequence="1"/>
+            sequence="3"/>
         <menuitem name="Membership products" parent="menu_conf"
             id="menu_membership_products"
             action="action_membership_products"/>
@@ -144,8 +147,8 @@
             <field name="view_mode">form</field>
             <field name="act_window_id" ref="action_membership_members"/>
         </record>
-        
-        <menuitem name="Current members" parent="menu_membership"
+
+        <menuitem name="Current members" parent="menu_member"
             id="menu_members"
             sequence="2"
             action="action_membership_members"/>
@@ -207,7 +210,7 @@
 
         <!-- MEMBERSHIP/REPORTING -->
         <menuitem name="Reporting" parent="menu_membership"
-            sequence="5"
+            sequence="2"
             id="menu_reporting"/>
 
         <!-- REPORTING/MEMBERSHIP BY YEAR  -->
diff --git a/addons/olap/__init__.py b/addons/olap/__init__.py
new file mode 100755
index 00000000000..fbc12796e54
--- /dev/null
+++ b/addons/olap/__init__.py
@@ -0,0 +1,30 @@
+##############################################################################
+#
+# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#                    Fabien Pinckaers <fp@tiny.Be>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import olap
+import wizard
diff --git a/addons/olap/__terp__.py b/addons/olap/__terp__.py
new file mode 100644
index 00000000000..7583de75182
--- /dev/null
+++ b/addons/olap/__terp__.py
@@ -0,0 +1,23 @@
+{
+    "name" : "Olap Schemes Management",
+    "version" : "0.1",
+    "author" : "Tiny",
+    "website" : "http://www.openerp.com",
+    "depends" : ["base"],
+    "category" : "Generic Modules/Olap",
+    "description": """
+    Base module to manage Olap schemas. Cube designer.
+    """,
+    "init_xml" :  ["data/olap_data.xml"],
+    "update_xml" : [
+        "data/olap_view.xml",
+        "data/olap_wizard.xml",
+        "data/olap_cube_view.xml",
+        "data/olap_fact_view.xml",
+        "data/olap_cube_workflow.xml",
+        "data/olap_security.xml"
+    ],
+    "demo_xml" : ["data/olap_demo.xml"],
+    "active": False,
+    "installable": True
+}
diff --git a/addons/olap/cli/Makefile b/addons/olap/cli/Makefile
new file mode 100755
index 00000000000..dd44a2c1289
--- /dev/null
+++ b/addons/olap/cli/Makefile
@@ -0,0 +1,69 @@
+DATABASE = 'bi'
+
+all: simple sale date where sublevels calc_meas cross page complex test
+
+simple:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c "select {[User].[all]} on rows, {[measures].[Credit Limit],[measures].[Count]} on columns from Partner"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c "select {[measures].[Credit Limit],[measures].[Count]} on rows, {[User].[all],[User].children} on columns from Partner"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c "select {[User].children} on rows from Partner"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c "select {[User].[all],[User].children} on rows, {[measures].[Credit Limit],[measures].[Count]} on columns from Partner"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c "select {[User].children} on rows, {[User].children} on columns from Partner where ([measures].[Count])"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c "select {[User].children} on rows, {[measures].[Count]} on columns from Partner where ([User].[3])" 
+#	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c "select {[Date].[2008]} on rows, {[measures].[Credit Limit],[measures].[Count]} on columns from Partner"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c "select {[Date].[all],[Date].children} on rows, {[measures].[Credit Limit],[measures].[Count]} on columns from Partner"
+
+sale:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Partner Country].children} on rows from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].children} on rows from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].children,[City].[Paris].children,[Partner Country].children} on rows, {[measures].[Total Sales]} on columns from Sales"
+
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Order Date].[all],[Order Date].children,[Users].children} on rows, {[measures].[Average Sales],[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Order Date].children, [Order Date].[all]} on rows, {[measures].[Average Sales],[measures].[Total Sales]} on columns from Sales"
+
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Partner Country].children} on rows, {[measures].[Average Sales],[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Partner Country].[China]} on rows, {[measures].[Average Sales],[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Partner Country].[Belgium]} on rows, {[measures].[Average Sales],[measures].[Total Sales]} on columns from Sales"
+
+date:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Order Date].children} on rows, {[measures].[Average Sales],[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Order Date].[2007]} on rows, {[measures].[Average Sales],[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Order Date].[2008]} on rows, {[measures].[Average Sales],[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Order Date].children,[Order Date].[2008].children,[Order Date].[2008].[Q2].children} on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Order Date].children,[Order Date].[2008].children,[Order Date].[2008].[Q2].children} on rows, {[measures].[Total Sales]} on columns from Sales where ([Order Date].[2008].[Q2])"
+
+where:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c " select crossjoin (crossjoin ({[Order Date].[all],[Users].[all]} , {[Users].children} ) , {[Partner Country].[all]}) on rows, {[measures].[Units Sold]} on columns from Sales"
+sublevels:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].[all],[City].children} on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].[all],[City].children} on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].[all],[City].children,[City].[Liege].children} on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Products Category].[all],[Products Category].children} on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Products Category].[all],[Products Category].children,[Products Category].[PC].children} on rows, {[measures].[Total Sales]} on columns from Sales"
+
+calc_meas:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].[all]} on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].[all],[City].children} on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].[all],[City].children} on rows, {[measures].[Units Sold],[measures].[Total Sales]} on columns from Sales"
+
+cross:	
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select  crossjoin ({[Order Date].[all],[Order Date].children} , {[All Products].[all]}) on rows from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin({[City].[all]},{[Users].[all]}) on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin({[City].[all],[Users].[all]},{[Order Date].[all]}) on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin({[City].[all],[City].children},{[Order Date].children}) on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin(crossjoin({[City].[all],[City].children},{[Users].children}),{[Order Date].children}) on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin(crossjoin({[City].[all],[City].children},{[Users].children}),{[Order Date].children}) on rows, {[measures].[Total Sales],[measures].[Units Sold]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin(crossjoin({[City].[all],[Users].[all]},{[Order Date].[all]}),{[Order Date].children}) on rows, crossjoin({[All Products].[all],[Products Category].[all]},{[Partner Country].children}) on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin({[City].[all]},{[Users].[all]}) on rows, crossjoin({[measures].[Total Sales]},{[Order Date].children}) on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin({[City].[all]},{[Users].[all]}) on rows, crossjoin(crossjoin({[measures].[Total Sales]},{[Order Date].children}),{[Users].children}) on columns from Sales"
+
+page:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].[all],[City].children} on rows, {[measures].[Units Sold],[measures].[Total Sales]} on columns, {[Order Date].children} on pages from Sales" 
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[measures].[Units Sold],[measures].[Total Sales]} on rows, {[City].[all],[City].children} on columns, {[Order Date].children} on pages from Sales"
+
+complex:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin({[City].[all],[City].children},{[Order Date].[all]}) on rows, {[measures].[Units Sold],[measures].[Total Sales]} on columns, {[Order Date].children} on pages from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin(crossjoin({[City].[all],[City].children},{[Order Date].children}),{[Users].children}) on rows, {[measures].[Units Sold],[measures].[Total Sales]} on columns, {[Order Date].children} on pages from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin(crossjoin({[City].[all],[City].children},{[Order Date].children}),{[Users].children}) on rows, crossjoin({[measures].[Units Sold],[measures].[Total Sales]},{[City].children}) on columns, {[Order Date].children} on pages from Sales"
+
+test:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c " select crossjoin (crossjoin ({[Order Date].[all],[Users].[all]} , {[Users].children} ) , {[Partner Country].[all]}) on rows, {[measures].[Units Sold]} on columns from Sales"
\ No newline at end of file
diff --git a/addons/olap/cli/tinybi.py b/addons/olap/cli/tinybi.py
new file mode 100755
index 00000000000..ec31232110d
--- /dev/null
+++ b/addons/olap/cli/tinybi.py
@@ -0,0 +1,86 @@
+#!/usr/bin/python
+
+##############################################################################
+#
+# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#                    Fabien Pinckaers <fp@tiny.Be>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+#
+# This module test all RPC methods
+#
+
+import optparse
+
+import xmlrpclib
+import time
+
+__version__ = '1.0'
+
+parser = optparse.OptionParser(version=__version__)
+
+group = optparse.OptionGroup(parser, "General options")
+group.add_option("-c", "--command", dest="command", help="The query to execute")
+group.add_option("-s", "--schema", dest="schema", help="The schema to use for the query")
+parser.add_option_group(group)
+
+group = optparse.OptionGroup(parser, "Connection options")
+group.add_option("-d", "--database", dest="database", help="Database name")
+group.add_option("-H", "--hostname", dest="hostname", default='localhost', help="Server hostname")
+group.add_option("-U", "--username", dest="username", default='admin', help="Username")
+group.add_option("-W", "--password", dest="password", default='admin', help="Password")
+group.add_option("-p", "--port", dest="port", default=8069, help="Server port")
+parser.add_option_group(group)
+
+(opt, args) = parser.parse_args()
+
+sock = xmlrpclib.ServerProxy('http://'+opt.hostname+':'+str(opt.port)+'/xmlrpc/object')
+uid = 1 
+
+axis,data = sock.execute(opt.database, uid, opt.password, 'olap.schema', 'request', opt.schema, opt.command)
+COLSPAN = 18
+ROWSPAN = 18
+
+print
+if len(axis)>1:
+    for i in range(8):
+        ok = False
+        for x in axis[1]:
+            if len(x[0])==i:
+                ok = True
+        if not ok:
+            continue
+        print ' '*COLSPAN,
+        print (('%-'+str(ROWSPAN)+'s ' ) * len(axis[1])) % tuple(map(lambda x: str(len(x[0])==i and x[1] or ''),axis[1]))
+for col in data:
+    print ('%-'+str(COLSPAN)+'s')% (' '*(len(axis[0][0][0])-1)*2 + str(axis[0].pop(0)[1]),),
+    for row in col:
+        if row==[False]:
+            print ('%-'+str(ROWSPAN)+'s')%('',),
+        else:
+            print ('%-'+str(ROWSPAN)+'s')%(row,),
+    print
+print
+
diff --git a/addons/olap/cube/__init__.py b/addons/olap/cube/__init__.py
new file mode 100755
index 00000000000..79c50e6422d
--- /dev/null
+++ b/addons/olap/cube/__init__.py
@@ -0,0 +1,3 @@
+from mdx_parser import mdx_parser
+from mdx_output import mdx_output
+from warehouse import warehouse
diff --git a/addons/olap/cube/agregator.py b/addons/olap/cube/agregator.py
new file mode 100755
index 00000000000..27cede990f2
--- /dev/null
+++ b/addons/olap/cube/agregator.py
@@ -0,0 +1,9 @@
+import sqlalchemy
+
+agregator = {}
+agregator['sum'] = sqlalchemy.func.sum
+agregator['count'] = sqlalchemy.func.count
+agregator['avg'] = sqlalchemy.func.avg
+agregator['min'] = sqlalchemy.func.min
+agregator['max'] = sqlalchemy.func.max
+
diff --git a/addons/olap/cube/axis.py b/addons/olap/cube/axis.py
new file mode 100755
index 00000000000..6bff19b49cd
--- /dev/null
+++ b/addons/olap/cube/axis.py
@@ -0,0 +1,43 @@
+
+import sqlalchemy
+import common
+
+
+
+class axis(object):
+    def __init__(self, axis, name=None):
+        self.axis = axis
+        self.name = name
+
+    def validate(self, cube):
+        self.object = cube
+        self.axis.validate(cube)
+
+    def name_set(self, name):
+        self.name = name
+
+    def __repr__(self):
+        res = '\t<olap.axis ['+str(self.name)+']\n'
+        res += str(self.axis)
+        res += '\t>'
+        return res
+
+	#
+	# Output:
+	#    a list of grouped values that can be computed at once
+	#    a group is defined by elements having the same query
+	#
+	#   [
+	#     {
+	#       'level': ["Time","2008","Q1"],
+	#       'value': '1er Trim 2008',
+	#       'query': SQLAlchemy query object
+	#     }
+	#   ]
+	#
+
+    def run(self, metadata):
+        result = self.axis.run(metadata)
+        return result
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/axis_map.py b/addons/olap/cube/axis_map.py
new file mode 100755
index 00000000000..9b0cf7e53cc
--- /dev/null
+++ b/addons/olap/cube/axis_map.py
@@ -0,0 +1,109 @@
+#
+# Interface for all mapping objects to map values into the right
+# position in the cube, according to cube definition
+#
+
+class mapping(object):
+    def query_init(self):
+        pass
+    def position_get(self):
+        return 0
+
+class column_static(mapping):
+    def __init__(self, value=False, position=0):
+        self.value = value
+    def cube_set(self, cube, value, delta=0):
+        return cube[ delta]
+    def value_set(self, value=False):
+        value.pop(0)
+        return self.value
+
+
+class column_static_dummy(mapping):
+    def __init__(self, value=False, position=0):
+        self.value = value
+    def cube_set(self, cube, value, delta=0):
+        return cube[ delta]
+    def value_set(self, value=False):
+        value.pop(0)
+        return self.value
+
+class column_fixed(mapping):
+    def __init__(self, pos=0, position=0):
+        self.pos = pos
+    def cube_set(self, cube, value, delta=0):
+        return cube[ self.pos +delta]
+    def value_set(self, value):
+        return value.pop(0)
+
+class column_mapping_value(mapping):
+    def __init__(self, value, position=0):
+        self.axis_value = {}
+        for v in range(len(value)):
+            self.axis_value[value[v][0]] = v
+
+    def cube_set(self, cube, value, delta=0):
+        pos = value.pop(0)
+        return cube[ self.axis_value[pos]+delta ]
+    def value_set(self, value):
+        return False
+
+class column_mapping(mapping):
+    def __init__(self, value, position=0):
+        self.axis_value = {}
+        for v in range(len(value)):
+            self.axis_value[value[v][0]] = v
+
+    def cube_set(self, cube, value, delta=0):
+        pos = value.pop(0)
+        return cube[ self.axis_value[pos]+delta ]
+
+    def value_set(self, value):
+        return False
+
+    def position_get(self):
+        return 1
+
+
+class column_mapping_axis(mapping):
+    def __init__(self, mapping, axis, position=0):
+        keys = {}
+        i = 0
+        for a in axis:
+            keys[tuple(list(a)[0][1:])] = i
+            i+=1
+
+        self.axis_value = {}
+        for m in mapping:
+            k = tuple(list(m)[:-1])
+            a = keys[k]
+            self.axis_value[tuple(m)[-1]] = a
+
+    def cube_set(self, cube, value, delta=0):
+        pos = value.pop(0)
+        return cube[ self.axis_value[pos]+delta ]
+
+    def value_set(self, value):
+        return False
+
+    def position_get(self):
+        return 1
+
+
+
+class column_mapping_join(mapping):
+    def __init__(self, mappings, position=0):
+        self.mappings = mappings
+
+    def cube_set(self, cube, value, delta=0):
+        for m in self.mappings:
+            cube = m.cube_set(cube, value, delta)
+        return cube
+
+    def value_set(self, value):
+        for m in self.mappings:
+            value = m.value_set(value)
+        return value
+
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/common.py b/addons/olap/cube/common.py
new file mode 100755
index 00000000000..508abade814
--- /dev/null
+++ b/addons/olap/cube/common.py
@@ -0,0 +1,109 @@
+import sqlalchemy
+from sqlalchemy import *
+import common
+
+def measure_sql_exp_col(metadata,col):
+    temp = col.split(".")
+    table_name =  filter(lambda x: x.name==temp[0],metadata.table_iterator(reverse=False))
+    if table_name:
+        if not col  in table_name[0].c:
+            col = sqlalchemy.Column(temp[1], sqlalchemy.Float)
+            table_name[0].append_column(col)
+            return col
+        else:
+            for k in table_name[0].c:
+                if temp[1] == k.name:
+                    return k
+    else:
+        print "The table %s  do not exist or match to cube fact table"%(temp[0])
+# To be Improved
+# I am sure it exist something better in SA
+def col_get(table, col_obj):
+#   table = sqlalchemy table object
+#   level = level object
+
+    # Check for the columns
+    
+    datatypes = {
+        'timestamp': sqlalchemy.DateTime,
+        'timestampz': sqlalchemy.DateTime,
+        'numeric': sqlalchemy.Numeric,
+        'int': sqlalchemy.Integer,
+        'float8': sqlalchemy.Float,
+        'varchar': sqlalchemy.String,
+        'bool': sqlalchemy.Boolean,
+        'bytea':'Byte A', # Not Clear 
+        'int2':sqlalchemy.SmallInteger,
+        'int4':sqlalchemy.Integer,
+        'int8':sqlalchemy.Integer,
+        'text':sqlalchemy.String,
+        'date':sqlalchemy.Date,
+        'time': sqlalchemy.Time,
+        'number':sqlalchemy.Numeric,
+    }
+    if not  ('.').join([col_obj.table_id.table_db_name,col_obj.column_db_name]) in table.c:
+        col = sqlalchemy.Column(col_obj.column_db_name, datatypes[col_obj.type])
+        table.append_column(col)
+        return col
+    else:
+        for k in table.c:
+            if col_obj.column_db_name == k.name:
+                return k
+
+def get_primary_key(table):
+    for cols in table.columns:
+        if cols.primary_key == True:
+            return cols
+
+
+# It gets the olap_cube_table browse object
+def table_get(metadata, table):
+    result = False
+    table1 = False
+    table2 = False
+    if table.line_ids:
+        temp = 0
+        for i in range(len(table.line_ids)):
+            table1 = sqlalchemy.Table(table.line_ids[i].table_id.table_db_name,metadata)
+            pk = get_primary_key(table.line_ids[i].table_id)
+            if result:
+                
+                result = join(result,table1, onclause=col_get(table1,pk)==col_get(table2,table.line_ids[i-1].field_id))
+            elif table2:
+                result = join(table1, table2, onclause=col_get(table1,pk)==col_get(table2,table.line_ids[i-1].field_id))
+            else:
+                table2=table1
+            temp=i
+            
+        if not result:
+            result = table1
+        pk = get_primary_key(table.line_ids[temp].table_id)
+        tab = sqlalchemy.Table(table.line_ids[temp].field_id.related_to.table_db_name,metadata)
+        result = join(result, tab,onclause=col_get(tab,pk)
+                 ==col_get(sqlalchemy.Table(table.line_ids[temp].table_id.table_db_name,metadata),table.line_ids[temp].field_id))
+                 
+    else:
+        if table.column_link_id.related_to:
+            result = sqlalchemy.Table(table.column_link_id.related_to.table_db_name,metadata)
+        else:
+            result = sqlalchemy.Table(table.column_link_id.table_id.table_db_name,metadata)
+
+    return result
+
+def xcombine(*seqin):
+    """
+        Cartesian product of the list of list that produce all distinct
+        subsets of my query.
+    """
+    def rloop(seqin,comb):
+        '''recursive looping function'''
+        if seqin:
+            for item in seqin[0]:
+                newcomb=comb+[item]
+                for item in rloop(seqin[1:],newcomb):
+                    yield item
+        else:
+            yield comb
+    return rloop(seqin, [])
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/cross.py b/addons/olap/cube/cross.py
new file mode 100755
index 00000000000..d3a53bf4853
--- /dev/null
+++ b/addons/olap/cube/cross.py
@@ -0,0 +1,32 @@
+
+import sqlalchemy
+import common
+import level
+
+class cross(object):
+    def __init__(self, cross):
+    	self.cross = cross
+        self.name = False 
+        self.object = False
+        
+    def validate(self, cube):
+        for obj in self.cross:
+            self.object = obj.validate(cube)
+        return self.object
+    
+    def name_set(self, name):
+        self.name = name
+        
+    def __repr__(self):
+        res = '\t<olap.cross\n'
+        res += str(self.cross)
+        res += '\t>'
+        return res
+        
+    def run(self, metadata):
+        print '*'*40
+        for obj in self.cross:
+            result = obj.run(metadata)
+        return result
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/cube.py b/addons/olap/cube/cube.py
new file mode 100755
index 00000000000..8b028f4d411
--- /dev/null
+++ b/addons/olap/cube/cube.py
@@ -0,0 +1,24 @@
+
+import sqlalchemy
+import common
+
+class cube(object):
+    def __init__(self, name=None):
+        super(cube, self).__init__()
+        self.object = False
+        self.name = name
+
+    def run(self, metadata):
+        table = common.table_get(metadata, self.object.table_id)
+        return sqlalchemy.select(from_obj = [table], columns=[]),table
+
+    def validate(self, schema):
+        for cube in schema.cube_ids:
+            if self.name == cube.name:
+                self.object = cube
+                break
+        return self.object
+
+    def __repr__(self):
+        return self.name
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/datatype.py b/addons/olap/cube/datatype.py
new file mode 100755
index 00000000000..67287a951d2
--- /dev/null
+++ b/addons/olap/cube/datatype.py
@@ -0,0 +1,8 @@
+
+class datatype_class(object):
+    def __init__(self):
+        self.datatype = {}
+    def subscribe(self, name, data):
+        self.datatype[name] = data
+datatype = datatype_class()
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/formatstring.py b/addons/olap/cube/formatstring.py
new file mode 100755
index 00000000000..9e6f56f58e6
--- /dev/null
+++ b/addons/olap/cube/formatstring.py
@@ -0,0 +1,8 @@
+class formatstring_class(object):
+    def __init__(self):
+        self.formatstrings = {}
+    def subscribe(self, name, data):
+        self.formatstrings[name] = data
+formatstring = formatstring_class()
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/level.py b/addons/olap/cube/level.py
new file mode 100755
index 00000000000..863ac9e8e16
--- /dev/null
+++ b/addons/olap/cube/level.py
@@ -0,0 +1,322 @@
+
+import sqlalchemy
+import common
+import axis_map
+import pooler,tools
+
+class level(object):
+    def __init__(self, level, sublevels=[]):
+        self.level = level
+        self.sublevels = sublevels
+        self.object = False
+
+    def validate(self, cube):
+        for dimension in cube.dimension_ids:
+            if self.object:
+                break
+            for hierarchy in dimension.hierarchy_ids:
+                if hierarchy.name==self.level:
+                    self.object = hierarchy
+                    break
+
+        #
+        # TODO: implement access to unique levels for not fully qualified names
+        #
+        if not self.object:
+            raise 'This dimension (%s) does not exist !' % (self.level,)
+
+        obj = hierarchy
+        pos = 0
+        for level in self.sublevels:
+            res = level.validate(hierarchy.level_ids[pos])
+            if res:
+                pos += 1
+        return self.object
+
+    def _to_unicode(self,s):
+        try:
+            return s.encode('ascii')
+        except UnicodeError:
+            try:
+                return s.decode('utf-8')
+            except UnicodeError:
+                try:
+                    return s.decode('latin')
+                except UnicodeError:
+                    return s
+
+    def _to_decode(self,s):
+        try:
+            return s.encode('utf-8')
+        except UnicodeError:
+            try:
+                return s.encode('latin')
+            except UnicodeError:
+                try:
+                    return s.decode('ascii')
+                except UnicodeError:
+                    return s
+
+    def run(self, metadata):
+        '''
+            RETURN: {
+                    'value': [(ID, NAME)],              # ID = ['user', 3]
+                    'query': {
+                        'whereclause': [col.in_(*primary_keys)],
+                        'column': [col],
+                        'group_by': [col]
+                    },
+                    'axis_mapping': axis_map.column_mapping(result),
+                    'delta':0
+                }
+        '''
+        if self.sublevels[0].name=='all':
+            return [{
+                'value': [([str(self.level)], str(self.level), False)],
+                'query': {
+                    'column': [sqlalchemy.literal('all')],
+                },
+                'axis_mapping': axis_map.column_static(False),
+                'delta':0,
+            }]
+
+
+        # Make these 2 commands working in all cases:
+        # return self._run_transform(metadata)
+        # return self._run_star(metadata)
+        
+        if self.object.table_id<>self.object.dimension_id.cube_id.table_id: # Add a condition on the object
+            result = self._run_transform(metadata)
+        else:
+            result = self._run_star(metadata)
+        return result
+
+    def _compute_axis(self, metadata, primarykey=False):
+        """
+            Compute axis values, and transform the main query in the same way
+            to add this branch of the star for this subset. The mappers
+            reassign to values.
+        """
+
+        #
+        # Build a query on all tables of the hierarchy
+        # It passes the hierarchy table_id browse object (olap_cube_table )
+        #
+        table = common.table_get(metadata, self.object.table_id)
+        #
+        # Implement the query for all sublevels
+        # Return:
+        #     [ (ID1, ID2, ID3, NAME, [PRIMARYKEY]) ]
+        #
+        result_axis = {}
+        for slevel in self.sublevels:
+            res = slevel.run(metadata, table)
+            for key in res.keys():
+                result_axis.setdefault(key, [])
+                result_axis[key] += res[key]
+        cols = []
+        axis_select = sqlalchemy.select(from_obj=[table], columns=[], distinct=True)
+        for where in result_axis.get('where_clause', []):
+            axis_select.append_whereclause(where)
+        for col in result_axis.get('column', []):
+            axis_select.append_column(col)
+        for group in result_axis.get('group_by', []):
+            axis_select.append_group_by(group)
+        # TODO: find a way to do: axis_select2 = axis_select.copy()
+        axis_select2 = sqlalchemy.select(from_obj=[table], columns=[], distinct=True)
+        for where in result_axis.get('where_clause', []):
+            axis_select2.append_whereclause(where)
+        for col in result_axis.get('column', []):
+            axis_select2.append_column(col)
+        for group in result_axis.get('group_by', []):
+            axis_select2.append_group_by(group)
+        # TODO: end
+        #metadata.bind.echo = True
+        axis_select2.append_column(result_axis['column_name'][-1].label('axis_name'))
+        query = axis_select2.execute()
+        result = query.fetchall()
+          
+        def _tuple_define(x):
+            y=list(x)
+            if y[-1] == None:
+                y[-1] = '/'
+            elif isinstance(y[-1],float):
+                y[-1] = str (int(y[-1]))
+            else:
+                y[-1] = self._to_unicode(y[-1])
+                y[-1] = tools.ustr(y[-1])
+            return ([self.level]+y[:-1]),y[-1]
+             
+        axis = map(_tuple_define, result)
+        # Gives the mapping
+
+        primary_key = ''
+        if primarykey:
+            if self.object.table_id.column_link_id.related_to:
+                primary_key = self.object.table_id.column_link_id.related_to
+            else:
+                primary_key = self.object.table_id.column_link_id.table_id
+            tableprim = sqlalchemy.Table(primary_key.table_db_name, metadata)
+            pk = common.get_primary_key(primary_key)
+            col = common.col_get(tableprim,pk)
+            axis_select.append_column(col.label('axis_primarykey'))
+            query = axis_select.execute()
+            result = query.fetchall()
+        else:
+            # To find the primary key that suits best as per the given criteria
+            raise 'Primary key table not made in the hierarchy'
+            
+        maps = []
+        position =0
+        for mapping in result_axis['axis_mapping']:
+            mapinst = mapping(result, position)
+            maps.append(mapinst)
+            position += mapinst.position_get()
+        result_axis['axis_mapping'] = maps
+#
+#       #
+#       # Apply the filters on the main query object due to this block
+#       #
+#
+#       maps = []
+#       position =0
+#       for mapping in result_axis['axis_mapping']:
+#           mapinst = mapping(result, position)
+#           maps.append(mapinst)
+#           position += mapinst.position_get()
+#       result_axis['axis_mapping'] = maps
+#       print '*'*50
+#       print table, result, result_axis
+        return table, axis, result ,result_axis
+
+    def _run_star(self, metadata):
+        """
+            Compute axis values, and transform the main query in the same way
+            to add this branch of the star for this subset. The mappers
+            reassign to values.
+        """
+        print '*** Start ***'
+        table, result,result_mapping, result_axis = self._compute_axis(metadata, True)
+        result_axis.setdefault('where_clause', [])
+        #
+        # The result to be applied to the main query object
+        #
+        result = {
+            'value': result,
+            'query': {
+#               'whereclause': result_axis.get('where_clause',[]),
+                'column': result_axis.get('column', []),
+                'group_by': result_axis.get('column', [])
+            },
+            ##
+            ## How to use group of axis_mapping ?
+            ##
+            'axis_mapping': axis_map.column_static(False),
+            'delta':0,
+        }
+        return [result]
+
+    def _run_transform(self, metadata):
+        """
+            Compute axis values, and transform the main query according to axis
+            values for this subset. The main query slicer is transformed to a
+            single condition like: foreign_key in (...) and reapplied to axis
+            values.
+        """
+
+        table, axis, mapping, result_axis = self._compute_axis(metadata, True)
+        table2 = common.table_get(metadata, self.object.dimension_id.cube_id.table_id)
+        sql_table = sqlalchemy.Table(self.object.table_id.column_link_id.table_id.table_db_name,metadata)
+        col = common.col_get(sql_table, self.object.table_id.column_link_id)
+
+        #
+        # The result to be applied to the main query object
+        #
+
+        result = []
+        for a in axis:
+            k = tuple(list(a)[0][1:])
+            mapping_axis = filter(lambda m: tuple(list(m)[:-1])==k, mapping)
+            primary_keys = map(lambda x:list(x)[-1], mapping_axis)
+            # To convert everything in to the string so that no conversion needed at later stage 
+            # This is for the elements to be displayed in the rows and columns
+            for i in range(len(a[0])):
+                if a[0][i]:
+                    if isinstance(a[0][i],int):
+                        a[0][i] = str(a[0][i])
+                    elif isinstance(a[0][i],float):
+                        a[0][i] = str(int(a[0][i]))
+                else:
+                    a[0][i] = '/'
+            a = list(a)
+            if isinstance(a[-1],int):
+                a[-1] = str(a[-1])
+            elif isinstance(a[-1],float):
+                a[-1] = str(int(a[-1]))
+            a = tuple(a)
+            primary_keys = map(lambda x: str(x),primary_keys)
+            result.append( {
+                'value': [a],
+                'query': {
+                          
+                    'whereclause': [col.in_(primary_keys)],#.extend(result_axis['where_clause']),
+                    'column': [sqlalchemy.literal('transform')],
+                },
+                'axis_mapping': axis_map.column_static(False),
+                'delta':0,
+            })
+        return result
+
+    def __repr__(self):
+        res= '\t\t<olap.level \n'
+        res+= '\t\t\t'+str(self.level)+'\n'
+        for l in self.sublevels:
+            res+= '\t\t\t'+str(l)+'\n'
+        res += '\t\t>'
+        return res
+
+class level_filter(object):
+    def __init__(self, name):
+        self.name=name
+        self.object=None
+
+    def validate(self, level):
+        self.object = level
+        return 1
+
+    #
+    # Modify for the query select to return tuples:
+    #   (id, name)
+    # where:
+    #   id: ["Time","2008","Q1"]
+    #   name: Quarter 1
+    # Return a description of what have been added
+    #
+    def run(self, metadata, table):
+        return self.object._types[self.object.type].run( self, metadata, table)
+
+    def __repr__(self):
+        return '<olap.level_filter '+self.name+'>'
+
+class level_function(object):
+    def __init__(self, name):
+        self.type='function'
+        self.name = name
+        self.object = None
+    # [{
+    #   'level': ["Time","2008","Q1"],
+    #   'value': '1er Trim 2008',
+    #   'query': SQLAlchemy query object
+    # }]
+    def run(self, metadata, table):
+        return self.object._types[self.object.type].children( self, metadata, table)
+
+    def validate(self, level):
+        self.object = level
+        return 0
+
+    def __repr__(self):
+        return '<olap.level_function '+self.name+'>'
+
+# vim: ts=4 sts=4 sw=4 si et
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/olap/cube/levels/__init__.py b/addons/olap/cube/levels/__init__.py
new file mode 100755
index 00000000000..ebfef2e83aa
--- /dev/null
+++ b/addons/olap/cube/levels/__init__.py
@@ -0,0 +1,3 @@
+import level_interface
+from level_normal import level_normal
+from level_date import *
diff --git a/addons/olap/cube/levels/level_date.py b/addons/olap/cube/levels/level_date.py
new file mode 100755
index 00000000000..fc6ddb891a3
--- /dev/null
+++ b/addons/olap/cube/levels/level_date.py
@@ -0,0 +1,109 @@
+
+import sqlalchemy
+from level_interface import level_interface
+
+from olap.cube import common
+from olap.cube import axis_map
+
+#
+# To Be Fixed:
+#   Mapping of QX and Month
+#
+
+class level_date_month(level_interface):
+    def run(self, level, metadata, table):
+        col = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        col_id = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        result = {
+            'column': [sqlalchemy.func.date_part('month',col_id)],
+            'column_name': [sqlalchemy.func.date_part('month', col)],
+            'axis_mapping': [axis_map.column_mapping],
+            'where_clause': [sqlalchemy.func.date_part('month',col_id) == level.name]
+        }
+        return result
+
+    def children(self, level, metadata, table):
+        col = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        col_id = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        qexpr = sqlalchemy.literal('Q')+ sqlalchemy.sql.cast(sqlalchemy.func.date_part('QUARTER',col_id), sqlalchemy.types.String) + sqlalchemy.sql.cast(sqlalchemy.func.date_part('month',col_id),sqlalchemy.types.String)
+        return  {
+            'column': [sqlalchemy.func.date_part('month',col)],
+            'column_name':[sqlalchemy.func.date_part('month',col)],
+            'axis_mapping': [axis_map.column_mapping]
+        }
+
+    def validate(self, level, name):
+        
+        return 1
+
+class level_date_year(level_interface):
+    def run(self, level, metadata, table):
+        col = common.col_get(sqlalchemy.Table(level.object.table_name,metadata),level.object.column_name)
+        col_id = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        result = {
+            'column': [sqlalchemy.func.date_part('year',col_id)],
+            'column_name': [sqlalchemy.func.date_part('year', col)],
+            'axis_mapping': [axis_map.column_mapping],
+            'where_clause': [sqlalchemy.func.date_part('year',col_id) == level.name]
+        }
+        return result
+
+    def children(self, level, metadata, table):
+        col = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        col_id = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        return  {
+            'column': [sqlalchemy.func.date_part('year',col_id)],
+            'column_name':[sqlalchemy.func.date_part('year',col)],
+            'axis_mapping': [axis_map.column_mapping],
+            'where_clause':[]
+        }
+
+    def validate(self, level, name):
+        return 1
+
+#
+# To Do: Create your own axis mapping
+#
+class level_date_quarter(level_interface):
+
+    def run(self, level, metadata, table):
+        quarters = {
+            'Q1': [1,2,3],
+            'Q2': [4,5,6],
+            'Q3': [7,8,9],
+            'Q4': [10,11,12]
+            }
+        col = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        col_id = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        qexpr = sqlalchemy.literal('Q')+ sqlalchemy.sql.cast(sqlalchemy.func.date_part('QUARTER',col_id), sqlalchemy.types.String)
+        if not level.name in quarters:
+            raise 'Quarter should be in Q1,Q2,Q3,Q4 !'
+
+        result = {
+            'column': [qexpr],
+            'column_name': [qexpr],
+            'axis_mapping': [axis_map.column_static],
+            'where_clause': [
+                (sqlalchemy.func.date_part('month',col_id)==quarters[level.name][0]) |
+                (sqlalchemy.func.date_part('month',col_id)==quarters[level.name][1]) |
+                (sqlalchemy.func.date_part('month',col_id)==quarters[level.name][2])
+            ]
+        }
+        return result
+
+
+
+    def children(self, level, metadata, table):
+        table = sqlalchemy.Table(level.object.table_name, metadata)
+        col =common.col_get(table, level.object.column_name)
+        col_id = common.col_get(table,level.object.column_name)
+        qexpr = sqlalchemy.literal('Q')+ sqlalchemy.sql.cast(sqlalchemy.func.date_part('QUARTER',col_id), sqlalchemy.types.String)
+        return  {
+            'column': [qexpr],
+            'column_name': [qexpr],
+            'axis_mapping': [axis_map.column_mapping_value]
+        }
+
+    def validate(self, level, name):
+        return 1
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/levels/level_interface.py b/addons/olap/cube/levels/level_interface.py
new file mode 100755
index 00000000000..fc73dbc272a
--- /dev/null
+++ b/addons/olap/cube/levels/level_interface.py
@@ -0,0 +1,14 @@
+
+class level_interface(object):
+    #
+    # Return the number of position consummed by this level
+    # 1 means this goes to the next level object (.[20])
+    # 0 means that the next argument is still on the same level object (.children)
+    #
+    def validate(self, level, name):
+        return 1
+
+    def run(self, level, metadata, table):
+        col = None
+        return {}
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/levels/level_normal.py b/addons/olap/cube/levels/level_normal.py
new file mode 100755
index 00000000000..1c3e860babd
--- /dev/null
+++ b/addons/olap/cube/levels/level_normal.py
@@ -0,0 +1,32 @@
+import sqlalchemy
+from olap.cube import common
+from olap.cube import axis_map
+from level_interface import level_interface
+
+class level_normal(level_interface):
+    def run(self, level, metadata, table):
+        col = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        col_id = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        result = {
+                  'column': [col_id],
+                  'column_name': [col],
+                  'axis_mapping': [axis_map.column_mapping],
+                  'where_clause': [col_id == level.name ]
+                  }
+        return result
+
+    def children(self, level, metadata, table):
+        col = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        col_id = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        result = {
+                  'column': [col_id],
+                  'column_name': [col],
+                  'axis_mapping': [axis_map.column_mapping],
+                  'where_clause': []
+                  }
+        return result
+
+    def validate(self, level, name):
+        return 1
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/mdx_input/__init__.py b/addons/olap/cube/mdx_input/__init__.py
new file mode 100755
index 00000000000..8c338cddef2
--- /dev/null
+++ b/addons/olap/cube/mdx_input/__init__.py
@@ -0,0 +1 @@
+from mdx_input import mdx_input
diff --git a/addons/olap/cube/mdx_input/mdx_input.py b/addons/olap/cube/mdx_input/mdx_input.py
new file mode 100755
index 00000000000..92d6d983a1c
--- /dev/null
+++ b/addons/olap/cube/mdx_input/mdx_input.py
@@ -0,0 +1,5 @@
+
+class mdx_input(object):
+
+    def parse(self, mdx):
+        return mdx
diff --git a/addons/olap/cube/mdx_operator.py b/addons/olap/cube/mdx_operator.py
new file mode 100755
index 00000000000..92102d88f02
--- /dev/null
+++ b/addons/olap/cube/mdx_operator.py
@@ -0,0 +1,35 @@
+import common
+
+#
+# Class constructed by {..., ...}
+#
+class mdx_set(object):
+    def __init__(self, list):
+        self.list = list
+
+    def run(self, metadata):
+        """
+            Should use xcombine, I think it's currently False
+            common.xcombine(*result)
+        """
+        result = []
+        for l in self.list:
+            result += l.run(metadata)
+        position = 0
+        for r in result:
+            r['delta'] = position
+            position += len(r['value'])
+        return result
+
+    def validate(self, object):
+        for l in self.list:
+            l.validate(object)
+        return True
+
+    def __repr__(self):
+        res = '\tSet: ['
+        for l in self.list:
+            res += str(l)+',\n'
+        res += '\t]'
+        return res
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/mdx_output/__init__.py b/addons/olap/cube/mdx_output/__init__.py
new file mode 100755
index 00000000000..0110b6fe01f
--- /dev/null
+++ b/addons/olap/cube/mdx_output/__init__.py
@@ -0,0 +1 @@
+from mdx_output import *
diff --git a/addons/olap/cube/mdx_output/mdx_output.py b/addons/olap/cube/mdx_output/mdx_output.py
new file mode 100755
index 00000000000..f4708387d0b
--- /dev/null
+++ b/addons/olap/cube/mdx_output/mdx_output.py
@@ -0,0 +1,56 @@
+#
+# Modify the final result (axis, data), for instance, reordering of axes
+#
+import copy
+
+def decimal_to_float(cube):
+# Note FP: I think the decimal > float conversion should be done more
+# in upstream
+    if type(cube)==type([]) and len(cube):
+        if type(cube[0])==type([]):
+            for b in cube:
+                decimal_to_float(b)
+        else:
+            for l in range(len(cube)):
+                cube[l] = str(float(cube[l]))
+
+def sort_apply(cube, axis_pos):
+    cube2 = copy.copy(cube)
+    for i in range(len(axis_pos)):
+        cube[i] = cube2[axis_pos[i]]
+    return cube
+
+def sort_axis(data):
+    for axis_id in range(len(data[0])):
+        axis_pos = []
+        for i in range(len(data[0][axis_id])):
+            axis_pos.append((data[0][axis_id][i], i))
+        axis_pos.sort()
+        data[0][axis_id] = map(lambda x: x[0], axis_pos)
+        axis_pos2 = map(lambda x: x[1], axis_pos)
+        cubes = [ data[1] ]
+        for i in range(axis_id):
+            cubes2 = []
+            for cube in cubes:
+                cubes2 += cube
+            cubes = cubes2
+        for cube in cubes:
+            sort_apply(cube, axis_pos2)
+
+def mdx_output(data):
+    print 'DATA',  data
+#    decimal_to_float(data[1])
+#    sort_axis(data) 
+    return data
+
+if __name__=='__main__':
+	print 'Testing Code'
+	data = ([[(['user'], 'All user')], [(['measures', 'credit_limit'], 'credit_limit'), (['measures', 'count'], 'count')]], [[[66700.0], [22L]]])
+	data = ([[([u'Products'], u'All Products'), ([u'Order Date'], u'All Order Date')]], [[False], [False]])
+	data = ([[([u'Order Date'], u'All Order Date'), ([u'Order Date', 2007.0], 2007.0), ([u'Order Date', 2008.0], 2008.0), ([u'Order Date', 2007.0, 'Q1'], 'Q1'), ([u'Order Date', 2007.0, 'Q2'], 'Q2'), ([u'Order Date', 2007.0, 'Q3'], 'Q3'), ([u'Order Date', 2007.0, 'Q4'], 'Q4'), ([u'Users'], u'All Users'), ([u'Users', 'Administrator'], 'Administrator'), ([u'Users', 'Demo User'], 'Demo User'), ([u'Users', 'Root'], 'Root'), ([u'Partner Country'], u'All Partner Country'), ([u'Partner Country', 'Belgium'], 'Belgium'), ([u'Partner Country', 'China'], 'China'), ([u'Partner Country', 'France'], 'France'), ([u'Partner Country', 'Taiwan'], 'Taiwan')]], [[False], [False], [False], [False], [False], [False], [False], [False], [False], [False], [False], [False], [False], [False], [False], [False]])
+	data = ([[([u'Order Date'], u'All Order Date'), ([u'Order Date', 2007.0], 2007.0), ([u'Order Date', 2008.0], 2008.0), ([u'Order Date', 2007.0, 'Q1'], 'Q1'), ([u'Order Date', 2007.0, 'Q2'], 'Q2'), ([u'Order Date', 2007.0, 'Q3'], 'Q3'), ([u'Order Date', 2007.0, 'Q4'], 'Q4'), ([u'Users'], u'All Users'), ([u'Users', 'Administrator'], 'Administrator'), ([u'Users', 'Demo User'], 'Demo User'), ([u'Users', 'Root'], 'Root'), ([u'Partner Country'], u'All Partner Country'), ([u'Partner Country', 'Belgium'], 'Belgium'), ([u'Partner Country', 'China'], 'China'), ([u'Partner Country', 'France'], 'France'), ([u'Partner Country', 'Taiwan'], 'Taiwan')], [(['measures', u'Items Sold'], u'Items Sold')]], [[[Decimal("258.00")]], [[Decimal("34.00")]], [[Decimal("224.00")]], [[Decimal("12.00")]], [[Decimal("9.00")]], [[Decimal("6.00")]], [[Decimal("7.00")]], [[Decimal("258.00")]], [[Decimal("204.00")]], [[Decimal("16.00")]], [[Decimal("38.00")]], [[Decimal("258.00")]], [[Decimal("17.00")]], [[Decimal("78.00")]], [[Decimal("139.00")]], [[Decimal("2.00")]]])
+	print 'Old', data
+	sort_axis(data)
+	print 'New', data
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/mdx_parser.py b/addons/olap/cube/mdx_parser.py
new file mode 100755
index 00000000000..76014c91acb
--- /dev/null
+++ b/addons/olap/cube/mdx_parser.py
@@ -0,0 +1,201 @@
+"""
+Tiny BI
+Copyright (C)2007 Fabien Pinckaers
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation version 2.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+"""
+
+from pyparsing import *
+
+import cube, axis, measure, level, query, slicer, cross
+import mdx_operator
+
+
+#
+# Predicate: the construction of the object's query does not depend
+# on the schema architecture. I think we can go on for this, this will
+# simplify the extension/module architecture.
+#
+# Rethink about that in one month.
+#
+
+class mdx_parser(object):
+    def mdx_level(self):
+        """
+            Return a parser that parse the level part of the MDX query and
+            return a level object
+            Examples:
+                [prod].[all prod].children
+                [prod].[all prod].join(...)
+        """
+        leftSqBr = Literal("[").suppress()
+        rightSqBr = Literal("]").suppress()
+        dotToken = Literal(".").suppress()
+        measuresToken = Literal("measures").suppress()
+        scalar = Word(alphanums+alphas8bit.encode("utf-8") +"_"+" "+"-" )
+        level_filter = leftSqBr + scalar + rightSqBr
+        level_function = Keyword("children", caseless=True)
+        level_filter.setParseAction(lambda s,a,toks: level.level_filter(toks[0]))
+        level_function.setParseAction(lambda s,a,toks: level.level_function(toks[0]))
+        level_item = level_filter | level_function
+        level_parse = leftSqBr + scalar + rightSqBr + Optional(dotToken + delimitedList(level_item, ".", combine=False))
+        level_parse.setParseAction(lambda s,a,toks: level.level(toks[0], toks[1:]))
+        measure_parse = leftSqBr + measuresToken + rightSqBr + dotToken + leftSqBr + scalar + rightSqBr
+        measure_parse.setParseAction(lambda s,a,toks: measure.measure(toks[0]))
+        lev = measure_parse | level_parse
+        return lev
+
+
+    def mdx_axis(self):
+        """
+            Return a parser that parse the axis part of the MDX query and 
+            return an axis object
+            Examples:
+                {[prod].[all prod].children, [a]}
+                OR 
+                crossjoin({[Order Date].[all]},{[prod].[all prod].children, [a]})
+                This is to be made recursive for the cross join
+                crossjoin(crossjoin({[City].[all],[City].children},{[User].[all]}),{[User].[Administrator]})
+
+        """
+        leftCurlBr = Literal("{").suppress()
+        rightCurlBr = Literal("}").suppress()
+        comma = Literal(",").suppress()
+
+        level_parse = self.mdx_level()
+        axis_parser = delimitedList(level_parse, ",", combine=False)
+        axis_parser.setParseAction(lambda s,a,toks:axis.axis(mdx_operator.mdx_set(toks)))
+
+        mdx = leftCurlBr + axis_parser + rightCurlBr
+        
+        return mdx
+
+    def cross_axis(self):
+        leftCurlBr = Literal("{").suppress()
+        rightCurlBr = Literal("}").suppress()
+        cross_parser = self.mdx_level()
+        cross_parser.setParseAction(lambda s,a,toks:cross.cross(toks))
+
+        cross_parse = leftCurlBr + cross_parser + rightCurlBr
+
+        return cross_parse 
+        
+    def mdx_cross_axis(self):
+        leftRoundBr = Literal("(").suppress()
+        rightRoundBr = Literal(")").suppress()
+        comma = Literal(",").suppress()
+        crossjoinToken = Keyword("crossjoin", caseless=True).suppress() 
+        
+        crossx = Forward() 
+        cross_mdx = crossx | self.mdx_axis() 
+        crossx << (crossjoinToken + leftRoundBr +  cross_mdx + comma + self.cross_axis()  + rightRoundBr)
+#        crossx.setParseAction(lambda s,a,toks:axis.axis(toks)
+        simple_mdx = self.mdx_axis()
+
+        mdx = simple_mdx | crossx
+        return mdx  
+
+    def mdx_axis_list(self):
+        #
+        # TODO: accept notation line AXIS(0) = rows, AXIS(1)=columns, ...
+        #
+        row_names = ["rows","columns","pages"]
+        onToken = Keyword("on", caseless=True).suppress()
+        page_name = oneOf(' '.join(row_names))
+        axis_parser = self.mdx_cross_axis() + Optional(onToken + page_name)
+
+        def _assign_name(s,a,toks):
+            if len(toks)>=3:
+                toks[0].name_set(toks[-1])
+                for x in range(1,len(toks)-1):
+                    toks[x].name_set('cross')
+            elif len(toks)==2:
+                toks[0].name_set(toks[1])
+            elif len(toks)==1:
+                toks[0].name_set(row_names.pop(0))
+            else:
+                raise 'invalid size'
+            return toks[:-1]
+        axis_parser.setParseAction(_assign_name)
+        axis_lst = delimitedList(axis_parser, ",")
+        axis_lst.setParseAction(lambda s,a,toks: [toks])
+        return axis_lst
+    
+    def mdx_slice(self):
+        """ Return a MDX parser of the where clause of a MDX query """
+        leftBr = Literal("(").suppress()
+        rightBr = Literal(")").suppress()
+        levels = delimitedList(self.mdx_level(), ',', combine=False)
+        levels.setParseAction(lambda s,a,toks: toks)
+        slicer_lst = delimitedList(leftBr + levels + rightBr, ",", combine=False)
+        slicer_lst.setParseAction(lambda s,a,toks:slicer.slicer(list(toks)))
+        return slicer_lst
+    
+    def mdx_cube(self):
+        """ Return a MDX parser of the from clause of a MDX query """
+        mdx = Word(alphas+'_')
+        mdx.setParseAction(lambda s,a,toks: cube.cube(toks[0]))
+        return mdx
+    
+    def mdx_query(self):
+        """ Return a MDX parser of the from clause of a MDX query """
+        selectToken = Keyword("select", caseless=True).suppress()
+        fromToken = Keyword("from", caseless=True).suppress()
+        whereToken = Keyword("where", caseless=True).suppress()
+        semicolon = Literal(";").suppress()
+        mdx = selectToken + self.mdx_axis_list() + fromToken + self.mdx_cube() + Optional(whereToken + self.mdx_slice()) + Optional(semicolon)
+        mdx.setParseAction(lambda s,a,toks: query.query(*toks))
+        return mdx
+    
+    def parse(self, query):
+        """ Parse a string and get a MDX object """
+        return self.mdx_query().parseString(query)[0]
+
+if __name__ == "__main__":
+    mdx = mdx_parser()
+    level_parse = mdx.mdx_level()
+    for test in ['[sales].children','[prod].[all prod]']:
+        print 'Testing level', test
+        print level_parse.parseString(test)
+    print
+    axis_parser = mdx.mdx_axis()
+    for test in ['{[a]}','{[prod].[all prod],[time].[Q3].[Sep]}']:
+        print 'Testing axis', test
+        print axis_parser.parseString(test)
+
+    axis_parser = mdx.mdx_axis_list()
+    for test in ['{[a]} on rows, {[prod].[all prod],[time].[Q3].[Sep]} on columns',
+        '{[region].[all region].children} on rows, {[prod].[all prod].children} on columns'
+    ]:
+        print 'Testing axis', test
+        print axis_parser.parseString(test)
+
+    cube_parser = mdx.mdx_cube()
+    for test in ['sales']:
+        print 'Testing axis', test
+        print cube_parser.parseString(test)
+
+    for query_parser in [
+"Select {[region].[all region].children} on rows, {[product]} on columns from cubulus where ([time].[all time].[time_2005])",
+"Select {[region].[all region].children} on rows, {[prod].[all prod].children} on columns from cubulus where ([time].[all time].[time_2005])",
+#"Select {[time].[all time].children} on rows, crossjoin([region].[all region].children, [region].[all region].children) on columns from cubulus"
+    ]:
+        print 'Testing ', query_parser
+        print mdx.parse(query_parser)
+
+    print mdx.parse('''select
+            {[date].[2007].[Q2].children} on rows, 
+            {[country_id].children,[country_id].[1].children} on columns 
+        from res_partner where ([measure].[credit_limit])''')
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/measure.py b/addons/olap/cube/measure.py
new file mode 100755
index 00000000000..2b8d563ba1d
--- /dev/null
+++ b/addons/olap/cube/measure.py
@@ -0,0 +1,84 @@
+
+import sqlalchemy
+import common
+import copy
+import pyparsing
+import operator
+from operator import add,sub
+from pyparsing import *
+
+from agregator import agregator
+import axis_map
+
+class measure(object):
+    def __init__(self, name):
+        self.name = name
+        self.object = False
+    def validate(self, cube):
+        for measure in cube.measure_ids:
+            if measure.name==self.name:
+                self.object = measure
+        if not self.object:
+            raise 'This measure does not exist !'
+        return True
+
+    def run(self, metadata):
+        table = common.table_get(metadata, self.object.cube_id.table_id)
+        if self.object.measure_type == 'fact_column':
+            col = common.col_get(sqlalchemy.Table(self.object.table_name,metadata), self.object.value_column)
+            col_agregated = agregator[self.object.agregator](col)
+        else:
+            scalar = Word(alphanums+"_"+" "+".") 
+            sql_func = ["sum","max","min","count","avg"]
+            arith_operator = ["-","*","/","+"]
+            
+            sql_function = oneOf(' '.join(sql_func))
+            leftRdBr = Literal("(").suppress()
+            rightRdBr = Literal(")").suppress()
+            operator_arith = oneOf(' '.join(arith_operator))
+            sqlexpression = sql_function.setResultsName('sql_func') + leftRdBr + delimitedList(scalar,",",combine=False) + rightRdBr | sql_function + leftRdBr +  scalar + ZeroOrMore(operator_arith.setResultsName('arithmetic') + scalar) + rightRdBr 
+            res = sqlexpression.parseString(self.object.value_sql)
+            operators = []
+            cols = []
+            function = None
+            for item in res:
+                if str(item) == res.sql_func:
+                    function = str(item)
+                elif str(item) == res.arithmetic or str(item) in ["+","-","/","*"]:
+                    operators.append(str(item))
+                else:
+                    cols.append(common.measure_sql_exp_col(metadata,str(item)))
+            operations = {
+                '+':operator.add,
+                '-':operator.sub,
+                '/':operator.div,
+                '%':operator.mod,
+                '*':operator.mul,
+            }
+            operators = [operations[name] for name in operators]
+            ops_cols = zip(operators, cols[1:])
+            col = reduce(lambda expr, op_col: op_col[0](expr, op_col[1]), ops_cols,cols[0]) 
+
+            if function:
+                col_agregated = agregator[function](col)
+            else:
+                col_agregated = col
+
+        return [ {
+            'value': [(['measures',self.name], self.name, False)],
+            'query': {
+                'column': [col_agregated]
+            },
+            'axis_mapping': axis_map.column_fixed(0),
+            'delta': 0,
+            'format':self.object.formatstring
+        } ]
+
+    def children(self, level, metadata):
+        raise 'Not yet implemented !'
+
+    def __repr__(self):
+        res= '\t\t<olap.measure %s>\n' % (self.name,)
+        return res
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/query.py b/addons/olap/cube/query.py
new file mode 100755
index 00000000000..37aaf365c87
--- /dev/null
+++ b/addons/olap/cube/query.py
@@ -0,0 +1,236 @@
+import locale
+
+
+import mdx_input
+import sqlalchemy
+import common
+import slicer
+import datetime
+import pooler
+import copy
+
+class mapper(object):
+    def __init__(self, size):
+        self.size = size
+
+class query(object):
+    def __init__(self, axis, cube, slicer_obj=None, *args):
+        super(query, self).__init__()
+        self.object = False
+        self.cube = cube
+        self.axis = axis
+        if not slicer_obj:
+            slicer_obj = slicer.slicer([])
+        self.slicer = slicer_obj
+
+    #
+    # Generate the cube with 'False' values
+    # This function could be improved
+    #
+    def _cube_create(self, cube_size):
+        cube_data = [False]
+        while cube_size:
+            newcube = []
+            for i in range(cube_size.pop()):
+                newcube.append(copy.deepcopy(cube_data))
+            cube_data = newcube
+        return cube_data
+
+    def run(self,currency):
+        db = sqlalchemy.create_engine(self.object.schema_id.database_id.connection_url,encoding='utf-8')
+        metadata = sqlalchemy.MetaData(db)
+        print 'Connected to database...', self.object.schema_id.database_id.connection_url
+        #
+        # Compute axis
+        #
+        axis = []
+        axis_result = []
+        cube_size = []
+        cross = False
+        cross_all = []
+        for ax in self.axis:
+            if ax.name == 'cross':
+                cross = True
+                cross = ax.run(metadata)
+                cube_size[-1] = cube_size[-1] * len(cross)
+                temp = axis_result[0][:] 
+                cross_all.append(cross)
+                final_axis = []
+                for cr in cross:
+                    for el in axis_result[-1]:
+                        t = copy.deepcopy(el)
+                        t = list(t)
+                        t[0].append(cr['value'][0][0])
+                        t.append(cr['value'][0][1])
+                        final_axis.append(tuple(t))
+                axis_result[-1]=final_axis[:]
+                final_axis=[]
+                len_axis = len(axis[-1])
+                len_cross = len(cross)
+                delta_count = 0 
+                d=0  
+                for data in common.xcombine(axis[-1],cross):
+                    flag = False
+                    make_where = []
+                    temp_where = []
+                    temp_column = []
+                    if 'whereclause' in data[0]['query'].keys():
+                        flag = True
+                        temp_where = data[0]['query']['whereclause'][0] 
+                        data[0]['query']['whereclause']=str(data[0]['query']['whereclause'][0])
+                        
+                    if isinstance(type(data[0]['query']['column'][0]),type(sqlalchemy.sql.expression._BindParamClause)):
+                        temp_column = data[0]['query']['column'][0]
+                        data[0]['query']['column'][0] = str(data[0]['query']['column'][0])
+                    data_temp = copy.deepcopy(data[0])
+                    if 'whereclause' in data[1]['query'].keys():
+                        if 'whereclause' in data_temp['query'].keys():
+                            make_where.append(data[1]['query']['whereclause'][0])
+                        else:
+                            make_where.append(data[1]['query']['whereclause'][0])
+                    delta_count = delta_count + 1
+                    if delta_count >= len_cross and len_cross!=1:
+                        delta_count = 0 
+                        data_temp['delta'] = d
+                        d = d + 1
+                    else:
+                        data_temp['delta'] = d
+                        d = d + 1
+                    if flag:
+                        data[0]['query']['whereclause']=[temp_where]
+                        data_temp['query']['whereclause'] = [temp_where]
+                    if make_where:
+                        if 'whereclause' in data_temp['query'].keys():
+                            data_temp['query']['whereclause'].append(make_where[0])
+                        else:
+                            data_temp['query']['whereclause'] = make_where
+                    if temp_column:
+                        data[0]['query']['column'] = [temp_column]
+                        data_temp['query']['column'] = [temp_column]
+                    final_axis.append(data_temp)
+                axis[-1] = []
+                axis[-1] = final_axis
+            else:
+                cross = False
+                result = ax.run(metadata)
+                length = 0
+                axis_result2 = []
+                for r in result:
+                    length += len(r['value'])
+                    axis_result2 += map(lambda x: (map(lambda y: y or False,x[0]),x[1] or False), r['value'])
+                axis_result.append(axis_result2)
+                axis.append(result)
+                cube_size.append(length)    
+        cube_data = self._cube_create(cube_size)
+        cr = []
+        slice = self.slicer.run(metadata)
+        position = 0
+        ax = []
+        for subset in common.xcombine(*axis):
+            select,table_fact = self.cube.run(metadata)
+            for s in subset+slice:
+                for key,val in s['query'].items():
+                    for v in val:
+                        if key=='column':
+                            v = v.label('p_%d' % (position,))
+                            position += 1
+                            select.append_column(v)
+                        elif key=='whereclause':
+                            select.append_whereclause(v)
+                        elif key=='group_by':
+                            select.append_group_by(v)
+                        else:
+                            raise 'Error, %s not implemented !'% (key,)
+#            metadata.bind.echo = True
+            query = select.execute()
+            result = query.fetchall()
+            for record in result:
+                cube = cube_data
+                r = list(record)
+                value = False
+                for s in subset:
+                    if s.has_key('format'):
+                        # To make use of the format string if specified for the measure
+                        # Its set to static for a testing
+                        if not currency:
+                            currency = "EUR"
+                        if isinstance(r[0],float) or isinstance(r[0],int) or isinstance(r[0],long):
+                            a = {'data':r[0]}
+                            r[0] = str(r[0])
+                        else:
+                            r[0] = '0.0'
+                            a = {'data':0.0}
+                        if s['format'] == 'cr_prefix':
+                            r[0] = currency + " "  + "%.2f"%a['data']
+                        elif s['format'] == 'cr_postfix':
+                            r[0] = "%.2f"%a['data'] + " " + currency
+                        elif s['format'] == 'comma_sep':
+                            r[0] = locale.format("%(data).2f", a, 1)
+                        elif s['format'] == 'cr_prefix_comma':
+                            r[0] = locale.format("%(data).2f", a, 1)
+                            r[0] = currency + " "  + str(r[0])
+                        elif s['format'] == 'cr_postfix_comma':
+                            a['currency'] = currency
+                            r[0] = locale.format("%(data).2f %(currency)s", a, 1)
+                    cube = s['axis_mapping'].cube_set(cube, r, s['delta'])
+                    value = s['axis_mapping'].value_set(r) or value
+                for s in slice:
+                    value = s['axis_mapping'].value_set(r) or value
+                if value:
+                    assert not cube[0], 'Already a value in cube, this is a bug !'
+                    cube[0] = value
+
+        i=0
+        for a in cube_data:
+            i=i+1;
+        return (axis_result, cube_data)
+
+    def preprocess(self):
+        wrapper = mdx_input.mdx_input()
+        wrapper.parse(self)
+
+    def validate(self, schema):
+        """ This function takes a query object and validate and assign
+        fact data to it. Browse object from Tiny ERP"""
+        cube = self.cube.validate(schema)
+        self.object = cube
+        if not self.object:
+            raise "Cube '%s' not found in the schema '%s' !"%(cube.name, schema.name)
+        self.slicer.validate(cube)
+
+        for axis in self.axis:
+            axis.validate(cube)
+        for dimension in cube.dimension_ids:
+            pass
+        return True,cube
+
+    def __repr__(self):
+        res = '<olap.query ['+str(self.cube)+']\n'
+        for l in self.axis:
+            res+= '\tAxis: '+str(l)+'\n'
+        res+= '\tSlicer:\n'+str(self.slicer)+'\n'
+        res += '>'
+        return res
+
+    def log(self,cr,uid,cube,query,context={}):
+        if not context==False:
+            log_ids = pooler.get_pool(cr.dbname).get('olap.query.logs').search( cr, uid, [('query','=', query), ('user_id','=', uid)])
+            if log_ids:
+                count = pooler.get_pool(cr.dbname).get('olap.query.logs').browse(cr, uid, log_ids, context)[0]
+                pooler.get_pool(cr.dbname).get('olap.query.logs').write(cr, uid, log_ids, {'count':count.count+1})
+                
+            else:
+                logentry={}
+                logentry['user_id']=uid
+                logentry['cube_id']=cube.id
+                logentry['query']=query
+                logentry['time']= str(datetime.datetime.now())
+                logentry['result_size']=0
+                logentry['count']=1
+                logentry['schema_id'] = cube.schema_id.id
+                log_id = pooler.get_pool(cr.dbname).get('olap.query.logs').create(cr,uid,logentry)
+#                count = pooler.get_pool(cr.dbname).get('olap.query.logs').browse(cr, uid, log_id, context)
+#                pooler.get_pool(cr.dbname).get('olap.query.logs').write(cr, uid, log_id, {'count':count.count+1})
+                return log_id
+        return -1
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/slicer.py b/addons/olap/cube/slicer.py
new file mode 100755
index 00000000000..66d86dbc065
--- /dev/null
+++ b/addons/olap/cube/slicer.py
@@ -0,0 +1,42 @@
+
+import sqlalchemy
+import common
+
+class slicer(object):
+    def __init__(self, slicer):
+        self.slicer = slicer
+
+    def validate(self, cube):
+        self.object = cube
+        for slicer in self.slicer:
+            slicer.validate(cube)
+
+    def __repr__(self):
+        res = '\t<olap.slicer\n'
+        res += str(self.slicer)
+        res += '\t>'
+        return res
+
+#
+# Output:
+#    a list of grouped values that can be computed at once
+#    a group is defined by elements having the same query
+#
+#   [
+#     {
+#       'level': ["Time","2008","Q1"],
+#       'value': '1er Trim 2008',
+#       'query': SQLAlchemy query object
+#     }
+#   ]
+#
+    def run(self, metadata):
+        print '*'*40
+        print self.slicer
+        result = []
+        for slicer_line in self.slicer:
+            res = slicer_line.run(metadata)
+            result += slicer_line.run(metadata)
+        return result
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/warehouse.py b/addons/olap/cube/warehouse.py
new file mode 100644
index 00000000000..4b3be0f1db4
--- /dev/null
+++ b/addons/olap/cube/warehouse.py
@@ -0,0 +1,270 @@
+##############################################################################
+#
+# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import locale
+import mdx_input
+import sqlalchemy
+from sqlalchemy import *
+import common
+import slicer
+import datetime
+import pooler
+import copy
+import pyparsing
+from pyparsing import *
+
+class warehouse(object):
+    def create_table(self, connection, table_name, data):
+        measures = data[0].keys()
+        measures.pop(measures.index('name'))
+        engine = create_engine(connection, echo=False)
+        metadata = MetaData()
+        tab = Table(str(table_name), metadata, 
+                      Column('name', String(100)),
+                      Column('parent_id', String(100)),
+                      Column('id', String(100))
+                      )
+        for msr in measures:
+            colmn = Column(msr, String(100))
+            tab.append_column(colmn)
+            
+        metadata.create_all(engine) 
+        result = engine.execute(tab.insert(), data)
+        return {}
+    
+    def log(self,cr,uid,cube,query,data,connection,context={}):
+        if not context==False:
+            log_ids = pooler.get_pool(cr.dbname).get('olap.query.logs').search( cr, uid, [('query','=', query), ('user_id','=', uid)])
+            if log_ids:
+                count = pooler.get_pool(cr.dbname).get('olap.query.logs').browse(cr, uid, log_ids, context)[0]
+                counter = count.count + 1
+                table_name = ''
+                if counter>=3:
+                    if len(data[0]) == 2:
+                        rows = data[0][0]
+                        columns = data[0][1]
+                        datas = data[1]
+                        result = []
+                        
+                        parent_list = [ rw[0] for rw in rows]
+                        
+                        for element in range(len(rows)):
+                            res = {}
+                            check_element = rows[element][0][:rows[element][0].index(rows[element][1])]
+                            if check_element:
+                                res['parent_id'] = str(parent_list.index(check_element))
+                                res['id'] = str(element)
+                            else:
+                                res['parent_id'] = str(None)
+                                res['id'] = str(element)
+                            res['name'] = str(rows[element][1])
+                            for col in range(len(columns)):
+                                col_elem = columns[col][0][:columns[col][0].index(columns[col][1])+1]
+                                c_element = '.'.join(map(lambda x: str(x), col_elem))
+                                res[c_element] = str(datas[element][col][0])
+                            result.append(res)
+                        table_name = cube.name+'_'+str(count.id)+'_'+str(counter)
+                        self.create_table(connection,table_name, result)
+                    elif len(data[0]) == 3:
+                        print "Its for Pages:>>>>>>>>>"
+                pooler.get_pool(cr.dbname).get('olap.query.logs').write(cr, uid, log_ids, {'count':counter, 'table_name': table_name})
+                return True
+            else:
+                logentry={}
+                logentry['user_id']=uid
+                logentry['cube_id']=cube.id
+                logentry['query']=query
+                logentry['time']= str(datetime.datetime.now())
+                logentry['result_size']=0
+                logentry['count']=1
+                logentry['schema_id'] = cube.schema_id.id
+                log_id = pooler.get_pool(cr.dbname).get('olap.query.logs').create(cr,uid,logentry)
+                return log_id
+        return -1
+    
+    def run(self, currency, qry_obj):
+        schema = qry_obj.schema_id
+        table_name = str(qry_obj.table_name)
+        connection = schema.database_id.connection_url
+        engine = create_engine(connection, echo=False)
+        metadata = MetaData(engine)
+        metadata.create_all(engine)
+        tab = Table(table_name, metadata, autoload=True, autoload_with=engine)
+        total_columns = [c.name for c in tab.columns]
+        columns = []
+        cols = []
+        for c in tab.columns:
+                if not c.name.__contains__('name') and not c.name.__contains__('id') and not c.name.__contains__('parent_id'):
+                    columns.append(c.name)
+                    cols.append((c.name.split('.'), str(c.name.split('.')[1])))
+        result = tab.select().execute()
+        res = result.fetchall()
+        rows = []
+#        dt = [[[]] * len(columns)] * len(res)
+        for r in range(len(res)):
+            if res[r][1] == str(None):
+                rows.append(([str(res[r][0])], str(res[r][0])))
+            else:
+                rows.append(([str(res[int(res[r][1])][0]),str(res[r][0])], str(res[r][0])))
+        
+        data = []
+        for r in range(len(res)):
+            data.append(res[r][3:])
+            
+        datas = []
+        for dd in range(len(data)):
+            datas.append([])
+            for d in range(len(data[dd])):
+                datas[dd].append([str(data[dd][d])])
+        
+        final_result = ([rows, cols], datas)
+        return  final_result
+    
+    def match_table(self, cr, uid,request, context):
+        qry_obj = pooler.get_pool(cr.dbname).get('olap.query.logs')
+        result = self.parse_query(request)
+        qry = result[1][0]
+        qry_axis = result[0]
+        qry_id = qry_obj.search(cr, uid, [('query','=',str(qry))])
+        result = ()
+        if qry_id:
+            qry = qry_obj.browse(cr, uid, qry_id)[0]
+            schema = qry.schema_id
+            if qry.table_name !='':
+                total_rows = []
+                total_cols = []
+                data = []
+                table_name = str(qry.table_name)
+                connection = schema.database_id.connection_url
+                engine = create_engine(connection, echo=False)
+                metadata = MetaData(engine)
+                metadata.create_all(engine)
+                tab = Table(table_name, metadata, autoload=True, autoload_with=engine)
+                total_columns = [c.name for c in tab.columns]
+                res = tab.select().execute().fetchall()
+                for val in range(len(res)):
+                    for row in range(len(res[val])):
+                        if total_columns[row]!='parent_id' and total_columns[row]!='id':
+                            if total_columns[row] == 'name':
+                                total_rows.append((str(res[val][row]).split("."), str(res[val][row]).split(".")[-1]))
+                            else:
+                                total_cols.append((str(total_columns[row]).split("."), str(total_columns[row]).split(".")[-1]))
+                                data.append([[str(res[val][row])]])
+                res_1 = []
+                res_1.append(total_rows)
+                res_1.append(total_cols)
+                result = (res_1, data)
+        return result
+    
+    def parse_query(self, query):
+        result = []
+        lrbrack, rrbrack = map( Suppress, "()" )
+        comma = Suppress( "," )
+        leftCurlBr, rightCurlBr = map( Suppress, "{}" )
+        dot = Suppress( "." )
+        crossToken = Literal( "crossjoin" ).suppress()
+        selectToken = Keyword( "select", caseless = True ).suppress()
+        fromToken = Keyword( "from", caseless = True ).suppress()
+        whereToken = Keyword( "where", caseless = True ).suppress()
+
+        scalar = Word( alphanums + "_" + " " + "-" + "+")
+        cube = Word( alphas + '_' )
+        level_scalar = Word( alphanums + "_" + " " )
+        level_filter = Suppress( "[" ) + level_scalar + Suppress( "]" )
+        level_function = Keyword( "children", caseless = True )
+        level_item = level_filter | level_function
+        levels = Group( level_item + Optional( dot + delimitedList( level_item, ".", combine = False ) ) )
+        axis_parser = delimitedList( levels, ",", combine = False )
+        where_parse = lrbrack + Group( delimitedList( levels , ",", combine = False ) ) + rrbrack
+
+        cross_parser = leftCurlBr + levels + rightCurlBr
+        crossx = Forward()
+        cross_mdx = crossx | leftCurlBr + axis_parser + rightCurlBr
+        crossx << ( crossToken + lrbrack + cross_mdx + comma + Group( cross_parser.setResultsName( "cross" ) ) + rrbrack )
+
+        rowsmdx = leftCurlBr + axis_parser + rightCurlBr
+        colsmdx = leftCurlBr + axis_parser + rightCurlBr
+        pagemdx = leftCurlBr + axis_parser + rightCurlBr
+        row_mdx_axis = rowsmdx | crossx
+        col_mdx_axis = colsmdx | crossx
+        row_names = ["rows", "columns", "pages"]
+        onToken = Keyword( "on", caseless = True ).suppress()
+        page_name = oneOf( ' '.join( row_names ) ).suppress()
+
+        query_parser = selectToken + Group( row_mdx_axis ) + onToken + page_name + Optional( comma + Group( col_mdx_axis ) + onToken + page_name ) \
+                + Optional( comma + Group( pagemdx ) + onToken + page_name )\
+                + fromToken + cube.suppress() + Optional( whereToken + Group(where_parse ))
+        qr = query_parser.parseString(query)
+        axes = [[],[], []]
+        crossjoins=[[],[],[]]
+        ax = 0
+        for items in qr:
+            for i in items:
+#                if ax == 2:
+#                    if len( items ) > 1:
+#                        for t in i:
+#                            conditions.append( list(t)  )
+#                    else:
+#                        conditions.append(  list(i))
+                if i.cross:
+                    if i[0][-1] == 'children':
+                        crossjoins[ax].append( '.'.join(map(lambda x: "[" + x +"]",i[0][:-1]))+".children")
+                    else:
+                        crossjoins[ax].append( '.'.join(map(lambda x: "[" + x +"]",i[0])))
+                else:
+                    if i[-1] == 'children':
+                        axes[ax].append( '.'.join(map(lambda x: "[" + x +"]",i[:-1]))+".children")
+                    else:
+                        axes[ax].append( '.'.join(map(lambda x: "[" + x +"]",i)))
+            ax = ax + 1
+    
+        result.append(axes)
+        result.append(crossjoins)
+        qry_list = [[], []]
+        t_qry = []
+        new_query = ''
+        
+        for x in range(len(axes)):
+            qry_select = 'select  {'
+            if x == 0:
+                rs = axes[x][:-1]
+                if rs:
+                    t_qry.append(rs)
+                    rs_axis = ','.join(rs)
+                    new_query  = qry_select + rs_axis + '} on rows,'
+            elif x == 1:
+                cs_axis = ','.join(axes[x])
+                if cs_axis:
+                    t_qry.append(cs_axis)
+                    new_query = new_query + ' {' + cs_axis + '} on columns from Sales'
+
+        qry_list[0].append(t_qry)
+        qry_list[1].append(new_query)
+        
+    #        else:
+    #            print "pages"
+        return qry_list
+        
\ No newline at end of file
diff --git a/addons/olap/data/olap_cube_view.xml b/addons/olap/data/olap_cube_view.xml
new file mode 100644
index 00000000000..4fa62e32185
--- /dev/null
+++ b/addons/olap/data/olap_cube_view.xml
@@ -0,0 +1,701 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+<!--
+
+Wizard view for the load data
+
+-->
+        <record id="bi_load_db_form" model="ir.ui.view">
+            <field name="name">bi.load.db.form</field>
+            <field name="model">bi.load.db.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Load Database Tables">
+                    <label align="0.0" string="We will load the complete structure of the database by introspection, so that you will be able to work on it, and specify a better structure according to your reporting needs." colspan="4" />
+                    <newline/>
+                    <label align="0.0" string="After having loaded the structure, you will be able to hide/show or rename tables and columns to simplify end-users interface. The following database will be loaded:" colspan="4"/>
+                    <newline/>
+                    <field name="fact_table" />
+                    <field name="db_name" />
+                    <newline/>
+                    <button name="action_cancel" string="Cancel" type="object" colspan="2"/>
+                    <button name="action_load" string="Load Data Structure" type="object"  colspan="2"/>
+                </form>
+            </field>
+        </record>
+        <record id="act_bi_load_db_wizard" model="ir.actions.act_window">
+            <field name="name">Load database Structure</field>
+            <field name="res_model">bi.load.db.wizard</field>
+            <field name="src_model">olap.schema</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="auto_refresh" eval="1"/>
+            <field name="target">new</field>
+        </record>
+
+
+<!--
+Wizard For Olap Warehouse
+ -->
+        <record id="view_warehouse_bi" model="ir.ui.view">
+            <field name="name">Olap Warehouse</field>
+            <field name="model">olap.warehouse.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Warehouse">
+                    <group colspan="16">
+                    <separator string="Query" colspan="16"/>
+                    <field name="query" nolabel="1" colspan="16"/>
+                    <button string="Ok" name="action_ok" colspan="16" type="object" icon='gtk-ok'/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="action_olap_warehouse" model="ir.actions.act_window">
+            <field name="name">Olap Warehouse</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">olap.warehouse.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <menuitem
+        name="Olap Warehouse"
+        action="action_olap_warehouse"
+        id="menu_bi_warehouse"
+        sequence="51"
+        parent="base.next_id_50"
+        />
+<!--
+
+Wizard View for the parameters wizard
+-->
+
+        <record id="view_config_bi" model="ir.ui.view">
+            <field name="name">Parameters Configuration</field>
+            <field name="model">olap.parameters.config.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Parameters Configure">
+                    <separator string="BI Web Client." colspan="4"/>
+                    <label string="This wizard will automatically configure the web client for BI." align="0.0" colspan="4"/>
+                    <field name="host_name" colspan="4"/>
+                    <field name="host_port" colspan="4"/>
+                    <separator string="" colspan="4"/>
+                    <label string="" colspan="2"/>
+                    <group col="4" colspan="2">
+                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
+                        <button name="action_config" string="Configure" icon='gtk-ok' type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_config_bi_parameters" model="ir.actions.act_window">
+            <field name="name">Parameters Configuration</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">olap.parameters.config.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <menuitem
+        name="Server Parameters"
+        action="action_config_bi_parameters"
+        id="menu_bi_server_parameters"
+        sequence="50"
+        parent="base.next_id_50"
+        />
+        <record model="ir.actions.todo" id="config_auto_directory">
+            <field name="name">Server Parameters Configuration</field>
+            <field name="note">This wizard will configure the URL of the web client</field>
+            <field name="action_id" ref="action_config_bi_parameters"/>
+        </record>
+
+
+<!--
+
+Wizard view for the Auto Configuring the data
+
+-->
+
+        <record id="bi_auto_configure_form" model="ir.ui.view">
+            <field name="name">bi.auto.configure.form</field>
+            <field name="model">bi.auto.configure.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Auto Congifuring Tables">
+                    <label align="0.0" string="This will Auto Configure Application. This will help to increase the readability of the tables and columns by giving it meaningful and easy to comprehend name. You can hides particular data and columns by reconfiguring the structure option." colspan="4" />
+                    <field name="name" select="1" colspan="4"/>
+                    <newline/>
+                    <button name="action_cancel" string="Cancel" type="object" colspan="2"/>
+                    <button name="action_load" string="Auto Configure Structure" type="object"  colspan="2"/>
+                </form>
+            </field>
+        </record>
+        <record id="act_bi_auto_configure" model="ir.actions.act_window">
+            <field name="name">Auto Configuration</field>
+            <field name="res_model">bi.auto.configure.wizard</field>
+            <field name="src_model">olap.schema</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="auto_refresh" eval="1"/>
+            <field name="target">new</field>
+        </record>
+
+
+
+    # ------------------------------------------------------------------
+    # Olap Schema
+    # ------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_schema_tree">
+        <field name="name">olap.schema.tree</field>
+        <field name="model">olap.schema</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap Schema">
+                <field name="name"/>
+                <field name="database_id"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_olap_schema_form">
+        <field name="name">olap.schema.form</field>
+        <field name="model">olap.schema</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap Schema">
+              <field name="name" select="1" colspan="4"/>
+              <field name="database_id" select="2" colspan="4"/>
+              <field name="loaded" colspan="3"/>
+              <button name="%(act_bi_load_db_wizard)d" string="Reload Structure" type="action" states="done"/>
+              <field name="configure" colspan="3"/>
+              <button name="%(bi_load_configuration_table)d" string="ReConfigure Structure" type="action" states="done"/>
+<!--              <button string="Configure Manually" name="dbconfigure" states="dbload" target="new"/>-->
+              <field name="ready" select="2" colspan="3"/>
+              <field name="note" colspan="4"/>
+              <field name="state" select="2" colspan="2" />
+              <group colspan="2">
+                <button string="Connect to Database" name="dbconnect" states="none"/>
+                <button string="Load Database Structure" name="%(act_bi_load_db_wizard)d" type="action" states="dbconnect" target="new" />
+                <button string="Configure Manually" name="dbconfigure"  states="dbload"/>
+                <button string="Mark as Configured" name="dbready" states="dbconfigure"/>
+              </group>
+              <separator string="Auto Application Configuration" colspan="4"/>
+              <field name="app_detect" nolabel="1" colspan="3"/>
+              <button string="Configure Automatically " name="%(act_bi_auto_configure)d" type="action" states="dbload" target="new"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_schema_form">
+        <field name="name">Olap Schemas</field>
+        <field name="res_model">olap.schema</field>
+        <field name="view_type">form</field>
+
+    </record>
+    <menuitem
+        name="Olap Schema"
+        action="action_olap_schema_form"
+        id="menu_action_olap_schema_form"
+        parent="menu_bi_conf_cubes"/>
+
+    # ------------------------------------------------------------------
+    # Olap Cubes Table
+    # ------------------------------------------------------------------
+    <record model="ir.ui.view" id="view_olap_cube_table_form">
+        <field name="name">olap.cube.table.form</field>
+        <field name="model">olap.cube.table</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap cube_table" >
+                <field name="name" select="2"/>
+                <field name="column_link_id" context="{'fk':True,'dim_x':context.get('d_id',False)}"/>
+                <newline/>
+                <separator colspan="2" string="Joined Tables"/>
+                <field invisible="True" name="line_ids" nolabel="1">
+                    <form string="Database Tables">
+                        <field name="table_id"/>
+                        <field name="field_id"/>
+                    </form>
+                    <tree string="Database Tables">
+                        <field name="table_id"/>
+                        <field name="field_id"/>
+                    </tree>
+                </field>
+                <field name="available_table_ids" colspan="4" nolabel="1" readonly="0" domain="[('available_table_ids','in',available_table_ids)]" context="{'flag':True,'master_dim':context.get('d_id',False),'master_schema':context.get('parent_schema_id',False),'link_col':column_link_id}">
+                    <tree string="Database Tables">
+                        <field name="related_to" string="Joined Table"/>
+                        <field name="name"/>
+                        <field name="table_id" />
+                        <field name="primary_key" />
+                    </tree>
+                </field>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_olap_cube_table_form">
+        <field name="name">Olap Cube Tables</field>
+        <field name="res_model">olap.cube.table</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Olap Cubes Table"
+        parent = "menu_bi_conf_cubes"
+        action="action_olap_cube_table_form"
+        id="menu_action_olap_cube_table_form"/>
+
+    # ------------------------------------------------------------------
+    # Olap Cubes
+    # ------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_cube_tree">
+        <field name="name">olap.cube.tree</field>
+        <field name="model">olap.cube</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap cube">
+                <field name="name"/>
+                <field name="table_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_cube_form">
+        <field name="name">olap.cube.form</field>
+        <field name="model">olap.cube</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap cube">
+                <field name="name" select="1" colspan="4"/>
+                <field name="schema_id" select="1" attrs="{'readonly':[('schema_id','!=','')]}"/>
+                <field name="query_log" select="2"/>
+                <field name="table_id"  colspan="4" context="{'parent_schema_id':schema_id}"/>
+
+                <!--<separator colspan="4" string="Dimensions"/>
+                <field name="dimension_ids" colspan="4" nolabel="1"/>
+                <separator colspan="4" string="Measures"/>
+                <field name="measure_ids" colspan="4" nolabel="1"/>-->
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_cube_form">
+        <field name="name">Olap Cubes</field>
+        <field name="res_model">olap.cube</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Olap Cubes"
+        parent ="menu_bi_conf_cubes"
+        action="action_olap_cube_form"
+        id="menu_action_olap_cube_form"/>
+
+
+    # ------------------------------------------------------------------
+    # Olap Dimensions
+    # ------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_dimension_tree">
+        <field name="name">olap.dimension.tree</field>
+        <field name="model">olap.dimension</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap dimension">
+                <field name="name"/>
+                <field name="cube_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_dimension_form">
+        <field name="name">olap.dimension.form</field>
+        <field name="model">olap.dimension</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap dimension">
+                <field name="name" select="1"/>
+                <field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
+<!--                <field name="cube_id" on_change="onchange_cube_id(cube_id)" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
+                <field name="foreign_key_table" select="2"/>
+                <field name="foreign_key" select="2"/>
+                <separator colspan="4" string="Select In These Tables For Foreign Keys"/>
+                <field name="available_foreign_table_ids" nolabel="1" colspan="4" readonly="0">
+                    <tree string="Database Tables">
+                        <button string="Mark as Foreign Table" name="mark_foreign" context="{'parent_id':parent.id,'parent_name':parent.name,'parent_cube':parent.cube_id,'reload':1}" type="object"/>
+                        <field name="table_id" />
+                        <field name="name" string="Link Column"/>
+                   </tree>
+                </field>
+                <separator colspan="4" string="Hierarchies"/>
+                <field name="hierarchy_ids" colspan="4" nolabel="1"/>-->
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_dimension_form">
+        <field name="name">Olap Dimensions</field>
+        <field name="res_model">olap.dimension</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Olap Dimension"
+        parent = "menu_bi_conf_cubes"
+        action="action_olap_dimension_form"
+        id="menu_action_olap_dimension_form"/>
+
+    # ------------------------------------------------------------------
+    # Olap Hierarchies
+    # ------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_hierarchy_tree">
+        <field name="name">olap.hierarchy.tree</field>
+        <field name="model">olap.hierarchy</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap hierarchy">
+                <field name="name"/>
+                <field name="dimension_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_hierarchy_form">
+        <field name="name">olap.hierarchy.form</field>
+        <field name="model">olap.hierarchy</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap hierarchy">
+                <field name="name" select="1" colspan="4"/>
+                <field name="dimension_id" select="1" attrs="{'readonly':[('dimension_id','!=','')]}"/>
+<!--                <field name="field_name" select="2"/>-->
+                <field name="sequence"/>
+                <field name="table_id" select="2" colspan="4" context="{'d_id':dimension_id}"/>
+<!--                <separator string="Levels" colspan="4"/>
+                <field name="level_ids" colspan="4" nolabel="1"/>-->
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_hierarchy_form">
+        <field name="name">Olap Hierarchies</field>
+        <field name="res_model">olap.hierarchy</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Olap Hierarchy"
+        parent = "menu_bi_conf_cubes"
+        action="action_olap_hierarchy_form"
+        id="menu_action_olap_hierarchy_form"/>
+
+
+    # ------------------------------------------------------------------
+    # Olap Levels
+    # ------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_level_tree">
+        <field name="name">olap.level.tree</field>
+        <field name="model">olap.level</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap Level">
+                <field name="name"/>
+                <field name="column_name"/>
+                <field name="column_id_name" invisible="True"/>
+                <field name="type"/>
+                <field name="table_name" invisible="True"/>
+                <field name="sequence"/>
+                <field name="hierarchy_id"/>
+
+
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_level_form">
+        <field name="name">olap.level.form</field>
+        <field name="model">olap.level</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap level">
+                <field name="name" select="1" colspan="4"/>
+                <field name="column_name" select="1" on_change="onchange_column_name(column_name)" context="{'filter_cols_hier':hierarchy_id}"/>
+                <field name="column_id_name" select="1"/>
+                <field name="type" select="1"/>
+                <field name="table_name" select="1"/>
+                <field name="sequence"/>
+                <!-- <field name="hierarchy_id" select="1"/>-->
+                <field name="hierarchy_id" select="1" attrs="{'readonly':[('hierarchy_id','!=','')]}"/>
+            </form>
+       </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_level_form">
+        <field name="name">Olap Level</field>
+        <field name="res_model">olap.level</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Olap Level"
+        parent = "menu_bi_conf_cubes"
+        action="action_olap_level_form"
+        id="menu_action_olap_level_form"/>
+
+
+    # ------------------------------------------------------------------
+    # Olap Measure
+    # ------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_measure_tree">
+        <field name="name">olap.measure.tree</field>
+        <field name="model">olap.measure</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap measure">
+                <field name="name"/>
+                <field name="cube_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_measure_form">
+        <field name="name">olap.measure.form</field>
+        <field name="model">olap.measure</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap measure">
+                <field name="name" select="1"/>
+                <field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
+                <field name="value_column_id_name" invisible="True"/>
+                <field name="table_name" invisible="True"/>
+                <field name="measure_type"/>
+
+<!--                <notebook colspan="4">
+                        <page string="Fact Table Column" >
+                            <newline/>
+                            <field name="value_column" select="1" on_change="onchange_measure_name(value_column)" context="{'filter_cols_cube':cube_id}"/>
+                            <field name="agregator" select="2"/>
+                            <field name="formatstring" select="2"/>
+                        </page>
+                        <page string="SQL Expression" attrs="{'invisible':[('measure_type','!=','sql_expr')]}">
+                             <field name="value_sql" colspan="4" select="2"/>
+                             <field name="datatype" select="2"/>
+                        </page>
+                    </notebook>
+-->
+
+                <group colspan="4" attrs="{'invisible':[('measure_type','!=','fact_column')]}">
+                    <newline/>
+                    <field name="value_column" select="1" attrs="{'required':[('measure_type','=','fact_column')]}" on_change="onchange_measure_name(value_column)" context="{'filter_cols_cube':cube_id}"/>
+                    <field name="agregator" select="2"/>
+                    <field name="formatstring" select="2"/>
+                </group>
+                <group colspan="4"  attrs="{'invisible':[('measure_type','!=','sql_expr')]}">
+                    <newline/>
+                    <field name="value_sql" colspan="4" select="2" attrs="{'required':[('measure_type','=','sql_expr')]}"/>
+                    <field name="datatype" select="2"/>
+                </group>
+            </form>
+
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_measure_form">
+        <field name="name">Olap Measures</field>
+        <field name="res_model">olap.measure</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Olap Measures"
+        parent = "menu_bi_conf_cubes"
+        action="action_olap_measure_form"
+        id="menu_action_olap_measure_form"/>
+
+    # ------------------------------------------------------------------
+    # Olap Saved Query
+    # ------------------------------------------------------------------
+    <record model="ir.ui.view" id="view_olap_saved_query_form_tree">
+        <field name="name">olap.saved.query.tree</field>
+        <field name="model">olap.saved.query</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap Saved Query">
+            	<field name="name"/>
+                <field name="cube_id"/>
+                <field name="mdx_id"/>
+                <field name="user_id"/>
+                <field name="query"/>
+                <field name="time"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_olap_saved_query_form_mdx">
+        <field name="name">olap.saved.query.mdx</field>
+        <field name="model">olap.saved.query</field>
+        <field name="type">mdx</field>
+        <field name="arch" type="xml">
+            <tree string="Olap Saved Query">
+            	<field name="name"/>
+                <field name="user_id"/>
+                <field name="query"/>
+                <field name="cube_id"/>
+                <field name="mdx_id"/>
+                <field name="axis_keys" readonly="True"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_saved_query_form">
+        <field name="name">olap.saved.query.form</field>
+        <field name="model">olap.saved.query</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap Saved Query">
+             	<field name="name" select="1" readonly="True"/>
+                <field name="query" select="1" colspan="4" readonly="True"/>
+                <field name="user_id" readonly="True"/>
+                <field name="cube_id" select="2" readonly="True"/>
+                <field name="mdx_id" select="2" readonly="True"/>
+                <field name="schema_id" select="2" readonly="True"/>
+                <field name="axis_keys" readonly="True"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_saved_query_form">
+        <field name="name">Olap Saved Query</field>
+        <field name="res_model">olap.saved.query</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form,mdx</field>
+    </record>
+    <menuitem
+        name="Olap Saved Query"
+        parent = "menu_bi_conf_tools"
+        action="action_olap_saved_query_form"
+        id="menu_action_olap_saved_query_form"/>
+
+<!--
+
+All Logs
+
+-->
+
+    <record model="ir.ui.view" id="view_olap_query_logs_tree">
+        <field name="name">olap.query.logs</field>
+        <field name="model">olap.query.logs</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="All Logs">
+                <field name="user_id"/>
+                <field name="query"/>
+                <field name="cube_id"/>
+                <field name="schema_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_query_logs_form">
+        <field name="name">olap.query.logs.form</field>
+        <field name="model">olap.query.logs</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="All Logs">
+                <field name="query" colspan="4" select="1" readonly="True"/>
+                <field name="time" select="2" readonly="True"/>
+                <field name="result_size" select="2" readonly="True"/>
+                <field name="cube_id" select="2" readonly="True"/>
+                <field name="count" readonly="True"/>
+                <field name="schema_id" readonly="True"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_query_logs_form">
+        <field name="name">All Logs</field>
+        <field name="res_model">olap.query.logs</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="All Logs"
+        action="action_olap_query_logs_form"
+        id="menu_action_olap_query_logs_form"
+        parent="menu_bi_conf_tools"/>
+
+
+
+
+
+
+<!--
+All Logs / My logs
+
+ -->
+
+
+    <record model="ir.ui.view" id="view_olap_query_logs_my_tree">
+        <field name="name">olap.query.logs</field>
+        <field name="model">olap.query.logs</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="My Logs">
+                <field name="user_id"/>
+                <field name="query"/>
+                <field name="cube_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_query_logs_my_tree">
+        <field name="name">olap.query.logs</field>
+        <field name="model">olap.query.logs</field>
+        <field name="type">mdx</field>
+        <field name="arch" type="xml">
+            <tree string="My Logs">
+                <field name="user_id"/>
+                <field name="query"/>
+                <field name="cube_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_query_logs_my_form">
+        <field name="name">olap.query.logs.form</field>
+        <field name="model">olap.query.logs</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="My Logs">
+                <field name="user_id" select="1" readonly="True"/>
+                <!--  domain="[('uid','=',uid)]"
+                /> -->
+                <field name="query" select="1" readonly="True"/>
+                <field name="time" select="2" readonly="True"/>
+                <field name="result_size" select="2" readonly="True"/>
+                <field name="cube_id" select="2" readonly="True"/>
+
+            </form>
+        </field>
+
+
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_query_logs_my_form">
+        <field name="name">My Logs</field>
+        <field name="res_model">olap.query.logs</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form,mdx</field>
+        <field name="domain">[('user_id','=',uid)]</field>
+    </record>
+    <menuitem
+        name="My Logs"
+        action="action_olap_query_logs_my_form"
+        id="menu_action_olap_query_logs_my_form"
+        parent="menu_action_olap_query_logs_form"/>
+
+
+<!--
+
+Clear All Logs
+
+ -->
+
+
+
+
+<!--
+
+Clear My logs
+
+ -->
+
+</data>
+</openerp>
diff --git a/addons/olap/data/olap_cube_workflow.xml b/addons/olap/data/olap_cube_workflow.xml
new file mode 100755
index 00000000000..cedfbcc686b
--- /dev/null
+++ b/addons/olap/data/olap_cube_workflow.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="workflow" id="wkf_schema">
+        <field name="name">olap.schema</field>
+        <field name="osv">olap.schema</field>
+        <field name="on_create">True</field>
+        </record>
+    
+        <record model="workflow.activity" id="act_none">
+            <field name="wkf_id" ref="wkf_schema"/>
+            <field name="flow_start">True</field>
+            <field name="name">none</field>
+        </record>
+        
+        <record model="workflow.activity" id="act_dbconnect">
+            <field name="wkf_id" ref="wkf_schema"/>
+            <field name="name">dbconnect</field>
+            <field name="kind">function</field>
+            <field name="action">action_dbconnect()</field>
+        </record>
+        
+        <record model="workflow.activity" id="act_dbload">
+            <field name="wkf_id" ref="wkf_schema"/>
+            <field name="name">dbload</field>
+            <field name="kind">function</field>
+            <field name="action">action_dbload()</field>
+        </record>
+        
+        <record model="workflow.activity" id="act_dbconfigure">
+            <field name="wkf_id" ref="wkf_schema"/>
+            <field name="name">dbconfigure</field>
+            <field name="kind">function</field>
+            <field name="action">action_dbconfigure()</field>
+        </record>
+        
+        <record model="workflow.activity" id="act_dbready">
+            <field name="wkf_id" ref="wkf_schema"/>
+            <field name="flow_stop">True</field>
+            <field name="name">dbready</field>
+            <field name="kind">function</field>
+            <field name="action">action_dbready()</field>           
+        </record>
+<!--        
+        <record model="workflow.activity" id="act_dbdone">
+            <field name="wkf_id" ref="wkf_schema"/>
+            <field name="flow_stop">True</field>
+            <field name="name">db_done</field>
+            <field name="kind">function</field>
+            <field name="action">action_done()</field>
+        </record>
+--> 
+
+        
+        <record model="workflow.transition" id="trans_none_dbconnect">
+            <field name="act_from" ref="act_none"/>
+            <field name="act_to" ref="act_dbconnect"/>
+            <field name="signal">dbconnect</field>
+        </record>
+
+        <record model="workflow.transition" id="trans_dbconnect_dbload">
+            <field name="act_from" ref="act_dbconnect"/>
+            <field name="act_to" ref="act_dbload"/>
+            <field name="signal">dbload</field>
+        </record>
+
+        <record model="workflow.transition" id="trans_dbload_dbconfigure">
+            <field name="act_from" ref="act_dbload"/>
+            <field name="act_to" ref="act_dbconfigure"/>
+            <field name="signal">dbconfigure</field>
+        </record>
+        
+        <record model="workflow.transition" id="trans_dbconfigure_dbready">
+            <field name="act_from" ref="act_dbconfigure"/>
+            <field name="act_to" ref="act_dbready"/>
+            <field name="signal">dbready</field>
+        </record>
+<!--
+        <record model="workflow.transition" id="trans_dbready_done">
+            <field name="act_from" ref="act_dbready"/>
+            <field name="act_to" ref="act_dbdone"/>
+            <field name="signal">dbdone</field>
+        </record>
+-->
+
+    </data>
+</openerp>
diff --git a/addons/olap/data/olap_data.xml b/addons/olap/data/olap_data.xml
new file mode 100755
index 00000000000..d36ec6161fe
--- /dev/null
+++ b/addons/olap/data/olap_data.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+</data>
+</openerp>
diff --git a/addons/olap/data/olap_demo.xml b/addons/olap/data/olap_demo.xml
new file mode 100755
index 00000000000..a57035c163a
--- /dev/null
+++ b/addons/olap/data/olap_demo.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="True">
+
+    <record model="olap.fact.database" id="fact_database_terp">
+        <field name="name">Tiny ERP database</field>
+        <field name="db_name">terp</field>
+        <field name="db_login">postgres</field>
+        <field name="db_password">postgres</field>
+    </record>
+
+    <record model="olap.database.tables" id="database_table_res_partner">
+        <field name="name">res_partner</field>
+        <field name="table_db_name">res_partner</field>
+        <field name="fact_database_id" ref="fact_database_terp"/>
+        <field name="active">True</field>
+        
+    </record>
+
+    <record model="olap.database.tables" id="database_table_res_user">
+        <field name="name">res_users</field>
+        <field name="table_db_name">res_users</field>
+        <field name="fact_database_id" ref="fact_database_terp"/>
+        <field name="active">True</field>
+        
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_partner_date">
+        <field name="name">date</field>
+        <field name="column_db_name">date</field>
+        <field name="type">date</field>
+        <field name="table_id" ref="database_table_res_partner"/>
+        <field name="active">True</field>
+    </record>
+        
+    <record model="olap.database.columns" id="columns_res_user_create_uid">
+        <field name="name">create_uid</field>
+        <field name="column_db_name">create_uid</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="database_table_res_user"/>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.columns" id="columns_res_user_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="database_table_res_user"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.columns" id="columns_res_partner_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="database_table_res_partner"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.columns" id="columns_res_user_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="database_table_res_user"/>
+        <field name="active">True</field>
+    </record>
+        
+    <record model="olap.database.columns" id="columns_res_partner_credit_limit">
+        <field name="name">credit_limit</field>
+        <field name="column_db_name">credit_limit</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="database_table_res_partner"/>
+        <field name="active">True</field>
+    </record>
+        
+        
+    <record model="olap.database.columns" id="columns_res_partner_user_id">
+        <field name="name">user_id</field>
+        <field name="column_db_name">user_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="database_table_res_partner"/>
+        <field name="related_to" ref="database_table_res_user"></field>
+        <field name="active">True</field>
+        
+    </record>
+    <record model="olap.schema" id="schema_main">
+        <field name="name">tinyerp</field>
+        <field name="state">none</field>
+        <field name="database_id" ref="fact_database_terp"/>
+    </record>
+
+    <record model="olap.cube.table" id="table_res_partner">
+        <field name="name">Partner</field>
+        <field name="schema_id" ref="schema_main"/>
+        <field name="column_link_id" ref="columns_res_partner_id"/>
+    </record>
+    <record model="olap.cube.table" id="table_res_user">
+        <field name="name">Partner(User)</field>
+        <field name="schema_id" ref="schema_main"/>
+        <field name="column_link_id" ref="columns_res_partner_user_id"/>
+    </record>
+    <record model="olap.cube" id="cube_partner">
+        <field name="name">Partner</field>
+        <field name="table_id" ref="table_res_partner"/>
+        <field name="schema_id" ref="schema_main"/>
+    </record>
+
+
+    <record model="olap.dimension" id="dimension_date">
+        <field name="name">Date</field>
+        <field name="cube_id" ref="cube_partner"/>
+    </record>
+    <record model="olap.hierarchy" id="hierarchy_date">
+        <field name="name">Date</field>
+        <field name="dimension_id" ref="dimension_date"/>
+        <field name="primary_key_table">res_partner</field>
+        <field name="table_id" ref="table_res_partner"/>
+    </record>
+    <record model="olap.level" id="hierarchy_level_date">
+        <field name="name">Date</field>
+        <field name="column_name" ref="columns_res_partner_date"></field>
+        <field name="column_id_name">date</field>
+        <field name="type">date_year</field>
+        <field name="table_name">res_partner</field>
+        <field name="hierarchy_id" ref="hierarchy_date"/>
+    </record>
+
+
+    <record model="olap.dimension" id="dimension_user">
+        <field name="name">User</field>
+        <field name="cube_id" ref="cube_partner"/>
+    </record>
+
+    <record model="olap.hierarchy" id="hierarchy_user">
+        <field name="name">User</field>
+        <field name="dimension_id" ref="dimension_user"/>
+        <field name="primary_key_table">res_users</field>
+        <field name="table_id" ref="table_res_user"/>
+    </record>
+    <record model="olap.level" id="hierarchy_user_level">
+        <field name="name">Name</field>
+        <field name="column_id_name">name</field>
+        <field name="column_name" ref="columns_res_user_name"></field>
+        <field name="table_name">res_users</field>
+        <field name="hierarchy_id" ref="hierarchy_user"/>
+    </record>
+
+
+    <record model="olap.measure" id="measure_credit_limit">
+        <field name="name">Credit Limit</field>
+        <field name="cube_id" ref="cube_partner"/>
+        <field name="value_column" ref="columns_res_partner_credit_limit"></field>
+        <field name="value_column_id_name">credit_limit</field>
+        <field name="table_name">res_partner</field>
+    </record>
+
+    <record model="olap.measure" id="measure_count">
+        <field name="name">Count</field>
+        <field name="cube_id" ref="cube_partner"/>
+        <field name="value_column" ref="columns_res_partner_id"></field>
+        <field name="value_column_id_name">id</field>
+        <field name="table_name">res_partner</field>
+        <field name="agregator">count</field>
+    </record>
+
+
+    <record model="olap.application" id="application_openerp">
+        <field name="name">OpenERP</field>
+        <field name="query">select * from res_users</field>
+    </record>
+</data>
+</openerp>
diff --git a/addons/olap/data/olap_fact_view.xml b/addons/olap/data/olap_fact_view.xml
new file mode 100755
index 00000000000..d46669e2725
--- /dev/null
+++ b/addons/olap/data/olap_fact_view.xml
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    # --------------------------------------------------------------------
+    # Fact databases
+    # --------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_fact_database_tree">
+        <field name="name">olap.fact.database.tree</field>
+        <field name="model">olap.fact.database</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap fact database">
+                <field name="name"/>
+                <field name="db_name"/>
+                <field name="type"/>
+                <field name="loaded"/>
+            </tree>
+        </field>
+    </record>
+<record model="ir.ui.view" id="view_olap_fact_database_form">
+        <field name="name">olap.fact.database.form</field>
+        <field name="model">olap.fact.database</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Fact database">
+                <notebook>
+                    <page string="Information">
+                        <separator string="General information" colspan="4"/>
+                        <field name="name" select="1" colspan="4"/>
+                        <field name="db_name" select="2"/>
+                        <field name="type" select="2"/>
+                        <separator string="Connection parameters" colspan="4"/>
+                        <field name="connection_type"/>
+                        <newline/>
+                        <field name="db_host"/>
+                        <field name="db_port"/>
+                        <field name="db_login"/>
+                        <field name="db_password" password="True"/>
+                        <field name="loaded"/>
+                        <separator string="Connection url" colspan="4"/>
+                        <field name="connection_url" nolabel="1" colspan="2"/>
+<!--
+                        <button name="test_connection" string="Test Connection" type="object" colspan="2"/>
+-->
+                        <button name="%(bi_test_connection)d" string="Test Connection" type="action" colspan="2"/>
+                    </page>
+                    <page string="Tables">
+                        <field name="table_ids" colspan="4" nolabel="1"/>
+                    </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_view_olap_fact_database_form">
+                <field name="name">Fact Databases</field>
+                <field name="res_model">olap.fact.database</field>
+                <field name="view_type">form</field>
+            </record>
+    <menuitem
+        name="Databases"
+        action="action_view_olap_fact_database_form"
+        id="menu_view_olap_fact_database_form"
+        parent="menu_bi_conf_fact"/>
+
+
+    # --------------------------------------------------------------------
+    # Fact Database Tables
+    # --------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_database_tables_tree">
+        <field name="name">olap.database.tables.tree</field>
+        <field name="model">olap.database.tables</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap database tables">
+                <field name="name"/>
+                <field name="table_db_name"/>
+                <field name="fact_database_id" select="2"/>
+                <field name="active"/>
+                <field name="hide"/>
+<!--                <button name="show_col_view" string="Columns" type="object"/>-->
+                <!--<button string="Columns_wiz" name="%(bi_load_column)d" type="action"/>-->
+                <button name="hide_col" string="Hide" type="object"/>
+                <button name="show_col" string="Show" type="object"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_database_tables_form">
+        <field name="name">olap.database.tables.form</field>
+        <field name="model">olap.database.tables</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Database tables">
+                <field name="name" select="1" colspan="2"/>
+                <field name="table_db_name"/>
+                <field name="columns" colspan="4" mode="tree" nolabel="1">
+                    <tree string="Olap database columns">
+                        <field name="name"/>
+                        <field name="column_db_name"/>
+                        <field name="type"/>
+                        <field name="table_id"/>
+                        <field name="primary_key"/>
+                        <field name="related_to"/>
+                        <field name="active"/>
+                        <field name="hide"/>
+                        <button name="hide_col" string="Hide" type="object"/>
+                        <button name="show_col" string="Show" type="object"/>
+                    </tree>
+                </field>            
+                <field name="fact_database_id" select="1" colspan="2"/>
+                <field name="active"/>
+                <field name="hide"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_view_olap_database_tables_form">
+        <field name="name">Database Tables</field>
+        <field name="res_model">olap.database.tables</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Tables"
+        action="action_view_olap_database_tables_form"
+        id="menu_view_olap_database_tables_form"
+        parent="menu_bi_conf_fact"/>
+
+    # --------------------------------------------------------------------
+    # Fact Database Columns
+    # --------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_database_columns_tree">
+        <field name="name">olap.database.columns.tree</field>
+        <field name="model">olap.database.columns</field>
+        <field name="type">tree</field>
+        <field name="priority">2</field>
+        <field name="arch" type="xml">
+            <tree string="Olap database columns">
+                <field name="name"/>
+                <field name="column_db_name"/>
+                <field name="type"/>
+                <field name="table_id"/>
+                <field name="primary_key"/>
+                <field name="related_to"/>
+                <field name="active"/>
+                <field name="hide"/>
+                <button name="hide_col" string="Hide" type="object"/>
+                <button name="show_col" string="Show" type="object"/>
+            </tree>
+        </field>
+    </record>
+    
+    <record model="ir.ui.view" id="view_olap_database_columns_tree_m20">
+        <field name="name">olap.database.columns.tree.m20</field>
+        <field name="model">olap.database.columns</field>
+        <field name="type">tree</field>
+        <field name="priority">1</field>
+        <field name="arch" type="xml">
+            <tree string="Olap database columns">
+                <field name="name"/>
+                <field name="column_db_name"/>
+                <field name="table_id"/>
+                <field name="related_to"/>
+            </tree>
+        </field>
+    </record>
+    
+    <record model="ir.ui.view" id="view_olap_database_columns_form">
+        <field name="name">olap.database.columns.form</field>
+        <field name="model">olap.database.columns</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Database columns">
+                <field name="name" select="1" colspan="2"/>
+                <field name="column_db_name"/>
+                <field name="type"/>
+                <field name="table_id" select="1" colspan="2"/>
+                <field name="primary_key"/>
+                <field name="related_to"/>
+                <field name="active"/>
+                <field name="hide"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_view_olap_database_columns_form">
+        <field name="name">Database Columns</field>
+        <field name="res_model">olap.database.columns</field>
+        <field name="view_type">form</field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_view_olap_database_columns_form">
+        <field name="name">Database Columns</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="view_type">form</field>
+        <field name="res_model">olap.database.columns</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_olap_database_columns_tree"></field>
+    </record>
+
+    <menuitem
+        name="Columns"
+        action="action_view_olap_database_columns_form"
+        id="menu_view_olap_database_columns_form"
+        parent="menu_bi_conf_fact"/>
+
+
+
+    # --------------------------------------------------------------------
+    # Olap Application
+    # --------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_application_tree">
+        <field name="name">olap.application.tree</field>
+        <field name="model">olap.application</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap Application">
+                <field name="name"/>
+                <field name="query"/>
+                <field name="table_ids"/>
+                <field name="field_ids"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_application_form">
+        <field name="name">olap.application.form</field>
+        <field name="model">olap.application</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap Application">
+                <newline/>
+                <field name="name" select="1" colspan="2"/>
+                <field name="query" select="1" colspan="2"/>
+                <field name="table_ids" select="1" colspan="4" nolabel="1"/>
+                <field name="field_ids" select="1" colspan="4" nolabel="1" rowspan="1"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_view_olap_application_form">
+        <field name="name">Olap Applicatiion</field>
+        <field name="res_model">olap.application</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Application"
+        action="action_view_olap_application_form"
+        id="menu_view_olap_application_form"
+        parent="menu_bi_conf_known_application"/>
+
+    # --------------------------------------------------------------------
+    # Olap Application table
+    # --------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_application_table_tree">
+        <field name="name">olap.application.table.tree</field>
+        <field name="model">olap.application.table</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap Application Table">
+                <field name="name"/>
+                <field name="table_name"/>
+                <field name="is_hidden"/>
+                <field name="application_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_application_table_form">
+        <field name="name">olap.application.table.form</field>
+        <field name="model">olap.application.table</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap Application Table">
+                <newline/>
+                <field name="name" select="1" colspan="2"/>
+                <field name="table_name" select="1" />
+                <field name="is_hidden" select="1" colspan="2" />
+                <field name="application_id" select="1" />
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_view_olap_application_table_form">
+        <field name="name">Olap Applicatiion Table</field>
+        <field name="res_model">olap.application.table</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Application Table"
+        action="action_view_olap_application_table_form"
+        id="menu_view_olap_application_table_form"
+        parent="menu_bi_conf_known_application"/>
+
+
+
+    # --------------------------------------------------------------------
+    # Olap Application Field
+    # --------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_application_field_tree">
+        <field name="name">olap.application.field.tree</field>
+        <field name="model">olap.application.field</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap Application Field">
+                <field name="name"/>
+                <field name="table_name"/>
+                <field name="field_name"/>
+                <field name="is_hidden" />
+                <field name="application_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_application_field_form">
+        <field name="name">olap.application.field.form</field>
+        <field name="model">olap.application.field</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap Application Field">
+                <newline/>
+                <field name="name" select="1" colspan="2"/>
+                <field name="field_name" select="1" />              
+                <field name="table_name" select="1" />
+                <newline/>
+                <field name="is_hidden" select="1" colspan="2"/>
+                <field name="application_id" select="1" />
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_view_olap_application_field_form">
+        <field name="name">Olap Applicatiion Field</field>
+        <field name="res_model">olap.application.field</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Application Field"
+        action="action_view_olap_application_field_form"
+        id="menu_view_olap_application_field_form"
+        parent="menu_bi_conf_known_application"/>
+
+
+
+
+
+</data>
+</openerp>
diff --git a/addons/olap/data/olap_security.xml b/addons/olap/data/olap_security.xml
new file mode 100755
index 00000000000..1ca5534dae3
--- /dev/null
+++ b/addons/olap/data/olap_security.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="access_olap_application" model="ir.model.access">
+            <field name="name">Olap Application</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.application')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+          
+        <record id="access_olap_application_field" model="ir.model.access">
+            <field name="name">Olap Application Field</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.application.field')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_application_table" model="ir.model.access">
+            <field name="name">Olap Application Table</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.application.table')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_cube" model="ir.model.access">
+            <field name="name">Olap Cube</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.cube')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_cube_table" model="ir.model.access">
+            <field name="name">Olap Cube Table</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.cube.table')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_cube_table_line" model="ir.model.access">
+            <field name="name">Olap Cube Table Line</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.cube.table.line')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_database_columns" model="ir.model.access">
+            <field name="name">Olap Database Columns</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.database.columns')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_database_tables" model="ir.model.access">
+            <field name="name">Olap Database Tables</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.database.tables')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_dimension" model="ir.model.access">
+            <field name="name">Olap Dimension</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.dimension')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_fact_database" model="ir.model.access">
+            <field name="name">Olap Fact Database</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.fact.database')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_hierarchy" model="ir.model.access">
+            <field name="name">Olap Hierarchy</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.hierarchy')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_level" model="ir.model.access">
+            <field name="name">Olap Level</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.level')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_schema" model="ir.model.access">
+            <field name="name">Olap Schema</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.schema')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_measure" model="ir.model.access">
+            <field name="name">Olap Measure</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.measure')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_query_logs" model="ir.model.access">
+            <field name="name">Olap Query Logs</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.query.logs')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+    </data>
+</openerp>        
diff --git a/addons/olap/data/olap_view.xml b/addons/olap/data/olap_view.xml
new file mode 100755
index 00000000000..306f9a29084
--- /dev/null
+++ b/addons/olap/data/olap_view.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+
+<!--    <menuitem-->
+<!--        name="Businesss Intelligence"-->
+<!--        id="menu_bi"-->
+<!--        icon="terp-account" parent="base.next_id_50"/>-->
+
+    <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting"/>
+    <menuitem
+            id="base.next_id_50"
+            name="Configuration"
+            parent="base.reporting_menu"
+            groups="base.group_system"
+            sequence="3"/>
+    <menuitem
+        name="Custom Reports" id="base.menu_custom_reports"
+        parent="base.reporting_menu" sequence="1"/>
+    <menuitem
+        name="Businesss Intelligence Configuration"
+        id="menu_bi_configuration"
+        parent="base.next_id_50" sequence="1"/>
+
+    <menuitem
+        name="Fact Databases"
+        sequence="10"
+        id="menu_bi_conf_fact"
+        parent="menu_bi_configuration"/>
+
+    <menuitem
+        name="Known Application"
+        sequence="20"
+        id="menu_bi_conf_known_application"
+        parent="menu_bi_configuration"/>
+
+    <menuitem
+        name="Olap Cubes"
+        sequence="30"
+        id="menu_bi_conf_cubes"
+        parent="menu_bi_configuration"/>
+
+    <menuitem
+        name="Tools"
+        sequence="40"
+        id="menu_bi_conf_tools"
+        parent="menu_bi_configuration"/>
+
+
+    <record model="ir.actions.url" id="menu_url_cube_browser">
+            <field name="name">name_menu_url_cube_browser</field>
+            <field name="url">http://localhost:8080/browser</field>
+    </record>
+    <menuitem name="Cube Browser" id="menu_browser_url" type="url" action="menu_url_cube_browser" parent="base.menu_custom_reports" sequence="1"/>
+
+    <record model="ir.actions.url" id="menu_url_cube_designer">
+            <field name="name">name_menu_url_cube_designer</field>
+            <field name="url">http://localhost:8080/designer</field>
+    </record>
+    <menuitem name="Cube Designer" sequence="60" action="menu_url_cube_designer" type="url" id="menu_designer_url" parent="base.next_id_50"/>
+
+</data>
+</openerp>
diff --git a/addons/olap/data/olap_wizard.xml b/addons/olap/data/olap_wizard.xml
new file mode 100755
index 00000000000..c2cda9ef29a
--- /dev/null
+++ b/addons/olap/data/olap_wizard.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+    <wizard
+            string="Query Builder"
+            model="olap.schema"
+            name="olap.query_builder"
+            menu= "False"
+            multi="True"
+            id="bi_conf_cube_query_builder"/>
+        <!--        <menuitem name="Query Builder" action="bi_conf_cube_query_builder" type="wizard"  id="menu_bi_conf_cube_query_builder" sequence="40" parent="menu_bi_conf_tools"/>
+        -->
+
+    <wizard
+            string="Load Tables"
+            model="olap.schema"
+            name="olap.load.table"
+            menu= "False"
+            multi="True"
+            id="bi_menu_olap_load_table"/>
+
+
+        <wizard
+            string="Load Tables"
+            model="olap.schema"
+            name="olap.load.table"
+            menu= "False"
+            multi="True"
+            id="bi_menu_olap_load_table"/>
+            
+        <wizard
+            string="Open Configuration"
+            model="olap.schema"
+            name="olap.load.configuration.table"
+            menu= "False"
+            multi="True"
+            id="bi_load_configuration_table"/>          
+
+        <wizard
+            string="Configure from Application"
+            model="olap.schema"
+            name="olap.application.configuration"
+            menu="False"
+            multi="True"
+            id="bi_application_configuration"/>
+
+        <wizard
+            string="Test Connection"
+            model="olap.fact.database"
+            name="olap.fact.database.test_connection"
+            menu="False"
+            id="bi_test_connection"/> 
+
+        <wizard
+            string="Open Columns"
+            model="olap.database.columns"
+            name="olap.load.column"
+            menu= "False"
+            multi="True"
+            id="bi_load_column"/> 
+            
+        <wizard
+            string="Clear Logs"
+            model="olap.query.logs"
+            name="olap.query.logs.clear"
+            menu="True"
+            id="bi_clear_logs"/>    
+        <menuitem name="Clear Logs" action="bi_clear_logs" type="wizard"  id="menu_bi_clear_logs" sequence="30" parent="menu_bi_conf_tools"/>
+
+
+    </data>
+</openerp>
diff --git a/addons/olap/i18n/fr_BE.po b/addons/olap/i18n/fr_BE.po
new file mode 100644
index 00000000000..0866638abff
--- /dev/null
+++ b/addons/olap/i18n/fr_BE.po
@@ -0,0 +1,1370 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* olap
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 05:24:42+0000\n"
+"PO-Revision-Date: 2009-11-26 05:24:42+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Hide"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_saved_query_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_saved_query_form
+#: view:olap.saved.query:0
+msgid "Olap Saved Query"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,time:0
+#: field:olap.saved.query,time:0
+msgid "Time"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Configure Structure"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Olap fact database"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,value_sql:0
+msgid "You can provide valid sql expression. Make sure it have function with fully qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) tablename.columnname)"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,schema_id:0
+msgid "Schema id"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,database_id:0
+msgid "Database Connection"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "MySQL"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_password:0
+msgid "Database password"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Olap database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection url"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.table:0
+msgid "Olap Application Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.parameters.config.wizard,host_name:0
+msgid "Server Name"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_password:0
+msgid "Password for the login."
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,application_id:0
+#: field:olap.application.table,application_id:0
+msgid "Application Id"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.todo,note:olap.config_auto_directory
+msgid "This wizard will configure the URL of the web client"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_fact_database_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_fact
+msgid "Fact Databases"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_browser_url
+msgid "Cube Browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_dimension_form
+msgid "Olap Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_columns
+msgid "Olap Database Columns"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "BI Web Client."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_port:0
+msgid " Port to be used in connection"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,primary_key:0
+msgid "Primary Key"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,table_id:0
+msgid "Table Id"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "This wizard will automatically configure the web client for BI."
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,type:0
+msgid "Database type"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query_builder,back:0
+#: wizard_view:olap.query_builder,init:0
+msgid "Cube Fetcher"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+msgid "Your database structure has been correctly loaded"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_parameters_config_wizard
+msgid "Olap Server Parameters"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_table_form
+msgid "Olap Cube Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,formatstring:0
+msgid "Format string"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,exec:0
+#: wizard_button:olap.query_builder,ok,exec:0
+msgid "Execute"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,configure,end:0
+#: wizard_button:olap.fact.database.test_connection,init,end:0
+#: wizard_button:olap.load.table,info,end:0
+#: wizard_button:olap.query.logs.clear,info,end:0
+#: wizard_button:olap.query.logs.clear,ok,end:0
+#: view:olap.warehouse.wizard:0
+msgid "Ok"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_known_application
+msgid "Known Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,level:0
+#: wizard_field:olap.query_builder,ok,level:0
+msgid "Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_id_name:0
+#: field:olap.measure,value_column_id_name:0
+msgid "Column ID"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "We will load the complete structure of the database by introspection, so that you will be able to work on it, and specify a better structure according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_form
+msgid "Olap Applicatiion"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,name:0
+msgid "Query Name"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query:0
+#: wizard_field:olap.query_builder,ok,mdx_query:0
+msgid "MDX Query"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_auto_configure_wizard
+msgid "bi.auto.configure.wizard"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key:0
+msgid "Primary key"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_auto_configure
+msgid "Auto Configuration"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,note:0
+msgid "Schema description"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_load_db_wizard
+msgid "Load database Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_level
+#: view:olap.level:0
+msgid "Olap level"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "None (0000.00)"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_host:0
+msgid "Database host"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_fact_database
+msgid "Olap Fact Database"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Congifuring Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,name:0
+msgid "Application name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,column_link_id:0
+msgid "Relational Column"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,type:0
+msgid "Level class"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,name:0
+msgid "Cube name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_table_form
+msgid "Olap Applicatiion Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_saved_query
+msgid "olap.saved.query"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_name:0
+msgid "Columns Name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_hierarchy_form
+msgid "Olap Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,ready:0
+msgid "Ready"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_column:0
+msgid "Fact Table Column"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_tables_form
+#: field:olap.application,table_ids:0
+#: view:olap.fact.database:0
+#: field:olap.fact.database,table_ids:0
+msgid "Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application
+msgid "Olap application"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Schema is ready to use"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_designer_url
+msgid "Cube Designer"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_login:0
+msgid "Database login"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_table_form
+msgid "Application Table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Logs Cleared successfully"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_schema
+#: model:ir.ui.menu,name:olap.menu_action_olap_schema_form
+#: view:olap.schema:0
+msgid "Olap Schema"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_form
+msgid "Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query_output:0
+#: wizard_field:olap.query_builder,ok,mdx_query_output:0
+msgid "MDX Query Output"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key_table:0
+msgid "Primary key table"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,table_name:0
+msgid "The name of the table on which the column is defined. If False, take the table from the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.warehouse.wizard:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_dimension_form
+msgid "Olap Dimensions"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,user_id:0
+msgid "Tiny ERP User"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_application_configuration
+msgid "Configure from Application"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_port:0
+msgid "Database port"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_port:0
+msgid "Put the port for the server. Put 8080 if                 its not clear."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Loaded"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,cube_id:0
+#: field:olap.measure,cube_id:0
+#: field:olap.query.logs,cube_id:0
+#: field:olap.saved.query,cube_id:0
+msgid "Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,available_table_ids:0
+msgid "Available Tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Manually"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,related_to:0
+msgid "Related To"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Olap database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,field_id:0
+msgid "Link Field"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Mark as Configured"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.field:0
+msgid "Olap Application Field"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Comma Seperator (0,000)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,agregator:0
+msgid "Agregator"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Your database structure (Open ERP) has been sucessfully configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_name:0
+msgid "Put here the server address or IP                 Put localhost if its not clear."
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Reload Structure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid "This will Auto Configure Application"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Data Structure"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+#: view:bi.load.db.wizard:0
+#: wizard_button:olap.application.configuration,init,end:0
+#: wizard_button:olap.load.table,init,end:0
+#: view:olap.parameters.config.wizard:0
+#: wizard_button:olap.query.logs.clear,init,end:0
+#: wizard_button:olap.query_builder,exec,end:0
+#: wizard_button:olap.query_builder,ok,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "After having loaded the structure, you will be able to hide/show or rename tables and columns to simplify end-users interface. The following database will be loaded:"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_level_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_level_form
+#: view:olap.level:0
+msgid "Olap Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,loaded:0
+msgid "Loaded"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_name:0
+msgid "Name of the database to be used for analysis."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_login:0
+msgid "Login for the database name specified."
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,dimension_id:0
+#: wizard_field:olap.query_builder,exec,dimension:0
+#: wizard_field:olap.query_builder,ok,dimension:0
+msgid "Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_table
+msgid "Olap application table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid "We will load the complete structure of the database by introspection,      so that you will be able to work on it, and specify a better structure      according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,axis_keys:0
+msgid "Axis Keys"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_log:0
+msgid "Query Logging"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,measure_type:0
+msgid "Measure Type"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,fact_database_id:0
+msgid "Database Id"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_host:0
+msgid "Give hostname to make connection to the database."
+msgstr ""
+
+#. module: olap
+#: field:olap.level,hierarchy_id:0
+msgid "Hierarchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_schema_form
+msgid "Olap Schemas"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,table_id:0
+msgid "Fact table"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "This will Auto Configure Application. This will help to increase the readability of the tables and columns by giving it meaningful and easy to comprehend name. You can hides particular data and columns by reconfiguring the structure option."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_field_form
+msgid "Olap Applicatiion Field"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,query:0
+#: field:olap.saved.query,query:0
+#: view:olap.warehouse.wizard:0
+#: field:olap.warehouse.wizard,query:0
+msgid "Query"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Auto Application Configuration"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency(0000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:bi.load.db.wizard,db_name:0
+#: wizard_field:olap.load.table,init,db_name:0
+msgid "Database Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,measure_ids:0
+msgid "Measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_conf_cube_query_builder
+#: wizard_view:olap.query_builder,exec:0
+#: wizard_view:olap.query_builder,ok:0
+msgid "Query Builder"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,dimension_ids:0
+msgid "Dimensions"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube
+#: view:olap.cube:0
+msgid "Olap cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_warehouse
+#: model:ir.model,name:olap.model_olap_warehouse_wizard
+#: model:ir.ui.menu,name:olap.menu_bi_warehouse
+msgid "Olap Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_field_form
+msgid "Application Field"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_dimension
+#: view:olap.dimension:0
+msgid "Olap dimension"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,name:0
+msgid "Application field name"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection parameters"
+msgstr ""
+
+#. module: olap
+#: field:bi.auto.configure.wizard,name:0
+#: field:bi.load.db.wizard,fact_table:0
+#: wizard_field:olap.load.table,init,fact_table:0
+msgid "Fact Name"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+msgid "Database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.table,table_name:0
+#: field:olap.cube.table,name:0
+#: field:olap.level,table_name:0
+#: field:olap.measure,table_name:0
+msgid "Table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,measure_type:0
+msgid "Select between auto column or sql expression for the measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_column
+msgid "Open Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_columns_form
+#: field:olap.database.tables,columns:0
+msgid "Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_test_connection
+#: view:olap.fact.database:0
+msgid "Test Connection"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_measure_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_measure_form
+msgid "Olap Measures"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,init,configure:0
+#: view:olap.parameters.config.wizard:0
+msgid "Configure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid "After having loaded the structure, you will be able to hide/show or      rename tables and columns to simplify end-users interface. The following database      will be loaded:"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,hierarchy:0
+#: wizard_field:olap.query_builder,ok,hierarchy:0
+msgid "Hiearchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_sql:0
+msgid "SQL Expression"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_menu_olap_load_table
+msgid "Load Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,level_ids:0
+msgid "Levels"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_field
+msgid "Olap application field"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_columns_form
+msgid "Database Columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,active:0
+#: field:olap.database.tables,active:0
+msgid "Active"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Integer"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid " Auto Configure "
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Sum"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query.logs.clear,init,user_name:0
+#: field:olap.saved.query,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,count:0
+msgid "Count"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,name:0
+msgid "End-User Name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency with comma seperator (0,000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,datatype:0
+msgid "Datatype"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,back,ok:0
+#: wizard_button:olap.query_builder,init,ok:0
+msgid "Fetch Data"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency with comma seperator (EUR 0,000.00)"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_ids:0
+msgid "Queries"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "Oracle"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_cubes
+msgid "Olap Cubes"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_table_form
+msgid "Olap Cubes Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,name:0
+msgid "Measure name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+msgid "Socket"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_type:0
+msgid "Connection type"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "count"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_name:0
+msgid "Database name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,type:0
+msgid "Type"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Show"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,back:0
+#: wizard_button:olap.query_builder,ok,back:0
+msgid "Change cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_tables_form
+#: view:olap.cube.table:0
+#: field:olap.cube.table,line_ids:0
+msgid "Database Tables"
+msgstr ""
+
+#. module: olap
+#: help:olap.level,table_name:0
+msgid "The name of the table on which the column is defined. If False, take the table from the hierarchy."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Nothing has been Configured"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,name:0
+msgid "Dimension name"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.load.table,ok,end:0
+msgid "Continue and Configure Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_measure
+#: view:olap.measure:0
+msgid "Olap measure"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,table_id:0
+msgid "Table(s) for cube."
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,measure:0
+#: wizard_field:olap.query_builder,ok,measure:0
+msgid "Measure"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,column_db_name:0
+msgid "Column DBName"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "We Can Start building Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,table_id:0
+msgid "Database Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,name:0
+msgid "Schema name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_my_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_my_form
+#: view:olap.query.logs:0
+msgid "My Logs"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Information"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,back,cube_schema:0
+#: wizard_field:olap.query_builder,init,cube_schema:0
+msgid "Select Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,table_id:0
+msgid "Fact table(s)"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_designer
+msgid "name_menu_url_cube_designer"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_config_bi_parameters
+msgid "Parameters Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Connect to Database"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Database Connected"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,table_name:0
+#: field:olap.application.table,name:0
+msgid "Application table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.hierarchy,table_id:0
+msgid "Table(s) to make hierarchy on the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "General information"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,query:0
+msgid "Application Query"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,query_log:0
+msgid "Enabling  this will log all the queries in the browser"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,mdx_id:0
+msgid "Module"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,is_hidden:0
+#: field:olap.application.table,is_hidden:0
+#: field:olap.database.columns,hide:0
+#: field:olap.database.tables,hide:0
+msgid "Hidden"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,hierarchy_ids:0
+msgid "Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,result_size:0
+msgid "Result Size"
+msgstr ""
+
+#. module: olap
+#: view:olap.application:0
+msgid "Olap Application"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_tables
+msgid "Olap Database Tables"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency (EUR 0000.00)"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Olap cube_table"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "Parameters Configure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_hierarchy
+#: view:olap.hierarchy:0
+msgid "Olap hierarchy"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube_table
+#: model:ir.model,name:olap.model_olap_cube_table_line
+msgid "Olap cube table"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,field_name:0
+msgid "Field name"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_query_logs
+msgid "Olap query logs"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,name:0
+msgid "Fact name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,formatstring:0
+msgid " Let you specify how the measure to be displayed in cube browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_server_parameters
+msgid "Server Parameters"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+#: wizard_button:olap.load.table,init,ok:0
+#: view:olap.schema:0
+msgid "Load Database Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,name:0
+msgid "Level name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,schema_id:0
+#: field:olap.query.logs,schema_id:0
+#: field:olap.saved.query,schema_id:0
+msgid "Schema"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_url:0
+#: field:olap.schema,app_detect:0
+msgid "Connection URL"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,cube_ids:0
+msgid "Cubes"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "ReConfigure Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,field_ids:0
+msgid "Fields"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Average"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Database Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_hierarchy_form
+msgid "Olap Hierarchy"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,cube_table_id:0
+msgid "Cube Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi
+msgid "Businesss Intelligence"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_load_db_wizard
+msgid "bi.load.db.wizard"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_browser
+msgid "name_menu_url_cube_browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_fact_database_form
+msgid "Databases"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,name:0
+msgid "Hierarchy name"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,description:olap.module_meta_information
+msgid "\n"
+"    Base module to manage Olap schemas. Cube designer.\n"
+"    "
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,loaded:0
+msgid "Loading Datastructure"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Table"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "PostgreSQL"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,init:0
+msgid " To Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,sequence:0
+#: field:olap.level,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_tools
+msgid "Tools"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,state:0
+msgid "Schema State"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Float"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_form
+#: view:olap.query.logs:0
+msgid "All Logs"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+#: field:olap.parameters.config.wizard,host_port:0
+msgid "Port"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Fact database"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,shortdesc:olap.module_meta_information
+msgid "olap"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,table_db_name:0
+msgid "Table Name"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Auto Configure"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,configure:0
+msgid "Configuring Datastructure"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_configuration_table
+msgid "Open Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Automatically "
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_clear_logs
+#: model:ir.ui.menu,name:olap.menu_bi_clear_logs
+#: wizard_button:olap.query.logs.clear,init,ok:0
+msgid "Clear Logs"
+msgstr ""
+
diff --git a/addons/olap/i18n/olap.pot b/addons/olap/i18n/olap.pot
new file mode 100644
index 00000000000..0866638abff
--- /dev/null
+++ b/addons/olap/i18n/olap.pot
@@ -0,0 +1,1370 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* olap
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 05:24:42+0000\n"
+"PO-Revision-Date: 2009-11-26 05:24:42+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Hide"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_saved_query_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_saved_query_form
+#: view:olap.saved.query:0
+msgid "Olap Saved Query"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,time:0
+#: field:olap.saved.query,time:0
+msgid "Time"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Configure Structure"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Olap fact database"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,value_sql:0
+msgid "You can provide valid sql expression. Make sure it have function with fully qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) tablename.columnname)"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,schema_id:0
+msgid "Schema id"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,database_id:0
+msgid "Database Connection"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "MySQL"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_password:0
+msgid "Database password"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Olap database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection url"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.table:0
+msgid "Olap Application Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.parameters.config.wizard,host_name:0
+msgid "Server Name"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_password:0
+msgid "Password for the login."
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,application_id:0
+#: field:olap.application.table,application_id:0
+msgid "Application Id"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.todo,note:olap.config_auto_directory
+msgid "This wizard will configure the URL of the web client"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_fact_database_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_fact
+msgid "Fact Databases"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_browser_url
+msgid "Cube Browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_dimension_form
+msgid "Olap Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_columns
+msgid "Olap Database Columns"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "BI Web Client."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_port:0
+msgid " Port to be used in connection"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,primary_key:0
+msgid "Primary Key"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,table_id:0
+msgid "Table Id"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "This wizard will automatically configure the web client for BI."
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,type:0
+msgid "Database type"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query_builder,back:0
+#: wizard_view:olap.query_builder,init:0
+msgid "Cube Fetcher"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+msgid "Your database structure has been correctly loaded"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_parameters_config_wizard
+msgid "Olap Server Parameters"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_table_form
+msgid "Olap Cube Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,formatstring:0
+msgid "Format string"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,exec:0
+#: wizard_button:olap.query_builder,ok,exec:0
+msgid "Execute"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,configure,end:0
+#: wizard_button:olap.fact.database.test_connection,init,end:0
+#: wizard_button:olap.load.table,info,end:0
+#: wizard_button:olap.query.logs.clear,info,end:0
+#: wizard_button:olap.query.logs.clear,ok,end:0
+#: view:olap.warehouse.wizard:0
+msgid "Ok"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_known_application
+msgid "Known Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,level:0
+#: wizard_field:olap.query_builder,ok,level:0
+msgid "Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_id_name:0
+#: field:olap.measure,value_column_id_name:0
+msgid "Column ID"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "We will load the complete structure of the database by introspection, so that you will be able to work on it, and specify a better structure according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_form
+msgid "Olap Applicatiion"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,name:0
+msgid "Query Name"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query:0
+#: wizard_field:olap.query_builder,ok,mdx_query:0
+msgid "MDX Query"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_auto_configure_wizard
+msgid "bi.auto.configure.wizard"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key:0
+msgid "Primary key"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_auto_configure
+msgid "Auto Configuration"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,note:0
+msgid "Schema description"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_load_db_wizard
+msgid "Load database Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_level
+#: view:olap.level:0
+msgid "Olap level"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "None (0000.00)"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_host:0
+msgid "Database host"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_fact_database
+msgid "Olap Fact Database"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Congifuring Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,name:0
+msgid "Application name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,column_link_id:0
+msgid "Relational Column"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,type:0
+msgid "Level class"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,name:0
+msgid "Cube name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_table_form
+msgid "Olap Applicatiion Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_saved_query
+msgid "olap.saved.query"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_name:0
+msgid "Columns Name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_hierarchy_form
+msgid "Olap Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,ready:0
+msgid "Ready"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_column:0
+msgid "Fact Table Column"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_tables_form
+#: field:olap.application,table_ids:0
+#: view:olap.fact.database:0
+#: field:olap.fact.database,table_ids:0
+msgid "Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application
+msgid "Olap application"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Schema is ready to use"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_designer_url
+msgid "Cube Designer"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_login:0
+msgid "Database login"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_table_form
+msgid "Application Table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Logs Cleared successfully"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_schema
+#: model:ir.ui.menu,name:olap.menu_action_olap_schema_form
+#: view:olap.schema:0
+msgid "Olap Schema"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_form
+msgid "Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query_output:0
+#: wizard_field:olap.query_builder,ok,mdx_query_output:0
+msgid "MDX Query Output"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key_table:0
+msgid "Primary key table"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,table_name:0
+msgid "The name of the table on which the column is defined. If False, take the table from the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.warehouse.wizard:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_dimension_form
+msgid "Olap Dimensions"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,user_id:0
+msgid "Tiny ERP User"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_application_configuration
+msgid "Configure from Application"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_port:0
+msgid "Database port"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_port:0
+msgid "Put the port for the server. Put 8080 if                 its not clear."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Loaded"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,cube_id:0
+#: field:olap.measure,cube_id:0
+#: field:olap.query.logs,cube_id:0
+#: field:olap.saved.query,cube_id:0
+msgid "Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,available_table_ids:0
+msgid "Available Tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Manually"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,related_to:0
+msgid "Related To"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Olap database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,field_id:0
+msgid "Link Field"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Mark as Configured"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.field:0
+msgid "Olap Application Field"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Comma Seperator (0,000)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,agregator:0
+msgid "Agregator"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Your database structure (Open ERP) has been sucessfully configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_name:0
+msgid "Put here the server address or IP                 Put localhost if its not clear."
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Reload Structure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid "This will Auto Configure Application"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Data Structure"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+#: view:bi.load.db.wizard:0
+#: wizard_button:olap.application.configuration,init,end:0
+#: wizard_button:olap.load.table,init,end:0
+#: view:olap.parameters.config.wizard:0
+#: wizard_button:olap.query.logs.clear,init,end:0
+#: wizard_button:olap.query_builder,exec,end:0
+#: wizard_button:olap.query_builder,ok,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "After having loaded the structure, you will be able to hide/show or rename tables and columns to simplify end-users interface. The following database will be loaded:"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_level_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_level_form
+#: view:olap.level:0
+msgid "Olap Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,loaded:0
+msgid "Loaded"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_name:0
+msgid "Name of the database to be used for analysis."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_login:0
+msgid "Login for the database name specified."
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,dimension_id:0
+#: wizard_field:olap.query_builder,exec,dimension:0
+#: wizard_field:olap.query_builder,ok,dimension:0
+msgid "Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_table
+msgid "Olap application table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid "We will load the complete structure of the database by introspection,      so that you will be able to work on it, and specify a better structure      according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,axis_keys:0
+msgid "Axis Keys"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_log:0
+msgid "Query Logging"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,measure_type:0
+msgid "Measure Type"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,fact_database_id:0
+msgid "Database Id"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_host:0
+msgid "Give hostname to make connection to the database."
+msgstr ""
+
+#. module: olap
+#: field:olap.level,hierarchy_id:0
+msgid "Hierarchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_schema_form
+msgid "Olap Schemas"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,table_id:0
+msgid "Fact table"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "This will Auto Configure Application. This will help to increase the readability of the tables and columns by giving it meaningful and easy to comprehend name. You can hides particular data and columns by reconfiguring the structure option."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_field_form
+msgid "Olap Applicatiion Field"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,query:0
+#: field:olap.saved.query,query:0
+#: view:olap.warehouse.wizard:0
+#: field:olap.warehouse.wizard,query:0
+msgid "Query"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Auto Application Configuration"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency(0000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:bi.load.db.wizard,db_name:0
+#: wizard_field:olap.load.table,init,db_name:0
+msgid "Database Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,measure_ids:0
+msgid "Measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_conf_cube_query_builder
+#: wizard_view:olap.query_builder,exec:0
+#: wizard_view:olap.query_builder,ok:0
+msgid "Query Builder"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,dimension_ids:0
+msgid "Dimensions"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube
+#: view:olap.cube:0
+msgid "Olap cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_warehouse
+#: model:ir.model,name:olap.model_olap_warehouse_wizard
+#: model:ir.ui.menu,name:olap.menu_bi_warehouse
+msgid "Olap Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_field_form
+msgid "Application Field"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_dimension
+#: view:olap.dimension:0
+msgid "Olap dimension"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,name:0
+msgid "Application field name"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection parameters"
+msgstr ""
+
+#. module: olap
+#: field:bi.auto.configure.wizard,name:0
+#: field:bi.load.db.wizard,fact_table:0
+#: wizard_field:olap.load.table,init,fact_table:0
+msgid "Fact Name"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+msgid "Database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.table,table_name:0
+#: field:olap.cube.table,name:0
+#: field:olap.level,table_name:0
+#: field:olap.measure,table_name:0
+msgid "Table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,measure_type:0
+msgid "Select between auto column or sql expression for the measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_column
+msgid "Open Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_columns_form
+#: field:olap.database.tables,columns:0
+msgid "Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_test_connection
+#: view:olap.fact.database:0
+msgid "Test Connection"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_measure_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_measure_form
+msgid "Olap Measures"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,init,configure:0
+#: view:olap.parameters.config.wizard:0
+msgid "Configure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid "After having loaded the structure, you will be able to hide/show or      rename tables and columns to simplify end-users interface. The following database      will be loaded:"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,hierarchy:0
+#: wizard_field:olap.query_builder,ok,hierarchy:0
+msgid "Hiearchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_sql:0
+msgid "SQL Expression"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_menu_olap_load_table
+msgid "Load Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,level_ids:0
+msgid "Levels"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_field
+msgid "Olap application field"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_columns_form
+msgid "Database Columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,active:0
+#: field:olap.database.tables,active:0
+msgid "Active"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Integer"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid " Auto Configure "
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Sum"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query.logs.clear,init,user_name:0
+#: field:olap.saved.query,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,count:0
+msgid "Count"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,name:0
+msgid "End-User Name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency with comma seperator (0,000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,datatype:0
+msgid "Datatype"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,back,ok:0
+#: wizard_button:olap.query_builder,init,ok:0
+msgid "Fetch Data"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency with comma seperator (EUR 0,000.00)"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_ids:0
+msgid "Queries"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "Oracle"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_cubes
+msgid "Olap Cubes"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_table_form
+msgid "Olap Cubes Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,name:0
+msgid "Measure name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+msgid "Socket"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_type:0
+msgid "Connection type"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "count"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_name:0
+msgid "Database name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,type:0
+msgid "Type"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Show"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,back:0
+#: wizard_button:olap.query_builder,ok,back:0
+msgid "Change cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_tables_form
+#: view:olap.cube.table:0
+#: field:olap.cube.table,line_ids:0
+msgid "Database Tables"
+msgstr ""
+
+#. module: olap
+#: help:olap.level,table_name:0
+msgid "The name of the table on which the column is defined. If False, take the table from the hierarchy."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Nothing has been Configured"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,name:0
+msgid "Dimension name"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.load.table,ok,end:0
+msgid "Continue and Configure Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_measure
+#: view:olap.measure:0
+msgid "Olap measure"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,table_id:0
+msgid "Table(s) for cube."
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,measure:0
+#: wizard_field:olap.query_builder,ok,measure:0
+msgid "Measure"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,column_db_name:0
+msgid "Column DBName"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "We Can Start building Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,table_id:0
+msgid "Database Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,name:0
+msgid "Schema name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_my_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_my_form
+#: view:olap.query.logs:0
+msgid "My Logs"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Information"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,back,cube_schema:0
+#: wizard_field:olap.query_builder,init,cube_schema:0
+msgid "Select Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,table_id:0
+msgid "Fact table(s)"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_designer
+msgid "name_menu_url_cube_designer"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_config_bi_parameters
+msgid "Parameters Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Connect to Database"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Database Connected"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,table_name:0
+#: field:olap.application.table,name:0
+msgid "Application table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.hierarchy,table_id:0
+msgid "Table(s) to make hierarchy on the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "General information"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,query:0
+msgid "Application Query"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,query_log:0
+msgid "Enabling  this will log all the queries in the browser"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,mdx_id:0
+msgid "Module"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,is_hidden:0
+#: field:olap.application.table,is_hidden:0
+#: field:olap.database.columns,hide:0
+#: field:olap.database.tables,hide:0
+msgid "Hidden"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,hierarchy_ids:0
+msgid "Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,result_size:0
+msgid "Result Size"
+msgstr ""
+
+#. module: olap
+#: view:olap.application:0
+msgid "Olap Application"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_tables
+msgid "Olap Database Tables"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency (EUR 0000.00)"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Olap cube_table"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "Parameters Configure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_hierarchy
+#: view:olap.hierarchy:0
+msgid "Olap hierarchy"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube_table
+#: model:ir.model,name:olap.model_olap_cube_table_line
+msgid "Olap cube table"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,field_name:0
+msgid "Field name"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_query_logs
+msgid "Olap query logs"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,name:0
+msgid "Fact name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,formatstring:0
+msgid " Let you specify how the measure to be displayed in cube browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_server_parameters
+msgid "Server Parameters"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+#: wizard_button:olap.load.table,init,ok:0
+#: view:olap.schema:0
+msgid "Load Database Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,name:0
+msgid "Level name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,schema_id:0
+#: field:olap.query.logs,schema_id:0
+#: field:olap.saved.query,schema_id:0
+msgid "Schema"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_url:0
+#: field:olap.schema,app_detect:0
+msgid "Connection URL"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,cube_ids:0
+msgid "Cubes"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "ReConfigure Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,field_ids:0
+msgid "Fields"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Average"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Database Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_hierarchy_form
+msgid "Olap Hierarchy"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,cube_table_id:0
+msgid "Cube Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi
+msgid "Businesss Intelligence"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_load_db_wizard
+msgid "bi.load.db.wizard"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_browser
+msgid "name_menu_url_cube_browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_fact_database_form
+msgid "Databases"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,name:0
+msgid "Hierarchy name"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,description:olap.module_meta_information
+msgid "\n"
+"    Base module to manage Olap schemas. Cube designer.\n"
+"    "
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,loaded:0
+msgid "Loading Datastructure"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Table"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "PostgreSQL"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,init:0
+msgid " To Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,sequence:0
+#: field:olap.level,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_tools
+msgid "Tools"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,state:0
+msgid "Schema State"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Float"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_form
+#: view:olap.query.logs:0
+msgid "All Logs"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+#: field:olap.parameters.config.wizard,host_port:0
+msgid "Port"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Fact database"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,shortdesc:olap.module_meta_information
+msgid "olap"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,table_db_name:0
+msgid "Table Name"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Auto Configure"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,configure:0
+msgid "Configuring Datastructure"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_configuration_table
+msgid "Open Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Automatically "
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_clear_logs
+#: model:ir.ui.menu,name:olap.menu_bi_clear_logs
+#: wizard_button:olap.query.logs.clear,init,ok:0
+msgid "Clear Logs"
+msgstr ""
+
diff --git a/addons/olap/olap.py b/addons/olap/olap.py
new file mode 100644
index 00000000000..349d204086f
--- /dev/null
+++ b/addons/olap/olap.py
@@ -0,0 +1,1718 @@
+##############################################################################
+#
+# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import psycopg2
+import sqlalchemy
+import time
+from pyparsing import *
+
+import wizard
+import pooler
+from osv import osv
+from osv import fields,osv
+import netsvc
+import cube
+from cube import levels
+
+
+class olap_fact_database(osv.osv):
+    _name = "olap.fact.database"
+    _description = "Olap Fact Database"
+
+
+
+    def _connection_get(self,cr,uid,ids,field_name,arg,context = {}):
+        """
+            Return a connection string url needed by SQL Alchemy. Exemple:
+            'postgres://scott:tiger@localhost:5432/mydatabase'
+        """
+        res = {}
+        for obj in self.browse(cr,uid,ids,context):
+            res[obj.id] = '%s://%s:%s@%s:%d/%s' % (obj.type,obj.db_login,obj.db_password,obj.db_host,obj.db_port,obj.db_name)
+        return res
+
+    def test_connection(self,cr,uid,ids,context = {}):
+        try:
+            self_obj = self.browse(cr,uid,ids,context)
+            for obj in self_obj:
+                host = obj.db_host
+                port = obj.db_port
+                db_name = obj.db_name
+                user = obj.db_login
+                password = obj.db_password
+                type = obj.type
+                if type == 'postgres':
+                    tdb = psycopg2.connect('host=%s port=%s dbname=%s user=%s password=%s' % (host,port,db_name,user,password))
+                elif type == 'mysql':
+                    try:
+                        import MySQLdb
+                        tdb = MySQLdb.connect(host = host,port = port,db = db,user = user,passwd = passwd)
+
+                    except Exception,e:
+                        raise osv.except_osv('Error (MySQLdb) : ',e)
+                elif type == 'oracle':
+                    try:
+                        import cx_Oracle
+                        tdb = cx_Oracle.connect(user,password,host)
+
+                    except Exception,e:
+                        raise osv.except_osv('Error (cx_Oracle) : ',e)
+
+        except Exception,e:
+            raise osv.except_osv('BI Error !',e)
+
+        return True
+
+    _columns = {
+        'name': fields.char('Fact name',size = 64,required = True),
+        'db_name': fields.char('Database name',size = 64,required = True , help = "Name of the database to be used for analysis."),
+        'db_login': fields.char('Database login',size = 64,required = True, help = "Login for the database name specified."),
+        'db_password': fields.char('Database password',size = 64,invisible = True,required = True, help = "Password for the login."),
+        'db_host': fields.char('Database host',size = 64,required = True , help= "Give hostname to make connection to the database."),
+        'db_port': fields.integer('Database port',required = True, help = " Port to be used in connection"),
+        'type': fields.selection([('mysql','MySQL' ),('postgres','PostgreSQL' ),('oracle','Oracle' )],'Database type',required = True ),
+        'connection_type': fields.selection([('socket','Socket' ),('port','Port' )],'Connection type',required = True ),
+        'connection_url': fields.function(_connection_get,method = True,type = 'char',string = 'Connection URL',size = 128 ),
+        'table_ids': fields.one2many('olap.database.tables','fact_database_id','Tables' ),
+        'loaded': fields.boolean('Loaded',readonly = True ),
+    }
+    _defaults = {
+        'type': lambda * args: 'postgres',
+        'connection_type': lambda * args: 'port',
+        'db_host': lambda * args: 'localhost',
+        'db_name': lambda * args: 'terp',
+        'db_port': lambda * args: '5432',
+        'loaded' : lambda * args: False,
+    }
+olap_fact_database()
+
+class olap_schema(osv.osv ):
+    _name = "olap.schema"
+    _description = "Olap Schema"
+
+    def _app_detect(self,cr,uid,ids,field_name,arg,context = {}):
+        """
+            Return a Application type
+        """
+        res = {}
+
+        for obj in self.browse(cr,uid,ids,context):
+            if obj.database_id.type == 'postgres':
+                e = sqlalchemy.create_engine(obj.database_id.connection_url)
+                app_objs = self.pool.get('olap.application')
+                app_ids = app_objs.search(cr,uid,[] )
+                app_res = app_objs.browse(cr,uid,app_ids)
+                for app_obj in app_res:
+                    try:
+                        result = e.execute(app_obj.query)
+                        if result:
+                            res[obj.id] = app_obj.name + ' Application'
+                        continue
+                    except:
+                        continue
+                if not res.has_key(obj.id):
+                    res[obj.id] = "Unknown Application"
+            else:
+                res[obj.id] = "Unknown Application"
+        return res
+
+    _columns = {
+        'name': fields.char('Schema name',size = 64,required = True),
+        'note': fields.text('Schema description' ),
+        'cube_ids': fields.one2many('olap.cube','schema_id','Cubes'),
+        'database_id': fields.many2one('olap.fact.database','Database Connection',required = True),
+        'loaded': fields.boolean('Loading Datastructure',readonly = True),
+        'configure': fields.boolean('Configuring Datastructure',readonly = True),
+        'ready': fields.boolean('Ready',readonly = True),
+        'state': fields.selection([
+            ('none','Nothing has been Configured'),
+            ('dbconnect','Database Connected' ),
+            ('dbload','The Structure is Loaded'),
+            ('dbconfigure','The Structure is Configured.'),
+            ('dbready','Schema is ready to use'),
+            ('done','We Can Start building Cube'),
+            ],'Schema State',readonly = True),
+        'app_detect': fields.function(_app_detect,method = True,type = 'char',string = 'Connection URL',size = 128),
+
+    }
+    _defaults = {
+        'loaded' : lambda * args: False,
+        'state': lambda * a: 'none',
+        'configure': lambda * a: False,
+        'ready': lambda * a: False
+        }
+
+    def action_dbconnect(self,cr,uid,ids,context = {}):
+        schema = self.browse(cr,uid,ids,context)[0]
+        type = schema.database_id.type
+        maxconn = 64
+        try:
+            if type == 'postgres':
+                host = schema.database_id.db_host and "host=%s" % schema.database_id.db_host or ''
+                port = schema.database_id.db_port and "port=%s" % schema.database_id.db_port or ''
+                name = schema.database_id.db_name and "dbname=%s" % schema.database_id.db_name or ''
+                user = schema.database_id.db_login and "user=%s" % schema.database_id.db_login or ''
+                password = schema.database_id.db_password and "password=%s" % schema.database_id.db_password or ''
+                tdb = psycopg2.connect('%s %s %s %s %s' % (host,port,name,user,password))
+
+            elif type == 'mysql':
+                try:
+                    import MySQLdb
+                    host = schema.database_id.db_host or ''
+                    port = schema.database_id.db_port or ''
+                    db = schema.database_id.db_name or ''
+                    user = schema.database_id.db_login or ''
+                    passwd = schema.database_id.db_password or ''
+                    tdb = MySQLdb.connect(host = host,port = port,db = db,user = user,passwd = passwd)
+                except Exception,e:
+                    raise osv.except_osv('Error (MySQLdb) : ',e)
+
+            elif type == 'oracle':
+                try:
+                    import cx_Oracle
+                    host = schema.database_id.db_host or ''
+                    port = schema.database_id.db_port or ''
+                    db = schema.database_id.db_name or ''
+                    user = schema.database_id.db_name.upper() or ''
+                    password = int(schema.database_id.db_password) or ''
+                    tdb = cx_Oracle.connect(user,password,host)
+                except Exception,e:
+                    raise osv.except_osv('Error (cx_Oracle) : ',e)
+
+            for id in ids:
+                self.write(cr,uid,id,{'state':'dbconnect'})
+        except Exception,e:
+
+            raise osv.except_osv('BI Error !',e)
+
+        return True
+
+    def action_dbload(self,cr,uid,ids,context = {}):
+        for id in ids:
+            id_change = self.browse(cr,uid,id)
+            self.write(cr,uid,id,{'loaded':True})
+            self.write(cr,uid,id,{'state':'dbload'})
+        return True
+
+
+    def action_dbconfigure(self,cr,uid,ids,context = {}):
+        for id in ids:
+            id_browsed = self.browse(cr,uid,id)
+            if not id_browsed.state == 'dbconfigure':
+                self.write(cr,uid,id,{'state':'dbconfigure'})
+                self.write(cr,uid,id,{'configure':True})
+        return True
+
+    def action_dbready(self,cr,uid,ids,context = {}):
+        for id in ids:
+            self.write(cr,uid,id,{'ready':True})
+            self.write(cr,uid,id,{'state':'done'})
+        return True
+
+    def action_done(self,cr,uid,ids,context = {}):
+        for id in ids:
+            self.write(cr,uid,id,{'state':'done'})
+        return True
+
+    def create_xml_schema(self,cr,uid,xml_schema,context = {}):
+        """
+            This function fill in the database according to a XML schema.
+            Exemple of schema:
+            <Schema>
+            <Cube name="Sales">
+                <Table name="sales_fact_1997"/>
+                <Dimension name="Gender" foreignKey="customer_id">
+                    <Hierarchy hasAll="true" allMemberName="All Genders" primaryKey="customer_id">
+                        <Table name="customer"/>
+                        <Level name="Gender" column="gender" uniqueMembers="true"/>
+                    </Hierarchy>
+                </Dimension>
+                <Dimension name="Time" foreignKey="time_id">
+                    <Hierarchy hasAll="false" primaryKey="time_id">
+                        <Table name="time_by_day"/>
+                        <Level name="Year" column="the_year" type="Numeric" uniqueMembers="true"/>
+                        <Level name="Quarter" column="quarter" uniqueMembers="false"/>
+                        <Level name="Month" column="month_of_year" type="Numeric" uniqueMembers="false"/>
+                    </Hierarchy>
+                </Dimension>
+                <Measure name="Store Sales" column="store_sales" aggregator="sum" formatString="#,###.##"/>
+                <Measure name="Store Cost" column="store_cost" aggregator="sum" formatString="#,###.00"/>
+                <CalculatedMember name="Profit" dimension="Measures" formula="[Measures].
+                    [Store Sales]-[Measures].[Store Cost]">
+                    <CalculatedMemberProperty name="FORMAT_STRING" value="$#,##0.00"/>
+                </CalculatedMember>
+            </Cube>
+            </Schema
+        """
+        raise 'Not implemented !'
+
+    def request(self,cr,uid,name,request,context = {}):
+        ids = self.search(cr,uid,[('name','=',name)])
+        if not len(ids):
+            raise 'Schema not found !'
+        schema = self.browse(cr,uid,ids[0],context)
+#        warehouse = cube.warehouse()
+#        find_table = warehouse.match_table(cr, uid, request, context)
+        print 'Parsing MDX...'
+        print '\t',request
+        mdx_parser = cube.mdx_parser()
+        mdx = mdx_parser.parse(request)
+
+        print 'Validating MDX...'
+        mdx.preprocess()
+        validate,cubex = mdx.validate(schema)
+
+        print 'Running MDX...'
+        res_comp = self.pool.get('res.company').search(cr,uid,([]))
+        res_comp = self.pool.get('res.company').browse(cr,uid,res_comp)
+        currency = res_comp[0].currency_id.name
+        print " Default Currency",currency
+        data = mdx.run(currency)
+#        qry_obj = self.pool.get('olap.query.logs')
+#        qry_id = qry_obj.search(cr, uid, [('query','=', request)])
+#        
+#        flag = True
+#        if qry_id:
+#            qry = qry_obj.browse(cr, uid, qry_id)[0]
+#            
+#            if qry.count >=3 and qry.table_name!='':
+#                data = warehouse.run(currency, qry)
+#                flag = False
+#                qry.count = qry.count +1
+#                qry_obj.write(cr, uid, qry_id, {'count': qry.count})
+#            else:
+#                data = mdx.run(currency)
+#        else:
+#            data = mdx.run(currency)
+        print 'Running Done...'
+        print 'Formatting Output...'
+#        if cubex.query_log and flag:
+        if cubex.query_log:
+            log = context.get('log')
+            if log:
+                connection = schema.database_id.connection_url
+#                warehouse.log(cr,uid,cubex,request,data,connection,context)
+                mdx.log(cr,uid,cubex,request,context)
+        return cube.mdx_output(data)
+olap_schema()
+
+class olap_database_tables(osv.osv):
+    _name = "olap.database.tables"
+    _description = "Olap Database Tables"
+    _columns = {
+        'table_db_name': fields.char('Table Name',size = 64,required = True,readonly = True),
+        'name': fields.char('End-User Name',size = 64,required = True),
+        'columns': fields.one2many('olap.database.columns','table_id','Columns'),
+        'fact_database_id': fields.many2one('olap.fact.database','Database Id',required = True,ondelete = 'cascade',readonly = True),
+        'active': fields.boolean('Active'),
+        'hide': fields.boolean('Hidden'),
+    }
+    _defaults = {
+        'active': lambda * args: True,
+        'hide': lambda * args: False
+    }
+    def name_get(self,cr,uid,ids,context = {}):
+        result = []
+        for t in self.browse(cr,uid,ids,context):
+            if t.name <> t.table_db_name:
+                result.append((t.id,t.name + ' (' + t.table_db_name + ')'))
+            else:
+                result.append((t.id,t.name))
+        return result
+
+    def show_col_view(self,cr,uid,ids,context = {}):
+        ids_cols = self.pool.get('olap.database.columns').search(cr,uid,([('table_id','=',ids[0])]))
+        id = self.pool.get('ir.ui.view').search(cr,uid,([('name','=','olap.database.columns.tree')]),context = {})[0]
+        return {
+            'domain': "[('id','in', [" + ','.join(map(str,ids_cols)) + "])]",
+            'name': 'Database Columns',
+            'view_type': 'form',
+            'view_mode': 'tree',
+            'res_model': 'olap.database.columns',
+            'views': [(id,'tree'),(False,'form')],
+            'type': 'ir.actions.act_window',
+        }
+
+    def hide_col(self,cr,uid,ids,context = {}):
+        # To hide all the related columns also
+        for id in ids:
+             self.write(cr,uid,id,{'hide':True})
+        return {}
+
+    def show_col(self,cr,uid,ids,context = {}):
+        # To show or unhide all the columns also
+        for id in ids:
+             self.write(cr,uid,id,{'hide':False})
+        return {}
+
+
+olap_database_tables()
+
+class olap_database_columns(osv.osv):
+    _name = "olap.database.columns"
+    _description = "Olap Database Columns"
+    datatypes = {
+        'timestamp': 'TimeStamp without Time Zone',
+        'timestampz': 'TimeStamp with Time Zone',
+        'numeric': 'Numeric',
+        'int': 'Integer',
+        'float8': 'Double Precesion',
+        'varchar': 'Character Varying',
+        'bool': 'Boolean',
+        'bytea':'Byte A',
+        'int2':'Small Integer',
+        'int4':'Integer',
+        'int8':'Big Integer',
+        'text':'Text',
+        'date':'Date',
+        'time': 'TimeStamp without Time Zone',
+    'number':'NUMBER',
+    }
+    def _datatypes_get(self,*args,**argv):
+        return self.datatypes.items()
+    _columns = {
+        'column_db_name': fields.char('Column DBName',size = 64,required = True,readonly = True),
+        'name': fields.char('Column Name',size = 64,required = True),
+        'table_id': fields.many2one('olap.database.tables','Table Id',required = True,ondelete = 'cascade',select = True,readonly = True),
+        'primary_key': fields.boolean('Primary Key'),
+        'type': fields.selection(_datatypes_get,'Type',size = 64,required = True,readonly = True),
+        'related_to': fields.many2one('olap.database.tables','Related To',required = False,readonly = True),
+        'active': fields.boolean('Active'),
+        'hide': fields.boolean('Hidden'),
+    }
+    _defaults = {
+        'hide': lambda * args: False,
+        'active': lambda * args: True,
+        'primary_key': lambda * args: False,
+    }
+    def name_get(self,cr,uid,ids,context = {}):
+        result = []
+        for t in self.browse(cr,uid,ids,context):
+            if t.name <> t.column_db_name:
+                result.append((t.id,t.table_id.table_db_name + ' (' + t.name + ')'))
+            else:
+                result.append((t.id,t.table_id.table_db_name + ' (' + t.name + ')'))
+        return result
+
+
+    def search(self,cr,uid,args,offset = 0,limit = None,order = None,
+            context = None,count = False):
+        if not context:
+            return super(olap_database_columns,self).search(cr,uid,args,offset,limit,
+                    order,context = context,count = count)
+        col_pool = self.pool.get('olap.database.columns')
+        if context and context.has_key('fk') and context['fk']:
+            if context.has_key('dim_x') and context['dim_x']:
+                dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['dim_x']))
+                make_ids = []
+                make_ids.append(dim_obj.cube_id.table_id.column_link_id.table_id.id)
+
+                for lines in  dim_obj.cube_id.table_id.line_ids:
+                    make_ids.append(lines.field_id.related_to.id)
+                    make_ids.append(lines.field_id.table_id.id)
+                args = [('table_id','in',make_ids),('related_to','<>',False),('hide','<>',True),('active','<>',False)]
+                return super(olap_database_columns,self).search(cr,uid,args,offset,limit,order,context = context,count = count)
+
+        if args and context and context.has_key('flag') and context['flag']:
+            ids = args[0][2][0][2]
+
+            if ids:
+                col_obj = col_pool.browse(cr,uid,ids)
+                make_ids = []
+                for lines in col_obj:
+                    make_ids.append(lines.related_to.id)
+                link_id = col_pool.browse(cr,uid,int(context['link_col']))
+                make_ids.append(link_id.table_id.id)
+                args = ['|',('table_id','in',make_ids),('related_to','in',make_ids),('primary_key','<>',True),('hide','<>',True),('active','<>',False)]
+                ids = super(olap_database_columns,self).search(cr,uid,args,offset,limit,order,context = context,count = count)
+                return ids
+            elif context and context.has_key('master_dim') and context['master_dim']:
+                make_ids = []
+                col_obj = col_pool.browse(cr,uid,int(context['link_col']))
+                args = ['|',('table_id','=',col_obj.related_to.id),('related_to','=',col_obj.table_id.id),('hide','<>',True),('active','<>',False)]
+                return  super(olap_database_columns,self).search(cr,uid,args,offset,limit,order,context = context,count = count)
+            else:
+                col = col_pool.browse(cr,uid,int(context['link_col']))
+                base_table = col.table_id
+                args = ['|',('table_id','=',base_table.id),('related_to','=',base_table.id),('hide','<>',True),('active','<>',False)]
+                return super(olap_database_columns,self).search(cr,uid,args,offset,limit,order,context = context,count = count)
+
+
+        if context and context.has_key('filter_cols_cube'):
+            cube_obj = self.pool.get('olap.cube').browse(cr,uid,int(context['filter_cols_cube']))
+            make_ids = []
+            make_ids.append(cube_obj.table_id.column_link_id.related_to.id)
+            for lines in cube_obj.table_id.line_ids:
+                make_ids.append(lines.table_id.id)
+            if make_ids:
+                make_ids.append(cube_obj.table_id.line_ids[len(cube_obj.table_id.line_ids) - 1].field_id.related_to.id)
+                args = [('table_id','in',make_ids),('related_to','=',False),('primary_key','<>',True),('type','not in',['date','timestamp','timestampz','time']),('hide','<>',True),('active','<>',False)]
+                ids = super(olap_database_columns,self).search(cr,uid,args,offset,limit,
+                    order,context = context,count = count)
+                return ids
+
+        elif context and context.has_key('filter_cols_hier'):
+            hier_obj = self.pool.get('olap.hierarchy').browse(cr,uid,int(context['filter_cols_hier']))
+            make_ids = []
+            if hier_obj.table_id.line_ids:
+                for lines in hier_obj.table_id.line_ids:
+                    make_ids.append(lines.field_id.related_to.id)
+
+                if make_ids:
+                    make_ids.append(hier_obj.table_id.column_link_id.related_to.id)
+                    make_ids.append(hier_obj.table_id.column_link_id.table_id.id)
+                    args = [('table_id','in',make_ids),('hide','<>',True),('active','<>',False)]
+                    ids = super(olap_database_columns,self).search(cr,uid,args,offset,limit,
+                        order,context = context,count = count)
+                    return ids
+            else:
+                args = [('table_id','=',hier_obj.table_id.column_link_id.related_to.id)]
+                ids = super(olap_database_columns,self).search(cr,uid,args,offset,limit,
+                        order,context = context,count = count)
+                return ids
+        elif context and context.has_key('fk') and context['fk']:
+            args = [('primary_key','=',True),('hide','<>',True),('active','<>',False)]
+
+        else:
+            if context and context.has_key('master_dim') and context['master_dim']:
+                dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['master_dim']))
+                lines = dim_obj.cube_id.table_id.line_ids
+                table_ids = []
+                for line in lines:
+                    table_ids.append(line.table_id.id)
+                args = [('table_id','in',table_ids),('related_to','<>',False),('hide','<>',True),('active','<>',False)]
+            elif context and context.has_key('master_schema') and context['master_schema']:
+                    args = [('primary_key','=','True')]
+        return super(olap_database_columns,self).search(cr,uid,args,offset,limit,
+                    order,context = context,count = count)
+
+
+    def hide_col(self,cr,uid,ids,context = {}):
+        for id in ids:
+             self.write(cr,uid,id,{'hide':True})
+        return {}
+
+    def show_col(self,cr,uid,ids,context = {}):
+        for id in ids:
+             self.write(cr,uid,id,{'hide':True})
+        return {}
+
+    def field_add(self,cr,uid,ids,context = {}):
+        col_data = self.pool.get('olap.database.columns').read(cr,uid,ids,[],context)[0]
+        ctx_list = []
+        if col_data['related_to']:
+            table_id = col_data['related_to'][0]
+        else:
+            table_id = col_data['table_id'][0]
+        if context['parent_id']:
+            parent_id = context['parent_id']
+            val = {
+            'cube_table_id':parent_id,
+            'table_id':table_id,
+            'field_id':ids[0]
+            }
+            id = self.pool.get('olap.cube.table.line').create(cr,uid,val,context)
+        else:
+            parent_id = self.pool.get('olap.cube.table').create(cr,uid,{'name':col_data['table_id'][1]},context)
+            ctx_list = [('client','web'),('app','bi'),('id',parent_id)]
+        return ctx_list
+
+    def make_hierarchy(self,cr,uid,ids,context = {}):
+        col_data = self.pool.get('olap.database.columns').read(cr,uid,ids,[],context)[0]
+        ctx_list = []
+        if context and context.has_key('hier_parent_id')and context['hier_parent_id']:
+            hier_obj = self.pool.get('olap.hierarchy').browse(cr,uid,context['hier_parent_id'])
+            pk_table = hier_obj.table_id.name
+        elif context and context.has_key('hier_parent_table'):
+            cube_table_obj = self.pool.get('olap.cube.table').browse(cr,uid,context['hier_parent_table'])
+            pk_table = cube_table_obj.name
+        val = {
+             'field_name':col_data['name'],
+             'name':col_data['name'],
+             'primary_key_table':pk_table
+        }
+        if context['hier_parent_id']:
+            id = self.pool.get('olap.hierarchy').write(cr,uid,context['hier_parent_id'],val,context)
+        else:
+            if context['parent_name']: val['name'] = context['parent_name']
+            if context['parent_dimension'] :val['dimension_id'] = context['parent_dimension']
+            if context['hier_parent_table'] : val['table_id'] = context['hier_parent_table']
+            if context['parent_field_name'] : val['field_name'] = context['parent_field_name']
+            if context['parent_level'] : val['level_ids'] = conext['parent_level']
+            if context['parent_member_all']: val['member_all'] = context['parent_member_all']
+            if context['parent_member_default'] : val['member_default'] = context['parent_member_default']
+            if context['parent_type']: val['type'] = context['parent_type']
+            val['primary_key_table'] = col_data['table_id'][1]
+            id = self.pool.get('olap.hierarchy').create(cr,uid,val,context)
+            ctx_list = [('client','web'),('app','bi'),('id',id)]
+        return ctx_list
+
+olap_database_columns()
+
+class olap_cube_table(osv.osv):
+    _name = "olap.cube.table"
+    _description = "Olap cube table"
+
+    def write(self,cr,uid,ids,vals,context = None):
+        if vals and vals.get('available_table_ids',0) and context and (context.has_key('master_dim') or context.has_key('d_id') or context.has_key('parent_schema_id')):
+            new_fields = vals['available_table_ids'][0][2]
+            final = []
+            for data in self.browse(cr,uid,ids):
+                orignal_lines = []
+                for line in data.line_ids:
+                    orignal_lines.append(line.id)
+
+                orignal_fields = []
+                for line in data.line_ids:
+                    orignal_fields.append(line.field_id.id)
+                if len(orignal_fields) < len(new_fields):
+                    if new_fields[:len(orignal_fields)] == orignal_fields:
+                        new_fields = new_fields[len(orignal_fields):]
+                        cols_obj = self.pool.get('olap.database.columns').browse(cr,uid,new_fields)
+                        val = {}
+                        val['cube_table_id'] = ids[0]
+                        for col in cols_obj:
+                            val['table_id'] = col.table_id.id
+                            val['field_id'] = col.id
+                        id = self.pool.get('olap.cube.table.line').create(cr,uid,val,context = context)
+                    else:
+                        cols_obj = self.pool.get('olap.database.columns').unlink(cr,uid,orignal_lines)
+                        cols_obj = self.pool.get('olap.database.columns').browse(cr,uid,new_fields)
+                        val = {}
+                        val['cube_table_id'] = ids[0]
+                        for col in cols_obj:
+                            val['table_id'] = col.table_id.id
+                            val['field_id'] = col.id
+                        id = self.pool.get('olap.cube.table.line').create(cr,uid,val,context = context)
+
+                elif len(orignal_fields) > len(new_fields):
+                    if orignal_fields[:len(new_fields)] == new_fields:
+                        remove_id = orignal_lines[len(new_fields):]
+                        id = self.pool.get('olap.cube.table.line').unlink(cr,uid,remove_id,context = context)
+                    else:
+                        val = {}
+                        id = self.pool.get('olap.cube.table.line').unlink(cr,uid,orignal_lines ,context = context)
+                        cols_obj = self.pool.get('olap.database.columns').browse(cr,uid,new_fields)
+                        val = {}
+                        val['cube_table_id'] = ids[0]
+                        for col in cols_obj:
+                            val['table_id'] = col.table_id.id
+                            val['field_id'] = col.id
+                        id = self.pool.get('olap.cube.table.line').create(cr,uid,val,context = context)
+            return  super(olap_cube_table,self).write(cr,uid,ids,vals,context)
+
+    def create(self,cr,uid,vals,context = None):
+        cube_table_id = super(olap_cube_table,self).create(cr,uid,vals,context)
+        if vals and vals.get('available_table_ids',0) and context and (context.has_key('d_id') or context.has_key('parent_schema_id') or context.has_key('master_dim') or context.has_key('d_id')):
+            lines_ids = vals['available_table_ids'][0][2]
+            cols_obj = self.pool.get('olap.database.columns').browse(cr,uid,lines_ids)
+            val = {}
+            val['cube_table_id'] = cube_table_id
+            for col in cols_obj:
+                val['table_id'] = col.table_id.id
+                val['field_id'] = col.id
+                id = self.pool.get('olap.cube.table.line').create(cr,uid,val,context = context)
+        return cube_table_id
+
+    def search(self,cr,uid,args,offset = 0,limit = None,order = None,
+            context = None,count = False):
+        if context and context.has_key('parent_schema_id'):
+            args = [('schema_id','=',context['parent_schema_id'])]
+        if context and context.has_key('d_id'):
+            dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['d_id']))
+            args = [('schema_id','=',dim_obj.cube_id.schema_id.id)]
+        return super(olap_cube_table,self).search(cr,uid,args,offset,limit,order,context = context,count = count)
+
+    def _available_table_get(self,cr,uid,ids,name,arg,context = None):
+        result = {}
+        parent_table_id = []
+        parent_table_ids = []
+        field_obj = self.pool.get('olap.database.columns')
+        for table in self.browse(cr,uid,ids,context):
+            if table.line_ids:
+                ids = []
+                ids = map(lambda x: x.field_id.id,table.line_ids)
+                result[table.id] = ids
+            else:
+                result[table.id] = []
+        return result
+
+    def _set_schema(self,cr,uid,context = {}):
+        if context and context.has_key('d_id'):
+            dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['d_id']))
+            return dim_obj.cube_id.schema_id.id
+        if context and context.has_key('parent_schema_id'):
+            return context['parent_schema_id']
+
+    def _set_name(self,cr,uid,context = {}):
+        if context and context.has_key('d_id'):
+            dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['d_id']))
+            return dim_obj.cubeAid.table_id.name
+
+    def _get_id(self,cr,uid,ids,context = {}):
+        if context and context.has_key('d_id'):
+            dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['d_id']))
+            table_id = self.pool.get('olap.database.tables').search(cr,uid,[('table_db_name','in',[dim_obj.cube_id.table_id.name]),('fact_database_id','=',dim_obj.cube_id.schema_id.database_id.id)])
+            col_ids = self.pool.get('olap.database.columns').search(cr,uid,[('table_id','in',table_id),('hide','<>',True),('related_to','<>',False)])
+        else:
+            col_ids = self.pool.get('olap.database.columns').search(cr,uid,[('primary_key','=',True),('hide','<>',True)])
+        return col_ids
+
+    def _def_set(self,cr,uid,context = {}):
+        return []
+
+    _columns = {
+        'name': fields.char('Table name',size = 64,required = True),
+        'line_ids': fields.one2many('olap.cube.table.line','cube_table_id','Database Tables',required = True),
+        'schema_id':fields.many2one('olap.schema','Schema id',ondelete = 'cascade'),
+        'column_link_id':fields.many2one('olap.database.columns','Relational Column' ,required = True),
+        'available_table_ids': fields.function(
+            _available_table_get,
+            method = True,
+            relation = 'olap.database.columns',
+            string = 'Available Tables',
+            type = "many2many"
+       ),
+    }
+    _defaults = {
+        'schema_id':_set_schema,
+    }
+    def field_add(self,cr,uid,ids,context = {}):
+        return {}
+olap_cube_table()
+
+class olap_cube_table_line(osv.osv):
+    _name = "olap.cube.table.line"
+    _description = "Olap cube table"
+    _rec_name = 'table_id'
+    _columns = {
+        'cube_table_id': fields.many2one('olap.cube.table','Cube Table',required = True,ondelete = 'cascade'),
+        'table_id': fields.many2one('olap.database.tables','Database Table',required = True,ondelete = 'cascade'),
+        'field_id': fields.many2one('olap.database.columns','Link Field'),
+    }
+    # Set the Table when changing field_id
+    def onchange_field_id(self,*args,**argv):
+        pass
+olap_cube_table_line()
+
+class olap_cube(osv.osv):
+    _name = "olap.cube"
+    _description = "Olap cube"
+
+    def _set_schema(self,cr,uid,context = {}):
+        if context and context.has_key('schema_id'):
+            return context['schema_id']
+        return False
+
+    _columns = {
+        'name': fields.char('Cube name',size = 64,required = True),
+        'table_id': fields.many2one('olap.cube.table','Fact table',size = 64,required = True, help="Table(s) for cube."),
+        'schema_id': fields.many2one('olap.schema','Schema',readonly = True),
+        'dimension_ids': fields.one2many('olap.dimension','cube_id','Dimensions'),
+        'measure_ids': fields.one2many('olap.measure','cube_id','Measures'),
+        'query_log': fields.boolean('Query Logging', help = "Enabling  this will log all the queries in the browser"),
+        'query_ids': fields.one2many('olap.query.logs','cube_id','Queries'),
+    }
+    _defaults = {
+                 'schema_id':_set_schema
+                 }
+olap_cube()
+
+class olap_query_logs(osv.osv):
+    _name = "olap.query.logs"
+    _description = "Olap query logs"
+    _columns = {
+        'user_id' : fields.many2one('res.users','Tiny ERP User'),
+        'query':fields.text('Query',required = True),
+        'time':fields.datetime('Time',required = True),
+        'result_size':fields.integer('Result Size',readonly = True),
+        'cube_id': fields.many2one('olap.cube','Cube',required = True),
+        'count': fields.integer('Count', readonly=True),
+        'schema_id': fields.many2one('olap.schema','Schema',readonly = True),
+#        'table_name': fields.char('Table Name', size=164, readonly = True),
+    }
+    
+    _defaults = {
+                 'count':lambda * args: 0
+                 }
+olap_query_logs()
+
+
+class olap_dimension(osv.osv):
+    _name = "olap.dimension"
+    _description = "Olap dimension"
+
+    def _set_cube(self,cr,uid,context = {}):
+        if context and context.has_key('cube_id'):
+            return context['cube_id']
+        return False
+
+    _columns = {
+        'name': fields.char('Dimension name',size = 64,required = True),
+        'cube_id': fields.many2one('olap.cube','Cube',required = True),
+        'hierarchy_ids': fields.one2many('olap.hierarchy','dimension_id','Hierarchies'),
+    }
+    _defaults = {
+                 'cube_id':_set_cube,
+    }
+
+olap_dimension()
+
+class olap_hierarchy(osv.osv):
+    _name = "olap.hierarchy"
+    _description = "Olap hierarchy"
+    _order = "sequence, id"
+    hierarchy_type = {
+        'date': 'Date',
+        'date_year': 'Year of Date',
+        'date_quarter': 'Quarter of Date',
+        'date_month': 'Month of Date',
+        'many2one': 'Many2one'
+    }
+
+    def _set_dimension(self,cr,uid,context = {}):
+        if context and context.has_key('dimension_id'):
+            return context['dimension_id']
+        return False
+
+    def _set_name(self,cr,uid,context = {}):
+        if context and context.has_key('dimension_id'):
+            dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['dimension_id']))
+            return dim_obj.name
+        return False
+
+    def _hierarchy_get(self,*args,**argv):
+        return self.hierarchy_type.items()
+
+    _columns = {
+        'name': fields.char('Hierarchy name',size = 64,required = True),
+        'primary_key': fields.char('Primary key',size = 64),
+        'primary_key_table': fields.char('Primary key table',size = 64),
+        'sequence': fields.integer('Sequence',required = True),
+        'dimension_id': fields.many2one('olap.dimension','Dimension',required = True),
+        'level_ids': fields.one2many('olap.level','hierarchy_id','Levels'),
+        'table_id': fields.many2one('olap.cube.table','Fact table(s)',required = True , help ="Table(s) to make hierarchy on the cube."),
+    }
+    _defaults = {
+        'sequence': lambda * args: 1,
+        'primary_key': lambda * args: 'id',
+        'dimension_id':_set_dimension,
+        'name':_set_name
+    }
+
+olap_hierarchy()
+
+class olap_level(osv.osv):
+    _name = "olap.level"
+    _description = "Olap level"
+    _order = "sequence, id"
+    _types = {
+        'normal': levels.level_normal(),
+        'date_year': levels.level_date_year(),
+        'date_quarter': levels.level_date_quarter(),
+        'date_month': levels.level_date_month()
+    }
+
+    def _set_hierarchy(self,cr,uid,context = {}):
+        if context and context.has_key('hierarchy_id'):
+            return context['hierarchy_id']
+        return False
+
+    def _set_name(self,cr,uid,context = {}):
+        if context and context.has_key('hierarchy_id'):
+            hier_obj = self.pool.get('olap.hierarchy').browse(cr,uid,int(context['hierarchy_id']))
+            return hier_obj.name
+
+    def onchange_column_name(self,cr,uid,ids,column,context = {}):
+        if not column:
+            return {}
+        val = {}
+        col = self.pool.get('olap.database.columns').browse(cr,uid,column)
+        val['table_name'] = col.table_id.table_db_name
+        val['column_id_name'] = col.column_db_name
+        if (col.type == 'date'):
+            val['type'] = 'date_year'
+        return {'value':val}
+
+    def _type_get(self,cr,uid,*args,**argv):
+        keys = self._types.keys()
+        return map(lambda x: (x,x),keys)
+
+
+    _columns = {
+        'name': fields.char('Level name',size = 64,required = True),
+        'column_name':fields.many2one('olap.database.columns','Columns Name',required = True),
+        'column_id_name': fields.char('Column ID',size = 64,required = True),
+        'type': fields.selection(selection = _type_get,string = 'Level class',size = 64,required = True),
+        'table_name': fields.char('Table name',size = 64,required = True,help = "The name of the table on which the column is defined. If False, take the table from the hierarchy."),
+        'sequence': fields.integer('Sequence',required = True),
+        'hierarchy_id': fields.many2one('olap.hierarchy','Hierarchy',required = True),
+    }
+
+    _defaults = {
+        'column_id_name': lambda * args: 'name',
+        'sequence':lambda * args: '1',
+        'type':lambda * args:'normal',
+        'hierarchy_id':_set_hierarchy,
+        'name':_set_name
+    }
+
+olap_level()
+
+
+class olap_measure(osv.osv):
+    _name = "olap.measure"
+    _description = "Olap measure"
+
+    def _set_cube(self,cr,uid,context = {}):
+        if context and context.has_key('cube_id'):
+            return context['cube_id']
+        return False
+
+    def onchange_measure_name(self,cr,uid,ids,column,context = {}):
+        val = {}
+        if not column:
+            return {}
+        col = self.pool.get('olap.database.columns').browse(cr,uid,column)
+        val['table_name'] = col.table_id.table_db_name
+        val['value_column_id_name'] = col.column_db_name
+        val['name'] = col.column_db_name
+        return {'value':val}
+
+    _columns = {
+        'name': fields.char('Measure name',size = 64,required = True),
+        'cube_id': fields.many2one('olap.cube','Cube',required = True),
+        'value_column': fields.many2one('olap.database.columns','Fact Table Column'),
+        'value_column_id_name': fields.char('Column ID',size = 64),
+        'table_name': fields.char('Table name',size = 64,help = "The name of the table on which the column is defined. If False, take the table from the cube."),
+        'measure_type':fields.selection([('fact_column','Fact Table Column'),('sql_expr','SQL Expression')],'Measure Type',required = True,help = "Select between auto column or sql expression for the measures"),
+        'value_sql': fields.char('SQL Expression',size = 200,help = "You can provide valid sql expression. Make sure it have function with fully qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) tablename.columnname)"),
+        'agregator': fields.selection([('sum','Sum'),('count','count'),('avg','Average')],'Agregator',required = True),
+        'datatype': fields.selection([('int','Integer'),('float','Float')],'Datatype',required = True),
+        'formatstring': fields.selection([
+                                           ('none','None (0000.00)'),
+                                           ('cr_prefix','Prefix Default Currency (EUR 0000.00)'),
+                                           ('cr_postfix','Postfix Default Currency(0000.00 EUR)'),
+                                           ('cr_prefix_comma','Prefix Default Currency with comma seperator (EUR 0,000.00)'),
+                                           ('cr_postfix_comma','Postfix Default Currency with comma seperator (0,000.00 EUR)'),
+                                           ('comma_sep', 'Comma Seperator (0,000)')
+                                           ],
+                                           'Format string',required = True, help=" Let you specify how the measure to be displayed in cube browser"),
+    }
+    _defaults = {
+        'agregator': lambda * args: 'sum',
+        'datatype': lambda * args: 'float',
+        'formatstring': lambda * args: 'none',
+        'cube_id':_set_cube,
+        'measure_type':lambda * args:'fact_column',
+    }
+olap_measure()
+
+class olap_application(osv.osv):
+    _name = "olap.application"
+    _description = "Olap application"
+    _columns = {
+        'name': fields.char('Application name',size = 64,required = True),
+        'query':fields.text('Application Query'),
+        'table_ids':fields.one2many('olap.application.table','application_id','Tables'),
+        'field_ids': fields.one2many('olap.application.field','application_id','Fields'),
+    }
+olap_application()
+
+
+class olap_application_table(osv.osv):
+    _name = "olap.application.table"
+    _description = "Olap application table"
+    _columns = {
+        'name': fields.char('Application table name',size = 64,required = True),
+        'table_name': fields.char('Table name',size = 64,required = True),
+        'is_hidden': fields.boolean('Hidden'),
+        'application_id':  fields.many2one('olap.application','Application Id',required = True),
+    }
+olap_application_table()
+
+class olap_application_field(osv.osv):
+    _name = "olap.application.field"
+    _description = "Olap application field"
+    _columns = {
+        'name': fields.char('Application field name',size = 64,required = True),
+        'table_name':  fields.char('Application table name',size = 64),
+        'field_name':fields.char('Field name',size = 64),
+        'is_hidden': fields.boolean('Hidden'),
+        'application_id':  fields.many2one('olap.application','Application Id',required = True),
+    }
+olap_application_field()
+
+class olap_saved_query(osv.osv):
+    _name = "olap.saved.query"
+    _decription = "Olap Saved Query"
+#   _rec_name = 'user_id'
+    _columns = {
+                'name': fields.text('Query Name',size = 64),
+                'user_id' : fields.many2one('res.users','User'),
+                'query': fields.text('Query',required = True),
+                'cube_id': fields.many2one('olap.cube','Cube',required = True),
+                'mdx_id': fields.char('Module', size=64),
+                'schema_id': fields.many2one('olap.schema','Schema',required = True),
+                'time':fields.datetime('Time',required = True),
+                'axis_keys': fields.text('Axis Keys'),
+                }
+olap_saved_query()
+# Wizard for the Load Data Structure
+# Replacement for the Load Wizard according to the new structure
+class bi_load_db_wizard(osv.osv_memory):
+    _name = 'bi.load.db.wizard'
+
+    def _get_fact_table(self,cr,uid,ctx):
+        if ctx and ctx.has_key('active_id'):
+            schema_obj = self.pool.get('olap.schema').browse(cr,uid,ctx['active_id'])
+            return schema_obj.name
+        return False
+
+    def _get_db_name(self,cr,uid,ctx):
+        if ctx and ctx.has_key('active_id'):
+            schema_obj = self.pool.get('olap.schema').browse(cr,uid,ctx['active_id'])
+            return schema_obj.database_id.name
+        return False
+
+    _columns = {
+        'fact_table':fields.char('Fact Name' ,size = 64,readonly = True),
+        'db_name':fields.char('Database Name',size = 64,readonly = True)
+    }
+
+    _defaults = {
+        'fact_table':_get_fact_table,
+        'db_name':_get_db_name,
+    }
+
+    def action_load(self,cr,uid,ids,context = None):
+        if context and context.has_key('active_id'):
+            lines = self.pool.get('olap.schema').browse(cr,uid,context['active_id'])
+            pool = pooler.get_pool(cr.dbname)
+#            lines=pool.get('olap.schema').browse(cr, uid, part['id'],context)
+            id_db = lines.database_id.id
+            type = lines.database_id.type
+            db_name = lines.database_id.db_name
+            tobj = pool.get('olap.database.tables')
+            tcol = pool.get('olap.database.columns')
+            if type == 'postgres':
+#                host = lines.database_id.db_host and "host=%s" % lines.database_id.db_host or ''
+#                port = lines.database_id.db_port and "port=%s" % lines.database_id.db_port or ''
+#                name = lines.database_id.db_name and "dbname=%s" % lines.database_id.db_name or ''
+#                user = lines.database_id.db_login and "user=%s" % lines.database_id.db_login or ''
+#                password = lines.database_id.db_password and "password=%s" % lines.database_id.db_password or ''
+#                tdb = psycopg2.connect('%s %s %s %s %s' % (host, port, name, user, password))
+#                cr_db = tdb.cursor()
+#                cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d', (id_db,))
+#                tables = dict(cr.fetchall())
+#                # Format for storing the tables
+#                # tables['table_db_name']=id
+#                tables_id = map(lambda x: str(tables[x]),tables)
+#                cols={}
+#                if tables_id:
+#                    cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) +')')
+#                else:
+#                    cr.execute('select column_db_name,id,table_id from olap_database_columns')
+#              
+#                for data in cr.fetchall():
+#                    cols[str(data[1])]=(data[0],int(data[2]))
+#                # Format of storing the cols 
+#                # cols['id']=(col_db_name,table_id)    
+#                print 'Creating / Updating Tables...' 
+#                cr_db.execute("select table_name, table_catalog from INFORMATION_SCHEMA.tables as a where a.table_schema = 'public'")
+#                for table in cr_db.fetchall():
+#                    val = {
+#                        'fact_database_id':id_db,
+#                        'table_db_name':table[0]
+#                    }
+#                   
+#                    if table[0] in tables.keys():
+#                        table_id=tobj.write(cr,uid,[tables[table[0]]], val, context)
+#                    else:
+#                        val['name']=table[0]
+#                        tables[val['name']] = tobj.create(cr,uid,val, context)    
+#                print 'Creating / Updating Columns...' 
+#                cr_db.execute("""SELECT
+#                        table_name, column_name, udt_name
+#                    from
+#                        INFORMATION_SCHEMA.columns
+#                    WHERE table_schema = 'public'""")
+#                
+#                for col in cr_db.fetchall():
+#                    val={
+#                        'table_id': tables[col[0]],
+#                        'column_db_name': col[1],
+#                        'type': col[2],
+#                    }
+#                    
+#                    id_made=filter(lambda x:(int(cols[x][1])==int(tables[col[0]])),cols)
+#                    if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
+#                        col_id=tcol.write(cr,uid,cols[tables[str(col[0])]], val, context)
+#                    else:
+#                        val['name']=col[1]
+#                        id_made = tcol.create(cr,uid,val, context)
+#                        cols[str(id_made)] = (val['name'],int(val['table_id']))
+#                print 'Creating / Updating Constraints...' 
+#                cr_db.execute("""select 
+#                        table_name,column_name 
+#                    from 
+#                        INFORMATION_schema.key_column_usage
+#                    where 
+#                        constraint_name in (
+#                                    select constraint_name from INFORMATION_SCHEMA .table_constraints
+#                                    where 
+#                                        constraint_type = 'PRIMARY KEY')""")
+#                print "Updating the Primary Key Constraint" 
+#                for constraint in cr_db.fetchall():
+#                    val={
+#                        'primary_key':True
+#                    }
+#                    
+#                    id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[0]])and(constraint[1]==cols[x][0])),cols)
+#                    col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context) 
+#                print "Updating the Foreign key constraint" 
+#                cr_db.execute("""select 
+#                            constraint_name,table_name 
+#                    from 
+#                        INFORMATION_schema.constraint_column_usage 
+#                    where
+#                        constraint_name in (
+#                                    select constraint_name from INFORMATION_SCHEMA.table_constraints 
+#                                    where 
+#                                        constraint_type = 'FOREIGN KEY')""")
+#                for_key=dict(cr_db.fetchall())
+#                
+#                cr_db.execute("""select 
+#                             table_name,column_name,constraint_name 
+#                         from 
+#                             INFORMATION_schema.key_column_usage
+#                         where 
+#                             constraint_name in (
+#                                         select constraint_name from INFORMATION_SCHEMA.table_constraints 
+#                                         where 
+#                                             constraint_type = 'FOREIGN KEY')""") 
+
+#                for constraint in cr_db.fetchall():
+#                    val={
+#                        'related_to':tables[for_key[constraint[2]]]
+#                    }
+#                    id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[0]])and (constraint[1]==cols[x][0])),cols)
+#                    col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context) 
+
+                host = lines.database_id.db_host and "host=%s" % lines.database_id.db_host or ''
+                port = lines.database_id.db_port and "port=%s" % lines.database_id.db_port or ''
+                name = lines.database_id.db_name and "dbname=%s" % lines.database_id.db_name or ''
+                user = lines.database_id.db_login and "user=%s" % lines.database_id.db_login or ''
+                password = lines.database_id.db_password and "password=%s" % lines.database_id.db_password or ''
+                tdb = psycopg2.connect('%s %s %s %s %s' % (host,port,name,user,password))
+                cr_db = tdb.cursor()
+                cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d',(id_db,))
+                tables = dict(cr.fetchall())
+                # Format for storing the tables
+                # tables['table_db_name']=id
+                tables_id = map(lambda x: str(tables[x]),tables)
+                # Format of storing the cols 
+                # cols['id']=(col_db_name,table_id)    
+                print 'Creating / Updating Tables...'
+                cr_db.execute("select table_name, table_catalog from INFORMATION_SCHEMA.tables as a where a.table_schema = 'public'")
+                for table in cr_db.fetchall():
+                    val = {
+                        'fact_database_id':id_db,
+                        'table_db_name':table[0]
+                    }
+                    if table[0] in tables.keys():
+                        table_id = tobj.write(cr,uid,[tables[table[0]]],val,context)
+                    else:
+                        val['name'] = table[0]
+                        tables[val['name']] = tobj.create(cr,uid,val,context)
+
+                print 'Creating / Updating Columns ....'
+                cols = {}
+                if tables_id:
+                    cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) + ')')
+                else:
+#                    cr.execute('select column_db_name,id,table_id from olap_database_columns ')
+                    cr.execute("select olap_database_columns.column_db_name, olap_database_columns.id, olap_database_columns.table_id from olap_database_columns join olap_database_tables on olap_database_columns.table_id = olap_database_tables.id where olap_database_tables.fact_database_id=%d",(id_db,))
+                table_col = {}
+                cols_name = {}
+                for x in tables:
+                    table_col[str(tables[x])] = [{}]
+                for data in cr.fetchall():
+                    cols[str(data[1])] = (data[0],int(data[2]))
+                    table_col[str(data[2])][0][data[0]] = data[1]
+                    cols_name[str(data[0])] = (data[1],int(data[2]))
+                cr_db.execute("""SELECT
+                        table_name, column_name, udt_name
+                    from
+                        INFORMATION_SCHEMA.columns
+                    WHERE table_schema = 'public'""")
+                for col in cr_db.fetchall():
+                    val = {
+                        'table_id': tables[col[0]],
+                        'column_db_name': col[1],
+                        'type': col[2],
+                    }
+                    id_made = filter(lambda x:(int(cols[x][1]) == int(tables[col[0]])),cols)
+                    if col[0] in tables.keys() and col[1] in cols_name.keys() and id_made:
+                        if table_col[str(tables[col[0]])][0] and col[1] in table_col[str(tables[col[0]])][0].keys():
+                            col_id = tcol.write(cr,uid,table_col[str(tables[col[0]])][0][col[1]],val,context)
+                        else:
+                            val['name'] = col[1]
+                            id_made = tcol.create(cr,uid,val,context)
+                            cols[str(id_made)] = (val['name'],int(val['table_id']))
+                    else:
+                        val['name'] = col[1]
+                        id_made = tcol.create(cr,uid,val,context)
+                        cols[str(id_made)] = (val['name'],int(val['table_id']))
+
+                print 'Creating / Updating Constraints...'
+                cr_db.execute("""select 
+                        table_name,column_name 
+                    from 
+                        INFORMATION_schema.key_column_usage
+                    where 
+                        constraint_name in (
+                                    select constraint_name from INFORMATION_SCHEMA .table_constraints
+                                    where 
+                                        constraint_type = 'PRIMARY KEY')""")
+
+                print "Updating the Primary Key Constraint"
+                for constraint in cr_db.fetchall():
+                    val = {
+                        'primary_key':True
+                    }
+
+                    id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[0]])and(constraint[1] == cols[x][0])),cols)
+                    col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
+
+                print "Updating the Foreign key constraint"
+                cr_db.execute("""select 
+                            constraint_name,table_name 
+                    from 
+                        INFORMATION_schema.constraint_column_usage 
+                    where
+                        constraint_name in (
+                                    select constraint_name from INFORMATION_SCHEMA.table_constraints 
+                                    where 
+                                        constraint_type = 'FOREIGN KEY')""")
+                for_key = dict(cr_db.fetchall())
+
+                cr_db.execute("""select 
+                             table_name,column_name,constraint_name 
+                         from 
+                             INFORMATION_schema.key_column_usage
+                         where 
+                             constraint_name in (
+                                         select constraint_name from INFORMATION_SCHEMA.table_constraints 
+                                         where 
+                                             constraint_type = 'FOREIGN KEY')""")
+
+                for constraint in cr_db.fetchall():
+                    val = {
+                        'related_to':tables[for_key[constraint[2]]]
+                    }
+                    id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[0]])and (constraint[1] == cols[x][0])),cols)
+                    if id_to_write:
+                        col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
+
+
+            elif type == 'mysql':
+                try:
+                    import MySQLdb
+                    host = lines.database_id.db_host or ''
+                    port = lines.database_id.db_port or ''
+                    db = lines.database_id.db_name or ''
+                    user = lines.database_id.db_login or ''
+                    passwd = lines.database_id.db_password or ''
+                    tdb = MySQLdb.connect(host = host,port = port,db = db,user = user,passwd = passwd)
+
+                except Exception,e:
+                    raise osv.except_osv('MySQLdb Packages Not Installed.',e)
+
+                cr_db = tdb.cursor()
+                cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d',(id_db,))
+                tables = dict(cr.fetchall())
+                tables_id = map(lambda x: str(tables[x]),tables)
+                cols = {}
+                if tables_id:
+                    cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) + ')')
+                else:
+                    cr.execute('select column_db_name,id,table_id from olap_database_columns')
+
+                for data in cr.fetchall():
+                    cols[str(data[1])] = (data[0],int(data[2]))
+                cr_db.execute("select table_name, table_catalog from INFORMATION_SCHEMA.tables where table_schema =%s",(db_name))
+
+                for table in cr_db.fetchall():
+                    val = {
+                        'fact_database_id':id_db,
+                        'table_db_name':table[0]
+                    }
+
+                    if table[0] in tables.keys():
+                        table_id = tobj.write(cr,uid,[tables[table[0]]],val,context)
+
+                    else:
+                        val['name'] = table[0]
+                        tables[val['name']] = tobj.create(cr,uid,val,context)
+                cr_db.execute("""SELECT
+                        table_name, column_name, data_type
+                    from
+                        INFORMATION_SCHEMA.columns
+                    WHERE table_schema = %s""",(db_name))
+
+                for col in cr_db.fetchall():
+
+                    val = {
+                        'table_id': tables[col[0]],
+                        'column_db_name': col[1],
+                        'type': col[2],
+                    }
+
+                    id_made = filter(lambda x:(int(cols[x][1]) == int(tables[col[0]])),cols)
+                    if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
+                        col_id = tcol.write(cr,uid,cols[tables[str(col[0])]],val,context)
+                    else:
+                        val['name'] = col[1]
+                        id_made = tcol.create(cr,uid,val,context)
+                        cols[str(id_made)] = (val['name'],int(val['table_id']))
+
+                cr_db.execute("""select 
+                        REFERENCED_COLUMN_NAME,REFERENCED_TABLE_NAME,COLUMN_NAME,TABLE_NAME
+                    from 
+                        INFORMATION_schema.key_column_usage
+                    where table_schema= %s and 
+                        constraint_name in (
+                                    select constraint_name from INFORMATION_SCHEMA .table_constraints
+                                    where 
+                                        constraint_type in('PRIMARY KEY','FOREIGN KEY'))
+                                    """,(db_name))
+        #            lines=pool.get('olap.schema').browse(cr, uid, part['id'],context)
+                for constraint in cr_db.fetchall():
+
+                    if constraint[0]:
+                        val = {
+                             'related_to':tables[constraint[1]]
+                             }
+                    else:
+
+                        val = {
+                             'primary_key':True
+                             }
+                    id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[3]])and(constraint[2] == cols[x][0])),cols)
+                    col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
+
+            elif type == 'oracle':
+                try:
+                    import cx_Oracle
+                    host = lines.database_id.db_host or ''
+                    port = lines.database_id.db_port or ''
+                    db = lines.database_id.db_name or ''
+                    user = lines.database_id.db_login.upper() or ''
+                    passwd = lines.database_id.db_password or ''
+                    tdb = cx_Oracle.connect(user,passwrd,host)
+
+                except Exception,e:
+                            raise osv.except_osv('cx_Oracle Packages Not Installed.',e)
+
+                cr_db = tdb.cursor()
+                cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d',(id_db,))
+                tables = dict(cr.fetchall())
+                tables_id = map(lambda x: str(tables[x]),tables)
+                cols = {}
+                if tables_id:
+                    cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) + ')')
+                else:
+                    cr.execute('select column_db_name,id,table_id from olap_database_columns')
+
+                for data in cr.fetchall():
+                    cols[str(data[1])] = (data[0],int(data[2]))
+
+                cr_db.execute("select table_name from all_tables where owner =%s",(user))
+                temp = cr_db.fetchall()
+                for table in temp:
+                    val = {
+                        'fact_database_id':id_db,
+                        'table_db_name':table[0]
+                    }
+
+                    if table[0] in tables.keys():
+                        table_id = tobj.write(cr,uid,[tables[table[0]]],val,context)
+
+                    else:
+                        val['name'] = table[0]
+                        tables[val['name']] = tobj.create(cr,uid,val,context)
+
+                cr_db.execute("""SELECT
+                        table_name, column_name, data_type
+                    from
+                        all_tab_columns 
+                    WHERE owner = %s""",(user))
+                temp = cr_db.fetchall()
+                for col in temp:
+                    if col[2] == 'NUMBER':
+                        type_col = 'numeric'
+                    elif col[2] == 'DATE':
+                        type_col = 'date'
+                    elif col[2] == 'VARCHAR2':
+                        type_col = 'varchar'
+                    else:
+                        type_col = col[2]
+                    val = {
+                        'table_id': tables[col[0]],
+                        'column_db_name': col[1],
+                        'type': type_col,
+                    }
+
+                    id_made = filter(lambda x:(int(cols[x][1]) == int(tables[col[0]])),cols)
+                    if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
+                        col_id = tcol.write(cr,uid,cols[tables[str(col[0])]],val,context)
+                    else:
+                        val['name'] = col[1]
+                        id_made = tcol.create(cr,uid,val,context)
+                        cols[str(id_made)] = (val['name'],int(val['table_id']))
+
+                cr_db.execute("""select 
+                        table_name,column_name,constraint_name
+                    from 
+                        all_cons_columns
+                    where
+                        constraint_name in (
+                                    select constraint_name from all_constraints
+                                    where 
+                                        constraint_type = 'P' and owner= %s)
+                                    """,(user))
+                temp = cr_db.fetchall()
+                pk_table = {}
+                for constraint in temp:
+                    val = {
+                        'primary_key' : True
+                    }
+                    pk_table[constraint[2]] = constraint[0]
+
+                    id_to_write = filter(lambda x : (int(cols[x][1]) == int(tables[constraint[0]])and(constraint[1] == cols[x][0])),cols)
+                    col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
+
+                cr_db.execute("""select 
+                                constraint_name,r_constraint_name from all_constraints
+                                    where 
+                                        constraint_type = 'R'  and owner = %s
+                                    """,(user))
+                constraints_map = {}
+                for data in cr_db.fetchall():
+                    constraints_map[data[0]] = data[1]
+
+                cr_db.execute("""select 
+                        table_name,column_name,constraint_name
+                    from 
+                        all_cons_columns
+                    where
+                        constraint_name in (
+                                    select constraint_name from all_constraints
+                                    where 
+                                        constraint_type = 'R' and owner = %s)
+                                    """,(user))
+
+
+                temp = cr_db.fetchall()
+                for constraint in temp:
+                    rel_constraint_name = constraints_map[constraint[2]]
+                    req_table = pk_table[rel_constraint_name]
+                    val = {
+                        'related_to' : tables[req_table]
+                    }
+                    id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[0]])and (constraint[1] == cols[x][0])),cols)
+                    col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
+
+            temp = pooler.get_pool(cr.dbname).get('olap.fact.database').write(cr,uid,[id_db],{'loaded':True})
+            wf_service = netsvc.LocalService('workflow')
+            wf_service.trg_validate(uid,'olap.schema',context['active_id'],'dbload',cr)
+            model_data_ids = self.pool.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_olap_schema_form')])
+            resource_id = self.pool.get('ir.model.data').read(cr,uid,model_data_ids,fields = ['res_id'])[0]['res_id']
+
+            return {'type':'ir.actions.act_window_close' }
+#            return{
+#           'domain': [],
+#           'name': 'view_olap_schema_form',
+#           'view_type': 'form',
+#           'view_mode': 'form,tree',
+#           'res_id': context['active_id'],
+#           'res_model': 'olap.schema',
+#           'view': [(resource_id,'form')],
+#           'type': 'ir.actions.act_window_close'
+#            }
+#
+
+    def action_cancel(self,cr,uid,ids,context = None):
+
+        return {'type':'ir.actions.act_window_close' }
+
+bi_load_db_wizard()
+
+
+
+# Wizard for the Automatic Application Configuration
+# Replacement for the Load Wizard according to the new structure
+class bi_auto_configure_wizard(osv.osv_memory):
+    _name = 'bi.auto.configure.wizard'
+
+
+    def _get_name(self,cr,uid,ctx):
+        if ctx and ctx.has_key('active_id'):
+            schema_obj = self.pool.get('olap.schema').browse(cr,uid,ctx['active_id'])
+            return schema_obj.name
+        return False
+
+    _columns = {
+        'name':fields.char('Fact Name' ,size = 64,readonly = True),
+
+        }
+
+    _defaults = {
+                   'name':_get_name,
+                   }
+
+    def action_load(self,cr,uid,ids,context = None):
+        vals = {}
+        apptabnew_vals = {}
+        appfieldnew_vals = {}
+
+        ids = pooler.get_pool(cr.dbname).get('olap.schema').browse(cr,uid,context['active_id'])
+
+        if ids.app_detect == "Unknown Application":
+            raise wizard.except_wizard('Warning','The Application is Unknown, we can not configure it automatically.')
+
+        else:
+            app_objs = pooler.get_pool(cr.dbname).get('olap.application')
+            app_ids = app_objs.search(cr,uid,[])
+            app_res = app_objs.browse(cr,uid,app_ids)
+            app_id = ''
+            for x_app in app_res:
+                  app_id = x_app['id']
+
+            apptab_objs = pooler.get_pool(cr.dbname).get('olap.application.table')
+            apptab_ids = apptab_objs.search(cr,uid,[])
+            apptab_res = apptab_objs.browse(cr,uid,apptab_ids)
+            apptab_name = []
+            map_apptab_name = {}
+            map_apptab_name_id = {}
+            for aptab in apptab_res:
+                apptab_name.append(aptab.name)
+                map_apptab_name_id[aptab.table_name] = aptab
+
+            appfield_objs = pooler.get_pool(cr.dbname).get('olap.application.field')
+            appfield_ids = appfield_objs.search(cr,uid,[])
+            appfield_res = appfield_objs.browse(cr,uid,appfield_ids)
+            appfield_data_res = appfield_objs.browse(cr,uid,appfield_ids)
+            appcol_name = []
+            for apcol in appfield_res:
+                appcol_name.append(apcol.name)
+
+            dbtab_obj = pooler.get_pool(cr.dbname).get('olap.database.tables')
+#            id_tables=dbtab_obj.search(cr,uid,[('fact_database_id','=',ids.database_id.id),('table_db_name','not in',['inherit','res_roles','user_rule_group_rel','res_roles_users_rel','group_rule_group_rel'])])
+            id_tables = dbtab_obj.search(cr,uid,[('fact_database_id','=',ids.database_id.id)])
+            tables_main = dbtab_obj.read(cr,uid,id_tables,context = {'wizard':True})
+            for tables in tables_main:
+                end_user_name = {'name':(" ").join(map(lambda x:x.capitalize(),tables['table_db_name'].split("_")))}
+                table_new = dbtab_obj.write(cr,uid,tables['id'],end_user_name)
+                if not(tables['table_db_name'].startswith('ir') or tables['table_db_name'].startswith('wkf') or tables['table_db_name'].startswith('res_groups') or tables['table_db_name'].startswith('res_role')) and tables['table_db_name'] not in ['inherit','user_rule_group_rel','group_rule_group_rel']:
+                    vals = {}
+
+                    if len(apptab_ids) == 0 and (tables['table_db_name'] not in apptab_name):
+                        vals['table_name'] = tables['table_db_name']
+                        vals['name'] = (" ").join(map(lambda x:x.capitalize(),tables['name'].split("_")))
+                        vals['is_hidden'] = tables['hide']
+                        vals['application_id'] = app_id
+                        table_new = dbtab_obj.write(cr,uid,tables['id'],{'hide':False})
+                        apptab_new_obj = apptab_objs.create(cr,uid,vals)
+                    else:
+                        if map_apptab_name_id.has_key(tables['table_db_name']):
+                            app_table = map_apptab_name_id[tables['table_db_name']]
+                            if ((app_table['table_name'] == tables['table_db_name']) and not (app_table['table_name'] == tables['name'])):
+                                vals['name'] = (" ").join(map(lambda x:x.capitalize(),tables['name'].split("_")))
+                                vals['is_hidden'] = tables['hide']
+                                tables_obj_new = apptab_objs.write(cr,uid,app_table['id'],vals)
+                        else:
+                            vals['table_name'] = tables['table_db_name']
+                            vals['name'] = (" ").join(map(lambda x:x.capitalize(),tables['table_db_name'].split("_")))
+                            vals['is_hidden'] = tables['hide']
+                            vals['application_id'] = app_id
+                            apptab_new_obj = apptab_objs.create(cr,uid,vals)
+            id_columns = pooler.get_pool(cr.dbname).get('olap.database.columns').search(cr,uid,[('table_id','in',id_tables)])
+            columns = pooler.get_pool(cr.dbname).get('olap.database.columns').read(cr,uid,id_columns,[])
+            for columns in columns:
+                vals = {}
+                if len(appfield_ids) == 0 and (columns['column_db_name'] not in appcol_name):
+                    vals['field_name'] = columns['column_db_name']
+                    vals['table_name'] = columns['table_id'][1]
+                    vals['name'] = (" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
+                    vals['is_hidden'] = columns['hide']
+                    vals['application_id'] = x_app['id']
+                    appfield_new_obj = appfield_objs.create(cr,uid,vals)
+                else:
+                    filter_column = filter(lambda x: columns['column_db_name'] == x['field_name'] and columns['table_id'][1] == x['table_name'],appfield_data_res)
+                    if map_apptab_name_id.has_key(columns['table_id'][1]) and filter_column:
+                        table_id_write = map_apptab_name_id[columns['table_id'][1]]
+                        vals['name'] = (" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
+                        vals['is_hidden'] = columns['hide']
+                        appfield_new_obj = appfield_objs.write(cr,uid,filter_column[0]['id'],vals)
+                    else:
+                        vals['field_name'] = columns['column_db_name']
+                        vals['table_name'] = columns['table_id'][1]
+                        vals['name'] = (" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
+                        vals['is_hidden'] = columns['hide']
+                        vals['application_id'] = x_app['id']
+                        appfield_new_obj = appfield_objs.create(cr,uid,vals)
+
+
+            database_tables = pooler.get_pool(cr.dbname).get('olap.database.tables')
+            id_tables = database_tables.search(cr,uid,[('fact_database_id','=',ids.database_id.id)])
+            tables = database_tables.read(cr,uid,id_tables,[])
+            make_id = []
+            for table in tables:
+                vals = {}
+                if (table['table_db_name'].startswith('ir') or table['table_db_name'].startswith('wkf')) or (table['table_db_name'].startswith('res_groups')) or (table['table_db_name'] in ['inherit','res_roles','user_rule_group_rel','res_roles_users_rel','group_rule_group_rel']):
+                    vals['hide'] = True
+                    vals['active'] = False
+                    make_id.append(table['id'])
+                    database_tables.write(cr,uid,table['id'],vals)
+
+            database_columns = pooler.get_pool(cr.dbname).get('olap.database.columns')
+            id_columns = database_columns.search(cr,uid,[('table_id','in',make_id)])
+            columns = database_columns.read(cr,uid,id_columns,[])
+            for col in columns:
+                val = {}
+                vals['hide'] = True
+                vals['active'] = False
+                database_columns.write(cr,uid,col['id'],vals)
+
+
+            wf_service = netsvc.LocalService('workflow')
+            wf_service.trg_validate(uid,'olap.schema',context['active_id'],'dbconfigure',cr)
+            model_data_ids = self.pool.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_olap_schema_form')])
+            resource_id = self.pool.get('ir.model.data').read(cr,uid,model_data_ids,fields = ['res_id'])[0]['res_id']
+
+            return {'type':'ir.actions.act_window_close' }
+
+    def action_cancel(self,cr,uid,ids,context = None):
+
+        return {'type':'ir.actions.act_window_close' }
+
+bi_auto_configure_wizard()
+
+
+class olap_warehouse_wizard(osv.osv_memory):
+    _name = "olap.warehouse.wizard"
+    _description = "Olap Warehouse"
+    
+    def _get_queries(self, cr, uid, context = {}):
+        query_obj = self.pool.get('olap.query.logs')
+        qry_ids = query_obj.search(cr, uid, [('user_id','=',uid),('count','>=',3)])
+        if qry_ids:
+            query = ''
+            for id in query_obj.browse(cr,uid,qry_ids,context):
+                if query == '':
+                    query = id.query
+                else:
+                    query = query + '\n'+id.query
+            return query
+        else:
+            return ''
+    def action_ok(self, cr, uid, ids, context = {}):
+        return {'type':'ir.actions.act_window_close' }
+    
+    _columns = {
+                'query': fields.text('Query', readonly=True),
+                }
+    _defaults = {
+        'query': _get_queries,
+        }
+olap_warehouse_wizard()
+class olap_parameters_config_wizard(osv.osv_memory):
+    _name = "olap.parameters.config.wizard"
+    _description = "Olap Server Parameters"
+
+    def _get_host(self,cr,uid,context = None):
+        obj = self.pool.get('olap')
+        objid = self.pool.get('ir.model.data')
+        aid = objid._get_id(cr,uid,'olap','menu_url_cube_browser')
+        aid = objid.browse(cr,uid,aid,context = context).res_id
+        aid = self.pool.get('ir.actions.url').browse(cr,uid,aid,context = context)
+        s_p = Literal("http://").suppress() + Word(alphanums + "_" + ".") + Literal(":").suppress() + Word(nums) + Literal("/").suppress() + Word(alphanums + "_" + " ").suppress()
+        return s_p.parseString(aid.url)[0]
+
+    def _get_port(self,cr,uid,context = None):
+        obj = self.pool.get('olap')
+        objid = self.pool.get('ir.model.data')
+        aid = objid._get_id(cr,uid,'olap','menu_url_cube_browser')
+        aid = objid.browse(cr,uid,aid,context = context).res_id
+        aid = self.pool.get('ir.actions.url').browse(cr,uid,aid,context = context)
+        s_p = Literal("http://").suppress() + Word(alphanums + "_" + ".") + Literal(":").suppress() + Word(nums) + Literal("/").suppress() + Word(alphanums + "_" + " ").suppress()
+        return s_p.parseString(aid.url)[1]
+
+    _columns = {
+        'host_name' : fields.char('Server Name',size = 64,help = "Put here the server address or IP \
+                Put localhost if its not clear.",required = True),
+        'host_port' : fields.char('Port',size = 4,help = "Put the port for the server. Put 8080 if \
+                its not clear.",required = True),
+            }
+
+    _defaults = {
+        'host_name': _get_host,
+        'host_port': _get_port,
+        }
+
+    def action_cancel(self,cr,uid,ids,conect = None):
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.actions.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+         }
+
+    def action_config(self,cr,uid,ids,context = None):
+        conf = self.browse(cr,uid,ids[0],context)
+        obj = self.pool.get('olap')
+        objid = self.pool.get('ir.model.data')
+        aid = objid._get_id(cr,uid,'olap','menu_url_cube_browser')
+        aid = objid.browse(cr,uid,aid,context = context).res_id
+        self.pool.get('ir.actions.url').write(cr,uid,[aid],{'url': 'http://' + (conf.host_name or 'localhost') + ':' + (conf.host_port or '8080') + '/browser'})
+
+        aid = objid._get_id(cr,uid,'olap','menu_url_cube_designer')
+        aid = objid.browse(cr,uid,aid,context = context).res_id
+        self.pool.get('ir.actions.url').write(cr,uid,[aid],{'url': 'http://' + (conf.host_name or 'localhost') + ':' + (conf.host_port or '8080') + '/designer'})
+
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.actions.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+        }
+olap_parameters_config_wizard()
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/wizard/__init__.py b/addons/olap/wizard/__init__.py
new file mode 100755
index 00000000000..a7b3a6af17f
--- /dev/null
+++ b/addons/olap/wizard/__init__.py
@@ -0,0 +1,34 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import wizard_query_builder
+import wizard_load_data
+import wizard_load_configured_table
+import wizard_clear_logs
+import wizard_application_configure
+import wizard_load_columns
+import wizard_test_connection
diff --git a/addons/olap/wizard/wizard_application_configure.py b/addons/olap/wizard/wizard_application_configure.py
new file mode 100755
index 00000000000..3dfac9e2974
--- /dev/null
+++ b/addons/olap/wizard/wizard_application_configure.py
@@ -0,0 +1,194 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import time
+
+import wizard
+import pooler
+from osv import osv
+import netsvc
+
+info = '''<?xml version="1.0"?>
+<form string="Auto Configure">
+    <label string="Your database structure (Open ERP) has been sucessfully configured."/>
+</form>'''
+
+form1 = '''<?xml version="1.0"?>
+<form string=" Auto Configure ">
+    <label string="This will Auto Configure Application"/>
+</form>'''
+
+class wizard_application_configure(wizard.interface):
+    
+    def configure_application(self,cr,uid,data,context):
+        
+        vals={}
+        apptabnew_vals={}
+        appfieldnew_vals={}
+        
+        ids=pooler.get_pool(cr.dbname).get('olap.schema').browse(cr,uid,data['id'])
+        
+        if ids.app_detect == "Unknown Application":
+            raise wizard.except_wizard('Warning', 'The Application is Unknown, we can not configure it automatically.')
+
+        else:
+            app_objs = pooler.get_pool(cr.dbname).get('olap.application')
+            app_ids = app_objs.search(cr, uid, [])
+            app_res = app_objs.browse(cr,uid, app_ids)
+            app_id=''
+            for x_app in app_res:
+                  app_id = x_app['id']
+                  
+            apptab_objs = pooler.get_pool(cr.dbname).get('olap.application.table')
+            apptab_ids = apptab_objs.search(cr, uid, [])
+            apptab_res = apptab_objs.browse(cr,uid, apptab_ids)
+            apptab_name=[]
+            for aptab in apptab_res:
+                apptab_name.append(aptab.name)
+
+            appfield_objs = pooler.get_pool(cr.dbname).get('olap.application.field')
+            appfield_ids = appfield_objs.search(cr, uid, [])
+            appfield_res = appfield_objs.browse(cr,uid, appfield_ids)
+            appcol_name=[]
+            for apcol in appfield_res:
+                appcol_name.append(apcol.name)
+            
+
+            apptab_objs = pooler.get_pool(cr.dbname).get('olap.application.table')
+            apptab_ids = apptab_objs.search(cr, uid, [])
+            apptab_res = apptab_objs.browse(cr,uid, apptab_ids)
+#            apptab_data_res = apptab_objs.read(cr,uid, apptab_ids,[])[0]
+            
+            apptab_name=[]
+            map_apptab_name_id={}
+            for aptab in apptab_res:
+                apptab_name.append(aptab.name)
+                map_apptab_name_id[aptab.table_name]=aptab
+            
+            appfield_objs = pooler.get_pool(cr.dbname).get('olap.application.field')
+            appfield_ids = appfield_objs.search(cr, uid, [])
+            appfield_res = appfield_objs.browse(cr,uid, appfield_ids)
+            appfield_data_res = appfield_objs.read(cr,uid, appfield_ids,[])
+            
+            appcol_name=[]
+            for apcol in appfield_res:
+                appcol_name.append(apcol.name)
+                
+            id_tables=pooler.get_pool(cr.dbname).get('olap.database.tables').search(cr,uid,[('fact_database_id','=',ids.database_id.id),('table_db_name','not in',['inherit','res_roles','user_rule_group_rel','res_roles_users_rel','group_rule_group_rel'])])
+            tables=pooler.get_pool(cr.dbname).get('olap.database.tables').read(cr,uid,id_tables,[])
+            
+            for tables in tables:
+                if not(tables['table_db_name'].startswith('ir') or tables['table_db_name'].startswith('wkf') or tables['table_db_name'].startswith('res_groups')):
+                    vals={}
+                    if len(apptab_ids)==0 and (tables['table_db_name'] not in apptab_name):
+                        vals['table_name']=tables['table_db_name']
+                        vals['name']=(" ").join(map(lambda x:x.capitalize(),tables['name'].split("_")))
+                        vals['is_hidden']=tables['hide']
+                        vals['application_id']=app_id
+                        apptab_new_obj=apptab_objs.create(cr,uid,vals)
+                    else:
+                        if map_apptab_name_id.has_key(tables['table_db_name']):
+                            app_table = map_apptab_name_id[tables['table_db_name']]
+                            if ((app_table['table_name']==tables['table_db_name']) and not (app_table['table_name']==tables['name'])):
+                                vals['name']=aptable_obj.table_name
+                                vals['hide']=aptable_obj.is_hidden
+                                tables_obj_new=apptab_objs.write(cr,uid,tables['id'],vals)
+                        else:
+                            vals['table_name']=tables['table_db_name']
+                            vals['name']=(" ").join(map(lambda x:x.capitalize(),tables['name'].split("_")))
+                            vals['is_hidden']=tables['hide']
+                            vals['application_id']=app_id
+                            apptab_new_obj=apptab_objs.create(cr,uid,vals)
+                    
+            id_columns=pooler.get_pool(cr.dbname).get('olap.database.columns').search(cr,uid,[('table_id','in',id_tables)])
+            columns=pooler.get_pool(cr.dbname).get('olap.database.columns').read(cr,uid,id_columns,[])
+            for columns in columns:
+                vals={}
+                if len(appfield_ids) == 0 and (columns['column_db_name'] not in appcol_name):
+                    vals['field_name']=columns['column_db_name']
+                    vals['table_name']=columns['table_id'][1]
+                    vals['name']=(" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
+                    vals['is_hidden']=columns['hide']
+                    vals['application_id']=x_app['id']                      
+                    appfield_new_obj=appfield_objs.create(cr,uid,vals)
+                else:
+                    if map_apptab_name_id.has_key(columns['table_id'][1]):
+                        table_id_write = map_apptab_name_id[columns['table_id'][1]]
+                        filter_column=filter(lambda x: columns['column_db_name']==x['field_name'] and columns['table_id'][1]==x['table_name'],appfield_data_res)
+                        vals['name']=(" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
+                        vals['is_hidden']=columns['hide']
+                        appfield_new_obj=appfield_objs.write(cr,uid,filter_column[0]['id'],vals)
+                    else:
+                        vals['field_name']=columns['column_db_name']
+                        vals['table_name']=columns['table_id'][1]
+                        vals['name']=(" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
+                        vals['is_hidden']=columns['hide']
+                        vals['application_id']=x_app['id']                      
+                        appfield_new_obj=appfield_objs.create(cr,uid,vals)
+        
+        
+            database_tables = pooler.get_pool(cr.dbname).get('olap.database.tables')
+            id_tables=database_tables.search(cr,uid,[('fact_database_id','=',ids.database_id.id)])
+            tables=database_tables.read(cr,uid,id_tables,[])
+            make_id=[]
+            for table in tables:
+                vals={}
+                if (table['table_db_name'].startswith('ir') or table['table_db_name'].startswith('wkf')) or (table['table_db_name'].startswith('res_groups')) or (table['table_db_name'] in ['inherit','res_roles','user_rule_group_rel','res_roles_users_rel','group_rule_group_rel']):            
+                    vals['hide']=True
+                    vals['active']=False
+                    make_id.append(table['id'])
+                    database_tables.write(cr,uid,table['id'],vals)
+                    
+            database_columns=pooler.get_pool(cr.dbname).get('olap.database.columns')
+            id_columns=database_columns.search(cr,uid,[('table_id','in',make_id)])
+            columns=database_columns.read(cr,uid,id_columns,[])
+            for col in columns:
+                val={}
+                vals['hide']=True
+                vals['active']=False
+                database_columns.write(cr,uid,col['id'],vals)
+                
+            
+        wf_service = netsvc.LocalService('workflow')
+        wf_service.trg_validate(uid, 'olap.schema', data['id'], 'dbconfigure', cr)
+        return {}
+      
+    
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':form1, 'fields':{}, 'state':[('configure','Configure'),('end','Cancel')]}
+        },
+        'configure': {
+            'actions': [configure_application],
+            'result': {'type':'form', 'arch':info, 'fields':{}, 'state':[('end','Ok')]}   
+        },
+
+      }
+
+
+wizard_application_configure('olap.application.configuration')
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/wizard/wizard_clear_logs.py b/addons/olap/wizard/wizard_clear_logs.py
new file mode 100755
index 00000000000..38b6531485a
--- /dev/null
+++ b/addons/olap/wizard/wizard_clear_logs.py
@@ -0,0 +1,83 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import time
+
+import wizard
+import pooler
+from osv import osv
+
+
+info = '''<?xml version="1.0"?>
+<form string="Load Data">
+    <label string="Logs Cleared successfully"/>
+</form>'''
+
+form1 = '''<?xml version="1.0"?>
+<form string=" To Load Data">
+    <field name='user_name'/>
+</form>'''
+
+field1 = {
+ #   'account_id': {'string':"Analytic Account", 'type':'many2one', 'relation':'account.analytic.account', 'required':True, 'domain':"[('type','=','normal')]"},
+    'user_name': {'string':'User', 'type':'char','size':'64', 'required':True, 'readonly':True},
+#    'db_name': {'string':'Database Name', 'type':'char','size':'64', 'required':True, 'readonly':True},
+
+}
+
+def clear_logs(self,cr,uid,part,context={}):
+    ids=pooler.get_pool(cr.dbname).get('olap.query.logs').search(cr,uid,[('user_id','=',uid)])
+    pooler.get_pool(cr.dbname).get('olap.query.logs').unlink(cr, uid,ids,context)
+    return {}
+
+def _getdata(self,cr,uid,part,context={}):
+    ids=pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid)
+    part['form']['user_name']=ids['name']
+#    part['form']['db_name']=lines.database_id.db_name
+    return part['form']
+
+class wizard_clear_logs(wizard.interface):
+
+    states = {
+
+       'init': {
+            'actions': [_getdata],
+            'result': {'type':'form','arch':form1, 'fields':field1, 'state':[('end','Cancel'),('ok','Clear Logs')]}
+        },
+
+        'ok': {
+            'actions': [clear_logs],
+            'result': {'type':'form','arch':info,'fields':{}, 'state':[('end','Ok')]}
+                },
+
+         'info': {
+            'actions': [],
+            'result': {'type':'form', 'arch':info, 'fields':{}, 'state':[('end','Ok')]}
+                },
+
+      }
+
+wizard_clear_logs('olap.query.logs.clear')
diff --git a/addons/olap/wizard/wizard_load_columns.py b/addons/olap/wizard/wizard_load_columns.py
new file mode 100755
index 00000000000..f64a94399b4
--- /dev/null
+++ b/addons/olap/wizard/wizard_load_columns.py
@@ -0,0 +1,55 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import time
+
+import wizard
+import pooler
+
+class wizard_load_columns(wizard.interface):
+    def _get_table_data(self, cr, uid, data, context={}):
+        pool_obj = pooler.get_pool(cr.dbname)
+        ids_cols=pool_obj.get('olap.database.columns').search(cr, uid, ([('table_id','=',data['id'])]),context={})
+        model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_olap_database_columns_form')],context={})
+        resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
+        return {
+            'domain': "[('id','in', ["+','.join(map(str,ids_cols))+"])]",
+            'name': 'Database Columns',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'olap.database.columns',
+            'views': [(False,'tree'),(resource_id,'form')],
+            'type': 'ir.actions.act_window',
+        }
+        
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'action' ,'action':_get_table_data,'state':'end'}
+        }
+      }
+
+wizard_load_columns('olap.load.column')
diff --git a/addons/olap/wizard/wizard_load_configured_table.py b/addons/olap/wizard/wizard_load_configured_table.py
new file mode 100755
index 00000000000..da9a23cd1ba
--- /dev/null
+++ b/addons/olap/wizard/wizard_load_configured_table.py
@@ -0,0 +1,67 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import time
+
+import wizard
+import pooler
+import netsvc
+
+class wizard_load_configured_table(wizard.interface):
+    def _get_table_data(self, cr, uid, data, context={}):
+        pool_obj = pooler.get_pool(cr.dbname)
+        
+#        vals={}
+#        vals['configure']=True
+#        vals['state']='dbconfigure'
+#        pooler.get_pool(cr.dbname).get('olap.schema').write(cr,uid,data['id'],vals)
+        
+        wf_service = netsvc.LocalService('workflow')
+        wf_service.trg_validate(uid, 'olap.schema', data['id'], 'dbconfigure', cr)
+        
+        lines=pool_obj.get('olap.schema').read(cr, uid, data['id'],context={})
+        fact_ids=pool_obj.get('olap.database.tables').search(cr, uid, ([('fact_database_id','=',lines['database_id'][0])]),context={})
+        model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_olap_database_tables_form')],context={})
+        resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
+        
+        return {
+            'domain': "[('id','in', ["+','.join(map(str,fact_ids))+"])]",
+            'name': 'Database Tables',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'olap.database.tables',
+            'views': [(False,'tree'),(resource_id,'form')],
+            'type': 'ir.actions.act_window'
+        }
+        
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'action' ,'action':_get_table_data,'state':'end'}
+        }
+      }
+
+wizard_load_configured_table('olap.load.configuration.table')
diff --git a/addons/olap/wizard/wizard_load_data.py b/addons/olap/wizard/wizard_load_data.py
new file mode 100755
index 00000000000..320c69683ec
--- /dev/null
+++ b/addons/olap/wizard/wizard_load_data.py
@@ -0,0 +1,406 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import psycopg2
+import time
+
+import wizard
+import pooler
+import netsvc
+
+info = '''<?xml version="1.0"?>
+<form string="Load Data">
+    <label string="Your database structure has been correctly loaded"/>
+</form>'''
+
+form1 = '''<?xml version="1.0"?>
+
+<form string="Load Database Structure">
+
+    <label align="0.0" string="We will load the complete structure of the database by introspection,
+     so that you will be able to work on it, and specify a better structure 
+    according to your reporting needs." colspan="4" />
+    <newline/>
+    <label align="0.0" string="After having loaded the structure, you will be able to hide/show or 
+    rename tables and columns to simplify end-users interface. The following database 
+    will be loaded:" colspan="4"/>
+    <field align="0.0" name='fact_table'/>
+    <newline/>
+    <field align="0.0" name='db_name' colspan="4"/>
+</form>'''
+
+field1 = {
+    'fact_table': {'string':'Fact Name', 'type':'char','size':'64', 'required':True, 'readonly':True},
+    'db_name': {'string':'Database Name', 'type':'char','size':'64', 'required':True, 'readonly':True},
+}
+
+def olap_db_connect(self,cr,uid,part,context={}):
+    pool = pooler.get_pool(cr.dbname)
+    lines=pool.get('olap.schema').browse(cr, uid, part['id'],context)
+    id_db=lines.database_id.id
+    type = lines.database_id.type
+    db_name = lines.database_id.db_name
+    tobj = pool.get('olap.database.tables')
+    tcol = pool.get('olap.database.columns')
+    if type == 'postgres':
+        host = lines.database_id.db_host and "host=%s" % lines.database_id.db_host or ''
+        port = lines.database_id.db_port and "port=%s" % lines.database_id.db_port or ''
+        name = lines.database_id.db_name and "dbname=%s" % lines.database_id.db_name or ''
+        user = lines.database_id.db_login and "user=%s" % lines.database_id.db_login or ''
+        password = lines.database_id.db_password and "password=%s" % lines.database_id.db_password or ''
+        tdb = psycopg2.connect('%s %s %s %s %s' % (host, port, name, user, password))
+        cr_db = tdb.cursor()
+        cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d', (id_db,))
+        tables = dict(cr.fetchall())
+        tables_id = map(lambda x: str(tables[x]),tables)
+        cols={}
+        if tables_id:
+            cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) +')')
+        else:
+            cr.execute('select column_db_name,id,table_id from olap_database_columns')
+      
+        for data in cr.fetchall():
+            cols[str(data[1])]=(data[0],int(data[2]))
+            
+        print 'Creating / Updating Tables...' 
+        cr_db.execute("select table_name, table_catalog from INFORMATION_SCHEMA.tables as a where a.table_schema = 'public'")
+        for table in cr_db.fetchall():
+            val = {
+                'fact_database_id':id_db,
+                'table_db_name':table[0]
+            }
+           
+            if table[0] in tables.keys():
+                table_id=tobj.write(cr,uid,[tables[table[0]]], val, context)
+            else:
+                val['name']=table[0]
+                tables[val['name']] = tobj.create(cr,uid,val, context)    
+        print 'Creating / Updating Columns...' 
+        cr_db.execute("""SELECT
+                table_name, column_name, udt_name
+            from
+                INFORMATION_SCHEMA.columns
+            WHERE table_schema = 'public'""")
+        
+        for col in cr_db.fetchall():
+            val={
+                'table_id': tables[col[0]],
+                'column_db_name': col[1],
+                'type': col[2],
+            }
+            
+            id_made=filter(lambda x:(int(cols[x][1])==int(tables[col[0]])),cols)
+            if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
+                col_id=tcol.write(cr,uid,cols[tables[str(col[0])]], val, context)
+            else:
+                val['name']=col[1]
+                id_made = tcol.create(cr,uid,val, context)
+                cols[str(id_made)] = (val['name'],int(val['table_id']))
+        print 'Creating / Updating Constraints...' 
+        cr_db.execute("""select 
+                table_name,column_name 
+            from 
+                INFORMATION_schema.key_column_usage
+            where 
+                constraint_name in (
+                            select constraint_name from INFORMATION_SCHEMA .table_constraints
+                            where 
+                                constraint_type = 'PRIMARY KEY')""")
+        print "Updating the Primary Key Constraint" 
+        for constraint in cr_db.fetchall():
+            val={
+                'primary_key':True
+            }
+            
+            id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[0]])and(constraint[1]==cols[x][0])),cols)
+            col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context) 
+        print "Updating the Foreign key constraint" 
+        cr_db.execute("""select 
+                    constraint_name,table_name 
+            from 
+                INFORMATION_schema.constraint_column_usage 
+            where
+                constraint_name in (
+                            select constraint_name from INFORMATION_SCHEMA.table_constraints 
+                            where 
+                                constraint_type = 'FOREIGN KEY')""")
+        for_key=dict(cr_db.fetchall())
+        
+        cr_db.execute("""select 
+                     table_name,column_name,constraint_name 
+                 from 
+                     INFORMATION_schema.key_column_usage
+                 where 
+                     constraint_name in (
+                                 select constraint_name from INFORMATION_SCHEMA.table_constraints 
+                                 where 
+                                     constraint_type = 'FOREIGN KEY')""") 
+
+        for constraint in cr_db.fetchall():
+            val={
+                'related_to':tables[for_key[constraint[2]]]
+            }
+            id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[0]])and (constraint[1]==cols[x][0])),cols)
+            col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context) 
+    
+    
+    elif type =='mysql':
+        try:
+            import MySQLdb
+            host = lines.database_id.db_host or ''
+            port = lines.database_id.db_port or ''
+            db = lines.database_id.db_name or ''
+            user = lines.database_id.db_login or ''
+            passwd = lines.database_id.db_password or ''
+            tdb = MySQLdb.connect(host = host,port = port, db = db, user = user, passwd = passwd)
+            
+        except Exception, e:
+            raise osv.except_osv('MySQLdb Packages Not Installed.',e )
+        
+        cr_db = tdb.cursor()
+        cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d', (id_db,))
+        tables = dict(cr.fetchall())
+        tables_id = map(lambda x: str(tables[x]),tables)
+        cols={}
+        if tables_id:
+            cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) +')')
+        else:
+            cr.execute('select column_db_name,id,table_id from olap_database_columns')
+        
+        for data in cr.fetchall():
+            cols[str(data[1])]=(data[0],int(data[2]))
+        cr_db.execute("select table_name, table_catalog from INFORMATION_SCHEMA.tables where table_schema =%s",(db_name))
+        
+        for table in cr_db.fetchall():
+            val = {
+                'fact_database_id':id_db,
+                'table_db_name':table[0]
+            }
+           
+            if table[0] in tables.keys():
+                table_id=tobj.write(cr,uid,[tables[table[0]]], val, context)
+                
+            else:
+                val['name']=table[0]
+                tables[val['name']] = tobj.create(cr,uid,val, context)
+        cr_db.execute("""SELECT
+                table_name, column_name, data_type
+            from
+                INFORMATION_SCHEMA.columns
+            WHERE table_schema = %s""",(db_name))
+        
+        for col in cr_db.fetchall():
+            
+            val={
+                'table_id': tables[col[0]],
+                'column_db_name': col[1],
+                'type': col[2],
+            }
+            
+            id_made=filter(lambda x:(int(cols[x][1])==int(tables[col[0]])),cols)
+            if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
+                col_id=tcol.write(cr,uid,cols[tables[str(col[0])]], val, context)
+            else:
+                val['name']=col[1]
+                id_made = tcol.create(cr,uid,val, context)
+                cols[str(id_made)] = (val['name'],int(val['table_id']))
+       
+        cr_db.execute("""select 
+                REFERENCED_COLUMN_NAME,REFERENCED_TABLE_NAME,COLUMN_NAME,TABLE_NAME
+            from 
+                INFORMATION_schema.key_column_usage
+            where table_schema= %s and 
+                constraint_name in (
+                            select constraint_name from INFORMATION_SCHEMA .table_constraints
+                            where 
+                                constraint_type in('PRIMARY KEY','FOREIGN KEY'))
+                            """,(db_name)) 
+
+        for constraint in cr_db.fetchall():
+            
+            if constraint[0]:
+                val={
+                     'related_to':tables[constraint[1]]
+                     }
+            else:
+                
+                val={
+                     'primary_key':True
+                     }
+            id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[3]])and(constraint[2]==cols[x][0])),cols)
+            col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context)  
+    
+    elif type == 'oracle':
+        try:
+            import cx_Oracle
+            host = lines.database_id.db_host or ''
+            port = lines.database_id.db_port or ''
+            db = lines.database_id.db_name or ''
+            user = lines.database_id.db_login.upper() or ''
+            passwd = lines.database_id.db_password or ''
+            tdb = cx_Oracle.connect(user, passwrd, host)
+            
+        except Exception, e:
+                    raise osv.except_osv('cx_Oracle Packages Not Installed.',e )
+
+        cr_db = tdb.cursor()
+        cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d', (id_db,))
+        tables = dict(cr.fetchall())
+        tables_id = map(lambda x: str(tables[x]),tables)
+        cols={}
+        if tables_id:
+            cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) +')')
+        else:
+            cr.execute('select column_db_name,id,table_id from olap_database_columns')
+        
+        for data in cr.fetchall():
+            cols[str(data[1])]=(data[0],int(data[2]))
+
+        cr_db.execute("select table_name from all_tables where owner =%s",(user))
+        temp = cr_db.fetchall()
+        for table in temp:
+            val = {
+                'fact_database_id':id_db,
+                'table_db_name':table[0]
+            }
+            
+            if table[0] in tables.keys():
+                table_id=tobj.write(cr,uid,[tables[table[0]]], val, context)
+                
+            else:
+                val['name']=table[0]
+                tables[val['name']] = tobj.create(cr,uid,val, context)
+
+        cr_db.execute("""SELECT
+                table_name, column_name, data_type
+            from
+                all_tab_columns 
+            WHERE owner = %s""",(user))
+        temp = cr_db.fetchall()
+        for col in temp:
+            if col[2]=='NUMBER':
+                type_col='numeric'
+            elif col[2]=='DATE':
+                type_col='date'
+            elif col[2]=='VARCHAR2':
+                type_col='varchar'
+            else:
+                type_col=col[2]
+            val={
+                'table_id': tables[col[0]],
+                'column_db_name': col[1],
+                'type': type_col,
+            }
+            
+            id_made=filter(lambda x:(int(cols[x][1])==int(tables[col[0]])),cols)
+            if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
+                col_id=tcol.write(cr,uid,cols[tables[str(col[0])]], val, context)
+            else:
+                val['name']=col[1]
+                id_made = tcol.create(cr,uid,val, context)
+                cols[str(id_made)] = (val['name'],int(val['table_id']))
+
+        cr_db.execute("""select 
+                table_name,column_name,constraint_name
+            from 
+                all_cons_columns
+            where
+                constraint_name in (
+                            select constraint_name from all_constraints
+                            where 
+                                constraint_type = 'P' and owner= %s)
+                            """,(user)) 
+        temp = cr_db.fetchall()
+        pk_table = {}        
+        for constraint in temp:
+            val={
+                'primary_key' : True
+            }
+            pk_table[constraint[2]] = constraint[0]
+
+            id_to_write=filter(lambda x : (int(cols[x][1])==int(tables[constraint[0]])and(constraint[1]==cols[x][0])),cols)
+            col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context)
+
+        cr_db.execute("""select 
+                        constraint_name,r_constraint_name from all_constraints
+                            where 
+                                constraint_type = 'R'  and owner = %s
+                            """,(user))
+        constraints_map={}
+        for data in cr_db.fetchall():
+            constraints_map[data[0]]=data[1]
+
+        cr_db.execute("""select 
+                table_name,column_name,constraint_name
+            from 
+                all_cons_columns
+            where
+                constraint_name in (
+                            select constraint_name from all_constraints
+                            where 
+                                constraint_type = 'R' and owner = %s)
+                            """,(user))
+            
+
+        temp = cr_db.fetchall()
+        for constraint in temp:
+            rel_constraint_name=constraints_map[constraint[2]]
+            req_table = pk_table[rel_constraint_name]
+            val={
+                'related_to' : tables[req_table]
+            }
+            id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[0]])and (constraint[1]==cols[x][0])),cols)
+            col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context)
+            
+    pooler.get_pool(cr.dbname).get('olap.fact.database').write(cr,uid,[id_db],{'loaded':True})
+    wf_service = netsvc.LocalService('workflow')
+    wf_service.trg_validate(uid, 'olap.schema', part['id'], 'dbload', cr)
+    return {}
+
+def _getdata(self,cr,uid,part,context={}):
+    lines=pooler.get_pool(cr.dbname).get('olap.schema').browse(cr, uid, part['id'],context)
+    part['form']['fact_table']=lines.database_id.name
+    part['form']['db_name']=lines.database_id.db_name
+    return part['form']
+
+class wizard_data_loader(wizard.interface):
+    states = {
+       'init': {
+            'actions': [_getdata],
+            'result': {'type':'form','arch':form1, 'fields':field1, 'state':[('end','Cancel'),('ok','Load Database Structure')]}
+        },
+        'ok': {
+            'actions': [olap_db_connect],
+            'result': {'type':'form','arch':info,'fields':{}, 'state':[('end','Continue and Configure Structure')]}
+        },
+        'info': {
+            'actions': [],
+            'result': {'type':'form', 'arch':info, 'fields':{}, 'state':[('end','Ok')]}
+        },
+      }
+wizard_data_loader('olap.load.table')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/olap/wizard/wizard_query_builder.py b/addons/olap/wizard/wizard_query_builder.py
new file mode 100755
index 00000000000..3b69c1cf996
--- /dev/null
+++ b/addons/olap/wizard/wizard_query_builder.py
@@ -0,0 +1,240 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import wizard
+import threading
+import pooler
+from osv import osv
+import optparse
+import xmlrpclib
+import time
+
+import netsvc
+
+
+
+class Log:
+    def __init__(self):
+        self.content= ""
+        self.error= False
+    def add(self,s,error=True):
+        self.content= self.content + s
+        if error:
+            self.error= error
+    def __call__(self):
+        return self.content
+
+
+def get_cube(self, cr, uid, context):
+        pool = pooler.get_pool(cr.dbname).get('olap.cube')
+        ids = pool.search(cr, uid, [])
+        res = pool.read(cr, uid, ids, ['schema_id','name'], context)
+        res=[(r['schema_id'], r['name']) for r in res]
+
+        return res
+
+def get_details(self, cr, uid,data, context):
+         """
+         To Fetch dimension of selected schema
+         """
+         pool = pooler.get_pool(cr.dbname).get('olap.cube')
+
+         search_id=data['form']['cube_schema'][0]
+
+         ids=pool.search(cr,uid,[('schema_id','=',search_id)])
+
+         """
+         ids now have the cube id from schema user selected
+         """
+
+         """
+         To Fetch hiearchy of selected schema
+         """
+         pool = pooler.get_pool(cr.dbname).get('olap.dimension')
+
+         id_dimension=pool.search(cr,uid,[('cube_id','=',ids[0])])
+         res=pool.read(cr,uid,id_dimension,['id','name'],context)
+         log_d=Log()
+         for r in res:
+             log_d.add(r['name'])
+             log_d.add("\n")
+
+
+         """
+         To Fetch hiearchy id
+         """
+         pool=pooler.get_pool(cr.dbname).get('olap.hierarchy')
+
+         id_hierarchy=pool.search(cr,uid,[('dimension_id','in',tuple(id_dimension))])
+         res=pool.read(cr,uid,id_hierarchy,['id','name'],context)
+         log_h=Log()
+         for r in res:
+             log_h.add(r['name'])
+             log_h.add("\n")
+
+
+
+         """
+         To fetch level id
+         """
+         pool=pooler.get_pool(cr.dbname).get('olap.level')
+         id_level=pool.search(cr,uid,[('hierarchy_id','in',tuple(id_hierarchy))])
+         res=pool.read(cr,uid,id_level,['id','name'],context)
+         log_l=Log()
+         for r in res:
+             log_l.add(r['name'])
+             log_l.add("\n")
+
+         """
+         To fetch measures id
+         """
+         pool=pooler.get_pool(cr.dbname).get('olap.measure')
+         id_level=pool.search(cr,uid,[('cube_id','in',tuple(ids))])
+         res=pool.read(cr,uid,id_level,['id','name'],context)
+         log_m=Log()
+         for r in res:
+             log_m.add(r['name'])
+             log_m.add("\n")
+
+
+         return {'hierarchy':log_h(),'dimension':log_d(),'level':log_l(),'measure':log_m()}
+
+
+
+
+query_builder_form = """<?xml version="1.0"?>
+<form string="Query Builder">
+ <field name="dimension"/>
+ <field name="hierarchy"/>
+ <field name="level"/>
+ <field name="measure"/>
+ <field name="mdx_query" colspan="4" height="100" width="800"/>
+ <field name="mdx_query_output" colspan="4" height="100" width="800"/>
+</form>"""
+query_builder_fields={
+
+
+                      'dimension':{'string':'Dimension','type':'text'},
+                      'hierarchy':{'string':'Hiearchy','type':'text'},
+                      'level':{'string':'Level','type':'text'},
+                      'measure':{'string':'Measure','type':'text'},
+                      'mdx_query':{'string':'MDX Query','type':'text'},
+                      'mdx_query_output':{'string':'MDX Query Output','type':'text'},
+                      }
+
+query_builder_fetch_form = """<?xml version="1.0"?>
+<form string="Cube Fetcher">
+  <field name="cube_schema"/>
+</form>"""
+
+query_builder_fetch_fields = {
+    'cube_schema':{'string':'Select Cube','type':'selection','selection':get_cube},
+}
+
+
+
+def _execute_mdx(self, cr, uid, data, context):
+
+    log=Log()
+
+    pool = pooler.get_pool(cr.dbname).get('olap.schema')
+    ids = pool.search(cr, uid, [('database_id','=',data['form']['cube_schema'][0])])
+    res1 = pool.read(cr, uid, ids,['name'], context)
+
+    """
+        doing same using request method of olap.schema
+        creating the object of olpa.schema and using its request method for parsing the query
+    """
+    r=data['form']['mdx_query']
+    n=res1[0]['name']
+    service=netsvc.LocalService("object_proxy")
+    axis,data1=service.execute(cr.dbname,uid,'olap.schema','request',n,r,context={})
+    output=''
+
+    COLSPAN = 18
+    ROWSPAN = 18
+    if len(axis)>1:
+        for i in range(8):
+            ok = False
+            for x in axis[1]:
+                if len(x[0])==i:
+                    ok = True
+            if not ok:
+                   continue
+            #print ' '*COLSPAN,
+            output =' '*COLSPAN
+            log.add(output)
+           # print (('%-'+str(ROWSPAN)+'s ' ) * len(axis[1])) % tuple(map(lambda x: str(len(x[0])==i and x[1] or ''),axis[1]))
+            output=(('%-'+str(ROWSPAN)+'s ' ) * len(axis[1])) % tuple(map(lambda x: str(len(x[0])==i and x[1] or ''),axis[1]))
+            log.add(output)
+
+        for col in data1:
+            x=(' '*(len(axis[0][0][0])-1)*2)
+            print "--------------------------------------",x
+            temp=(axis[0].pop(0)[1])
+            print "--------------------------------------",temp
+          #  print ('%-'+str(COLSPAN)+'s')% (' '*(len(axis[0][0][0])-1)*2 + (temp),),
+            output =('%-'+str(COLSPAN)+'s')% (str(x)+str(temp))
+            log.add("\n")
+            log.add(output)
+            #output=(temp)
+
+            for row in col:
+                if row==[False]:
+          #          print ('%-'+str(ROWSPAN)+'s')%('',),
+                    output=('%-'+str(ROWSPAN)+'s')%('')
+                    log.add(output)
+
+                else:
+         #            print ('%-'+str(ROWSPAN)+'s')%(row,),
+                     output=('%-'+str(ROWSPAN)+'s')%(row)
+                     log.add(output)
+        #print
+        log.add("\n")
+    return {'mdx_query_output':log()}
+
+class wizard_query_builder(wizard.interface):
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type':'form', 'arch':query_builder_fetch_form, 'fields':query_builder_fetch_fields, 'state':[('ok', 'Fetch Data')]}
+        },
+        'ok':{
+            'actions' : [get_details],
+            'result' : {'type':'form', 'arch':query_builder_form, 'fields':query_builder_fields, 'state':[('back','Change cube'),('exec', 'Execute'),('end', 'Cancel')]}
+              },
+
+        'exec': {
+            'actions': [_execute_mdx],
+            'result': {'type':'form','arch':query_builder_form,'fields':query_builder_fields,'state':[('back','Change cube'),('exec', 'Execute'),('end', 'Cancel')]},
+        },
+        'back':{
+            'actions':[],
+            'result':{'type':'form','arch':query_builder_fetch_form,'fields':query_builder_fetch_fields,'state':[('ok', 'Fetch Data')]},
+        },
+    }
+wizard_query_builder('olap.query_builder')
\ No newline at end of file
diff --git a/addons/olap/wizard/wizard_test_connection.py b/addons/olap/wizard/wizard_test_connection.py
new file mode 100755
index 00000000000..0ea5aa29edf
--- /dev/null
+++ b/addons/olap/wizard/wizard_test_connection.py
@@ -0,0 +1,52 @@
+import psycopg2
+
+import wizard
+import pooler
+import netsvc
+from tools.misc import UpdateableStr, UpdateableDict
+
+
+_connection_arch = UpdateableStr()
+
+def _test_connection(self,cr,uid,part,context={}):
+    lines=pooler.get_pool(cr.dbname).get('olap.fact.database').browse(cr, uid, part['id'],context)
+    host = lines.db_host
+    port = lines.db_port
+    db_name = lines.db_name
+    user = lines.db_login
+    password = lines.db_password
+    type = lines.type
+    return_str = "Connection Successful"
+    try:	
+        if type == 'postgres':
+            tdb = psycopg2.connect('host=%s port=%s dbname=%s user=%s password=%s' % (host, port, db_name, user, password))
+
+        elif type == 'mysql':
+            import MySQLdb
+            tdb = MySQLdb.connect(host = host,port = port, db = db_name, user = user, passwd = password)
+                
+
+        elif type == 'oracle':
+            import cx_Oracle
+            tdb = cx_Oracle.connect(user, password, host)
+                
+    except Exception, e:
+            return_str = e.message
+
+    _arch = ['''<?xml version="1.0"?>''', '''<form string="Connection Status">''']
+    _arch.append('''<label string='%s' />''' % (return_str))
+    _arch.append('''</form>''')
+    _connection_arch.string = '\n'.join(_arch)
+
+    return {}
+
+
+
+class wizard_test_connection(wizard.interface):
+    states = {
+        'init': {
+            'actions': [_test_connection],
+            'result': {'type':'form', 'arch': _connection_arch, 'fields':{}, 'state':[('end','Ok')]}
+        },
+    }
+wizard_test_connection('olap.fact.database.test_connection')
diff --git a/addons/olap_crm/__init__.py b/addons/olap_crm/__init__.py
new file mode 100755
index 00000000000..40d842dcc48
--- /dev/null
+++ b/addons/olap_crm/__init__.py
@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import olap_crm
\ No newline at end of file
diff --git a/addons/olap_crm/__terp__.py b/addons/olap_crm/__terp__.py
new file mode 100644
index 00000000000..794b65138b4
--- /dev/null
+++ b/addons/olap_crm/__terp__.py
@@ -0,0 +1,37 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+{
+    "name" : "olap_crm",
+    "version" : "0.1",
+    "author" : "Tiny",
+    "website" : "http://www.openerp.com",
+    "depends" : ["olap"],
+    "category" : "Generic Modules/Olap",
+    "description": """
+    Sale module will load the data in olap tables
+    """,
+    "init_xml" :  ['olap_data.xml'],
+    "update_xml" :[],
+    "demo_xml" : ['olap_crm.xml'],
+    "active": False,
+    "installable": True
+}
diff --git a/addons/olap_crm/i18n/fr_BE.po b/addons/olap_crm/i18n/fr_BE.po
new file mode 100644
index 00000000000..f93a3dfa8e2
--- /dev/null
+++ b/addons/olap_crm/i18n/fr_BE.po
@@ -0,0 +1,29 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* olap_crm
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 05:29:03+0000\n"
+"PO-Revision-Date: 2009-11-26 05:29:03+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: olap_crm
+#: model:ir.module.module,description:olap_crm.module_meta_information
+msgid "\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+
+#. module: olap_crm
+#: model:ir.module.module,shortdesc:olap_crm.module_meta_information
+msgid "olap_crm"
+msgstr ""
+
diff --git a/addons/olap_crm/i18n/olap_crm.pot b/addons/olap_crm/i18n/olap_crm.pot
new file mode 100644
index 00000000000..f93a3dfa8e2
--- /dev/null
+++ b/addons/olap_crm/i18n/olap_crm.pot
@@ -0,0 +1,29 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* olap_crm
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 05:29:03+0000\n"
+"PO-Revision-Date: 2009-11-26 05:29:03+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: olap_crm
+#: model:ir.module.module,description:olap_crm.module_meta_information
+msgid "\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+
+#. module: olap_crm
+#: model:ir.module.module,shortdesc:olap_crm.module_meta_information
+msgid "olap_crm"
+msgstr ""
+
diff --git a/addons/olap_crm/olap_crm.xml b/addons/olap_crm/olap_crm.xml
new file mode 100755
index 00000000000..96dadb7d783
--- /dev/null
+++ b/addons/olap_crm/olap_crm.xml
@@ -0,0 +1,462 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="True">
+
+<!--
+CUSTOM CUBE FOR CRM
+-->
+
+  <record model="olap.fact.database" id="fact_databases_BI">
+    <field name="name">Open ERP CRM Database</field>
+    <field name="db_name">crm</field>
+    <field name="db_login">postgres</field>
+    <field name="db_password">postgres</field>
+  </record>
+<!--
+Schema
+-->
+  <record model="olap.schema" id="schema_crm">
+    <field name="name">OpenERPCRM</field>
+    <field name="state">none</field>
+    <field name="database_id" ref="fact_databases_BI"/>
+  </record>
+
+<!--
+Adding the database tables and database columns to be used and making up the of the
+cube table and cube table line
+-->
+
+
+<!-- Olap Database Tables -->
+    <record model="olap.database.tables" id="table_crm_case">
+        <field name="name">crm_case</field>
+        <field name="table_db_name">crm_case</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_crm_case_categ">
+        <field name="name">crm_case_categ</field>
+        <field name="table_db_name">crm_case_categ</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_crm_case_stage">
+        <field name="name">crm_case_stage</field>
+        <field name="table_db_name">crm_case_stage</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_res_partner">
+        <field name="name">res_partner</field>
+        <field name="table_db_name">res_partner</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+     <record model="olap.database.tables" id="table_crm_case_section">
+        <field name="name">crm_case_section</field>
+        <field name="table_db_name">crm_case_section</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.tables" id="table_res_partner_canal">
+        <field name="name">res_partner_canal</field>
+        <field name="table_db_name">res_partner_canal</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+   
+<!-- Olap Database Columns -->
+
+    
+    <record model="olap.database.columns" id="crm_case_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.columns" id="crm_case_planned_revenue">
+        <field name="name">planned_revenue</field>
+        <field name="column_db_name">planned_revenue</field>
+        <field name="type">float8</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.columns" id="crm_case_partner_id">
+        <field name="name">parnter_id</field>
+        <field name="column_db_name">partner_id</field>
+        <field name="type">float8</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="active">True</field>
+        <field name="related_to" ref="table_res_partner"/>
+    </record>
+ 
+    <record model="olap.database.columns" id="crm_case_planned_cost">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">float8</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.columns" id="crm_case_probability">
+        <field name="name">probability</field>
+        <field name="column_db_name">probability</field>
+        <field name="type">float8</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.columns" id="crm_case_state">
+        <field name="name">state</field>
+        <field name="column_db_name">state</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="res_partner_canal_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_partner_canal"/>
+        <field name="active">True</field>
+    </record>
+
+
+
+
+
+    <record model="olap.database.columns" id="crm_case_categ_id">
+        <field name="name">categ_id</field>
+        <field name="column_db_name">categ_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="related_to" ref="table_crm_case_categ"/>
+    </record>
+
+    <record model="olap.database.columns" id="crm_case_partner_id">
+        <field name="name">partner_id</field>
+        <field name="column_db_name">partner_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="related_to" ref="table_res_partner"/>
+    </record>    
+
+    <record model="olap.database.columns" id="crm_case_canal_id">
+        <field name="name">canal_id</field>
+        <field name="column_db_name">canal_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="related_to" ref="table_res_partner_canal"/>
+    </record>
+
+
+    <record model="olap.database.columns" id="res_partner_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_partner"/>
+    </record>
+
+    <record model="olap.database.columns" id="crm_case_section_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_crm_case_section"/>
+    </record>
+    <record model="olap.database.columns" id="crm_case_stage_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_crm_case_stage"/>
+    </record>
+
+    <record model="olap.database.columns" id="crm_case_stage_id">
+        <field name="name">stage_id</field>
+        <field name="column_db_name">stage_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="related_to" ref="table_crm_case_stage"/>
+    </record>
+
+    <record model="olap.database.columns" id="crm_case_stage_section_id">
+        <field name="name">section_id</field>
+        <field name="column_db_name">section_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_crm_case_stage"/>
+        <field name="related_to" ref="table_crm_case_section"/>
+    </record>
+
+    <record model="olap.database.columns" id="crm_case_categ_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_crm_case_categ"/>
+    </record>
+
+
+
+<!-- Cube-->
+
+    <!-- Cube Table -->
+    <record model="olap.cube.table" id="crm_cube_table">
+        <field name="name">crm_cube</field>
+        <field name='schema_id' ref='schema_crm'/>
+        <field name='column_link_id' ref='crm_case_id'/>
+    </record>
+
+
+    <record model="olap.cube.table" id="crm_cube_section_table">
+        <field name="name">crm_cube_section</field>
+        <field name='schema_id' ref='schema_crm'/>
+        <field name='column_link_id' ref='crm_case_stage_id'/>
+    </record>
+
+    <record model="olap.cube.table" id="crm_cube_stage_table">
+        <field name="name">crm_cube_stage_parnter</field>
+        <field name='schema_id' ref='schema_crm'/>
+        <field name='column_link_id' ref='crm_case_stage_id'/>
+    </record>
+    <record model="olap.cube.table" id="crm_cube_parnter_table">
+        <field name="name">crm_cube_parnter</field>
+        <field name='schema_id' ref='schema_crm'/>
+        <field name='column_link_id' ref='crm_case_partner_id'/>
+    </record>
+
+
+    <record model="olap.cube.table" id="crm_cube_categ_table">
+        <field name="name">crm_cube_categ</field>
+        <field name='schema_id' ref='schema_crm'/>
+        <field name='column_link_id' ref='crm_case_categ_id'/>
+    </record>
+
+    <record model="olap.cube.table" id="crm_cube_channel_table">
+        <field name="name">crm_cube_channel</field>
+        <field name='schema_id' ref='schema_crm'/>
+        <field name='column_link_id' ref='crm_case_canal_id'/>
+    </record>
+
+
+    <!-- Cube  Table Line -->
+    <record model="olap.cube.table.line" id="crm_cube_table_line">
+        <field name="field_id" ref="crm_case_categ_id"/>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="cube_table_id" ref="crm_cube_table"/>
+    </record>
+
+    <record model="olap.cube.table.line" id="crm_section_table_line">
+        <field name="field_id" ref="crm_case_stage_section_id"/>
+        <field name="table_id" ref="table_crm_case_stage"/>
+        <field name="cube_table_id" ref="crm_cube_section_table"/>
+    </record>
+    <!-- Cube -->
+
+    <record model="olap.cube" id="cube_crm">
+        <field name="name">CRM</field>
+        <field name="table_id" ref="crm_cube_table"/>
+        <field name="schema_id" ref="schema_crm"/>
+    </record>
+
+<!--
+DIMENSION Sections
+
+-->
+    
+    <record model="olap.dimension" id="dimension_crm_section">
+        <field name="name">Sections</field>
+        <field name="cube_id" ref="cube_crm"/>
+    </record>
+
+
+    <record model="olap.hierarchy" id="hierarchy_crm_section">
+        <field name="name">Sections</field>
+        <field name="dimension_id" ref="dimension_crm_section"/>
+        <field name="table_id" ref="crm_cube_section_table"/>
+    </record>
+
+    <record model="olap.level" id="level_crm_section">
+        <field name="name">Sections</field>
+        <field name="column_name" ref="crm_case_section_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">crm_case_section</field>
+        <field name="hierarchy_id" ref="hierarchy_crm_section"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record model="olap.level" id="level_crm_section_seq_2">
+        <field name="name">States</field>
+        <field name="column_name" ref="crm_case_stage_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">crm_case_stage</field>
+        <field name="hierarchy_id" ref="hierarchy_crm_section"/>
+        <field name="sequence">2</field>
+    </record>
+
+<!-- Dimension State-->
+
+    <record model="olap.dimension" id="dimension_crm_state">
+        <field name="name">States</field>
+        <field name="cube_id" ref="cube_crm"/>
+    </record>
+
+
+    <record model="olap.hierarchy" id="hierarchy_crm_state">
+        <field name="name">States</field>
+        <field name="dimension_id" ref="dimension_crm_state"/>
+        <field name="table_id" ref="crm_cube_table"/>
+    </record>
+
+    <record model="olap.level" id="level_crm_section">
+        <field name="name">States</field>
+        <field name="column_name" ref="crm_case_state"></field>
+        <field name="column_id_name">state</field>
+        <field name="table_name">crm_case</field>
+        <field name="hierarchy_id" ref="hierarchy_crm_state"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record model="olap.level" id="level_crm_section_seq_2">
+        <field name="name">States</field>
+        <field name="column_name" ref="crm_case_stage_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">crm_case_stage</field>
+        <field name="hierarchy_id" ref="hierarchy_crm_section"/>
+        <field name="sequence">2</field>
+    </record>
+
+
+
+<!--
+Category
+-->
+    <record model="olap.dimension" id="dimension_crm_category">
+        <field name="name">Category</field>
+        <field name="cube_id" ref="cube_crm"/>
+    </record>
+
+
+    <record model="olap.hierarchy" id="hierarchy_crm_category">
+        <field name="name">Category</field>
+        <field name="dimension_id" ref="dimension_crm_category"/>
+        <field name="primary_key_table">crm_case</field>
+        <field name="table_id" ref="crm_cube_categ_table"/>
+    </record>
+
+    <record model="olap.level" id="level_crm_categorys">
+        <field name="name">name</field>
+        <field name="column_name" ref="crm_case_categ_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">crm_case_categ</field>
+        <field name="hierarchy_id" ref="hierarchy_crm_category"/>
+    </record>
+
+<!--
+    Customer
+-->
+    <record model="olap.dimension" id="dimension_crm_customer">
+        <field name="name">Customer</field>
+        <field name="cube_id" ref="cube_crm"/>
+    </record>
+
+    <record model="olap.hierarchy" id="hierarchy_crm_customer">
+        <field name="name">Customer</field>
+        <field name="dimension_id" ref="dimension_crm_customer"/>
+        <field name="primary_key_table">crm_case</field>
+        <field name="table_id" ref="crm_cube_parnter_table"/>
+    </record>
+
+    <record model="olap.level" id="level_crm_category">
+        <field name="name">name</field>
+        <field name="column_name" ref="res_partner_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">res_partner</field>
+        <field name="hierarchy_id" ref="hierarchy_crm_customer"/>
+    </record>
+
+
+    
+    <record model="olap.dimension" id="dimension_crm_channel">
+        <field name="name">Channels</field>
+        <field name="cube_id" ref="cube_crm"/>
+    </record>
+
+
+    <record model="olap.hierarchy" id="hierarchy_crm_channel">
+        <field name="name">Channel</field>
+        <field name="dimension_id" ref="dimension_crm_channel"/>
+        <field name="table_id" ref="crm_cube_channel_table"/>
+    </record>
+
+    <record model="olap.level" id="level_crm_channel">
+        <field name="name">Channel</field>
+        <field name="column_name" ref="res_partner_canal_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">res_partner_canal</field>
+        <field name="hierarchy_id" ref="hierarchy_crm_channel"/>
+        <field name="sequence">1</field>
+    </record>
+
+
+
+<!--
+Measures
+-->
+
+    <record model="olap.measure" id="measure_crm_total_cases">
+        <field name="name">Total Cases</field>
+        <field name="cube_id" ref="cube_crm"/>
+        <field name="measure_type">sql_expr</field>
+        <field name="value_sql">count(crm_case.id)</field>
+    </record>
+
+    <record model="olap.measure" id="measure_crm_avg_planned_cost">
+        <field name="name">Average Planned Revenue</field>
+        <field name="cube_id" ref="cube_crm"/>
+        <field name="measure_type">sql_expr</field>
+        <field name="value_sql">avg(crm_case.planned_revenue)</field>
+        <field name="formatstring">cr_postfix_comma</field>
+    </record>
+
+    <record model="olap.measure" id="measure_crm_avg_planned_revenue">
+        <field name="name">Average Planned Cost</field>
+        <field name="cube_id" ref="cube_crm"/>
+        <field name="measure_type">sql_expr</field>
+        <field name="value_sql">avg(crm_case.planned_cost)</field>
+        <field name="formatstring">cr_postfix_comma</field>
+    </record>
+    
+     <record model="olap.measure" id="measure_planned_revenue">
+        <field name="name">Planned Revenue</field>
+        <field name="cube_id" ref="cube_crm"/>
+        <field name="value_column" ref="crm_case_planned_cost"></field>
+        <field name="value_column_id_name">planned_cost</field>
+        <field name="table_name">crm_case</field>
+        <field name="agregator">sum</field>
+        <field name="formatstring">cr_postfix_comma</field>
+    </record>
+ 
+    <record model="olap.measure" id="measure_planned_revenue">
+        <field name="name">Planned Revenue</field>
+        <field name="cube_id" ref="cube_crm"/>
+        <field name="value_column" ref="crm_case_planned_revenue"></field>
+        <field name="value_column_id_name">planned_revenue</field>
+        <field name="table_name">crm_case</field>
+        <field name="agregator">sum</field>
+    </record>
+    
+    <record model="olap.measure" id="measure_probability">
+        <field name="name">Probability</field>
+        <field name="cube_id" ref="cube_crm"/>
+        <field name="value_column" ref="crm_case_probability"></field>
+        <field name="value_column_id_name">probability</field>
+        <field name="table_name">crm_case</field>
+        <field name="agregator">sum</field>
+    </record>
+d
+</data>
+</openerp>
+
diff --git a/addons/olap_crm/olap_data.xml b/addons/olap_crm/olap_data.xml
new file mode 100755
index 00000000000..d36ec6161fe
--- /dev/null
+++ b/addons/olap_crm/olap_data.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+</data>
+</openerp>
diff --git a/addons/olap_extract/__init__.py b/addons/olap_extract/__init__.py
new file mode 100755
index 00000000000..8ec082d25fb
--- /dev/null
+++ b/addons/olap_extract/__init__.py
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import olap_extract
+import wizard_olap_extract
\ No newline at end of file
diff --git a/addons/olap_extract/__terp__.py b/addons/olap_extract/__terp__.py
new file mode 100644
index 00000000000..6e44d5e7e43
--- /dev/null
+++ b/addons/olap_extract/__terp__.py
@@ -0,0 +1,37 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+{
+    "name" : "Module to extracts the schema structure",
+    "version" : "0.1",
+    "author" : "Tiny",
+    "website" : "http://www.openerp.com",
+    "depends" : ["olap"],
+    "category" : "Generic Modules/Olap",
+    "description": """
+    Extracts the schema structure.
+    """,
+    "init_xml" :  [],
+    "update_xml" : ["olap_extract_wizard.xml"],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}
diff --git a/addons/olap_extract/i18n/fr_BE.po b/addons/olap_extract/i18n/fr_BE.po
new file mode 100644
index 00000000000..92f455fcebd
--- /dev/null
+++ b/addons/olap_extract/i18n/fr_BE.po
@@ -0,0 +1,54 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* olap_extract
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 05:29:21+0000\n"
+"PO-Revision-Date: 2009-11-26 05:29:21+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: olap_extract
+#: model:ir.module.module,shortdesc:olap_extract.module_meta_information
+msgid "olap_extract"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,ok:0
+msgid "OK"
+msgstr ""
+
+#. module: olap_extract
+#: model:ir.actions.wizard,name:olap_extract.bi_olap_extract_schema
+msgid "Olap Extract"
+msgstr ""
+
+#. module: olap_extract
+#: model:ir.module.module,description:olap_extract.module_meta_information
+msgid "\n"
+"    Extracts the schema structure.\n"
+"    "
+msgstr ""
+
+#. module: olap_extract
+#: wizard_field:olap.extract.schema,init,module_name:0
+msgid "Module Name"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_view:olap.extract.schema,init:0
+msgid "New Module Name"
+msgstr ""
+
diff --git a/addons/olap_extract/i18n/olap_extract.pot b/addons/olap_extract/i18n/olap_extract.pot
new file mode 100644
index 00000000000..92f455fcebd
--- /dev/null
+++ b/addons/olap_extract/i18n/olap_extract.pot
@@ -0,0 +1,54 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* olap_extract
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 05:29:21+0000\n"
+"PO-Revision-Date: 2009-11-26 05:29:21+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: olap_extract
+#: model:ir.module.module,shortdesc:olap_extract.module_meta_information
+msgid "olap_extract"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,ok:0
+msgid "OK"
+msgstr ""
+
+#. module: olap_extract
+#: model:ir.actions.wizard,name:olap_extract.bi_olap_extract_schema
+msgid "Olap Extract"
+msgstr ""
+
+#. module: olap_extract
+#: model:ir.module.module,description:olap_extract.module_meta_information
+msgid "\n"
+"    Extracts the schema structure.\n"
+"    "
+msgstr ""
+
+#. module: olap_extract
+#: wizard_field:olap.extract.schema,init,module_name:0
+msgid "Module Name"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_view:olap.extract.schema,init:0
+msgid "New Module Name"
+msgstr ""
+
diff --git a/addons/olap_extract/olap_extract_wizard.xml b/addons/olap_extract/olap_extract_wizard.xml
new file mode 100755
index 00000000000..7de48f3c7ac
--- /dev/null
+++ b/addons/olap_extract/olap_extract_wizard.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+		<wizard
+			string="Olap Extract"
+			model="olap.schema"
+			name="olap.extract.schema"
+			menu= "True"
+ 			id="bi_olap_extract_schema"/>
+
+	</data>
+</openerp>
diff --git a/addons/olap_extract/wizard_olap_extract.py b/addons/olap_extract/wizard_olap_extract.py
new file mode 100755
index 00000000000..e71d2cb7fe6
--- /dev/null
+++ b/addons/olap_extract/wizard_olap_extract.py
@@ -0,0 +1,249 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import wizard
+import pooler
+import csv
+import os
+import time
+import netsvc
+import zipfile
+
+
+form1 = '''<?xml version="1.0"?>
+<form string="New Module Name">
+    <field name='module_name'/>
+</form>'''
+
+field1 = {
+    'module_name': {'string':'Module Name', 'type':'char','size':'64', 'required':True},
+}
+
+
+class wizard_olap_extract(wizard.interface):
+    
+    def zipper(self,zipname,filename,mode="a"):
+        z = zipfile.ZipFile(zipname+".zip", mode)
+        z.write(filename)
+        print "\n",z.printdir()
+ 
+    
+    def write_csv(self,filename,content=[]):
+        fid = open(filename, 'w')        
+        if fid == -1:
+            print 'File: temp.csv not found or could not be opened'
+            return False
+        else:
+            writer=csv.writer(fid, 'TINY',delimiter=',')
+            for row in content:
+                writer.writerow(row)
+            fid.close    
+        return True
+    
+    def table_depth(self,cr,uid,list=[],context={}):
+
+        res={}
+        templeft={}
+        tempright={}
+        for table_id in list:
+            lines=pooler.get_pool(cr.dbname).get('olap.cube.table').browse(cr, uid,table_id,context)            
+            res[str(lines.id)] = ["cubetable_"+str(lines.id),lines.name and lines.name or '',lines.table_alias and lines.table_alias or '',lines.key_left and lines.key_left or '',lines.key_right and lines.key_right or '',lines.table_left_id.id and "cubetable_"+str(lines.table_left_id.id) or '',lines.table_right_id.id and "cubetable_"+str(lines.table_right_id.id) or '']
+            if(lines.table_left_id.id):
+                templeft = self.table_depth(cr,uid,[lines.table_left_id.id],context)
+        
+                if templeft:
+                    for temp in templeft:
+                        if not res.has_key(temp):
+                            res[temp]= templeft[temp]
+
+
+            if(lines.table_right_id.id):
+                tempright = self.table_depth(cr,uid,[lines.table_right_id.id],context) 
+        
+                if tempright:
+                    for temp in tempright:
+                        if not res.has_key(temp):
+                            res[temp]= tempright[temp]
+        return res
+        
+    
+    def _extract_schema(self, cr, uid, data, context={}):
+
+        _name = data['form']['module_name']
+        _modulename = "olap_"+_name
+        
+        dirname = _modulename
+        if not os.path.isdir("./addons/" + dirname + "/"):
+            os.mkdir("./addons/" + dirname + "/")        
+        
+        os.chdir("./addons/"+dirname)
+
+        _init = "import %s" % _modulename
+        f = open("__init__.py","w")
+        f.write(_init)
+        f.close()
+        self.zipper(_modulename, "__init__.py","w")
+        
+        _init_files = {
+                       "1":"olap.fact.database.csv",
+                       "2":"olap.schema.csv",
+                       "5":"olap.cube.table.csv",
+                       "6":"olap.cube.csv",
+                       "7":"olap.dimension.csv",
+                       "8":"olap.hierarchy.csv",
+                       "9":"olap.level.csv",
+                       "10":"olap.measure.csv"                    
+                       }        
+        _init_xml = """"%(1)s",
+                    "%(2)s",
+                    "%(5)s",
+                    "%(6)s",
+                    "%(7)s",
+                    "%(8)s",
+                    "%(9)s",
+                    "%(10)s",
+        """ % _init_files
+        
+        data['modulename'] = _modulename
+        data['init_xml'] = _init_xml
+
+        _terp= """{
+                "name" : "%(modulename)s",
+                "version" : "0.1",
+                "author" : "Tiny",
+                "website" : "http://tinyerp.com/",
+                "depends" : ["olap"],
+                "category" : "Generic Modules/Others",
+                "description": "Module will load the data in olap tables",
+                "init_xml" :[
+                    %(init_xml)s
+                    ],
+                "update_xml" : [],
+                "demo_xml" : [],
+                "active": False,
+                "installable": True
+            }"""%data
+
+        f = open("__terp__.py","w")
+        f.write(_terp)
+        f.close()        
+        self.zipper(_modulename, "__terp__.py")  
+                  
+
+        schema_id = data['id']
+
+        lines=pooler.get_pool(cr.dbname).get('olap.schema').browse(cr, uid, schema_id,context)
+        
+        _extract=[]
+        _extract.append(['id','name','db_name','db_login','db_password'])
+        _extract.append(["db_"+str(lines.database_id.id),lines.database_id.name,lines.database_id.db_name,lines.database_id.db_login,lines.database_id.db_password])
+        self.write_csv('olap.fact.database.csv',_extract)
+        self.zipper(_modulename, "olap.fact.database.csv")
+        
+        _extract=[]
+        _extract.append(['id','name','database_id:id','loaded','configure','ready','state','note'])
+        _extract.append(["schema_"+str(lines.id),lines.name,"db_"+str(lines.database_id.id),lines.loaded and lines.loaded or '',lines.configure and lines.configure or '', lines.ready and lines.ready or '',lines.state,lines.note and lines.note or ''])
+        self.write_csv('olap.schema.csv',_extract)
+        self.zipper(_modulename, "olap.schema.csv")                
+        
+        cube_ids = lines.cube_ids
+        _extractcubes=[]
+        _extractcubes.append(['id','name','table_id:id','schema_id:id'])
+        
+        _extractmeasures=[]
+        _extractmeasures.append(['id','name','cube_id:id','value_column','value_sql','agregator','datatype','formatstring'])        
+        
+        _extractdimension=[]
+        _extractdimension.append(['id','name','foreign_key','foreign_key_table','cube_id:id'])
+        
+        _extracthiers=[]
+        _extracthiers.append(['id','name','primary_key','primary_key_table','field_name','member_all','member_default','sequence','type','dimension_id:id','table_id:id'])
+
+        _extractlevels=[]
+        _extractlevels.append(['id','name','column_name','column_id_name','type','table_name','sequence','hierarchy_id:id'])
+
+        _cube_table_ids = []
+        for cube in cube_ids:
+            _extractcubes.append(["cube_"+str(cube.id),cube.name,"cubetable_"+str(cube.table_id.id),"schema_"+str(cube.schema_id.id)])    
+            _cube_table_ids.append(cube.table_id.id)   
+            
+            measure_ids = cube.measure_ids
+            for measure in measure_ids:
+                _extractmeasures.append(["msr_"+str(measure.id),measure.name,"cube_"+str(measure.cube_id.id),measure.value_column and measure.value_column or '',measure.value_sql and measure.value_sql or '',measure.agregator,measure.datatype and measure.datatype or '',measure.formatstring])        
+            
+            dimension_ids = cube.dimension_ids
+            for dimension in dimension_ids:
+                _extractdimension.append(["dim_"+str(dimension.id),dimension.name,dimension.foreign_key and dimension.foreign_key or '',dimension.foreign_key_table and dimension.foreign_key_table or '',"cube_"+str(dimension.cube_id.id)])
+                
+                hiers_ids = dimension.hierarchy_ids
+                for hier in hiers_ids:
+                    _extracthiers.append(["hier_"+str(hier.id),hier.name,hier.primary_key,hier.primary_key_table and hier.primary_key_table or '',hier.field_name,hier.member_all,hier.member_default,hier.sequence,hier.type,"dim_"+str(hier.dimension_id.id),"cubetable_"+str(hier.table_id.id)])
+                    _cube_table_ids.append(hier.table_id.id)
+                    
+                    level_ids = hier.level_ids
+                    for level in level_ids:
+                        _extractlevels.append(["lvl_"+str(level.id),level.name,level.column_name,level.column_id_name,level.type,level.table_name,level.sequence,"hier_"+str(level.hierarchy_id.id)])
+                        
+        res={}
+        _extract=[]
+        _extract.append(['id','name','table_alias','key_left','key_right','table_left_id:id','table_right_id:id'])
+        res = self.table_depth(cr,uid,_cube_table_ids,context)
+        key = res.keys()
+        key = map(lambda x: int(x),key)
+        key.sort()
+        
+        for k in key:
+            _extract.append(res[str(k)])
+        
+        self.write_csv('olap.cube.csv',_extractcubes)
+        self.zipper(_modulename, "olap.cube.csv")
+        
+        self.write_csv('olap.measure.csv',_extractmeasures)
+        self.zipper(_modulename, "olap.measure.csv")   
+        
+        self.write_csv('olap.dimension.csv',_extractdimension)
+        self.zipper(_modulename, "olap.dimension.csv")
+        
+        self.write_csv('olap.hierarchy.csv',_extracthiers)
+        self.zipper(_modulename, "olap.hierarchy.csv")      
+        
+        self.write_csv('olap.level.csv',_extractlevels)
+        self.zipper(_modulename, "olap.level.csv")                                    
+
+        self.write_csv('olap.cube.table.csv',_extract)
+        self.zipper(_modulename, "olap.cube.table.csv")      
+
+        return {}
+        
+    states = {
+              
+       'init': {
+            'actions': [],
+            'result': {'type':'form','arch':form1, 'fields':field1, 'state':[('end','Cancel'),('ok','OK')]}
+        },              
+              
+        'ok' : {
+            'actions' : [],
+            'result' : {'type' : 'action' ,'action':_extract_schema,'state':'end'}
+        }
+      }
+
+wizard_olap_extract('olap.extract.schema')
diff --git a/addons/olap_sale/__init__.py b/addons/olap_sale/__init__.py
new file mode 100755
index 00000000000..5d7667acf15
--- /dev/null
+++ b/addons/olap_sale/__init__.py
@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import olap_sale
\ No newline at end of file
diff --git a/addons/olap_sale/__terp__.py b/addons/olap_sale/__terp__.py
new file mode 100644
index 00000000000..d94e6ee956d
--- /dev/null
+++ b/addons/olap_sale/__terp__.py
@@ -0,0 +1,37 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+{
+    "name" : "Load Sale Module data in Olap Tables",
+    "version" : "0.1",
+    "author" : "Tiny",
+    "website" : "http://www.openerp.com",
+    "depends" : ["olap"],
+    "category" : "Generic Modules/Olap",
+    "description": """
+    Sale module will load the data in olap tables
+    """,
+    "init_xml" :  ['olap_data.xml'],
+    "update_xml" :[],
+    "demo_xml" : ['olap_sale.xml'],
+    "active": False,
+    "installable": True
+}
diff --git a/addons/olap_sale/i18n/fr_BE.po b/addons/olap_sale/i18n/fr_BE.po
new file mode 100644
index 00000000000..a9f03334ab3
--- /dev/null
+++ b/addons/olap_sale/i18n/fr_BE.po
@@ -0,0 +1,29 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* olap_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 05:29:36+0000\n"
+"PO-Revision-Date: 2009-11-26 05:29:36+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: olap_sale
+#: model:ir.module.module,description:olap_sale.module_meta_information
+msgid "\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+
+#. module: olap_sale
+#: model:ir.module.module,shortdesc:olap_sale.module_meta_information
+msgid "olap_sale"
+msgstr ""
+
diff --git a/addons/olap_sale/i18n/olap_sale.pot b/addons/olap_sale/i18n/olap_sale.pot
new file mode 100644
index 00000000000..a9f03334ab3
--- /dev/null
+++ b/addons/olap_sale/i18n/olap_sale.pot
@@ -0,0 +1,29 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* olap_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 05:29:36+0000\n"
+"PO-Revision-Date: 2009-11-26 05:29:36+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: olap_sale
+#: model:ir.module.module,description:olap_sale.module_meta_information
+msgid "\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+
+#. module: olap_sale
+#: model:ir.module.module,shortdesc:olap_sale.module_meta_information
+msgid "olap_sale"
+msgstr ""
+
diff --git a/addons/olap_sale/olap_data.xml b/addons/olap_sale/olap_data.xml
new file mode 100755
index 00000000000..d36ec6161fe
--- /dev/null
+++ b/addons/olap_sale/olap_data.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+</data>
+</openerp>
diff --git a/addons/olap_sale/olap_sale.xml b/addons/olap_sale/olap_sale.xml
new file mode 100644
index 00000000000..42b6b327dc9
--- /dev/null
+++ b/addons/olap_sale/olap_sale.xml
@@ -0,0 +1,753 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="True">
+
+<!--
+CUSTOM CUBE FOR SALES
+-->
+
+    <record model="olap.fact.database" id="fact_databases_BI">
+        <field name="name">OpenERP Sales Databases</field>
+        <field name="db_name">sales</field>
+        <field name="db_login">postgres</field>
+        <field name="db_password">postgres</field>
+    </record>
+<!--
+Schema
+-->
+    <record model="olap.schema" id="schema_main_sales">
+        <field name="name">OpenERPSales</field>
+        <field name="state">none</field>
+        <field name="database_id" ref="fact_databases_BI"/>
+    </record>
+
+<!--
+Adding the database tables and database columns to be used and making up the of the
+cube table and cube table line
+-->
+
+    <record model="olap.database.tables" id="table_sale_order_line">
+        <field name="name">sale_order_line</field>
+        <field name="table_db_name">sale_order_line</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_sale_order">
+        <field name="name">sale_order</field>
+        <field name="table_db_name">sale_order</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_product_product">
+        <field name="name">product_product</field>
+        <field name="table_db_name">product_product</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_product_template">
+        <field name="name">product_template</field>
+        <field name="table_db_name">product_template</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_product_category">
+        <field name="name">product_category</field>
+        <field name="table_db_name">product_category</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.tables" id="table_res_partner_address">
+        <field name="name">res_partner_address</field>
+        <field name="table_db_name">res_partner_address</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>	
+
+    <record model="olap.database.tables" id="table_res_country">
+        <field name="name">res_country</field>
+        <field name="table_db_name">res_country</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_res_user">
+        <field name="name">res_users</field>
+        <field name="table_db_name">res_users</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_res_partner">
+        <field name="name">res_partner</field>
+        <field name="table_db_name">res_partner</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+
+    </record>	
+    <record model="olap.database.columns" id="columns_product_id_sale_order_line">
+        <field name="name">product_id</field>
+        <field name="column_db_name">product_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="related_to" ref="table_product_product"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_product_product_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_product_product"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+</record>
+<!--	<record model="olap.database.columns" id="columns_sale_order_line_product_id">
+		<field name="name">product_id</field>
+		<field name="column_db_name">id</field>
+		<field name="type">int4</field>
+		<field name="table_id" ref="table_sale_order_line"/>
+		<field name="active">True</field>
+		<field name="related_to" ref="table_product_product"/>
+	</record>
+-->	
+    <record model="olap.database.columns" id="columns_product_template_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_product_template"/>
+        <field name="active">True</field>
+        <field name="primary_key">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_line_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="active">True</field>
+        <field name="primary_key">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order"/>
+        <field name="active">True</field>
+        <field name="primary_key">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_amount_total">
+        <field name="name">amount_total</field>
+        <field name="column_db_name">amount_total</field>
+        <field name="type">float8</field>
+        <field name="table_id" ref="table_sale_order"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_user_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_user"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_product_category_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_product_category"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_product_template_category_id">
+        <field name="name">categ_id</field>
+        <field name="column_db_name">categ_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_product_template"/>
+        <field name="related_to" ref="table_product_category"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_product_template_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_product_template"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_partner_address_city">
+        <field name="name">city</field>
+        <field name="column_db_name">city</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_partner_address"/>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.columns" id="columns_res_country_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_country"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_product_product_product_tmpl_id">
+        <field name="name">product_tmpl_id</field>
+        <field name="column_db_name">product_tmpl_id</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_product_product"/>
+        <field name="related_to" ref="table_product_template"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_product_category_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_product_category"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_product_template_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_product_template"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_product_product_default_code">
+        <field name="name">default_code</field>
+        <field name="column_db_name">default_code</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_product_product"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_date_order">
+        <field name="name">date_order</field>
+        <field name="column_db_name">date_order</field>
+        <field name="type">date</field>
+        <field name="table_id" ref="table_sale_order"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_line_product_uom_qty">
+        <field name="name">product_uom_qty</field>
+        <field name="column_db_name">product_uom_qty</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_line_price_unit">
+        <field name="name">price_unit</field>
+        <field name="column_db_name">price_unit</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_line_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+
+<!--	<record model="olap.database.columns" id="columns_sale_order_line_product_id">
+<field name="name">product_id</field>
+<field name="column_db_name">product_id</field>
+<field name="type">int4</field>
+<field name="table_id" ref="table_sale_order_line"/>
+<field name="related_to" ref="table_product_product"/>
+<field name="active">True</field>
+
+</record>
+-->
+    <record model="olap.database.columns" id="columns_sale_order_line_order_id">
+        <field name="name">order_id</field>
+        <field name="column_db_name">order_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="related_to" ref="table_sale_order"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_partner_id">
+        <field name="name">partner_id</field>
+        <field name="column_db_name">partner_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order"/>
+        <field name="related_to" ref="table_res_partner"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_partner_address_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_res_partner_address"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_partner_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_res_partner"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_partner_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_partner"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_user_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_res_user"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_country_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_res_country"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_partner_order_id">
+        <field name="name">partner_order_id</field>
+        <field name="column_db_name">partner_order_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order"/>
+        <field name="related_to" ref="table_res_partner_address"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_user_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_user"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_country_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_country"/>
+        <field name="active">True</field>
+    </record>	
+
+    <record model="olap.database.columns" id="columns_res_partner_address_country_id">
+        <field name="name">country_id</field>
+        <field name="column_db_name">country_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_res_partner_address"/>
+        <field name="related_to" ref="table_res_country"/>
+        <field name="active">True</field>
+    </record>	
+
+    <record model="olap.database.columns" id="columns_res_partner_address_city">
+        <field name="name">city</field>
+        <field name="column_db_name">city</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_partner_address"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_line_order_id">
+        <field name="name">order_id</field>
+        <field name="column_db_name">order_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="related_to" ref="table_sale_order"/>
+        <field name="active">True</field>
+    </record>
+
+<!--	<record model="olap.database.columns" id="columns_sale_order_line_product_id">
+<field name="name">product_id</field>
+<field name="column_db_name">product_id</field>
+<field name="type">int4</field>
+<field name="table_id" ref="table_sale_order_line"/>
+<field name="related_to" ref="table_product_product"/>
+<field name="active">True</field>
+
+</record>
+-->
+    <record model="olap.database.columns" id="columns_sale_order_line_product_uom_qty">
+        <field name="name">product_uom_qty</field>
+        <field name="column_db_name">product_uom_qty</field>
+        <field name="type">numeric</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_line_price_unit">
+        <field name="name">price_unit</field>
+        <field name="column_db_name">price_unit</field>
+        <field name="type">numeric</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_line_create_uid">
+        <field name="name">create_uid</field>
+        <field name="column_db_name">create_uid</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="related_to" ref="table_res_user"/>
+        <field name="active">True</field>
+    </record>
+
+
+<!--
+Making of the olap.cube.table and olap.cube.table.lines 
+
+-->
+    <record model="olap.cube.table" id="cube_table_sale_order_line">
+        <field name="name">Sales</field>
+        <field name='schema_id' ref='schema_main_sales'/>
+        <field name='column_link_id' ref='columns_sale_order_line_id'/>
+    </record>
+
+    <record model="olap.cube.table" id="cube_table_product_category">
+        <field name="name">Product Category</field>
+        <field name='schema_id' ref='schema_main_sales'/>
+        <field name='column_link_id' ref="columns_product_id_sale_order_line"/>
+    </record>
+
+    <record model="olap.cube.table.line" id="line_prodcut_category_line_21">
+        <field name="field_id" ref="columns_product_product_product_tmpl_id"/>
+        <field name="table_id" ref="table_product_product"/>
+        <field name="cube_table_id" ref="cube_table_product_category"/>
+    </record>
+
+    <record model="olap.cube.table.line" id="line_prodcut_category_line_31">
+        <field name="field_id" ref="columns_product_template_category_id"/>
+        <field name="table_id" ref="table_product_template"/>
+        <field name="cube_table_id" ref="cube_table_product_category"/>
+    </record>
+
+    <record model="olap.cube.table.line" id="line_sale_order_line">
+        <field name="field_id" ref="columns_sale_order_line_order_id"/>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="cube_table_id" ref="cube_table_sale_order_line"/>
+    </record>
+
+    <record model="olap.cube.table" id="product_table">
+        <field name="name">Sale Product</field>
+        <field name='schema_id' ref='schema_main_sales'/>
+        <field name='column_link_id' ref='columns_product_id_sale_order_line'/>
+    </record>
+
+    <record model="olap.cube.table" id="country_table">
+        <field name="name">Sale Country</field>
+        <field name='schema_id' ref='schema_main_sales'/>
+        <field name='column_link_id' ref='columns_sale_order_line_order_id'/>
+    </record>
+
+    <record model="olap.cube.table" id="address_table">
+        <field name='schema_id' ref='schema_main_sales'/>
+        <field name="name">sale_order_line</field>
+        <field name='column_link_id' ref='columns_sale_order_line_order_id'/>
+    </record>
+
+    <record model="olap.cube.table" id="date_table">
+        <field name="name">sale_order_line</field>
+        <field name='schema_id' ref='schema_main_sales'/>
+        <field name='column_link_id' ref='columns_sale_order_line_order_id'/>
+    </record>
+
+    <record model="olap.cube.table" id="user_table">
+        <field name="name">sale_order_line</field>
+        <field name='schema_id' ref='schema_main_sales'/>
+        <field name='column_link_id' ref='columns_sale_order_line_create_uid'/>
+    </record>
+
+    <record model="olap.cube.table.line" id="country_table_line_id_2">
+        <field name="field_id" ref="columns_sale_order_partner_order_id"/>
+        <field name="table_id" ref="table_sale_order"/>
+        <field name="cube_table_id" ref="country_table"/>
+    </record>
+
+    <record model="olap.cube.table.line" id="country_table_line_id_3">
+        <field name="field_id" ref="columns_res_partner_address_country_id"/>
+        <field name="table_id" ref="table_res_partner_address"/>
+        <field name="cube_table_id" ref="country_table"/>
+    </record>
+
+    <record model="olap.cube.table.line" id="country_table_line_id_31">
+        <field name="field_id" ref="columns_sale_order_partner_order_id"/>
+        <field name="table_id" ref="table_sale_order"/>
+        <field name="cube_table_id" ref="address_table"/>
+    </record>
+
+    <record model="olap.cube.table.line" id="country_table_line_id_41">
+        <field name="field_id" ref="columns_sale_order_partner_id"/>
+        <field name="table_id" ref="table_res_partner_address"/>
+        <field name="cube_table_id" ref="address_table"/>
+    </record>
+
+<!--
+Fact Table
+sale_order_line
+-->
+
+    <record model="olap.cube" id="cube_sales_order_line">
+        <field name="name">Sales</field>
+        <field name="table_id" ref="cube_table_sale_order_line"/>
+        <field name="schema_id" ref="schema_main_sales"/>
+    </record>
+
+<!--
+DIMENSION PRODUCT CATEGORY
+
+product_template (product_id)
+-->
+
+    <record model="olap.dimension" id="dimension_product_template">
+        <field name="name"> All Products</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+    </record>
+
+    <record model="olap.hierarchy" id="hierarchy_product_template">
+        <field name="name">All Products</field>
+        <field name="dimension_id" ref="dimension_product_template"/>
+        <field name="primary_key_table">product_product</field>
+        <field name="table_id" ref="product_table"/>
+    </record>
+
+    <record model="olap.level" id="level_product_template">
+        <field name="name">Product Code</field>
+        <field name="column_name" ref="columns_product_product_default_code"></field>
+        <field name="column_id_name">default_code</field>
+        <field name="table_name">product_product</field>
+        <field name="hierarchy_id" ref="hierarchy_product_template"/>
+    </record>
+<!--
+Adding of the product by the category
+-->
+    <record model="olap.dimension" id="dimension_product_category">
+        <field name="name">Products by Category</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+    </record>
+
+    <record model="olap.hierarchy" id="hierarchy_product_category">
+        <field name="name">Products Category</field>
+        <field name="dimension_id" ref="dimension_product_category"/>
+        <field name="primary_key_table">product_product</field>
+        <field name="table_id" ref="cube_table_product_category"/>
+    </record>
+
+    <record model="olap.level" id="level_product_category_1">
+        <field name="name">Product Category</field>
+        <field name="column_name" ref="columns_product_category_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">product_category</field>
+        <field name="hierarchy_id" ref="hierarchy_product_category"/>
+    </record>
+
+    <record model="olap.level" id="level_product_category_2">
+        <field name="name">Product</field>
+        <field name="column_name" ref="columns_product_template_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">product_template</field>
+        <field name="hierarchy_id" ref="hierarchy_product_category"/>
+    </record>
+<!--
+DIMENSION ORDER DATE
+sale_order (order_id)
+-->
+    <record model="olap.dimension" id="dimension_sales_order">
+        <field name="name">Order Date</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+    </record>
+
+    <record model="olap.hierarchy" id="hierarchy_sales_order">
+        <field name="name">Order Date</field>
+        <field name="dimension_id" ref="dimension_sales_order"/>
+        <field name="primary_key_table">sale_order</field>
+        <field name="table_id" ref="date_table"/>
+    </record>
+
+    <record model="olap.level" id="level_sales_order">
+        <field name="name">date_order</field>
+        <field name="column_name" ref="columns_sale_order_date_order"></field>
+        <field name="column_id_name">date_order</field>
+        <field name="type">date_year</field>
+        <field name="sequence">1</field>
+        <field name="table_name">sale_order</field>
+        <field name="hierarchy_id" ref="hierarchy_sales_order"/>
+    </record>
+
+    <record model="olap.level" id="level_sales_order_q">
+        <field name="name">date_order</field>
+        <field name="column_name" ref="columns_sale_order_date_order"></field>
+        <field name="column_id_name">date_order</field>
+        <field name="type">date_quarter</field>
+        <field name="sequence">2</field>
+        <field name="table_name">sale_order</field>
+        <field name="hierarchy_id" ref="hierarchy_sales_order"/>
+    </record>
+
+    <record model="olap.level" id="level_sales_order_m">
+        <field name="name">date_order</field>
+        <field name="column_name" ref="columns_sale_order_date_order"></field>
+        <field name="column_id_name">date_order</field>
+        <field name="type">date_month</field>
+        <field name="sequence">3</field>
+        <field name="table_name">sale_order</field>
+        <field name="hierarchy_id" ref="hierarchy_sales_order"/>
+    </record>
+<!--
+DIMENSION ORDER DATE
+
+partner_country (order_id)
+-->
+<!--
+DIMENSION PARTNER TO COUNTRY
+res_users (user_id)
+-->
+
+    <record model="olap.dimension" id="dimension_partner_country">
+        <field name="name">Country</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+    </record>
+
+    <record model="olap.hierarchy" id="hierarchy_partner_country">
+        <field name="name">Partner Country</field>
+        <field name="dimension_id" ref="dimension_partner_country"/>
+        <field name="primary_key_table">sale_order</field>
+        <field name="table_id" ref="country_table"/>
+    </record>
+
+    <record model="olap.level" id="level_partner_country">
+        <field name="name">country_id</field>
+        <field name="column_name" ref="columns_res_country_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">res_country</field>
+        <field name="hierarchy_id" ref="hierarchy_partner_country"/>
+    </record>
+
+<!--
+DIMENSION PARTNER_ADDRESS TO COUNTRY
+-->
+
+    <record model="olap.dimension" id="dimension_partner_address_country">
+        <field name="name">Sales by Partner City</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+    </record>
+
+    <record model="olap.hierarchy" id="hierarchy_partner_address_country">
+        <field name="name">City</field>
+        <field name="dimension_id" ref="dimension_partner_address_country"/>
+        <field name="primary_key_table">sale_order</field>
+        <field name="table_id" ref="address_table"/>
+    </record>
+
+    <record model="olap.level" id="level_address_country">
+        <field name="name">city</field>
+        <field name="sequence">1</field>
+        <field name="column_name" ref="columns_res_partner_address_city"></field>
+        <field name="column_id_name">city</field>
+        <field name="table_name">res_partner_address</field>
+        <field name="hierarchy_id" ref="hierarchy_partner_address_country"/>
+    </record>
+
+    <record model="olap.level" id="level_address_country_1">
+        <field name="name">name</field>
+        <field name="sequence">2</field>
+        <field name="column_name" ref="columns_res_partner_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">res_partner</field>
+        <field name="hierarchy_id" ref="hierarchy_partner_address_country"/>
+    </record>
+
+
+
+<!--
+DIMENSION SALEMAN
+
+res_users (user_id)
+-->
+
+    <record model="olap.dimension" id="dimension_sales_user">
+        <field name="name">Users</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+    </record>
+
+    <record model="olap.hierarchy" id="hierarchy_sales_user">
+        <field name="name">Users</field>
+        <field name="dimension_id" ref="dimension_sales_user"/>
+        <field name="primary_key_table">res_users</field>
+        <field name="table_id" ref="user_table"/>
+    </record>
+
+    <record model="olap.level" id="hierarchy_sales_user_level">
+        <field name="name">name</field>
+        <field name="column_name" ref="columns_res_user_name"></field>
+        <field name="hierarchy_id" ref="hierarchy_sales_user"/>
+        <field name="table_name">res_users</field>
+        <field name="column_id_name">name</field>
+    </record>
+
+
+
+
+<!--
+Measures
+-->
+
+    <record model="olap.measure" id="measure_item_sold">
+        <field name="name">Average Sales</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+        <field name="value_column" ref="columns_sale_order_amount_total"></field>
+        <field name="value_column_id_name">amount_total</field>
+        <field name="table_name">sale_order</field>
+        <field name="agregator">avg</field>
+        <field name="formatstring">cr_postfix</field>
+    </record>
+    <record model="olap.measure" id="measure_total_sales">
+        <field name="name">Total Sales</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+        <field name="value_column" ref="columns_sale_order_amount_total"></field>
+        <field name="value_column_id_name">amount_total</field>
+        <field name="table_name">sale_order</field>
+        <field name="agregator">sum</field>
+        <field name="formatstring">cr_postfix_comma</field>
+    </record>
+
+    <record model="olap.measure" id="measure_sql_expression">
+        <field name="name">Units Sold</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+        <field name="measure_type">sql_expr</field>
+        <field name="value_sql">count(sale_order.id)</field>
+    </record>
+
+
+</data>
+</openerp>
diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
index 9d39c1a9306..1a83d3f3b44 100644
--- a/addons/point_of_sale/__init__.py
+++ b/addons/point_of_sale/__init__.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,5 +24,8 @@ import pos
 import stock
 import wizard
 import report
+import pos_account_bank_statement
+import account_bank_statement
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 596142c7902..0610144ca87 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -35,8 +36,23 @@ Main features :
 
     """,
     'author': 'Tiny',
-    'depends': ['sale', 'purchase', 'account', 'account_tax_include'],
-    'init_xml': [],
+    'depends': ['sale', 'delivery','report_mrp'],
+#    'depends': ['sale', 'purchase', 'account', 'account_tax_include','board','mrp','board_manufacturing','delivery','profile_manufacturing','account','multi_company'],
+    'init_xml': [
+        'security/point_of_sale_security.xml',
+        'security/ir.model.access.csv',
+        'pos_report.xml',
+        'pos_wizard.xml',
+        'pos_view.xml',
+        'pos_sequence.xml',
+        'posrule_data.xml',
+        'pos_data.xml',
+        'pos_workflow.xml',
+        'statement_view.xml',
+        'statement_report.xml', 
+        'statement_data.xml',
+        'statement_wizard.xml'
+    ],
     'update_xml': [
         'security/point_of_sale_security.xml',
         'security/ir.model.access.csv',
@@ -44,11 +60,12 @@ Main features :
         'pos_wizard.xml',
         'pos_view.xml',
         'pos_sequence.xml',
+        'posrule_data.xml',
         'pos_data.xml',
         'pos_workflow.xml'
     ],
-    'demo_xml': [],
+    'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml'],
     'installable': True,
-    'certificate': '0048272150909',
+    'certificate': '',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
new file mode 100644
index 00000000000..b599f0531f9
--- /dev/null
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -0,0 +1,215 @@
+# encoding: utf-8
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 PC Solutions (<http://pcsol.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import time
+from mx import DateTime
+from decimal import Decimal
+from tools.translate import _
+
+
+class account_journal(osv.osv):
+    _inherit = 'account.journal'
+    _columns = {
+        'auto_cash': fields.boolean('Automatic Opening', help="This field authorize the automatic creation of the cashbox"),
+        'special_journal':fields.boolean('Special Journal', help="Will put all the orders in waiting status till being accepted"),
+        'check_dtls': fields.boolean('Check Details', help="This field authorize Validation of Cashbox without checking ending details"),
+        'statement_sequence_id': fields.many2one('ir.sequence', 'Statement Sequence', \
+            help="The sequence used for statement numbers in this journal."),
+        }
+    _defaults = {
+        'check_dtls': lambda *a:True,
+        'auto_cash': lambda *a:True,
+        }
+account_journal()
+
+
+class singer_statement(osv.osv):
+    _name = 'singer.statement'
+    _description = 'Statements'
+
+    def _sub_total(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for obj in self.browse(cr, uid, ids):
+            res[obj.id] = obj.pieces * obj.number
+        return res
+
+    def on_change_sub2(self, cr, uid, ids, pieces, number, *a):
+        sub=pieces*number
+        return {'value':{'subtotal': sub or 0.0}}
+
+
+    def on_change_sub(self, cr, uid, ids, pieces, number,*a):
+        sub=pieces*number
+        return {'value':{'subtotal': sub or 0.0}}
+
+    _columns = {
+          'pieces': fields.float('Values', digits=(16,2)),
+          'number': fields.integer('Number'),
+          'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float',digits=(16,2)),
+          'starting_id': fields.many2one('account.bank.statement',ondelete='cascade'),
+          'ending_id': fields.many2one('account.bank.statement',ondelete='cascade'),
+     }
+
+singer_statement()
+
+class account_bank_statement(osv.osv):
+    _inherit = 'account.bank.statement'
+    def _get_starting_balance(self, cr, uid, ids, name, arg, context=None):
+        res ={}
+        for statement in self.browse(cr, uid, ids):
+            amount_total=0.0
+            for line in statement.starting_details_ids:
+                amount_total+= line.pieces * line.number
+            res[statement.id]=amount_total
+        return res
+
+    def _get_sum_entry_encoding(self, cr, uid, ids, name, arg, context=None):
+        res2={}
+        for statement in self.browse(cr, uid, ids):
+            encoding_total=0.0
+            for line in statement.line_ids:
+               encoding_total+= line.amount
+            res2[statement.id]=encoding_total
+        return res2
+
+    def _default_journal_id(self, cr, uid, context={}):
+        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+        print [('type','=','cash'),('auto_cash','=',False), ('company_id', '=', company_id)]
+        journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('auto_cash','=',False), ('company_id', '=', company_id)])
+        if journal:
+            return journal[0]
+        else:
+            return False
+
+    _columns = {
+          'journal_id': fields.many2one('account.journal', 'Journal', required=True),
+          'balance_start': fields.function(_get_starting_balance, method=True, string='Starting Balance', type='float',digits=(16,2)),
+         # 'balance_start': fields.float('Starting Balance',digits=(16,2)),
+         # 'balance_end': fields.float('Balance',digits=(16,2)),
+          'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirm'),('open','Open')],
+                                    'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
+          'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, string="Total of Entry encoding"),
+          'date':fields.datetime("Opening Date"),
+          'closing_date':fields.datetime("Closing Date"),
+          'starting_details_ids': fields.one2many('singer.statement', 'starting_id', string='Starting Details'),
+          'ending_details_ids': fields.one2many('singer.statement', 'ending_id', string='Ending Details'),
+          'name': fields.char('Name', size=64, required=True, readonly=True),
+
+    }
+    _defaults = {
+          'state': lambda *a: 'draft',
+          'name': lambda *a: '/',
+          'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
+          'journal_id': _default_journal_id,
+
+         }
+
+    def create(self, cr, uid, vals, context=None):
+        open_jrnl = self.search(cr, uid, [('company_id', '=', vals['company_id']), ('journal_id', '=', vals['journal_id']), ('state', '=', 'open')])
+        if open_jrnl:
+            raise osv.except_osv('Error', u'Une caisse de type espèce est déjà ouverte')
+        if 'starting_details_ids' in vals:
+            vals['starting_details_ids'] = starting_details_ids = map(list, vals['starting_details_ids'])
+            for i in starting_details_ids:
+                if i and i[0] and i[1]:
+                    i[0], i[1] = 0, 0
+        res = super(account_bank_statement, self).create(cr, uid, vals, context=context)
+        return res
+
+    def onchange_journal_id(self, cursor, user, statement_id, journal_id, context=None):
+        id_s=[]
+        if not journal_id:
+            return {'value': {'balance_start': 0.0}}
+        balance_start=0.0
+        cash_obj = self.pool.get('singer.statement')
+        statement_obj = self.pool.get('account.bank.statement')
+        cursor.execute("Select a.id from account_bank_statement a where journal_id=%d and user_id=%d order by a.id desc limit 1"%(journal_id,user))
+        res2=cursor.fetchone()
+        res2=res2 and res2[0] or None
+        if res2:
+            statmt_id=statement_obj.browse(cursor,user,res2)
+            check_det=statmt_id.journal_id.check_dtls
+            if not check_det:
+                balance_start=statmt_id.balance_end_real or 0.0
+                return {'value': {'balance_start': balance_start}}
+        cursor.execute("Select a.id from account_bank_statement a, singer_statement s where journal_id=%d and user_id=%d order by a.id desc limit 1"%(journal_id,user))
+        res1=cursor.fetchone()
+        res1=res1 and res1[0] or None
+        if res1:
+            cursor.execute("Select sum(ss.pieces*ss.number),ss.ending_id from singer_statement ss, account_bank_statement s where ss.ending_id=s.id and s.journal_id=%d and s.user_id=%d and s.id=%d group by ss.ending_id,s.id order by s.id desc"%(journal_id,user, res1))
+            res = cursor.fetchone()
+            balance_start = res and res[0] or 0.0
+            cash_end=res and res[1] or None
+            id_s=statement_obj.browse(cursor,user,cash_end).ending_details_ids
+        new=[]
+        if id_s:
+            for s in id_s:
+                new.append(s.id)
+        return {'value': {'balance_start': balance_start, 'starting_details_ids':new}}
+
+    def button_open(self, cr, uid, ids, context=None):
+        obj_inv = self.browse(cr, uid, ids)[0]
+        s_id=obj_inv.journal_id
+        if s_id.statement_sequence_id:
+            s_id=s_id.id
+            number = self.pool.get('ir.sequence').get_id(cr, uid, s_id)
+        else:
+            number = self.pool.get('ir.sequence').get(cr, uid,
+                            'account.bank.statement')
+
+        self.write(cr, uid, ids, {'date':time.strftime("%Y-%m-%d %H:%M:%S"), 'state':'open', 'name':number})
+        return True
+
+    def button_confirm(self, cr, uid, ids, context=None):
+        val = 0.0
+        val2 = 0.0
+        val_statement_line = 0.0
+        diff = self.pool.get('res.users').browse(cr,uid,uid).company_id.max_diff or 0.0
+        for statement in self.browse(cr, uid, ids):
+            bal = statement.balance_end
+            bal_st=statement.balance_start
+            for st in statement.line_ids:
+                val_statement_line += st.amount
+            for stat in statement.starting_details_ids:
+                val2 += stat.subtotal
+            for stat in statement.ending_details_ids:
+                val += stat.subtotal
+            if statement.journal_id.check_dtls:
+                if Decimal(str(val)).quantize(Decimal('.001')) != (Decimal(str(val_statement_line)) + Decimal(str(val2))).quantize(Decimal('.001')):
+                    raise osv.except_osv(_('Invalid action !'), _(' You can not confirm your cashbox, Please enter ending details, missing value matches to "%s"')%(abs(Decimal(str(val))-(Decimal(str(val_statement_line))+Decimal(str(val2))))))
+
+            self.write(cr, uid, statement.id, {'balance_end_real':Decimal(str(val_statement_line))+Decimal(str(val2)),'closing_date':time.strftime("%Y-%m-%d %H:%M:%S"),'state':'draft'})
+           # self.write(cr, uid, statement.id, {'balance_end_real':bal_st+val_statement_line,'closing_date':time.strftime("%Y-%m-%d %H:%M:%S"),'state':'draft'})
+        return  super(account_bank_statement, self).button_confirm(cr, uid, ids, context=None)
+
+account_bank_statement()
+
+#class singer_account_bank_statement_line(osv.osv):
+#    _inherit = 'account.bank.statement.line'
+#    _columns = {
+#           'pos_statement_id': fields.many2one('pos.order',ondelete='cascade'),
+#     }
+#
+#singer_account_bank_statement_line()
+
+
diff --git a/addons/point_of_sale/multi_company_demo.xml b/addons/point_of_sale/multi_company_demo.xml
new file mode 100644
index 00000000000..dfc59cc09c8
--- /dev/null
+++ b/addons/point_of_sale/multi_company_demo.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+        <record id="second_partner" model="res.partner">
+            <field name="name">Tiny Editor</field>
+        </record>
+
+        <record id="second_company" model="res.company">
+            <field name="name">Tiny Editor</field>
+            <field name="partner_id" ref="base.main_partner"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field name="rml_header1">Free Business Solutions</field>
+            <field name="rml_footer1">Web: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
+            <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701</field>
+            <field name="currency_id" ref="base.EUR"/>
+
+        </record>
+
+        <record id="ter_partner" model="res.partner">
+            <field name="name">Tiny Integrator</field>
+        </record>
+
+        <record id="ter_company" model="res.company">
+            <field name="name">Tiny Integrator</field>
+            <field name="partner_id" ref="base.main_partner"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field name="rml_header1">Free Business Solutions</field>
+            <field name="rml_footer1">Web: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
+            <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701</field>
+            <field name="currency_id" ref="base.EUR"/>
+
+        </record>
+
+  
+
+    </data>
+</openerp>
+
diff --git a/addons/point_of_sale/multi_company_stock_data.xml b/addons/point_of_sale/multi_company_stock_data.xml
new file mode 100644
index 00000000000..539a27ff1a2
--- /dev/null
+++ b/addons/point_of_sale/multi_company_stock_data.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0"?>
+<openerp>
+
+<data>
+        <!-- <record id="res_partner_tinyshop0" model="res.partner">
+            <field eval="0" name="customer"/>
+            <field eval="0" name="supplier"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;Tiny Shop 1&quot;&quot;&quot;" name="name"/>
+        </record>
+        <record id="res_partner_address_fabien0" model="res.partner.address">
+            <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;92000&quot;&quot;&quot;" name="zip"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field name="partner_id" ref="res_partner_tinyshop0"/>
+            <field name="country_id" ref="base.fr"/>
+            <field eval="&quot;&quot;&quot;Avenue de Paris&quot;&quot;&quot;" name="street"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
+        </record>
+        <record id="res_company_shop0" model="res.company">
+            <field eval="5.0" name="security_lead"/>
+            <field name="currency_id" ref="base.EUR"/>
+            <field eval="1.0" name="po_lead"/>
+            <field name="partner_id" ref="res_partner_tinyshop0"/>
+            <field eval="1.0" name="manufacturing_lead"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field eval="80.0" name="schedule_range"/>
+            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+
+        </record>
+        <record id="res_partner_tinyshop1" model="res.partner">
+            <field eval="1" name="customer"/>
+            <field eval="0" name="supplier"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;Tiny Shop 2&quot;&quot;&quot;" name="name"/>
+       </record>
+        <record id="res_partner_address_eric0" model="res.partner.address">
+            <field eval="&quot;&quot;&quot;Eric&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;1500&quot;&quot;&quot;" name="zip"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field name="country_id" ref="base.fr"/>
+            <field eval="&quot;&quot;&quot;Avenue de la Resistance&quot;&quot;&quot;" name="street"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_company_tinyshop0" model="res.company">
+            <field name="currency_id" ref="base.EUR"/>
+            <field eval="1.0" name="po_lead"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field eval="1.0" name="manufacturing_lead"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field eval="80.0" name="schedule_range"/>
+            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
+        </record>
+
+
+        <record id="res_users_shopuser0" model="res.users">
+            <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
+            <field eval="[(6,0,[ref('base.group_partner_manager')])]" name="groups_id"/>
+            <field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/>
+            <field eval="[(6,0,[ref('purchase.res_roles_purchase0'),ref('sale.res_roles_salesman0')])]" name="roles_id"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;shop1&quot;&quot;&quot;" name="password"/>
+            <field eval="&quot;&quot;&quot;en_US&quot;&quot;&quot;" name="context_lang"/>
+            <field eval="&quot;&quot;&quot;Shop 1 User&quot;&quot;&quot;" name="name"/>
+            <field name="company_id" ref="res_company_shop0"/>
+            <field eval="&quot;&quot;&quot;shop1&quot;&quot;&quot;" name="login"/>
+            <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
+        </record>
+        <record id="res_users_shopuser1" model="res.users">
+            <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
+            <field eval="[(6,0,[ref('base.group_partner_manager')])]" name="groups_id"/>
+            <field model="res.partner.address" name="address_id" search="[('name','=','Eric')]"/>
+            <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="password"/>
+            <field eval="&quot;&quot;&quot;Shop 2 User&quot;&quot;&quot;" name="name"/>
+            <field name="company_id" ref="res_company_tinyshop0"/>
+            <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="login"/>
+            <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
+        </record>
+
+        <record id="res_groups_posuserposline0" model="res.groups">
+			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
+			<field eval="&quot;&quot;&quot;POS_user_pos_line&quot;&quot;&quot;" name="name"/>
+		</record>
+
+		<record id="res_groups_posuser0" model="res.groups">
+			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
+			<field eval="&quot;&quot;&quot;POS_user&quot;&quot;&quot;" name="name"/>
+		</record>-->
+
+        <record forcecreate="True" id="property_product_pricelist_multi" model="ir.property">
+            <field name="name">property_product_pricelist</field>
+            <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_product_pricelist')]"/>
+            <field eval="'product.pricelist,'+str(ref('product.list0'))" name="value"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+
+
+        <record forcecreate="True" id="property_stock_account_output_prd_multi" model="ir.property">
+            <field name="name">property_stock_account_output</field>
+            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_stock_account_output')]"/>
+            <field eval="False" name="value"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+        <record forcecreate="True" id="property_stock_account_input_prd_multi" model="ir.property">
+            <field name="name">property_stock_account_input</field>
+            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_stock_account_input')]"/>
+            <field eval="False" name="value"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+        <record forcecreate="True" id="property_stock_account_output_categ_multi" model="ir.property">
+            <field name="name">property_stock_account_output_categ</field>
+            <field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_account_output_categ')]"/>
+            <field eval="False" name="value"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+        <record forcecreate="True" id="property_stock_account_input_categ_multi" model="ir.property">
+            <field name="name">property_stock_account_input_categ</field>
+            <field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_account_input_categ')]"/>
+            <field eval="False" name="value"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+        <record id="ir_property_propertystockjournal0" model="ir.property">
+			<field eval="&quot;&quot;&quot;property_stock_journal&quot;&quot;&quot;" name="name"/>
+			<field name="company_id" ref="res_company_shop0"/>
+			<field eval="&quot;&quot;&quot;account.journal,16&quot;&quot;&quot;" name="value"/>
+			<field name="fields_id" ref="stock.field_product_category_property_stock_journal"/>
+		</record>
+    </data>
+    <data>
+    	<record id="stock.property_stock_journal" model="ir.property">
+             <field name="company_id" ref="base.main_company"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index b26106477b1..e9c89570729 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -1,20 +1,21 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
+#    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
@@ -24,9 +25,9 @@ import netsvc
 from osv import fields, osv
 from mx import DateTime
 from tools.translate import _
-import tools
-from wizard import except_wizard
 from decimal import Decimal
+import tools
+import re
 
 
 class pos_config_journal(osv.osv):
@@ -40,23 +41,53 @@ class pos_config_journal(osv.osv):
 
 pos_config_journal()
 
+class res_mode_contact(osv.osv):
+    _name = "res.mode.contact"
+    _description = "Contact mode"
+    _columns={
+        'name': fields.char('Mode', size=64, select=1),
+        'active': fields.boolean('Active', select=2),
+    }
+res_mode_contact()
+
+class contact_mode_partner(osv.osv):
+    _inherit = 'res.partner'
+    _columns = {
+        'contact_mode_id': fields.many2one('res.mode.contact','Contact Mode'),
+     }
+contact_mode_partner()
+
+
+class pos_company_discount(osv.osv):
+    _inherit = 'res.company'
+    _columns = {
+        'company_discount': fields.float('Max Discount(%)', digits=(16,2)),
+        'max_diff': fields.float('Max Difference for Cashboxes', digits=(16,2)),
+        'account_receivable': fields.many2one('account.account',
+            'Default Receivable', required=True, states={'draft': [('readonly', False)]}),
+     }
+
+pos_company_discount()
+
 
 class pos_order(osv.osv):
     _name = "pos.order"
     _description = "Point of Sale"
     _order = "date_order, create_date desc"
+    _order = "date_order desc"
 
     def unlink(self, cr, uid, ids, context={}):
         for rec in self.browse(cr, uid, ids, context=context):
-            if rec.state != 'draft':
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete a point of sale which is already confirmed !'))
+            for rec_statement in rec.statement_ids:
+                if (rec_statement.statement_id and rec_statement.statement_id.state=='confirm') or rec.state=='done':
+                    raise osv.except_osv(_('Invalid action !'), _('Cannot delete a point of sale which is closed or contains confirmed cashboxes!'))
         return super(pos_order, self).unlink(cr, uid, ids, context=context)
 
     def onchange_partner_pricelist(self, cr, uid, ids, part, context={}):
         if not part:
             return {}
         pricelist = self.pool.get('res.partner').browse(cr, uid, part).property_product_pricelist.id
-        return {'value': {'pricelist_id': pricelist}}
+        return {'value':{'pricelist_id': pricelist}}
 
     def _amount_total(self, cr, uid, ids, field_name, arg, context):
         id_set = ",".join(map(str, ids))
@@ -68,39 +99,121 @@ class pos_order(osv.osv):
                 ) AS amount
         FROM pos_order p
             LEFT OUTER JOIN pos_order_line l ON (p.id=l.order_id)
-        WHERE p.id IN (""" + id_set +""") GROUP BY p.id """)
+        WHERE p.id IN (""" + id_set  +""") GROUP BY p.id """)
         res = dict(cr.fetchall())
-
         for rec in self.browse(cr, uid, ids, context):
             if rec.partner_id \
                and rec.partner_id.property_account_position \
                and rec.partner_id.property_account_position.tax_ids:
                 res[rec.id] = res[rec.id] - rec.amount_tax
+            else :
+                res[rec.id] = res[rec.id] + rec.amount_tax
         return res
 
+    def _get_date_payment2(self, cr, uid, ids, context, *a):
+        res = {}
+        pay_obj = self.pool.get('account.bank.statement')
+        stat_obj_line = self.pool.get('account.bank.statement.line')
+        tot =0.0
+        val=None
+        for order in self.browse(cr, uid, ids):
+            cr.execute("select date_payment2 from pos_order where id=%d"%(order.id))
+            date_p=cr.fetchone()
+            date_p=date_p and date_p[0] or None
+            if date_p:
+                res[order.id]=date_p
+                return res
+            cr.execute(" SELECT max(l.date) from account_move_line l, account_move m, account_invoice i, account_move_reconcile r, pos_order o where i.move_id=m.id and l.move_id=m.id and l.reconcile_id=r.id and o.id=%d and o.invoice_id=i.id"%(order.id))
+            val=cr.fetchone()
+            val= val and val[0] or None
+            if not val:
+                cr.execute("select max(date) from account_bank_statement_line l, account_bank_statement_reconcile s where l.pos_statement_id=%d and l.reconcile_id=s.id"%(order.id))
+                val=cr.fetchone()
+                val=val and val[0] or None
+            if val:
+                res[order.id]=val
+        return res
+    def _get_date_payment(self, cr, uid, ids, context, *a):
+        res = {}
+        pay_obj = self.pool.get('pos.payment')
+        tot =0.0
+        val=None
+        for order in self.browse(cr, uid, ids):
+            cr.execute("select date_payment from pos_order where id=%d"%(order.id))
+            date_p=cr.fetchone()
+            date_p=date_p and date_p[0] or None
+            if date_p:
+                res[order.id]=date_p
+                return res
+            discount_allowed=order.company_id.company_discount
+            for line in order.lines:
+                if line.discount > discount_allowed:
+                    return {order.id: None }
+            if order.amount_paid == order.amount_total and not date_p:
+                cr.execute("select max(date) from account_bank_statement_line where pos_statement_id=%d"%(order.id))
+                val=cr.fetchone()
+                val=val and val[0] or None
+            if order.invoice_id and order.invoice_id.move_id and not date_p and not val:
+                for o in order.invoice_id.move_id.line_id:
+                    if o.balance==0:
+                        if val<o.date_created:
+                            val=o.date_created
+            if val:
+             #   cr.execute("Update pos_order set date_payment='%s' where id = %d"%(val, order.id))
+             #   cr.commit()
+                res[order.id]=val
+        return res
+ #       tax_obj = self.pool.get('account.tax')
+ #       pay_obj = self.pool.get('pos.payment')
+ #       for order in self.browse(cr, uid, ids):
+ #           val = 0.0
+ #           tot =0.0
+ #           for pay in order.payments:
+ #               tot+= pay.amount
+ #           if order.amount_total==tot:
+ #               res[order.id]=time.strftime('%Y-%m-%d')
+ #           for line in order.lines:
+
+ #               val = reduce(lambda x, y: x+round(y['amount'], 2),
+ #                       tax_obj.compute_inv(cr, uid, line.product_id.taxes_id,
+ #                           line.price_unit * \
+ #                           (1-(line.discount or 0.0)/100.0), line.qty),
+ #                           val)
+
+ #           res[order.id] = val
+
     def _amount_tax(self, cr, uid, ids, field_name, arg, context):
         res = {}
         tax_obj = self.pool.get('account.tax')
         for order in self.browse(cr, uid, ids):
             val = 0.0
             for line in order.lines:
-                val = reduce(lambda x, y: x+round(y['amount'], 2),
+                if order.price_type!='tax_excluded':
+                    val = reduce(lambda x, y: x+round(y['amount'], 2),
                         tax_obj.compute_inv(cr, uid, line.product_id.taxes_id,
                             line.price_unit * \
                             (1-(line.discount or 0.0)/100.0), line.qty),
                             val)
+                else:
+                    val = reduce(lambda x, y: x+round(y['amount'], 2),
+                        tax_obj.compute(cr, uid, line.product_id.taxes_id,
+                            line.price_unit * \
+                            (1-(line.discount or 0.0)/100.0), line.qty),
+                            val)
 
             res[order.id] = val
         return res
 
     def _total_payment(self, cr, uid, ids, field_name, arg, context):
         res = {}
+        i=0
         for order in self.browse(cr, uid, ids):
             val = 0.0
-            for payment in order.payments:
+            for payment in order.statement_ids:
                 val += payment.amount
             res[order.id] = val
-        return res
+            return res
+        return {order.id:val}
 
     def _total_return(self, cr, uid, ids, field_name, arg, context):
         res = {}
@@ -125,6 +238,15 @@ class pos_order(osv.osv):
         else:
             return False
 
+    def _shop_get(self, cr, uid, context):
+        company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
+        res = self.pool.get('sale.shop').search(cr, uid, [])
+       # res = self.pool.get('sale.shop').search(cr, uid, [('company_id', '=', company.id)])
+        if res:
+            return res[0]
+        else:
+            return False
+
     def _receivable_get(self, cr, uid, context=None):
         prop_obj = self.pool.get('ir.property')
         res = prop_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
@@ -145,60 +267,99 @@ class pos_order(osv.osv):
         })
         return super(pos_order, self).copy(cr, uid, id, default, context)
 
+    def _get_v( self, cr, uid, ids,*a):
+        flag=False
+        res_company = self.pool.get('res.company')
+        res_obj = self.pool.get('res.users')
+        company_disc=self.browse(cr,uid,ids)
+        if not company_disc:
+            comp=res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
+        else:
+            comp= company_disc[0] and company_disc[0].company_id and  company_disc[0].company_id.company_discount  or 0.0
+        cr.execute("select discount from pos_order_line where order_id=%s and discount <= %s"%(ids[0],comp))
+        res=cr.fetchone()
+        cr.execute("select discount from pos_order_line where order_id=%s and discount > %s"%(ids[0],comp))
+        res2=cr.fetchone()
+        cr.execute("select journal_id from account_bank_statement_line where pos_statement_id=%s "%(ids[0]))
+        res3=cr.fetchall()
+        list_jrnl=[]
+        for r in res3:
+            cr.execute("select id from account_journal where name= '%s' and special_journal='t'"%(r[0]))
+            res3=cr.fetchone()
+            is_special=res3 and res3[0] or None
+            if is_special:
+                list_jrnl.append(is_special)
+        r = {}
+        for order in self.browse(cr, uid, ids):
+            if order.state in ('paid','done','invoiced') and res and not res2 and not len(list_jrnl):
+                r[order.id] = 'accepted'
+        return r
+
     _columns = {
         'name': fields.char('Order Description', size=64, required=True,
             states={'draft': [('readonly', False)]}, readonly=True),
+        'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True),
+        'num_sale': fields.char('Internal Note', size=64),
         'shop_id': fields.many2one('sale.shop', 'Shop', required=True,
             states={'draft': [('readonly', False)]}, readonly=True),
         'date_order': fields.datetime('Date Ordered', readonly=True),
+        'date_payment': fields.function(_get_date_payment, method=True, string='Validation Date', type='date',  store=True),
+        'date_payment2': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date',  store=True),
         'date_validity': fields.date('Validity Date', required=True),
-        'user_id': fields.many2one('res.users', 'Logged in User', readonly=True,
-            help="This is the logged in user (not necessarily the salesman)."),
-        'salesman_id': fields.many2one('res.users', 'Salesman',
-            help="This is the salesman actually making the order."),
+        'user_id': fields.many2one('res.users', 'Connected Salesman', readonly=True),
+        'user_id1': fields.many2one('res.users', 'Salesman', required=True),
+        'user_id2': fields.many2one('res.users', 'Salesman Manager'),
         'amount_tax': fields.function(_amount_tax, method=True, string='Taxes'),
         'amount_total': fields.function(_amount_total, method=True, string='Total'),
-        'amount_paid': fields.function(_total_payment, 'Paid',
-            states={'draft': [('readonly', False)]}, readonly=True,
-            method=True),
+        'amount_paid': fields.function(_total_payment, 'Paid', states={'draft': [('readonly', False)]}, readonly=True, method=True),
         'amount_return': fields.function(_total_return, 'Returned', method=True),
-        'lines': fields.one2many('pos.order.line', 'order_id',
-            'Order Lines', states={'draft': [('readonly', False)]},
-            readonly=True),
-        'payments': fields.one2many('pos.payment', 'order_id',
-            'Order Payments', states={'draft': [('readonly', False)]},
-            readonly=True),
-        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist',
-            required=True, states={'draft': [('readonly', False)]},
-            readonly=True),
-        'partner_id': fields.many2one(
-            'res.partner', 'Partner', change_default=True,
-            states={'draft': [('readonly', False)], 'paid': [('readonly', False)]},
-            readonly=True),
-        'state': fields.selection([('cancel', 'Cancel'), ('draft', 'Draft'),
-            ('paid', 'Paid'), ('done', 'Done'), ('invoiced', 'Invoiced')], 'State',
-            readonly=True,
-            help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed pos order. \
-            \n* The \'Paid\' state is set automatically when users makes payment for the pos order. \
-            \n* The \'Invoiced\' state is set when invoice is created for pos order. \
-            \n* The \'Done\' state is set automatically when user close the pos order.\
-            \n* The \'Cancel\' state is used when user cancel pos order.'),
-        'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
+        'lines': fields.one2many('pos.order.line', 'order_id', 'Order Lines', states={'draft': [('readonly', False)]}, readonly=True),
+        'price_type': fields.selection([
+            ('tax_excluded','Tax excluded')
+        ], 'Price method', required=True),
+        'statement_ids': fields.one2many('account.bank.statement.line','pos_statement_id','Payments'),
+        'payments': fields.one2many('pos.payment', 'order_id', 'Order Payments', states={'draft': [('readonly', False)]}, readonly=True),
+        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, states={'draft': [('readonly', False)]}, readonly=True),
+        'partner_id': fields.many2one( 'res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}),
+        'state': fields.selection([('draft', 'Draft'), ('payment', 'Payment'),
+                                    ('advance','Advance'),
+                                   ('paid', 'Paid'), ('done', 'Done'), ('invoiced', 'Invoiced'), ('cancel', 'Cancel')],
+                                  'State', readonly=True, ),
+        'invoice_id': fields.many2one('account.invoice', 'Invoice'),
         'account_move': fields.many2one('account.move', 'Account Entry', readonly=True),
         'pickings': fields.one2many('stock.picking', 'pos_order', 'Picking', readonly=True),
-        'last_out_picking': fields.many2one('stock.picking',
-                                            'Last Output Picking',
-                                            readonly=True),
-        'note': fields.text('Notes'),
+        'last_out_picking': fields.many2one('stock.picking', 'Last Output Picking', readonly=True),
+        'first_name': fields.char('First Name', size=64),
+        'state_2': fields.function(_get_v,type='selection',selection=[('to_verify', 'To Verify'), ('accepted', 'Accepted'),
+            ('refused', 'Refused')], string='State', readonly=True, method=True, store=True),
+        
+    #    'last_name': fields.char('Last Name', size=64),
+    #    'street': fields.char('Street', size=64),
+    #    'zip2': fields.char('Zip', size=64),
+    #    'city': fields.char('City', size=64),
+    #    'mobile': fields.char('Mobile', size=64),
+    #    'email': fields.char('Email', size=64),
+        'note': fields.text('Internal Notes'),
         'nb_print': fields.integer('Number of Print', readonly=True),
-        'sale_journal': fields.many2one('account.journal', 'Journal',
-            required=True, states={'draft': [('readonly', False)]},
-            readonly=True, ),
-        'account_receivable': fields.many2one('account.account',
-            'Default Receivable', required=True, states={'draft': [('readonly', False)]},
-            readonly=True, ),
-        'invoice_wanted': fields.boolean('Create Invoice')
-        }
+        'sale_journal': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True, ),
+      #  'account_receivable': fields.many2one('account.account',
+      #      'Default Receivable', required=True, states={'draft': [('readonly', False)]},
+      #      readonly=True, ),
+        'invoice_wanted': fields.boolean('Create Invoice'),
+        'note_2': fields.char('Customer Note',size=64),
+        'type_rec': fields.char('Type of Receipt',size=64),
+        'remboursed': fields.boolean('Remboursed'),
+        'contract_number': fields.char('Contract Number', size=512, select=1),
+        'journal_entry': fields.boolean('Journal Entry'),
+    }
+
+
+    def _select_pricelist(self, cr, uid, context):
+        pricelist = self.pool.get('product.pricelist').search(cr, uid, [('name', '=', 'Public Pricelist')])
+        if pricelist:
+            return pricelist[0]
+        else:
+            return False
 
     def _journal_default(self, cr, uid, context={}):
         journal_list = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')])
@@ -209,18 +370,22 @@ class pos_order(osv.osv):
 
     _defaults = {
         'user_id': lambda self, cr, uid, context: uid,
-        'salesman_id': lambda self, cr, uid, context: uid,
+        'user_id2': lambda self, cr, uid, context: uid,
         'state': lambda *a: 'draft',
-        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence')\
-            .get(cr, uid, 'pos.order'),
+        'price_type': lambda *a: 'tax_excluded',
+        'state_2': lambda *a: 'to_verify',
+        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.order'),
         'date_order': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'date_validity': lambda *a: (DateTime.now() + DateTime.RelativeDateTime(months=+6)).strftime('%Y-%m-%d'),
         'nb_print': lambda *a: 0,
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
         'sale_journal': _sale_journal_get,
-        'account_receivable': _receivable_get,
-        'invoice_wanted': lambda *a: False
+        'invoice_wanted': lambda *a: False,
+        'shop_id': _shop_get,
+        'pricelist_id': _select_pricelist,
     }
 
+
     def test_order_lines(self, cr, uid, order, context={}):
         if not order.lines:
             raise osv.except_osv(_('Error'), _('No order lines defined for this sale.'))
@@ -233,14 +398,11 @@ class pos_order(osv.osv):
         return True
 
     def test_paid(self, cr, uid, ids, context=None):
-        def deci(val):
-            return Decimal("%f" % (val, ))
-
         for order in self.browse(cr, uid, ids, context):
             if order.lines and not order.amount_total:
                 return True
-            if (not order.lines) or (not order.payments) or \
-                (deci(order.amount_paid) != deci(order.amount_total)):
+            if (not order.lines) or (not order.statement_ids) or \
+                Decimal(str(order.amount_total))!=Decimal(str(order.amount_paid)):
                 return False
         return True
 
@@ -307,14 +469,11 @@ class pos_order(osv.osv):
     def create_picking(self, cr, uid, ids, context={}):
         """Create a picking for each order and validate it."""
         picking_obj = self.pool.get('stock.picking')
-        partner_obj = self.pool.get('res.partner')
-        address_id = False
+
         orders = self.browse(cr, uid, ids, context)
         for order in orders:
             if not order.last_out_picking:
                 new = True
-                if order.partner_id.id:
-                    address_id = partner_obj.address_get(cr, uid, [order.partner_id.id], ['delivery'])['delivery']
                 picking_id = picking_obj.create(cr, uid, {
                     'origin': order.name,
                     'type': 'out',
@@ -324,15 +483,11 @@ class pos_order(osv.osv):
                     'invoice_state': 'none',
                     'auto_picking': True,
                     'pos_order': order.id,
-                    'address_id' : address_id
-                    },context)
+                    })
                 self.write(cr, uid, [order.id], {'last_out_picking': picking_id})
             else:
                 picking_id = order.last_out_picking.id
-                picking_obj.write(cr, uid, [picking_id], {
-                    'auto_picking': True,
-                    'invoice_state': '2binvoiced',
-                })
+                picking_obj.write(cr, uid, [picking_id], {'auto_picking': True})
                 picking = picking_obj.browse(cr, uid, [picking_id], context)[0]
                 new = False
 
@@ -343,14 +498,17 @@ class pos_order(osv.osv):
 
             if new:
                 for line in order.lines:
-                    prop_ids = self.pool.get("ir.property").search(cr, uid,
-                            [('name', '=', 'property_stock_customer')])
-                    val = self.pool.get("ir.property").browse(cr, uid,
-                            prop_ids[0]).value
-                    location_id = order.shop_id.warehouse_id.lot_stock_id.id
+                    if line.product_id and line.product_id.type=='service':
+                        continue
+                    prop_ids = self.pool.get("ir.property").search(cr, uid, [('name', '=', 'property_stock_customer')])
+                    val = self.pool.get("ir.property").browse(cr, uid, prop_ids[0]).value
+                    cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order.shop_id.warehouse_id.id))
+                    res=cr.fetchone()
+                    location_id=res and res[0] or None
+#                    location_id = order and order.shop_id and order.shop_id.warehouse_id and order.shop_id.warehouse_id.lot_stock_id.id or None
                     stock_dest_id = int(val.split(',')[1])
                     if line.qty < 0:
-                        (location_id, stock_dest_id)= (stock_dest_id, location_id)
+                        location_id, stock_dest_id = stock_dest_id, location_id
 
                     self.pool.get('stock.move').create(cr, uid, {
                         'name': 'Stock move (POS %d)' % (order.id, ),
@@ -361,17 +519,14 @@ class pos_order(osv.osv):
                         'product_uos_qty': abs(line.qty),
                         'product_qty': abs(line.qty),
                         'tracking_id': False,
-                        'pos_line_id': line.id,
                         'state': 'waiting',
                         'location_id': location_id,
                         'location_dest_id': stock_dest_id,
                     })
 
             wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'stock.picking',
-                    picking_id, 'button_confirm', cr)
-            self.pool.get('stock.picking').force_assign(cr,
-                    uid, [picking_id], context)
+            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
+            self.pool.get('stock.picking').force_assign(cr, uid, [picking_id], context)
 
         return True
 
@@ -386,71 +541,92 @@ class pos_order(osv.osv):
             wf_service.trg_create(uid, 'pos.order', i, cr)
         return True
 
+    def button_invalidate(self, cr, uid, ids, *args):
+        res_obj = self.pool.get('res.company')
+        try:
+            part_company=res_obj.browse(cr,uid,uid) and res_obj.browse(cr,uid,uid).parent_id and res_obj.browse(cr,uid,uid).parent_id.id or None
+        except Exception, e:
+            raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
+        if part_company:
+            raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
+        return True
+
+    def button_validate(self, cr, uid, ids, *args):
+        res_obj = self.pool.get('res.company')
+        try:
+            part_company=res_obj.browse(cr,uid,uid) and res_obj.browse(cr,uid,uid).parent_id and res_obj.browse(cr,uid,uid).parent_id.id or None
+        except Exception, e:
+            raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
+        if part_company:
+            raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
+        for order in self.browse(cr, uid, ids):
+            if not order.date_payment:
+                cr.execute("select max(date) from account_bank_statement_line where pos_statement_id=%d"%(order.id))
+                val=cr.fetchone()
+                val=val and val[0] or None
+                if val:
+                    cr.execute("Update pos_order set date_payment='%s' where id = %d"%(val, order.id))
+                    cr.commit()
+        return True
+
+
     def cancel_order(self, cr, uid, ids, context=None):
-        """Cancel each picking with an inverted one."""
-
-        picking_obj = self.pool.get('stock.picking')
-        stock_move_obj = self.pool.get('stock.move')
-        payment_obj = self.pool.get('pos.payment')
-        picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', ids), ('state', '=', 'done')])
-        clone_list = []
-
-        # Copy all the picking and blank the last_out_picking
-        for order in self.browse(cr, uid, ids, context=context):
-            if not order.last_out_picking:
-                continue
-
-            clone_id = picking_obj.copy(
-                cr, uid, order.last_out_picking.id, {'type': 'in'})
-            # Confirm the picking
-            wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'stock.picking',
-                clone_id, 'button_confirm', cr)
-            clone_list.append(clone_id)
-            # Remove the ref to last picking and delete the payments
-            self.write(cr, uid, ids, {'last_out_picking': False})
-            payment_obj.unlink(cr, uid, [i.id for i in order.payments],
-                context=context)
-
-            # Switch all the moves
-            move_ids = stock_move_obj.search(
-                cr, uid, [('picking_id', '=', clone_id)])
-            for move in stock_move_obj.browse(cr, uid, move_ids, context=context):
-                stock_move_obj.write(
-                    cr, uid, move.id, {'location_id': move.location_dest_id.id,
-                                    'location_dest_id': move.location_id.id})
-
-        self.pool.get('stock.picking').force_assign(cr,
-            uid, clone_list, context)
-
+        self.write(cr, uid, ids, {'state': 'cancel'})
+        self.cancel_picking(cr, uid, ids, context={})
         return True
 
     def add_payment(self, cr, uid, order_id, data, context=None):
         """Create a new payment for the order"""
+        res_obj = self.pool.get('res.company')
+        statementl_obj = self.pool.get('account.bank.statement.line')
+        prod_obj = self.pool.get('product.product')
+        flag=''
+        curr_c=self.pool.get('res.users').browse(cr, uid, uid).company_id
+        curr_company=curr_c.id
         order = self.browse(cr, uid, order_id, context)
+        if not order.num_sale and data['num_sale']:
+            self.write(cr,uid,order_id,{'num_sale': data['num_sale']})
+        ids_new=[]
         if order.invoice_wanted and not order.partner_id:
             raise osv.except_osv(_('Error'), _('Cannot create invoice without a partner.'))
-
         args = {
-            'order_id': order_id,
-            'journal_id': data['journal'],
             'amount': data['amount'],
-            'payment_id': data['payment_id'],
             }
-
         if 'payment_date' in data.keys():
-            args['payment_date'] = data['payment_date']
+            args['date'] = data['payment_date']
         if 'payment_name' in data.keys():
-            args['payment_name'] = data['payment_name']
-        if 'payment_nb' in data.keys():
-            args['payment_nb'] = data['payment_nb']
+            args['name'] = data['payment_name'] + ' ' +order.name
+        account_def = self.pool.get('ir.property').get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
+        args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
+        if data.get('is_acc',False):
+            args['is_acc']=data['is_acc']
+            args['account_id']= prod_obj.browse(cr,uid, data['product_id']).property_account_income and prod_obj.browse(cr,uid, data['product_id']).property_account_income.id
+            if not args['account_id']:
+                raise osv.except_osv(_('Error'), _('Please provide an account for the product: %s')%(prod_obj.browse(cr,uid, data['product_id']).name))
+        args['partner_id'] = order.partner_id and order.partner_id.id or None
+        args['ref'] = order.contract_number or None
 
-        payment_id = self.pool.get('pos.payment').create(cr, uid, args )
+        statement_obj= self.pool.get('account.bank.statement')
+        statement_id = statement_obj.search(cr,uid, [
+                                                     ('journal_id', '=', data['journal']),
+                                                     ('company_id', '=', curr_company),
+                                                     ('user_id', '=', uid),
+                                                     ('state', '=', 'open')])
+        if len(statement_id)==0:
+            raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
+        if statement_id:
+            statement_id=statement_id[0]
+        args['statement_id']= statement_id
+        args['pos_statement_id']= order_id
+        args['journal_id']= data['journal']
+        statement_line_id = self.pool.get('account.bank.statement.line').create(cr, uid, args)
+        ids_new.append(statement_id)
 
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(uid, 'pos.order', order_id, 'paid', cr)
         wf_service.trg_write(uid, 'pos.order', order_id, cr)
-        return payment_id
+
+        return statement_id
 
     def add_product(self, cr, uid, order_id, product_id, qty, context=None):
         """Create a new order line the order"""
@@ -486,26 +662,26 @@ class pos_order(osv.osv):
                 'note': 'REFUND\n'+ (order.note or ''),
                 'invoice_id': False,
                 'nb_print': 0,
-                'payments': False,
+                'statement_ids': False,
                 })
             clone_list.append(clone_id)
-            self.write(cr, uid, clone_id, {
-                'partner_id': order.partner_id.id,
-            })
+
 
         for clone in self.browse(cr, uid, clone_list):
             for order_line in clone.lines:
                 line_obj.write(cr, uid, [order_line.id], {
-                    'qty': -order_line.qty,
+                    'qty': -order_line.qty
                     })
         return clone_list
 
     def action_invoice(self, cr, uid, ids, context={}):
+        res_obj = self.pool.get('res.company')
         inv_ref = self.pool.get('account.invoice')
         inv_line_ref = self.pool.get('account.invoice.line')
         inv_ids = []
 
         for order in self.browse(cr, uid, ids, context):
+            curr_c = order.user_id1.company_id
             if order.invoice_id:
                 inv_ids.append(order.invoice_id.id)
                 continue
@@ -513,25 +689,26 @@ class pos_order(osv.osv):
             if not order.partner_id:
                 raise osv.except_osv(_('Error'), _('Please provide a partner for the sale.'))
 
+            cr.execute('select a.id from account_account a, res_company p where p.account_receivable=a.id and p.id=%s', (curr_c.id, ))
+            res=cr.fetchone()
+            acc=res and res[0] or None
             inv = {
                 'name': 'Invoice from POS: '+order.name,
                 'origin': order.name,
+                'account_id':acc,
+                'journal_id':order.sale_journal.id or None,
                 'type': 'out_invoice',
                 'reference': order.name,
                 'partner_id': order.partner_id.id,
                 'comment': order.note or '',
-                'price_type': 'tax_included'
             }
             inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', order.partner_id.id)['value'])
-
-            if not self.pool.get('res.partner').browse(cr, uid, inv['partner_id']).address:
-                raise osv.except_osv(_('Error'), _('Unable to create invoice (partner has no address).'))
-
+            if not inv.get('account_id', None):
+                inv['account_id'] = acc
             inv_id = inv_ref.create(cr, uid, inv, context)
 
             self.write(cr, uid, [order.id], {'invoice_id': inv_id, 'state': 'invoiced'})
             inv_ids.append(inv_id)
-
             for line in order.lines:
                 inv_line = {
                     'invoice_id': inv_id,
@@ -539,11 +716,12 @@ class pos_order(osv.osv):
                     'quantity': line.qty,
                 }
                 inv_line.update(inv_line_ref.product_id_change(cr, uid, [],
-                    line.product_id.id,
-                    line.product_id.uom_id.id,
-                    line.qty, partner_id = order.partner_id.id, fposition_id=order.partner_id.property_account_position.id)['value'])
+                                                               line.product_id.id,
+                                                               line.product_id.uom_id.id,
+                                                               line.qty, partner_id = order.partner_id.id, fposition_id=order.partner_id.property_account_position.id)['value'])
                 inv_line['price_unit'] = line.price_unit
                 inv_line['discount'] = line.discount
+                inv_line['account_id'] = acc
 
                 inv_line['invoice_line_tax_id'] = ('invoice_line_tax_id' in inv_line)\
                     and [(6, 0, inv_line['invoice_line_tax_id'])] or []
@@ -555,8 +733,6 @@ class pos_order(osv.osv):
         return inv_ids
 
     def create_account_move(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         account_move_obj = self.pool.get('account.move')
         account_move_line_obj = self.pool.get('account.move.line')
         account_period_obj = self.pool.get('account.period')
@@ -564,14 +740,13 @@ class pos_order(osv.osv):
         period = account_period_obj.find(cr, uid, context=context)[0]
 
         for order in self.browse(cr, uid, ids, context=context):
-
+            curr_c = self.pool.get('res.users').browse(cr, uid, uid).company_id
+            comp_id = self.pool.get('res.users').browse(cr, order.user_id.id, order.user_id.id).company_id
+            comp_id=comp_id and comp_id.id or False
             to_reconcile = []
             group_tax = {}
-
-            if order.amount_total > 0:
-                order_account = order.sale_journal.default_credit_account_id.id
-            else:
-                order_account = order.sale_journal.default_debit_account_id.id
+            account_def = self.pool.get('ir.property').get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
+            order_account = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
 
             # Create an entry for the sale
             move_id = account_move_obj.create(cr, uid, {
@@ -584,8 +759,12 @@ class pos_order(osv.osv):
 
                 tax_amount = 0
                 taxes = [t for t in line.product_id.taxes_id]
-                computed_taxes = account_tax_obj.compute_inv(
-                    cr, uid, taxes, line.price_unit, line.qty)
+                if order.price_type=='tax_excluded':
+                    computed_taxes = account_tax_obj.compute(
+                        cr, uid, taxes, line.price_unit, line.qty)
+                else:
+                    computed_taxes = account_tax_obj.compute_inv(
+                        cr, uid, taxes, line.price_unit, line.qty)
 
                 for tax in computed_taxes:
                     tax_amount += round(tax['amount'], 2)
@@ -597,8 +776,10 @@ class pos_order(osv.osv):
                         group_tax[group_key] += round(tax['amount'], 2)
                     else:
                         group_tax[group_key] = round(tax['amount'], 2)
-
-                amount = line.price_subtotal - tax_amount
+                if order.price_type!='tax_excluded':
+                    amount = line.price_subtotal - tax_amount
+                else:
+                    amount = line.price_subtotal
 
                 # Search for the income account
                 if  line.product_id.property_account_income.id:
@@ -631,18 +812,20 @@ class pos_order(osv.osv):
 
                 # Create a move for the line
                 account_move_line_obj.create(cr, uid, {
-                    'name': order.name,
+                    'name': "aa"+order.name,
                     'date': order.date_order,
-                    'ref': order.name,
+                    'ref': order.contract_number or order.name,
+                    'quantity': line.qty,
+                    'product_id':line.product_id.id,
                     'move_id': move_id,
                     'account_id': income_account,
+                    'company_id': comp_id,
                     'credit': ((amount>0) and amount) or 0.0,
                     'debit': ((amount<0) and -amount) or 0.0,
                     'journal_id': order.sale_journal.id,
                     'period_id': period,
                     'tax_code_id': tax_code_id,
                     'tax_amount': tax_amount,
-                    'partner_id' : order.partner_id and order.partner_id.id or False,
                 }, context=context)
 
                 # For each remaining tax with a code, whe create a move line
@@ -657,18 +840,20 @@ class pos_order(osv.osv):
                         continue
 
                     account_move_line_obj.create(cr, uid, {
-                        'name': order.name,
+                        'name': "bb"+order.name,
                         'date': order.date_order,
-                        'ref': order.name,
+                        'ref': order.contract_number or order.name,
+                        'product_id':line.product_id.id,
+                        'quantity': line.qty,
                         'move_id': move_id,
                         'account_id': income_account,
+                        'company_id': comp_id,
                         'credit': 0.0,
                         'debit': 0.0,
                         'journal_id': order.sale_journal.id,
                         'period_id': period,
                         'tax_code_id': tax_code_id,
                         'tax_amount': tax_amount,
-                        'partner_id' : order.partner_id and order.partner_id.id or False,
                     }, context=context)
 
 
@@ -676,10 +861,13 @@ class pos_order(osv.osv):
             (tax_code_pos, base_code_pos, account_pos)= (0, 1, 2)
             for key, amount in group_tax.items():
                 account_move_line_obj.create(cr, uid, {
-                    'name': order.name,
+                    'name':"cc"+order.name,
                     'date': order.date_order,
-                    'ref': order.name,
+                    'ref': order.contract_number or order.name,
                     'move_id': move_id,
+                    'company_id': comp_id,
+                    'quantity': line.qty,
+                    'product_id':line.product_id.id,
                     'account_id': key[account_pos],
                     'credit': ((amount>0) and amount) or 0.0,
                     'debit': ((amount<0) and -amount) or 0.0,
@@ -687,15 +875,15 @@ class pos_order(osv.osv):
                     'period_id': period,
                     'tax_code_id': key[tax_code_pos],
                     'tax_amount': amount,
-                    'partner_id' : order.partner_id and order.partner_id.id or False,
                 }, context=context)
 
             # counterpart
             to_reconcile.append(account_move_line_obj.create(cr, uid, {
-                'name': order.name,
+                'name': "dd"+order.name,
                 'date': order.date_order,
-                'ref': order.name,
+                'ref': order.contract_number or order.name,
                 'move_id': move_id,
+                'company_id': comp_id,
                 'account_id': order_account,
                 'credit': ((order.amount_total<0) and -order.amount_total)\
                     or 0.0,
@@ -703,7 +891,6 @@ class pos_order(osv.osv):
                     or 0.0,
                 'journal_id': order.sale_journal.id,
                 'period_id': period,
-                'partner_id' : order.partner_id and order.partner_id.id or False,
             }, context=context))
 
 
@@ -713,94 +900,157 @@ class pos_order(osv.osv):
                 raise  osv.except_osv(_('Error !'),
                     _('There is no receivable account defined for this journal:'\
                     ' "%s" (id:%d)') % (order.sale_journal.name, order.sale_journal.id, ))
+            am=0.0
+            for payment in order.statement_ids:
+                am+=payment.amount
 
-            for payment in order.payments:
-                if not payment.journal_id.default_debit_account_id:
-                    raise osv.except_osv(_('No Default Debit Account !'),
-                        _('You have to define a Default Debit Account for your Financial Journals!\n'))
-
-                if not payment.journal_id.default_credit_account_id:
-                    raise osv.except_osv(_('No Default Credit Account !'),
-                        _('You have to define a Default Credit Account for your Financial Journals!\n'))
-
-                if payment.amount > 0:
-                    payment_account = payment.journal_id.default_debit_account_id.id
+                if am > 0:
+                    payment_account = \
+                        payment.statement_id.journal_id.default_debit_account_id.id
                 else:
-                    payment_account = payment.journal_id.default_credit_account_id.id
-
-                if payment.amount > 0:
-                    order_account = \
-                        order.sale_journal.default_credit_account_id.id
-                else:
-                    order_account = \
-                        order.sale_journal.default_debit_account_id.id
+                    payment_account = \
+                        payment.statement_id.journal_id.default_credit_account_id.id
 
                 # Create one entry for the payment
+                if payment.is_acc:
+                    continue
                 payment_move_id = account_move_obj.create(cr, uid, {
-                    'journal_id': payment.journal_id.id,
+                    'journal_id': payment.statement_id.journal_id.id,
                     'period_id': period,
                 }, context=context)
-                account_move_line_obj.create(cr, uid, {
-                    'name': order.name,
-                    'date': order.date_order,
-                    'ref': order.name,
-                    'move_id': payment_move_id,
-                    'account_id': payment_account,
-                    'credit': ((payment.amount<0) and -payment.amount) or 0.0,
-                    'debit': ((payment.amount>0) and payment.amount) or 0.0,
-                    'journal_id': payment.journal_id.id,
-                    'period_id': period,
-                    'partner_id' : order.partner_id and order.partner_id.id or False,
-                }, context=context)
-                to_reconcile.append(account_move_line_obj.create(cr, uid, {
-                    'name': order.name,
-                    'date': order.date_order,
-                    'ref': order.name,
-                    'move_id': payment_move_id,
-                    'account_id': order_account,
-                    'credit': ((payment.amount>0) and payment.amount) or 0.0,
-                    'debit': ((payment.amount<0) and -payment.amount) or 0.0,
-                    'journal_id': payment.journal_id.id,
-                    'period_id': period,
-                    'partner_id' : order.partner_id and order.partner_id.id or False,
-                }, context=context))
 
-            account_move_obj.button_validate(cr, uid, [move_id, payment_move_id], context=context)
-            account_move_line_obj.reconcile(cr, uid, to_reconcile, type='manual', context=context)
+            for stat_l in order.statement_ids:
+                if stat_l.is_acc and len(stat_l.move_ids):
+                    for st in stat_l.move_ids:
+                        for s in st.line_id:
+                            if s.credit:
+                                account_move_line_obj.copy(cr, uid, s.id, { 'debit': s.credit,
+                                                                            'statement_id': False,
+                                                                            'credit': s.debit})
+                                account_move_line_obj.copy(cr, uid, s.id, {
+                                                                        'statement_id': False,
+                                                                        'account_id':order_account
+                                                                     })
+           #     account_move_obj.button_validate(cr, uid, [move_id, payment_move_id], context=context)
+            self.write(cr,uid,order.id,{'state':'done'})
+         #       account_move_line_obj.reconcile(cr, uid, to_reconcile, type='manual', context=context)
         return True
 
+    def cancel_picking(self, cr, uid, ids, context=None):
+        for order in self.browse(cr, uid, ids, context=context):
+            for picking in order.pickings:
+                self.pool.get('stock.picking').unlink(cr, uid, [picking.id], context)
+        return True
+
+
+    def action_payment(self, cr, uid, ids, context=None):
+        vals = {'state': 'payment'}
+        for pos in self.browse(cr, uid, ids):
+            create_contract_nb = False
+            for line in pos.lines:
+                if line.product_id.product_type == 'MD':
+                    create_contract_nb = True
+                    break
+            if create_contract_nb:
+                seq = self.pool.get('ir.sequence').get(cr, uid, 'pos.user_%s' % pos.user_id1.login)
+                vals['contract_number'] ='%s-%s' % (pos.user_id1.login, seq)
+        self.write(cr, uid, ids, vals)
+
     def action_paid(self, cr, uid, ids, context=None):
-        if context is None:
+        if not context:
             context = {}
-        self.create_picking(cr, uid, ids, context=context)
-        self.write(cr, uid, ids, {'state': 'paid'})
+        if context.get('flag',False):
+            self.create_picking(cr, uid, ids, context={})
+            self.write(cr, uid, ids, {'state': 'paid'})
+        else:
+            context['flag']=True
         return True
 
     def action_cancel(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        self.cancel_order(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state': 'cancel'})
         return True
 
     def action_done(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        self.create_account_move(cr, uid, ids, context=context)
-        self.write(cr, uid, ids, {'state': 'done'})
+        for order in self.browse(cr, uid, ids, context=context):
+            if not order.journal_entry:
+                self.create_account_move(cr, uid, ids, context={})
+        #self.write(cr, uid, ids, {'state': 'done'})
         return True
 
+    def compute_state(self, cr, uid, id):
+        cr.execute("select act.id, act.name from wkf_activity act "
+                   "inner join wkf_workitem item on act.id=item.act_id "
+                   "inner join wkf_instance inst on item.inst_id=inst.id "
+                   "inner join wkf on inst.wkf_id=wkf.id "
+                   "where wkf.osv='pos.order' and inst.res_id=%s "
+                   "order by act.name", (id,))
+        return [name for id, name in cr.fetchall()]
+
 pos_order()
 
+class account_bank_statement(osv.osv):
+    _inherit = 'account.bank.statement'
+    _columns={
+        'user_id': fields.many2one('res.users',ondelete='cascade',string='User', readonly=True),
+    }
+    _defaults = {
+        'user_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).id
+    }
+account_bank_statement()
+
+class account_bank_statement_line(osv.osv):
+    _inherit = 'account.bank.statement.line'
+    def _get_statement_journal(self, cr, uid, ids, context, *a):
+        res = {}
+        for line in self.browse(cr, uid, ids):
+            res[line.id] = line.statement_id and line.statement_id.journal_id and line.statement_id.journal_id.name or None
+        return res
+    _columns={
+        'journal_id': fields.function(_get_statement_journal, method=True,store=True, string='Journal', type='char', size=64),
+        'am_out':fields.boolean("To count"),
+        'is_acc':fields.boolean("Is accompte"),
+        'pos_statement_id': fields.many2one('pos.order',ondelete='cascade'),
+    }
+account_bank_statement_line()
 
 class pos_order_line(osv.osv):
     _name = "pos.order.line"
     _description = "Lines of Point of Sale"
 
-    def _amount_line(self, cr, uid, ids, field_name, arg, context):
+    def _get_amount(self, cr, uid, ids, field_name, arg, context):
         res = {}
         for line in self.browse(cr, uid, ids):
-            res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
+            price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
+            res[line.id]=price
+        return res
+
+    def _amount_line_ttc(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+        account_tax_obj = self.pool.get('account.tax')
+        for line in self.browse(cr, uid, ids):
+            tax_amount = 0.0
+            taxes = [t for t in line.product_id.taxes_id]
+            computed_taxes = account_tax_obj.compute(cr, uid, taxes, line.price_unit, line.qty)
+            for tax in computed_taxes:
+                tax_amount += tax['amount']
+            price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
+            if line.discount!=0.0:
+                res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
+            else:
+                res[line.id]=line.price_unit*line.qty
+            res[line.id] = res[line.id] + tax_amount
+            
+        return res
+    def _amount_line(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+
+        for line in self.browse(cr, uid, ids):
+            price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
+            if line.discount!=0.0:
+                res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
+#                res[line.id] = price * line.qty * (1 - (line.discount or 0.0) / 100.0)
+            else:
+                res[line.id]=line.price_unit*line.qty
         return res
 
     def price_by_product(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
@@ -810,9 +1060,9 @@ class pos_order_line(osv.osv):
             raise osv.except_osv(_('No Pricelist !'),
                 _('You have to select a pricelist in the sale form !\n' \
                 'Please set one before choosing a product.'))
-
+        p_obj = self.pool.get('product.product').browse(cr,uid,product_id).list_price
         price = self.pool.get('product.pricelist').price_get(cr, uid,
-            [pricelist], product_id, qty or 1.0, partner_id)[pricelist]
+            [pricelist], product_id, qty or 1.0, partner_id)[pricelist] 
         if price is False:
             raise osv.except_osv(_('No valid pricelist line found !'),
                 _("Couldn't find a pricelist line matching this product" \
@@ -822,17 +1072,66 @@ class pos_order_line(osv.osv):
 
     def onchange_product_id(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
         price = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id)
+        self.write(cr,uid,ids,{'price_unit':price})
+        return {'value': {'price_unit': price}, 'qty': 1}
 
-        return {'value': {'price_unit': price}}
+    def onchange_subtotal(self, cr, uid, ids, discount, price, pricelist,qty,partner_id, product_id,*a):
+        prod_obj = self.pool.get('product.product')
+        price_f = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id)
+        prod_id=''
+        if product_id:
+            prod_id=prod_obj.browse(cr,uid,product_id).disc_controle
+        disc=0.0
+        if (disc != 0.0 or prod_id) and price_f>0:
+            disc=100-(price/price_f*100)
+            return {'value':{'discount':disc, 'price_unit':price_f}}#,'notice':''}}#, 'price_subtotal':(price_f*qty*(1-disc))}}
+        return {}
 
+    def onchange_ded(self, cr, uid,ids, val_ded,price_u,*a):
+        pos_order = self.pool.get('pos.order.line')
+        res_obj = self.pool.get('res.users')
+        res_company = self.pool.get('res.company')
+        comp = res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
+        val=0.0
+        if val_ded and price_u:
+            val=100.0*val_ded/price_u
+        if val > comp:
+            return {'value': {'discount':val, 'notice':'' }}
+        return {'value': {'discount':val}}
+
+    def onchange_discount(self, cr, uid,ids, discount,price,*a):
+        pos_order = self.pool.get('pos.order.line')
+        res_obj = self.pool.get('res.users')
+        res_company = self.pool.get('res.company')
+        company_disc = pos_order.browse(cr,uid,ids)
+        if discount:
+            if not company_disc:
+                comp=res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
+            else:
+                comp= company_disc[0] and company_disc[0].order_id.company_id and  company_disc[0].order_id.company_id.company_discount  or 0.0
+
+            if discount > comp :
+                return {'value': {'notice':'','price_ded':price*discount*0.01 or 0.0  }}
+            else:
+                return {'value': {'notice':'Minimum Discount','price_ded':price*discount*0.01 or 0.0  }}
+        else :
+            return {'value': {'notice':'No Discount', 'price_ded':price*discount*0.01 or 0.0 }}
     _columns = {
         'name': fields.char('Line Description', size=512),
+        'company_id':fields.many2one('res.company', 'Company', required=True),
+        'notice': fields.char('Discount Notice', size=128, required=True),
+        'serial_number': fields.char('Serial Number', size=128),
+#        'contract_number': fields.char('Contract Number', size=512),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], required=True, change_default=True),
-        'price_unit': fields.float('Unit Price', required=True),
+#        'price_unit': fields.float('Unit Price'),
+        'price_unit': fields.function(_get_amount, method=True, string='Unit Price', store=True),
+        'price_ded': fields.float('Discount(Amount)'),
         'qty': fields.float('Quantity'),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal'),
+        'qty_rfd': fields.float('Refunded Quantity'),
+        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal w/o Tax'),
+        'price_subtotal_incl': fields.function(_amount_line_ttc, method=True, string='Subtotal'),
         'discount': fields.float('Discount (%)', digits=(16, 2)),
-        'order_id': fields.many2one('pos.order', 'Order Reference', ondelete='cascade'),
+        'order_id': fields.many2one('pos.order', 'Order Ref', ondelete='cascade'),
         'create_date': fields.datetime('Creation Date', readonly=True),
         }
 
@@ -840,6 +1139,9 @@ class pos_order_line(osv.osv):
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.order.line'),
         'qty': lambda *a: 1,
         'discount': lambda *a: 0.0,
+        'price_ded': lambda *a: 0.0,
+        'notice': lambda *a: 'No Discount',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
         }
 
     def create(self, cr, user, vals, context={}):
@@ -862,7 +1164,7 @@ class pos_order_line(osv.osv):
 
         product_id = self.pool.get('product.product').search(cr, uid, [('ean13','=', ean)])
         if not product_id:
-            return False
+           return False
 
         # search price product
         product = self.pool.get('product.product').read(cr, uid, product_id)
@@ -884,7 +1186,7 @@ class pos_order_line(osv.osv):
                    }
             line_id = self.create(cr, uid, vals)
             if not line_id:
-                raise except_wizard(_('Error'), _('Create line failed !'))
+                raise wizard.except_wizard(_('Error'), _('Create line failed !'))
         else:
             vals = {
                 'qty': qty,
@@ -892,19 +1194,12 @@ class pos_order_line(osv.osv):
             }
             line_id = self.write(cr, uid, order_line_id, vals)
             if not line_id:
-                raise except_wizard(_('Error'), _('Modify line failed !'))
+                raise wizard.except_wizard(_('Error'), _('Modify line failed !'))
             line_id = order_line_id
 
         price_line = float(qty)*float(price)
         return {'name': product_name, 'product_id': product_id[0], 'price': price, 'price_line': price_line ,'qty': qty }
 
-    def unlink(self, cr, uid, ids, context={}):
-        """Allows to delete pos order lines in draft,cancel state"""
-        for rec in self.browse(cr, uid, ids, context=context):
-            if rec.order_id.state not in ['draft','cancel']:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete an order line which is %s !')%(rec.order_id.state,))
-        return super(pos_order_line, self).unlink(cr, uid, ids, context=context)
-
 pos_order_line()
 
 
@@ -928,7 +1223,7 @@ class pos_payment(osv.osv):
 
     _columns = {
         'name': fields.char('Description', size=64),
-        'order_id': fields.many2one('pos.order', 'Order Reference', required=True, ondelete='cascade'),
+        'order_id': fields.many2one('pos.order', 'Order Ref', required=True, ondelete='cascade'),
         'journal_id': fields.many2one('account.journal', "Journal", required=True),
         'payment_id': fields.many2one('account.payment.term','Payment Term', select=True),
         'payment_nb': fields.char('Piece Number', size=32),
@@ -963,33 +1258,266 @@ class report_transaction_pos(osv.osv):
     _auto = False
     _columns = {
         'date_create': fields.char('Date', size=16, readonly=True),
-        'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
+        'journal_id': fields.many2one('account.journal', 'Sales Journal', readonly=True),
+        'jl_id': fields.many2one('account.journal', 'Cash Journals', readonly=True),
         'user_id': fields.many2one('res.users', 'User', readonly=True),
         'no_trans': fields.float('Number of Transaction', readonly=True),
         'amount': fields.float('Amount', readonly=True),
-        'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
+        'invoice_id': fields.float('Nbr Invoice', readonly=True),
+        'invoice_am': fields.float('Invoice Amount', readonly=True),
+        'product_nb': fields.float('Product Nb.', readonly=True),
+        'disc': fields.float('Disc.', readonly=True),
     }
 
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'report_transaction_pos')
         cr.execute("""
             create or replace view report_transaction_pos as (
-                select
-                    min(pp.id) as id,
-                    count(pp.id) as no_trans,
-                    sum(amount) as amount,
-                    pp.journal_id,
-                    to_char(pp.create_date, 'YYYY-MM-DD') as date_create,
-                    ps.user_id,
-                    ps.invoice_id
+               select
+                    min(absl.id) as id,
+                    count(absl.id) as no_trans,
+                    sum(absl.amount) as amount,
+                    sum(line.price_ded) as disc,
+                    to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
+                    po.user_id as user_id,
+                    po.sale_journal as journal_id,
+                    abs.journal_id as jl_id,
+                    count(po.invoice_id) as invoice_id,
+                    count(p.id) as product_nb
                 from
-                    pos_payment pp, pos_order ps
-                WHERE ps.id = pp.order_id
+                    account_bank_statement_line as absl,
+                    account_bank_statement as abs,
+                    product_product as p,
+                    pos_order_line as line,
+                    pos_order as po
+                where
+                    absl.pos_statement_id = po.id and
+                    line.order_id=po.id and
+                    line.product_id=p.id and
+                    absl.statement_id=abs.id
+
                 group by
-                    pp.journal_id, date_create, ps.user_id, ps.invoice_id
-            )
-            """)
+                    po.user_id,po.sale_journal, abs.journal_id,
+                    to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text
+                )
+        """)
+                    #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')
+                    #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
 report_transaction_pos()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+class report_sales_by_user_pos(osv.osv):
+    _name = "report.sales.by.user.pos"
+    _description = "Sales by user"
+    _auto = False
+    _columns = {
+        'date_order': fields.date('Order Date',required=True, select=True),
+        'amount': fields.float('Total', readonly=True, select=True),
+        'qty': fields.float('Quantity', readonly=True, select=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+    }
 
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sales_by_user_pos')
+        cr.execute("""
+            create or replace view report_sales_by_user_pos as (
+                select
+                    min(po.id) as id,
+                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text as date_order,
+                    po.user_id as user_id,
+                    sum(pol.qty)as qty,
+                    sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as amount
+                from
+                    pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt
+                where
+                    pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id
+               group by
+                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text,
+                    po.user_id
+
+                )
+        """)
+report_sales_by_user_pos()
+
+class report_sales_by_user_pos_month(osv.osv):
+    _name = "report.sales.by.user.pos.month"
+    _description = "Sales by user monthly"
+    _auto = False
+    _columns = {
+        'date_order': fields.date('Order Date',required=True, select=True),
+        'amount': fields.float('Total', readonly=True, select=True),
+        'qty': fields.float('Quantity', readonly=True, select=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sales_by_user_pos_month')
+        cr.execute("""
+            create or replace view report_sales_by_user_pos_month as (
+                select
+                    min(po.id) as id,
+                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text as date_order,
+                    po.user_id as user_id,
+                    sum(pol.qty)as qty,
+                    sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as amount
+                from
+                    pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt
+                where
+                    pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id
+               group by
+                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text,
+                    po.user_id
+
+                )
+        """)
+report_sales_by_user_pos_month()
+
+class report_sales_by_margin_pos(osv.osv):
+    _name = "report.sales.by.margin.pos"
+    _description = "Sales by margin"
+    _auto = False
+    _columns = {
+#        'pos_name': fields.char('POS Order', size=64, readonly=True),
+        'product_name':fields.char('Product Name', size=64, readonly=True),
+        'date_order': fields.date('Order Date',required=True, select=True),
+        'amount': fields.float('Total', readonly=True, select=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+        'qty': fields.float('Qty', readonly=True, select=True),
+        'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
+        'total':fields.float('Margin', readonly=True, select=True),
+
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sales_by_margin_pos')
+        cr.execute("""
+            create or replace view report_sales_by_margin_pos as (
+                select
+                    min(pol.id) as id,
+                    po.user_id as user_id,
+                    pt.name as product_name,
+                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text as date_order,
+                    sum(pol.qty) as qty,
+                    pt.list_price-pt.standard_price as net_margin_per_qty,
+                    (pt.list_price-pt.standard_price) *sum(pol.qty) as total
+                from
+                    product_template as pt,
+                    product_product as pp,
+                    pos_order_line as pol,
+                    pos_order as po
+                where
+                    pol.product_id = pp.product_tmpl_id and
+                    pp.product_tmpl_id = pt.id and
+                    po.id = pol.order_id
+
+                group by
+                    pt.name,
+                    pt.list_price,
+                    pt.standard_price,
+                    po.user_id,
+                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text
+
+                )
+        """)
+report_sales_by_margin_pos()
+
+class report_sales_by_margin_pos_month(osv.osv):
+    _name = "report.sales.by.margin.pos.month"
+    _description = "Sales by margin monthly"
+    _auto = False
+    _columns = {
+#        'pos_name': fields.char('POS Order', size=64, readonly=True),
+        'product_name':fields.char('Product Name', size=64, readonly=True),
+        'date_order': fields.date('Order Date',required=True, select=True),
+        'amount': fields.float('Total', readonly=True, select=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+        'qty': fields.float('Qty', readonly=True, select=True),
+        'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
+        'total':fields.float('Margin', readonly=True, select=True),
+
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sales_by_margin_pos_month')
+        cr.execute("""
+            create or replace view report_sales_by_margin_pos_month as (
+                select
+                    min(pol.id) as id,
+                    po.user_id as user_id,
+                    pt.name as product_name,
+                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text as date_order,
+                    sum(pol.qty) as qty,
+                    pt.list_price-pt.standard_price as net_margin_per_qty,
+                    (pt.list_price-pt.standard_price) *sum(pol.qty) as total
+                from
+                    product_template as pt,
+                    product_product as pp,
+                    pos_order_line as pol,
+                    pos_order as po
+                where
+                    pol.product_id = pp.product_tmpl_id and
+                    pp.product_tmpl_id = pt.id and
+                    po.id = pol.order_id
+
+                group by
+                    pt.name,
+                    pt.list_price,
+                    pt.standard_price,
+                    po.user_id,
+                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text
+
+                )
+        """)
+report_sales_by_margin_pos_month()
+
+
+class account_move_line(osv.osv):
+    _inherit = 'account.move.line'
+    def create(self, cr, user, vals, context={}):
+        pos_obj = self.pool.get('pos.order')
+        val_name = vals.get('name', '')
+        val_ref = vals.get('ref', '')
+        if (val_name and 'POS' in val_name) and (val_ref and 'PACK' in val_ref):
+            aaa = re.search(r'Stock move.\((.*)\)', vals.get('name'))
+            name_pos = aaa.groups()[0]
+            pos_id = name_pos.replace('POS ','')
+            if pos_id and pos_id.isdigit():
+                pos_curr = pos_obj.browse(cr,user,int(pos_id))
+                pos_curr = pos_curr  and pos_curr.contract_number or ''
+                vals['ref'] = pos_curr or vals.get('ref')
+        return super(account_move_line, self).create(cr, user, vals, context)
+
+account_move_line()
+
+
+class account_move(osv.osv):
+    _inherit = 'account.move'
+    def create(self, cr, user, vals, context={}):
+        pos_obj = self.pool.get('pos.order')
+        val_name = vals.get('name', '')
+        val_ref = vals.get('ref', '')
+        if (val_name and 'POS' in val_name) and (val_ref and 'PACK' in val_ref):
+            aaa = re.search(r'Stock move.\((.*)\)', vals.get('name'))
+            name_pos = aaa.groups()[0]
+            pos_id = name_pos.replace('POS ','')
+            if pos_id and pos_id.isdigit():
+                pos_curr = pos_obj.browse(cr,user,int(pos_id))
+                pos_curr = pos_curr  and pos_curr.contract_number or ''
+                vals['ref'] = pos_curr or vals.get('ref')
+        return super(account_move, self).create(cr, user, vals, context)
+
+account_move()
+
+
+class product_product(osv.osv):
+    _inherit = 'product.product'
+    _columns = {
+        'income_pdt': fields.boolean('Product for Incoming'),
+        'expense_pdt': fields.boolean('Product for expenses'),
+        'am_out': fields.boolean('Controle for Outgoing Operations'),
+        'disc_controle': fields.boolean('Discount Controle '),
+}
+    _defaults = {
+        'disc_controle': lambda *a: True,
+}
+product_product()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/pos_account_bank_statement.py b/addons/point_of_sale/pos_account_bank_statement.py
new file mode 100644
index 00000000000..887a7b8060c
--- /dev/null
+++ b/addons/point_of_sale/pos_account_bank_statement.py
@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import time
+import netsvc
+
+
+class account_bank_statement(osv.osv):
+    _inherit = 'account.bank.statement'
+    _columns = {
+        'company_id':fields.many2one('res.company', 'Company', required=True),
+    }
+    _defaults = {
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+    }
+account_bank_statement()
+
+class account_bank_statement_line(osv.osv):
+    def _default_company(self, cr, uid, context={}):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if user.company_id:
+            return user.company_id.id
+        return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+    _inherit = 'account.bank.statement.line'
+    _columns = {
+        'company_id':fields.many2one('res.company', 'Company', required=True),
+    }
+    _defaults = {
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+    }
+account_bank_statement_line()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/pos_data.xml b/addons/point_of_sale/pos_data.xml
index 5e562bc2ad7..8ff4697804e 100644
--- a/addons/point_of_sale/pos_data.xml
+++ b/addons/point_of_sale/pos_data.xml
@@ -1,32 +1,60 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
+    <data>
+        <record id="cat1" model="product.category">
+            <field name="name">Paiement</field>
+        </record>
+        <record id="advance_product_pos" model="product.product">
+            <field name="name">Acompte</field>
+            <field name="categ_id" ref="cat1"/>
+            <field name="type">service</field>
+            <field name="list_price">0.0</field>
+            <field name="standard_price">0.0</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <!--  <field name="company_id" ref="base.main_company"/>  -->
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+        </record>
 
-<!-- FIXME : -->
+        <record id="advance_product_pos2" model="product.product">
+            <field name="name">Reparation</field>
+            <field name="categ_id" ref="cat1"/>
+            <field name="type">service</field>
+            <field name="list_price">100.0</field>
+            <field name="standard_price">100.0</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <!--  <field name="company_id" ref="multi_company_stock.res_company_tinyshop0"/> -->
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+        </record>
 
-<!-- model access -->
-<!-- 	<record id="access_pos" model="ir.model.access"> -->
-<!-- 		<field name="name">pos</field> -->
-<!-- 		<field name="model_id" eval="(6,0,pos.order)" /> -->
-<!-- 		<field name="group_id">admin</field> -->
-<!-- 		<field name="perm_read">True</field> -->
-<!-- 		<field name="perm_write">True</field> -->
-<!-- 		<field name="perm_create">True</field> -->
-<!-- 		<field name="perm_unlink">True</field> -->
-<!-- 	</record> -->
+        <record id="product_category_voucher" model="product.category">
+            <field name="name">Bon</field>
+        </record>
 
-    <function
-        eval="('default',False,'pricelist_id', [('pos.order', False)], ref('product.list0'), True, False, False, False, True)"
-        id="pos_pricelist_set"
-        model="ir.values"
-        name="set"/>
+        <record id="product_product_giftvoucher" model="product.product">
+            <field name="default_code">GIFT</field>
+            <field name="supply_method">produce</field>
+            <field name="list_price">1.0</field>
+            <field name="standard_price">1.0</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+            <field name="sale_delay">0.0</field>
+            <field name="name">Cheque cadeau</field>
+            <field name="categ_id" ref="product_category_voucher"/>
+        </record>
 
-    <function
-        eval="('default',False,'shop_id', [('pos.order', False)], ref('sale.shop'), True, False, False, False, True)"
-        id="pos_shop_set"
-        model="ir.values"
-        name="set"/>
-
-
-</data>
+        <record id="product_product_shipping_cost" model="product.product">
+            <field name="default_code">PORT01</field>
+            <field name="supply_method">produce</field>
+            <field name="list_price">1.0</field>
+            <field name="standard_price">1.0</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+            <field name="sale_delay">0.0</field>
+            <field name="name">Shipping cost</field>
+            <field name="categ_id" ref="product_category_voucher"/>
+            <field name="type">service</field>
+            <field name="produce_delay">0</field>
+            <field name="purchase_ok" eval="False" />
+        </record>
+    </data>
 </openerp>
diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml
new file mode 100644
index 00000000000..789d96b897d
--- /dev/null
+++ b/addons/point_of_sale/pos_demo.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0"?>
+<openerp>
+
+	<data >
+        <record id="res_partner_tinyshop1" model="res.partner">
+			    <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+        </record>
+
+        <record id="res_company_tinyshop1" model="res.company">
+            <field name="currency_id" ref="base.EUR"/>
+            <field eval="1.0" name="po_lead"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field eval="1.0" name="manufacturing_lead"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field eval="80.0" name="schedule_range"/>
+            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+        </record>
+        <record id="res_company_tinyshop0" model="res.company">
+            <field name="currency_id" ref="base.EUR"/>
+            <field eval="1.0" name="po_lead"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field eval="1.0" name="manufacturing_lead"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field eval="80.0" name="schedule_range"/>
+            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
+        </record>
+        <record id="res_company_shop0" model="res.company">
+            <field eval="5.0" name="security_lead"/>
+            <field name="currency_id" ref="base.EUR"/>
+            <field eval="1.0" name="po_lead"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field eval="1.0" name="manufacturing_lead"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field eval="80.0" name="schedule_range"/>
+            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+
+        </record>
+    </data>
+	<data noupdate="1">
+		<record id="res_users_sofia0" model="res.users">
+			<field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
+			<field eval="[(6,0,[ref('base.group_user'),ref('stock.group_stock_user')])]" name="groups_id"/>
+			<field eval="[(6,0,[])]" name="roles_id"/>
+			<field eval="1" name="active"/>
+			<field eval="&quot;&quot;&quot;shop3&quot;&quot;&quot;" name="password"/>
+			<field eval="&quot;&quot;&quot;en_US&quot;&quot;&quot;" name="context_lang"/>
+			<field eval="&quot;&quot;&quot;Shop 3&quot;&quot;&quot;" name="name"/>
+			<field name="company_id" ref="res_company_shop0"/>
+			<field eval="&quot;&quot;&quot;shop3&quot;&quot;&quot;" name="login"/>
+			<field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
+		</record>
+	</data>
+  <data>
+		<record id="pos_order_pos0" model="pos.order">
+			<field name="sale_journal" ref="account.sales_journal"/>
+			<field eval="&quot;&quot;&quot;2009-11-29&quot;&quot;&quot;" name="date_validity"/>
+			<field name="shop_id" ref="sale.shop"/>
+			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
+			<field name="partner_id" ref="base.res_partner_5"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field name="user_id1" ref="base.user_root"/>
+			<field eval="&quot;&quot;&quot;POS/001&quot;&quot;&quot;" name="name"/>
+			<field name="company_id" ref="res_company_tinyshop0"/>
+			<field eval="0" name="invoice_wanted"/>
+			<field eval="&quot;&quot;&quot;tax_excluded&quot;&quot;&quot;" name="price_type"/>
+			<field eval="&quot;&quot;&quot;draft&quot;&quot;&quot;" name="state"/>
+			<field name="pricelist_id" ref="product.list0"/>
+		</record>
+		<record id="pos_order_line_orderline0" model="pos.order.line">
+			<field eval="0.5" name="discount"/>
+			<field name="product_id" ref="product.product_product_pc2"/>
+			<field eval="&quot;&quot;&quot;Order Line/01&quot;&quot;&quot;" name="name"/>
+			<field name="order_id" ref="pos_order_pos0"/>
+			<field eval="750.0" name="price_unit"/>
+			<field name="company_id" ref="res_company_tinyshop0"/>
+			<field eval="5.0" name="qty"/>
+		</record>
+		<record id="pos_order_line_orderline1" model="pos.order.line">
+			<field eval="1.0" name="discount"/>
+			<field name="product_id" ref="product.product_product_cpu1"/>
+			<field eval="&quot;&quot;&quot;Order Line/02&quot;&quot;&quot;" name="name"/>
+			<field name="order_id" ref="pos_order_pos0"/>
+			<field name="company_id" ref="res_company_tinyshop0"/>
+			<field eval="75.0" name="price_unit"/>
+			<field eval="1" name="qty"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="pos_order_pos1" model="pos.order">
+			<field name="sale_journal" ref="account.sales_journal"/>
+			<field eval="&quot;&quot;&quot;2009-11-29&quot;&quot;&quot;" name="date_validity"/>
+      <field name="shop_id" ref="sale.shop"/>
+			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
+			<field name="partner_id" ref="base.res_partner_3"/>
+			<field name="user_id" ref="res_users_sofia0"/>
+			<field name="user_id1" ref="base.user_root"/>
+			<field eval="&quot;&quot;&quot;POS/002&quot;&quot;&quot;" name="name"/>
+			<field name="company_id" ref="res_company_shop0"/>
+			<field eval="&quot;&quot;&quot;tax_excluded&quot;&quot;&quot;" name="price_type"/>
+			<field eval="0" name="invoice_wanted"/>
+			<field eval="&quot;&quot;&quot;draft&quot;&quot;&quot;" name="state"/>
+			<field name="pricelist_id" ref="product.list0"/>
+		</record>
+
+		 <!--
+	Resource: pos.order.line
+	-->
+		<record id="pos_order_line_orderline2" model="pos.order.line">
+			<field eval="1.0" name="discount"/>
+			<field name="product_id" ref="product.product_product_hdd1"/>
+			<field eval="&quot;&quot;&quot;Order Line/04&quot;&quot;&quot;" name="name"/>
+			<field name="order_id" ref="pos_order_pos1"/>
+			<field eval="50.0" name="price_unit"/>
+		    <field name="company_id" ref="res_company_shop0"/>
+			<field eval="10.0" name="qty"/>
+		</record>
+
+
+
+		 <function
+        eval="('default',False,'pricelist_id', [('pos.order', False)], ref('product.list0'), True, False, False, False, True)"
+        id="pos_pricelist_set"
+        model="ir.values"
+        name="set"/>
+
+    <function
+        eval="('default',False,'shop_id', [('pos.order', False)], ref('sale.shop'), True, False, False, False, True)"
+        id="pos_shop_set"
+        model="ir.values"
+        name="set"/>
+		<record id="pos_order_posadvance" model="pos.order">
+			<field eval="&quot;&quot;&quot;tax_excluded&quot;&quot;&quot;" name="price_type"/>
+			<field name="sale_journal" ref="account.sales_journal"/>
+			<field eval="&quot;&quot;&quot;2009-11-29&quot;&quot;&quot;" name="date_validity"/>
+			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
+			<field name="partner_id" ref="base.res_partner_3"/>
+			<field name="user_id" ref="res_users_sofia0"/>
+			<field name="user_id1" ref="base.user_root"/>
+			<field eval="&quot;&quot;&quot;POS/0012&quot;&quot;&quot;" name="name"/>
+			<field name="company_id" ref="res_company_shop0"/>
+			<field eval="0" name="invoice_wanted"/>
+			<field eval="&quot;&quot;&quot;draft&quot;&quot;&quot;" name="state"/>
+			<field name="pricelist_id" ref="product.list0"/>
+      <field name="shop_id" ref="sale.shop"/>
+    </record>
+
+<!--		<record id="pos_order_line_orderlineadv" model="pos.order.line">
+			<field eval="0.0" name="discount"/>
+			<field name="product_id" ref="advance_product_pos"/>
+			<field eval="&quot;&quot;&quot;Order Line/Advance&quot;&quot;&quot;" name="name"/>
+			<field name="order_id" ref="pos_order_posadvance"/>
+			<field eval="50.0" name="price_unit"/>
+		    <field name="company_id" ref="res_company_shop0"/>
+			<field eval="-1.0" name="qty"/>
+		</record-->
+          <record id="data_fiscalyear" model="account.fiscalyear">
+            <field eval="'Fiscal Year Shop '+time.strftime('%Y')" name="name"/>
+            <field eval="'FY'+time.strftime('%Y')" name="code"/>
+            <field eval="time.strftime('%Y')+'-01-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-12-31'" name="date_stop"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+             <record id="period_j6" model="account.period">
+            <field eval="'Jun.'+time.strftime('%Y')" name="name"/>
+            <field name="fiscalyear_id" ref="data_fiscalyear"/>
+            <field eval="True" name="special"/>
+            <field eval="time.strftime('%Y')+'-06-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-06-30'" name="date_stop"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+        <record id="period_j7" model="account.period">
+            <field eval="'Jul.'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
+            <field name="fiscalyear_id" ref="data_fiscalyear"/>
+            <field eval="time.strftime('%Y')+'-07-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-07-31'" name="date_stop"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+        <record id="a_recv" model="account.account">
+            <field name="name">Main Receivable</field>
+            <field name="code">x 40000</field>
+            <field name="type">receivable</field>
+            <field name="user_type" ref="account.account_type_asset"/>
+            <field eval="ref('account.minimal_0')" name="parent_id"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field eval="True" name="reconcile"/>
+            <field name="company_id" ref="res_company_shop0"/>
+            <field name="user_type" ref="account.account_type_income"/>
+            <field name="note">
+This chart of account is used for automated testing purpose. It is installed
+only if you selected demo data during your database creation. Modules can
+do black box testing on entries on this chart of account, without modifying
+your own chart of account.
+</field>
+        </record>
+<!--        <record id="stock_location.product_pulled_flow_d1" model="product.pulled.flow">
+          <field name="partner_addr_id" ref="multi_company_stock.res_partner_address_fabien0"/>
+        </record>
+
+        <record id="stock_location.product_pulled_flow_d2" model="product.pulled.flow">
+          <field name="partner_addr_id" ref="multi_company_stock.res_partner_address_eric0"/>
+        </record-->
+  </data>
+</openerp>
diff --git a/addons/point_of_sale/pos_report.xml b/addons/point_of_sale/pos_report.xml
index c9956c2c029..2e9ff5e6107 100644
--- a/addons/point_of_sale/pos_report.xml
+++ b/addons/point_of_sale/pos_report.xml
@@ -1,53 +1,145 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <openerp>
-  <data>
-    <report
-      id="pos_receipt"
-      string="Receipt"
-      model="pos.order"
-      name="pos.receipt"
-      rml="point_of_sale/report/pos_receipt.rml"
-      auto="False"
-      header="False"
-      />
+	<data>
+		<!--report
+			id="pos_receipt"
+			string="Receipt"
+			model="pos.order"
+			name="pos.receipt"
+			rml="point_of_sale/report/pos_receipt.rml"
+			auto="False"
+			header="False"
+			multi="True"
+			/-->
 
-    <report
-      id="pos_invoice_report"
-      string="Invoice"
-      model="pos.order"
-      name="pos.invoice"
-      auto="False"
-      rml="account/report/invoice.rml"
-       />
 
-    <report
-      id="pos_lines_detail"
-      string="Details of Sales"
-      model="pos.order"
-      name="pos.details"
-      auto="False"
-      multi="True"
-      rml="point_of_sale/report/pos_details.rml"
-       />
+<!--
+		<report
+			id="pos_receipt_with_remboursment"
+			string="Refund Receipt"
+			model="pos.order"
+			name="pos.receipt.with.remboursment"
+			rml="point_of_sale/report/pos_receipt_with_remboursment.rml"
+			auto="False"
+			header="False"
+			multi="True"
+			/>
+		<report
+			id="pos_receipt_without_remboursment"
+			string="Voucher Receipt"
+			model="pos.order"
+			name="pos.receipt.without.remboursment"
+			rml="point_of_sale/report/pos_receipt_without_remboursment.rml"
+			auto="False"
+			header="False"
+			multi="True"
+			/-->
 
-    <report
-      id="pos_details_summary"
-      string="Sales (summary)"
-      model="pos.order"
-      name="pos.details_summary"
-      auto="False"
-      multi="True"
-      rml="point_of_sale/report/pos_details_summary.rml"
-       />
+		<report
+			id="pos_invoice_report"
+			string="Invoice"
+			model="pos.order"
+			name="pos.invoice"
+			auto="False"
+			multi="True"
+			rml="account/report/invoice.rml"
+			 />
 
-    <report
-      id="pos_lines_report"
-      string="Pos Lines"
-      model="pos.order"
-      name="pos.lines"
-      auto="False"
-      rml="point_of_sale/report/pos_lines.rml"
-       />
+		<report
+			id="pos_lines_detail"
+			string="Details of Sales"
+			model="pos.order"
+			name="pos.details"
+			auto="False"
+			multi="True"
+			menu="False"
+			rml="point_of_sale/report/pos_details.rml"
+			 />
 
-  </data>
+		<report
+			id="pos_details_summary"
+			string="Sales (summary)"
+			model="pos.order"
+			name="pos.details_summary"
+			auto="False"
+			multi="True"
+			rml="point_of_sale/report/pos_details_summary.rml"
+			 />
+
+		<report
+			id="pos_lines_report"
+			string="Pos Lines"
+			model="pos.order"
+			name="pos.lines"
+			auto="False"
+			multi="True"
+			rml="point_of_sale/report/pos_lines.rml"
+			 />
+
+		<report
+			id="pos_payment_report"
+			string="Payment Report For Sale"
+			model="pos.order"
+			name="pos.payment.report"
+			auto="False"
+			multi="True"
+			menu="True"
+			rml="point_of_sale/report/pos_payment_report.rml"
+			 />
+
+		<report
+			id="pos_sales_user"
+			string="Sales Report"
+			model="pos.order"
+			name="pos.sales.user"
+			auto="False"
+			multi="True"
+			menu="False"
+			rml="point_of_sale/report/pos_sales_user.rml"
+			 />
+
+		<report
+			id="pos_sales_user_today"
+			string="Today's Sales"
+			model="pos.order"
+			name="pos.sales.user.today"
+			auto="False"
+			multi="True"
+			menu="False"
+			rml="point_of_sale/report/pos_sales_user_today.rml"
+			 />
+
+		<report
+			id="pos_payment_report_date"
+			string="Payment Report"
+			model="pos.order"
+			name="pos.payment.report.date"
+			auto="False"
+			multi="True"
+			menu="False"
+			rml="point_of_sale/report/pos_payment_report_date.rml"
+			 />
+		<report
+			id="pos_payment_report_user"
+			string="Today's Payment By User"
+			model="pos.order"
+			name="pos.payment.report.user"
+			auto="False"
+			multi="True"
+			menu="False"
+			rml="point_of_sale/report/pos_payment_report_user.rml"
+			 />
+		<report
+			id="pos_sales_user_today_current_user"
+			string="Today's Sales by Current User"
+			model="pos.order"
+			name="pos.sales.user.today.current.user"
+			auto="False"
+			multi="True"
+			menu="False"
+			rml="point_of_sale/report/pos_sales_user_today_current_user.rml"
+			 />
+
+
+	</data>
 </openerp>
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 3f328f00f4d..f0afcd1aac1 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
         <record model="ir.ui.view" id="view_pos_pos_form">
             <field name="name">pos.order</field>
             <field name="model">pos.order</field>
@@ -9,103 +10,125 @@
                 <form string="Sales Order POS">
                     <notebook >
                         <page string="Order lines">
-                            <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
-                            <field name="pricelist_id" domain="[('type','=','sale')]"/>
-                            <field name="salesman_id" />
+                            <group colspan="4" col="6">
+                                <field name="user_id1" />
+                                <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
+                                <field name="contract_number" select="1" />
+                            </group>
                             <field name="lines" colspan="4" nolabel="1">
                                 <tree string="Order lines" editable="bottom">
+                                    <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)" width="275" />
+                                    <field name="qty" />
+                                    <field name="qty_rfd" />
+                                    <field name="discount" on_change="onchange_discount(discount,price_unit)" />
+                                    <field name="price_ded" on_change="onchange_ded(price_ded, price_unit)" />
+                                    <field name="price_unit" readonly="1"/>
+                                    <field name="notice"/>
+                                    <field name="serial_number"/>
+                                    <field name="price_subtotal" />
+                                    <field name="price_subtotal_incl"/>
+                                </tree>
+                                <form string="Order lines" >
                                     <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)" width="275"/>
                                     <field name="qty" />
-                                    <field name="discount" />
-                                    <field name="price_unit" />
-                                    <field name="price_subtotal"/>
-                                </tree>
-
-                                <form string="Order lines">
-                                    <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)"/>
-                                    <field name="qty" />
-                                    <field name="discount" />
-                                    <field name="price_unit" />
-                                    <field name="price_subtotal"/>
+                                    <field name="qty_rfd" />
+                                    <field name="discount" on_change="onchange_discount(discount,price_unit)" />
+                                    <field name="price_ded" on_change="onchange_ded(price_ded, price_unit)" />
+                                    <field name="price_unit"/>
+                                    <field name="notice"/>
+                                    <field name="serial_number"/>
                                 </form>
+
                             </field>
                             <group colspan="4" col="7">
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
-
-                                <button name="%(pos_add_product)d"
-                                    string="_Add product"
-                                    type="action" states="draft"/>
-
-                                <button name="dummy_button"
-                                    string="Compute"
-                                    type="object" />
-
+                                <button name="%(pos_discount)d" string="D_iscount" type="action" states="draft"/>
+                                <button name="dummy_button" string="Compute" type="object" />
                             </group>
 
+                            <group colspan="4" col="9" groups="base.group_extended">
+                            <separator colspan="4" string="Validation of the Sale"/>
+                                <newline/>
+                                <field name="state_2" select="2" />
+                                <button name="button_validate"
+                                		string="Accept"
+                                		type="object"
+                                     icon="gtk-ok"
+                                    states="paid, draft"
+                                		attrs="{'invisible':[('state_2','=','accepted')]}"/>
+                              </group>
+
                             <separator colspan="4" string="Actions"/>
-                            <group colspan="4" col="9">
+                            <group colspan="4" col="6">
 
-                                <field name="state" select="2"/>
+                                <field name="state" select="1"/>
 
-                                <button name="%(pos_discount)d"
-                                    string="D_iscount"
-                                    type="action" states="draft"/>
+                                <!--
+                                <button name="%(pos_add_product)d" string="_Add product" type="action" states="draft"/>
+                                -->
 
-                                <button name="%(pos_payment)d"
-                                    string="Ma_ke Payment"
-                                    type="action" states="draft"/>
+                                <button name="%(pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance"/>
+                                <button name="%(o_rec)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
 
-                                <button name="cancel"
-                                    string="Cancel"
-                                    states="paid"/>
 
-                                <button name="set_to_draft"
-                                    string="Set to draft"
-                                    states="cancel"
-                                    type="object" />
+                                <!--
+                                <button name="action_cancel" string="Cancel" type="object" states="paid" />
+                                -->
+                                <button name="set_to_draft" string="Set to draft" states="paid" icon="gtk-execute" type="object" />
+
+                                <button name="%(pos_return_picking)d" string="Return Packing" type="action" icon="gtk-ok" states="paid"
+                                    attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}"/>
 
-                                <button name="%(pos_confirm)d"
-                                    string="Close"
-                                    type="action"
-                                    states="paid"/>
                             </group>
                         </page>
 
-
                         <page string="Payment">
-                            <field name="payments" colspan="4" nolabel="1">
-                                <tree string="Payments" editable="bottom">
-                                    <field name="payment_id" />
-                                    <field name="payment_nb" />
-                                    <field name="payment_name" width="200" />
-                                    <field name="payment_date" />
-                                    <field name="amount" />
+                            <group colspan="2" col="2" name="Type">
+                                <separator string="Order Information" colspan="4"/>
+                                <field name="company_id"/>
+                                <field name="shop_id" widget="selection"  />
+                                <field name="name" select="1"/>
+                                <field name="user_id" />
+                                <field name="user_id2" />
+                                <field name="price_type" />
+                            </group>
+                            <group colspan="2" col="2" name="Type">
+                                <separator string="Dates" colspan="4"/>
+                                <field name="date_order" select="1" />
+                                <field name="date_payment" select="1"  />
+                                <field name="date_payment2" select="1"  groups="base.group_extended"/>
+                            </group>
+                            <group colspan="4">
+                                <separator string="Invoicing" colspan="4"/>
+                                <field name="sale_journal" domain="[('type','=','sale'),('company_id','=',company_id)]"/>
+                                <field name="pricelist_id" domain="[('type','=','sale')]" widget="selection"/>
+                                <field name="invoice_id"/>
+                                <group colspan="2" col="3">
+                                    <button name="invoice" string="Create _Invoice" states="paid"/>
+                                </group>
+                            </group>
+
+                            <field name="statement_ids" colspan="4" nolabel="1">
+                                <tree editable="bottom" string="Statement lines">
+                                    <field name="amount"/>
+                                    <field name="journal_id"/>
+                                    <field name="statement_id" />
                                 </tree>
+                                <form string="Statement lines">
+                                    <field name="account_id"/>
+                                    <field name="amount"/>
+                                    <field name="statement_id" domain="[('company_id','=',parent.company_id),('state','=','open')]"/>
+                                </form>
                             </field>
-                            <separator string="Invoicing" colspan="4"/>
-                            <field name="nb_print"/>
-                            <newline/>
-                            <field name="invoice_id"/>
-                            <label/>
-                            <button name="invoice" string="Create _Invoice" states="paid"/>
-                            <newline/>
-                            <field name="sale_journal"/>
-                            <field name="account_receivable"/>
                         </page>
 
-                        <page string="Other">
-                            <field name="shop_id" />
-                            <field name="name" select="1"/>
-                            <field name="date_order" select="1" />
-                            <field name="date_validity" />
-                            <field name="user_id" />
-
-                            <separator string="Notes" colspan="4"/>
-                            <field name="note" nolabel="1" colspan="4"/>
-                            <separator string="Picking" colspan="4"/>
-                            <field name="pickings" nolabel="1" colspan="4"/>
-
+                        <page string="Notes" >
+                            <separator string="Notes" colspan="4" />
+                            <group colspan="4">
+                                <field name="type_rec"  colspan="4"/>
+                                <field name="note"  colspan="4"/>
+                            </group>
                         </page>
                     </notebook>
 
@@ -120,7 +143,7 @@
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_pos_pos_form"/>
-            <field name="domain">[ ('date_order','>=',time.strftime('%Y-%m-%d 00:00:00')) ]</field>
+            <field name="domain">[['date_order','>=',time.strftime('%Y-%m-%d')]]</field>
         </record>
 
 
@@ -131,63 +154,83 @@
             <field name="arch" type="xml">
                 <tree string="POS Orders">
                     <field name="name"/>
-                    <field name="date_order"/>
+                    <field name="date_order" select="1"/>
+                    <field name="date_payment"/>
+                    <field name="date_payment2"/>
                     <field name="user_id"/>
                     <field name="invoice_id"/>
-                    <field name="last_out_picking"/>
-                    <field name="state"/>
+                    <field name="state" select="1"/>
                     <field name="amount_total" sum="Amount total"/>
+                    <field name="company_id"/>
                 </tree>
             </field>
         </record>
         <menuitem name="Point of Sale" id="menu_point_root" />
+        <menuitem name="Point of Sale" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
+        <menuitem name="New Sale" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
+		<menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale" sequence="2" name="Products"/>
 
-        <wizard 
-            string="Wizard default journals"
-            model="pos.config.journal"
-            name="pos.config.journal"
-            menu="False"
-            id="wizard_default_journal"/>
+        <!--  POS Order view (date_payment)  -->
+         <record model="ir.actions.act_window" id="action_pos_pos_form_user">
+            <field name="name">Point of Sale</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.order</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_pos_order_tree"/>
+            <field name="domain">['|',('state_2','=','to_verify'),('state','=','advance')]</field>
+        </record>
+invoiced
 
-        <menuitem name="Configuration" parent="menu_point_root"
-            id="menu_point_config" sequence="0"/>
-        <menuitem
-            name="Default journals" parent="menu_point_config"
-            string="Default journals"
-            action="wizard_default_journal"
-            type="wizard"
-            id="menu_wizard_default_journal" />
-
-        <!-- 	<record model="ir.actions.act_window" id="action_pos_order_tree"> -->
-            <!-- 		<field name="name">pos.order</field> -->
-            <!-- 		<field name="type">ir.actions.act_window</field> -->
-            <!-- 		<field name="res_model">pos.order</field> -->
-            <!-- 		<field name="view_type">form</field> -->
-            <!-- 		<field name="view_mode">tree,form</field> -->
-            <!-- 		<field name="view_id" ref="pos.view_pos_order_tree"/> -->
-            <!-- 		<field name="domain">[('invoice_id','=',False)]</field> -->
-            <!-- 	</record> -->
-        <!-- 	<menuitem name="Point of Sale/Point of Sale/Orders not invoiced" id="menu_action_pos_order_tree" action="action_pos_order_tree"/> -->
-
-        <record model="ir.actions.act_window" id="action_pos_order_tree2">
-            <field name="name">Orders for today</field>
+		<record model="ir.actions.act_window" id="action_pos_order_tobinvoiced">
+            <field name="name">Sales to Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_pos_order_tree"/>
-            <field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-%d')),('date_order','&lt;=',time.strftime('%Y-%m-%d'))]</field>
+            <field name="domain">[('state','!=', 'invoiced')]</field>
         </record>
-        <menuitem name="Point of Sale" parent="menu_point_root" id="menu_point_ofsale" action="action_pos_order_tree2"/>
+        <menuitem name="Invoicing" id="menu_point_of_sale_invoicing" parent="menu_point_root" sequence="4" />
+		<menuitem name="Sales to Invoice" action="action_pos_order_tobinvoiced" id="menu_point_of_sale_tobinvoiced" parent="menu_point_of_sale_invoicing"/>
+        <record model="ir.actions.act_window" id="action_pos_order_accepted">
+            <field name="name">Accepted Sales</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_pos_order_tree"/>
+            <field name="domain">[('state','=', 'paid')]</field>
+        </record>
+        <record model="ir.actions.act_window" id="action_pos_order_tree2">
+            <field name="name">Point of Sale</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_pos_order_tree"/>
+            <field name="domain">[('date_order','&lt;=', time.strftime('%Y-%m-%d 23:59:59'))]</field>
+        </record>
+
+<!--        <menuitem name="Orders of the day" parent="menu_point_ofsale" id="menu_action_pos_order_tree2" action="action_pos_order_tree2"/-->
 
         <record model="ir.actions.act_window" id="action_pos_order_tree3">
-            <field name="name">All orders</field>
+            <field name="name">Point of Sale</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_pos_order_tree"/>
         </record>
+<!--        <menuitem name="All orders" parent="menu_point_ofsale" id="menu_action_pos_order_tree3" action="action_pos_order_tree3"/-->
+
+        <record model="ir.actions.act_window" id="action_pos_order_tree_open">
+            <field name="name">Opened Sales</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="view_pos_pos_form"/>
+        </record>
 
         <record model="ir.ui.view" id="view_pos_order_line">
             <field name="name">Sale lines</field>
@@ -200,6 +243,7 @@
                     <field name="discount" readonly="1"/>
                     <field name="price_unit" readonly="1"/>
                     <field name="price_subtotal" readonly="1" sum="Sum of subtotals"/>
+                    <field name="price_subtotal_incl" readonly="1" sum="Sum of subtotals"/>
                     <field name="create_date" readonly="1"/>
                 </tree>
             </field>
@@ -211,12 +255,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS Order line">
-                    <field name="product_id" readonly="1" select="1"/>
-                    <field name="qty" readonly="1" select="1"/>
-                    <field name="discount" readonly="1" select="2"/>
-                    <field name="price_unit" readonly="1" select="2"/>
-                    <field name="price_subtotal" readonly="1" />
-                    <field name="create_date" readonly="1" select="1"/>
+                    <field name="product_id"  select="1"/>
+                    <field name="qty"  select="1"/>
+                    <field name="discount"  select="2"/>
+                    <field name="price_unit"  select="2"/>
+                    <field name="create_date"  select="1"/>
                 </form>
             </field>
         </record>
@@ -229,20 +272,28 @@
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_pos_order_line"/>
         </record>
-        <menuitem name="POS Lines" parent="menu_point_root" id="menu_action_pos_order_line" action="action_pos_order_line"/>
+
+		<record model="ir.actions.act_window" id="action_pos_order_line_form">
+            <field name="name">Sale line</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.order.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="view_pos_order_line_form"/>
+        </record>
 
         <record model="ir.actions.act_window" id="action_pos_order_line_day">
-            <field name="name">POS Lines for today</field>
+            <field name="name">Sale line</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.order.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_pos_order_line"/>
-			<field name="filter" eval="True"/>
             <field name="domain">[('create_date', '&gt;=', time.strftime('%Y-%m-%d 00:00:00')),('create_date', '&lt;=', time.strftime('%Y-%m-%d 23:59:59'))]</field>
         </record>
 
 
+
         <!-- report -->
 
         <record model="ir.ui.view" id="view_pos_trans_user_form">
@@ -253,6 +304,7 @@
                 <form string="POS ">
                     <field name="user_id" select="1"/>
                     <field name="journal_id" select="1"/>
+                    <field name="jl_id" select="1"/>
                     <field name="date_create" select="1" widget="date"/>
                     <field name="no_trans" select="2"/>
                     <field name="amount" select="2"/>
@@ -271,63 +323,681 @@
                     <field name="date_create" widget="date" />
                     <field name="user_id"/>
                     <field name="journal_id"/>
+                    <field name="jl_id"/>
                     <field name="no_trans" sum="Total Transaction"/>
                     <field name="amount" sum="Amount total"/>
+                    <field name="product_nb" />
                     <field name="invoice_id"/>
+                    <field name="disc"/>
                 </tree>
             </field>
         </record>
+
+        <record model="ir.ui.view" id="view_report_transaction_pos_calendar">
+	        <field name="name">report.transaction.pos.calendar</field>
+	        <field name="model">report.transaction.pos</field>
+	        <field name="type">calendar</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <calendar color="user_id" date_start="date_create" string="POS Report">
+	                <field name="journal_id"/>
+	                <field name="amount"/>
+	            </calendar>
+	        </field>
+	     </record>
+
+	     <record model="ir.ui.view" id="view_report_transaction_pos_graph">
+	        <field name="name">report.transaction.pos.graph</field>
+	        <field name="model">report.transaction.pos</field>
+	        <field name="type">graph</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <graph  type="bar" string="POS Report">
+	                <field name="user_id" />
+	                <field name="amount"/>
+	                <field group="True" name="journal_id"/>
+	            </graph>
+	        </field>
+	     </record>
+
         <record model="ir.actions.act_window" id="action_trans_pos_tree_today">
-            <field name="name">Sales by user</field>
+            <field name="name">Sales by day</field>
             <field name="res_model">report.transaction.pos</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
-            <field name="domain">[('date_create','like',time.strftime('%Y-%m-%d'))]</field>
+            <field name="view_mode">tree,calendar,form,graph</field>
+            <field name="domain">[('date_create','=',time.strftime('%Y-%m-%d'))]</field>
         </record>
-        <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep"/>
-        <menuitem name="Sales of the day" parent="menu_point_rep" action="action_trans_pos_tree_today" id="menu_trans_pos_tree_today"/>
-        <!-- 	<record model="ir.actions.act_window" id="action_trans_pos_user_tree_today"> -->
-            <!-- 		<field name="name">Sales by user</field> -->
-            <!-- 		<field name="res_model">report.transaction.pos</field> -->
-            <!-- 		<field name="view_type">form</field> -->
-            <!-- 		<field name="view_mode">tree</field> -->
-            <!-- 		<field name="domain">[('date_create','=',time.strftime('%Y-%m-%d')),('user_id','=',uid)]</field> -->
-            <!-- 	</record> -->
-        <!-- 	<menuitem name="Point of Sale/Reporting/Sales of the day/My sales of the day" action="action_trans_pos_user_tree_today" id="menu_trans_pos_user_tree_today"/> -->
 
 
         <record model="ir.actions.act_window" id="action_trans_pos_tree_month">
-            <field name="name">Sales by user</field>
+            <field name="name">Sales by month</field>
             <field name="res_model">report.transaction.pos</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,calendar,form,graph</field>
             <field name="domain">[('date_create','like',time.strftime('%Y-%m'))]</field>
         </record>
-        <menuitem name="Sales of the month" parent="menu_point_rep" action="action_trans_pos_tree_month" id="menu_trans_pos_tree_month"/>
-        <!-- 	<record model="ir.actions.act_window" id="action_trans_pos_user_tree_month"> -->
-            <!-- 		<field name="name">Sales by user</field> -->
-            <!-- 		<field name="res_model">report.transaction.pos</field> -->
-            <!-- 		<field name="view_type">form</field> -->
-            <!-- 		<field name="view_mode">tree,form</field> -->
-            <!-- 		<field name="domain">[('date_create','like',time.strftime('%Y-%m')),('user_id','=',uid)]</field> -->
-            <!-- 	</record> -->
-        <!-- 	<menuitem name="Point of Sale/Reporting/Sales of the month/My sales of the month" action="action_trans_pos_user_tree_month" id="menu_trans_pos_user_tree_month"/> -->
 
 
         <record model="ir.actions.act_window" id="action_trans_pos_tree">
             <field name="name">Sales by user</field>
             <field name="res_model">report.transaction.pos</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
+            <field name="view_mode">tree,calendar,form,graph</field>
+            <field name="view_id" ref="view_trans_pos_user_tree"/>
         </record>
-        <menuitem name="All the sales" parent="menu_point_rep" action="action_trans_pos_tree" id="menu_trans_pos_tree"/>
-        <!-- 	<record model="ir.actions.act_window" id="action_trans_pos_user_tree"> -->
-            <!-- 		<field name="name">Sales by user</field> -->
-            <!-- 		<field name="res_model">report.transaction.pos</field> -->
-            <!-- 		<field name="view_type">form</field> -->
-            <!-- 		<field name="view_mode">tree</field> -->
-            <!-- 		<field name="domain">[('user_id','=',uid)]</field> -->
-            <!-- 	</record> -->
-        <!-- 	<menuitem name="Point of Sale/Reporting/All the sales/All my sales " action="action_trans_pos_user_tree" id="menu_trans_pos_user_tree"/> -->
+
+
+		<record model="ir.ui.view" id="view_report_sales_by_user_pos_form">
+            <field name="name">report.sales.by.user.pos.form</field>
+            <field name="model">report.sales.by.user.pos</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="POS ">
+                    <field name="date_order" select="1" widget="date"/>
+                    <field name="qty" select="2"/>
+                    <field name="amount" select="2"/>
+                    <field name="user_id" select="2"/>
+                </form>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_report_sales_by_user_pos_tree">
+            <field name="name">report.sales.by.user.pos.tree</field>
+            <field name="model">report.sales.by.user.pos</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="POS">
+                    <field name="date_order" select="1" widget="date"/>
+                    <field name="qty" select="2"/>
+                    <field name="amount" select="2"/>
+                    <field name="user_id" select="2"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_sales_by_user_pos_calendar">
+	        <field name="name">report.sales.by.user.pos.calendar</field>
+	        <field name="model">report.sales.by.user.pos</field>
+	        <field name="type">calendar</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <calendar color="user_id" date_start="date_order" string="POS Report">
+	            	<field name="qty" select="2"/>
+	                <field name="amount" />
+	            </calendar>
+	        </field>
+	     </record>
+
+		<record model="ir.ui.view" id="view_report_sales_by_user_pos_graph">
+	        <field name="name">report.sales.by.user.pos.graph</field>
+	        <field name="model">report.sales.by.user.pos</field>
+	        <field name="type">graph</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <graph  type="bar" string="Sales by User">
+	                <field name="user_id" />
+	                <field name="amount"/>
+	            </graph>
+	        </field>
+	     </record>
+
+	     <record model="ir.actions.act_window" id="action_report_sales_by_user_pos_today">
+            <field name="name">Sales by User</field>
+            <field name="res_model">report.sales.by.user.pos</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,calendar,form,graph</field>
+            <field name="domain">[('date_order','=',time.strftime('%Y-%m-%d'))]</field>
+ 		</record>
+
+
+		<!-- Sales of user by month -->
+
+		<record model="ir.ui.view" id="view_report_sales_by_user_pos_month_form">
+            <field name="name">report.sales.by.user.pos.month.form</field>
+            <field name="model">report.sales.by.user.pos.month</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="POS ">
+                    <field name="date_order" select="1" widget="date"/>
+                    <field name="qty" select="2"/>
+                    <field name="amount" select="2"/>
+                    <field name="user_id" select="2"/>
+                </form>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_report_sales_by_user_pos_month_tree">
+            <field name="name">report.sales.by.user.pos.month.tree</field>
+            <field name="model">report.sales.by.user.pos.month</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="POS">
+                    <field name="date_order" select="1" widget="date"/>
+                    <field name="qty" select="2"/>
+                    <field name="amount" select="2"/>
+                    <field name="user_id" select="2"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_sales_by_user_pos_month_calendar">
+	        <field name="name">report.sales.by.user.pos.month.calendar</field>
+	        <field name="model">report.sales.by.user.pos.month</field>
+	        <field name="type">calendar</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <calendar color="user_id" date_start="date_order" string="POS Report">
+	            	<field name="qty" select="2"/>
+	                <field name="amount" />
+	            </calendar>
+	        </field>
+	     </record>
+
+		<record model="ir.ui.view" id="view_report_sales_by_user_pos_month_graph">
+	        <field name="name">report.sales.by.user.pos.month.graph</field>
+	        <field name="model">report.sales.by.user.pos.month</field>
+	        <field name="type">graph</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <graph  type="bar" string="Sales by User">
+	                <field name="user_id" />
+	                <field name="amount"/>
+	            </graph>
+	        </field>
+	     </record>
+
+
+ 		<record model="ir.actions.act_window" id="action_report_sales_by_user_pos_month">
+            <field name="name">Sales by User Monthly</field>
+            <field name="res_model">report.sales.by.user.pos.month</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,calendar,form,graph</field>
+            <field name="domain">[('date_order','like',time.strftime('%Y-%m'))]</field>
+		</record>
+
+		<!-- Sales by margin -->
+
+		<record model="ir.ui.view" id="view_report_sales_by_margin_pos_form">
+            <field name="name">report.sales.by.margin.pos.form</field>
+            <field name="model">report.sales.by.margin.pos</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="POS ">
+                	<field name="user_id" select="2"/>
+                	<field name="product_name" select="2"/>
+                    <field name="date_order" select="1" widget="date"/>
+                    <field name="qty" select="2"/>
+                    <field name="net_margin_per_qty" select="2"/>
+                    <field name="total" select="2"/>
+                </form>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_report_sales_by_margin_pos_tree">
+            <field name="name">report.sales.by.margin.pos.tree</field>
+            <field name="model">report.sales.by.margin.pos</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="POS">
+                    <field name="user_id" select="2"/>
+                	<field name="product_name" select="2"/>
+                    <field name="date_order" select="1" widget="date"/>
+                    <field name="qty" select="2"/>
+                    <field name="net_margin_per_qty" select="2"/>
+                    <field name="total" select="2"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_sales_by_margin_pos_calendar">
+	        <field name="name">report.sales.by.margin.pos.calendar</field>
+	        <field name="model">report.sales.by.margin.pos</field>
+	        <field name="type">calendar</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <calendar color="user_id" date_start="date_order" string="Sales by User Margin">
+	            	<field name="product_name" select="2"/>
+	                <field name="total" />
+	            </calendar>
+	        </field>
+	     </record>
+
+		<record model="ir.ui.view" id="view_report_sales_by_margin_pos_graph">
+	        <field name="name">report.sales.by.margin.pos.graph</field>
+	        <field name="model">report.sales.by.margin.pos</field>
+	        <field name="type">graph</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <graph  type="bar" string="Sales by User Margin" orientation="horizontal">
+	                <field name="product_name" />
+	                <field name="total" operator="+"/>
+	            </graph>
+	        </field>
+	     </record>
+
+        <record model="ir.actions.act_window" id="action_report_sales_by_margin_pos_today">
+            <field name="name">Sales by User Daily margin</field>
+            <field name="res_model">report.sales.by.margin.pos</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,calendar,form,graph</field>
+            <field name="domain">[('date_order','=',time.strftime('%Y-%m-%d'))]</field>
+ 		</record>
+
+ 		<record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_form">
+            <field name="name">report.sales.by.margin.pos.month.form</field>
+            <field name="model">report.sales.by.margin.pos.month</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="POS ">
+                	<field name="user_id" select="2"/>
+                	<field name="product_name" select="2"/>
+                    <field name="date_order" select="1" widget="date"/>
+                    <field name="qty" select="2"/>
+                    <field name="net_margin_per_qty" select="2"/>
+                    <field name="total" select="2"/>
+                </form>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_tree">
+            <field name="name">report.sales.by.margin.pos.month.tree</field>
+            <field name="model">report.sales.by.margin.pos.month</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="POS">
+                    <field name="user_id" select="2"/>
+                	<field name="product_name" select="2"/>
+                    <field name="date_order" select="1" widget="date"/>
+                    <field name="qty" select="2"/>
+                    <field name="net_margin_per_qty" select="2"/>
+                    <field name="total" select="2"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_calendar">
+	        <field name="name">report.sales.by.margin.pos.month.calendar</field>
+	        <field name="model">report.sales.by.margin.pos.month</field>
+	        <field name="type">calendar</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <calendar color="user_id" date_start="date_order" string="Sales by User Margin">
+	            	<field name="product_name" select="2"/>
+	                <field name="total" />
+	            </calendar>
+	        </field>
+	     </record>
+
+		<record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_graph">
+	        <field name="name">report.sales.by.margin.pos.month.graph</field>
+	        <field name="model">report.sales.by.margin.pos.month</field>
+	        <field name="type">graph</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <graph  type="bar" string="Sales by User Margin" orientation="horizontal">
+	                <field name="product_name" />
+	                <field name="total" operator="+"/>
+	            </graph>
+	        </field>
+	     </record>
+
+ 		<record model="ir.actions.act_window" id="action_report_sales_by_margin_pos_month">
+            <field name="name">Sales by User Monthly margin</field>
+            <field name="res_model">report.sales.by.margin.pos.month</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,calendar,form,graph</field>
+            <field name="domain">[('date_order','like',time.strftime('%Y-%m'))]</field>
+		</record>
+		<!--  Sales by margin ends -->
+    	<record model="ir.ui.view" id="view_company_form_pos">
+            <field name="name">view.company.form.pos</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+				<notebook position="inside">
+                    <page string="Other">
+                      <field  name="company_discount" colspan="4"/>
+                      <field  name="max_diff" colspan="4"/>
+                      <field  name="account_receivable" colspan="4"/>
+                    </page>
+                </notebook>
+        	</field>
+       	</record>
+
+
+        <record model="ir.ui.view" id="form_mode_p_contact">
+            <field name="name">Contact Mode</field>
+            <field name="model">res.mode.contact</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Contact Mode">
+                    <field  name="name" select="1"/>
+                    <field  name="active" select="2"/>
+              </form>
+            </field>
+          </record>
+
+        <record model="ir.ui.view" id="tree_mode_p_contact">
+            <field name="name">Contact Mode</field>
+            <field name="model">res.mode.contact</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+             <tree string="Contact Mode">
+                    <field  name="name"/>
+                    <field  name="active"/>
+              </tree>
+            </field>
+          </record>
+
+        <record model="ir.actions.act_window" id="action_mode_p">
+            <field name="name">Contact Mode</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.mode.contact</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem name="Contact Mode" parent="base.menu_base_config" action="action_mode_p" id="menu_mode_po"/>
+
+        <record model="ir.ui.view" id="view_partner_contact">
+            <field name="name">view.partner.contact</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+              <field name="website" position="after">
+                    <field  name="contact_mode_id"/>
+              </field>
+            </field>
+          </record>
+
+        <record id="product_normal_form_view" model="ir.ui.view">
+            <field name="name">product.normal.form.inherit</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                  <field name="active" position="after">
+                      <field name="income_pdt"/>
+                      <field name="expense_pdt"/>
+                      <field name="am_out"/>
+                      <field name="disc_controle"/>
+                  </field>
+            </field>
+        </record>
+
+        <record id="product_input_output_form_view" model="ir.ui.view">
+            <field name="name">product.normal.form.inherit</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            	<form string="Product">
+				   <group colspan="4" col="6">
+                    <group colspan="4" col="2">
+                        <separator string="Product Description" colspan="4"/>
+                        <field name="name" select="1"  />
+                        <field groups="base.group_extended" name="variants" select="2" />
+                    </group>
+                    <group colspan="1" col="2">
+                        <separator string="Codes" colspan="2"/>
+                        <field name="default_code" select="1"/>
+                        <field groups="base.group_extended" name="ean13" select="2"/>
+                    </group>
+
+                   </group>
+                   <notebook colspan="4">
+                        <page string="Information">
+                          <group colspan="2" col="2" name="Type">
+                            <separator string="Product Type" colspan="2"/>
+	                          <field name="categ_id" select="1"/>
+	                          <field name="property_account_income" select="1" string="Account" required="1"/>
+	                          <field name="type" select="2"/>
+		                    </group>
+		                    <group colspan="2" col="2" name="Miscelleanous">
+		                      <separator string="Miscelleanous" colspan="2"/>
+	                      		<field name="income_pdt"/>
+	                      		<field name="expense_pdt"/>
+                            <field name="am_out"/>
+                          <field name="disc_controle"/>
+	                      		<field name="company_id" select="2" groups="base.group_extended"/>
+	                      	</group>
+	                      	<group colspan="2" col="2" name="Prices">
+	                      		<separator string="Prices" colspan="2"/>
+		                      	<field name="lst_price"/>
+			                    <field name="standard_price"/>
+			                 </group>
+                        </page>
+                   </notebook>
+                </form>
+            </field>
+        </record>
+
+		<menuitem name="Configuration" parent="menu_point_root"
+            id="menu_point_config_product" sequence="6"/>
+
+        <record model="ir.actions.act_window" id="action_product_input">
+            <field name="name">Products</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('income_pdt','=',True)]</field>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_product_input_tree_tag">
+	        <field name="sequence" eval="1"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="product.product_product_tree_view"/>
+	        <field name="act_window_id" ref="action_product_input"/>
+	    </record>
+        <record model="ir.actions.act_window.view" id="action_product_input_form_tag">
+	        <field name="sequence" eval="2"/>
+	        <field name="view_mode">form</field>
+	        <field name="view_id" ref="product_input_output_form_view"/>
+	        <field name="act_window_id" ref="action_product_input"/>
+	    </record>
+		<menuitem name="Products for Input Operations"
+					parent="menu_point_config_product"
+					action="action_product_input"
+					id="products_for_input_operations"/>
+
+		<record model="ir.actions.act_window" id="action_product_output">
+            <field name="name">Products</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('expense_pdt','=',True)]</field>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_product_output_tree_tag">
+	        <field name="sequence" eval="1"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="product.product_product_tree_view"/>
+	        <field name="act_window_id" ref="action_product_output"/>
+	    </record>
+        <record model="ir.actions.act_window.view" id="action_product_output_form_tag">
+	        <field name="sequence" eval="2"/>
+	        <field name="view_mode">form</field>
+	        <field name="view_id" ref="product_input_output_form_view"/>
+	        <field name="act_window_id" ref="action_product_output"/>
+	    </record>
+		<menuitem name="Products for Output Operations"
+					parent="menu_point_config_product"
+					action="action_product_output"
+					id="products_for_output_operations"/>
+
+        <wizard
+            string="Refloat Box entries"
+            model="account.bank.statement"
+            name="pos.entry"
+            menu="False"
+            id="pos_entries"/>
+        <menuitem name="Register Management" parent="menu_point_root"
+            id="menu_point_config" sequence="3"/>
+        <menuitem
+            name="Input Operations" parent="menu_point_config"
+            string="Refloat"
+            action="pos_entries"
+            type="wizard"
+            id="menu_wizard_enter_jrnl" sequence="2" />
+        <wizard
+            string="Enter negative operations"
+            model="account.bank.statement"
+            name="pos.out"
+            menu="False"
+            id="pos_entries2"/>
+        <menuitem
+            name="Output Operations" parent="menu_point_config"
+            string="Refloat"
+            action="pos_entries2"
+            type="wizard"
+            id="menu_wizard_enter_jrnl2" sequence="3" />
+
+<!--        <menuitem name="Sales Waiting Validation" parent="menu_point_config" id="menu_point_ofsale_date_payment"-->
+<!--            action="action_pos_pos_form_user" sequence="4"/>-->
+
+
+        <record model="ir.ui.view" id="view_pos_order_tree_all_sales">
+            <field name="name">POS Sales</field>
+            <field name="model">pos.order</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="POS Orders">
+                    <field name="name"/>
+                    <field name="date_order" select="1"/>
+                    <field name="partner_id" />
+                    <field name="date_payment"/>
+                    <field name="date_payment2"/>
+                    <field name="user_id"/>
+                    <field name="invoice_id"/>
+                    <field name="note" select="1" />
+                    <field name="state" select="1"/>
+                    <field name="amount_total" sum="Amount total"/>
+                    <field name="company_id"/>
+                </tree>
+            </field>
+        </record>
+         <record model="ir.actions.act_window" id="action_pos_all_sales">
+            <field name="name">All sales</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.order</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_pos_order_tree_all_sales" />
+        </record>
+<!--        <menuitem name="All Sales" parent="menu_point_of_sale" id="menu_pos_all_sales" action="action_pos_all_sales" sequence="5" />-->
+
+        <record model="ir.ui.view" id="view_pos_order_tree_all_sales_lines">
+            <field name="name">POS Sales Lines</field>
+            <field name="model">pos.order.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="POS Orders lines">
+                    <field name="order_id" select="1" />
+                    <field name="serial_number" select="1" />
+                    <field name="create_date" select="1" />
+                    <field name="product_id" select="1" />
+                    <field name="qty" />
+                    <field name="price_unit" />
+                </tree>
+            </field>
+        </record>
+         <record model="ir.actions.act_window" id="action_pos_all_sales_lines">
+            <field name="name">All sales lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.order.line</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_pos_order_tree_all_sales_lines" />
+        </record>
+<!--        <menuitem name="Toutes les lignes de ventes" parent="menu_point_root" id="menu_pos_all_sales_lines" action="action_pos_all_sales_lines" sequence="5" />-->
+
+        <!--  Miscelleanous Operations/Reporting -->
+		<menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="5"/>
+		<menuitem name="Registers" parent="menu_point_rep" id="menu_point_report_register" sequence="0" />
+		<menuitem name="Sales" parent="menu_point_rep" id="menu_point_report_sale" sequence="1" />
+
+		<menuitem name="Details Of Operations" parent="menu_point_report_sale" id="menu_details_of_oper" sequence="1" groups="base.group_extended"/>
+		<menuitem name="All Sales" parent="menu_details_of_oper"
+						id="menu_action_all_sales_tree3" action="action_pos_order_tree3" sequence="1"  groups="base.group_extended"/>
+		<menuitem name="Sales of the day" parent="menu_action_all_sales_tree3"
+						id="menu_action_sale_of_day_tree2" action="action_trans_pos_tree_today"/>
+		<menuitem name="Accepted Sales" parent="menu_action_all_sales_tree3"
+						id="menu_action_sale_of_day_accept" action="action_pos_order_accepted"/>
+<!--		<menuitem name="Open Sales" parent="menu_action_all_sales_tree3"
+						id="menu_action_open_sales_treeop" action="action_pos_order_tree_open"/-->
+
+		<menuitem name="Sales Reports" parent="menu_point_report_sale" id="menu_sales_report" sequence="2"/>
+
+        <menuitem name="Sales of the day" parent="menu_sales_report"
+        		action="action_trans_pos_tree_today" id="menu_trans_pos_tree_today"/>
+
+		<menuitem name="Sales of the month" parent="menu_sales_report"
+				action="action_trans_pos_tree_month" id="menu_trans_pos_tree_month"/>
+
+		<menuitem name="All the sales" parent="menu_sales_report"
+		 		action="action_trans_pos_tree" id="menu_trans_pos_tree"/>
+
+		 <menuitem name="Sales by User" parent="menu_sales_report"
+		 		action="action_report_sales_by_user_pos_today" id="menu_report_sales_by_user_pos_tree"/>
+
+		<menuitem name="Sales by User Monthly" parent="menu_sales_report"
+		 		action="action_report_sales_by_user_pos_month" id="menu_report_sales_by_user_pos_month_tree"/>
+
+		 <menuitem name="Sales by User Daily Margin" parent="menu_sales_report"
+		 		action="action_report_sales_by_margin_pos_today" id="menu_report_sales_by_user_margin_daily_pos_tree"/>
+
+		<menuitem name="Sales by User Monthly Margin" parent="menu_sales_report"
+		 		action="action_report_sales_by_margin_pos_month" id="menu_report_sales_by_user_pos_month_margin_tree"/>
+		<!-- Invoice -->
+
+		<record model="ir.actions.act_window" id="action_pos_invoice">
+            <field name="name">Invoices</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+			<field name="domain">[('origin','like','POS')]</field>
+        </record>
+		<menuitem name="All Invoices" parent="menu_details_of_oper"
+		 		action="action_pos_invoice" id="menu_pos_invoice_tree"/>
+
+		<menuitem name="Payments and Sales" parent="menu_point_report_sale"
+		 		 id="menu_cashboxes_closing_tree" sequence="1"/>
+		<menuitem name="Today" parent="menu_cashboxes_closing_tree"
+		 		 id="menu_cashboxes_by_day" sequence="1"/>
+
+		<menuitem name="All Sales Lines" parent="menu_details_of_oper"
+						id="menu_action_pos_order_line" action="action_pos_order_line" sequence="2"/>
+
+		<menuitem name="Sales Lines of the day" parent="menu_action_pos_order_line"
+					id="menu_action_pos_order_line_day" action="action_pos_order_line_day"/>
+
+<!--		<menuitem name="Open Sales Line" parent="menu_action_pos_order_line"
+					id="menu_action_open_sales_line" action="action_pos_order_line_form"/-->
+
+<!--		<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="wizard_pos_sales_user_today"
+				id="menu_pos_sales_user_today" parent="menu_trans_pos_tree_today" type="wizard" sequence="2" groups="base.group_extended"/>
+
+		<menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report_date"
+				id="menu_pos_payment_report_date" parent="menu_trans_pos_tree" type="wizard" sequence="5" groups="base.group_extended"/>
+
+		<menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report_user"
+				id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" type="wizard" sequence="6" groups="base.group_extended"/>
+		<menuitem icon="STOCK_PRINT" action="wizard_pos_sales_user_today_current_user"
+				id="menu_pos_sales_user_today_current_user" parent="menu_cashboxes_by_day" type="wizard" sequence="7"/>
+    	<menuitem icon="STOCK_PRINT" action="wizard_pos_details"
+				id="menu_pos_details" parent="menu_cashboxes_by_day" type="wizard" />
+
+
     </data>
 </openerp>
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 34a4d345637..325350d031b 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -1,33 +1,94 @@
 <?xml version="1.0"?>
 <openerp>
-  <data>
+	<data>
+  <wizard
+        id="pos_return_picking"
+        model="pos.order"
+        menu="False"
+        name="pos.return.picking"
+        string="Return Goods"/>
 
-    <wizard string="Refund Orders" model="pos.order"
-        name="pos.refund_order" id="pos_refund" menu="True"/>
 
-    <wizard string="Payment" model="pos.order"
-        name="pos.payment" id="pos_payment" menu="False"/>
+		<wizard string="Receipt" model="pos.order"
+				name="ord.receipt" id="o_rec"
+         keyword="client_print_multi"
+         menu="False"
+         />
 
-      <!--<wizard string="Create Invoices" model="pos.order"
-        name="pos.create_invoice" id="pos_invoice" multi="True"/>-->
+<!--		<wizard string="Box Entries" model="account.bank.statement"
+				name="pos.entry" id="pos_entry" menu="False"/>-->
 
-    <wizard string="Add products" model="pos.order"
-        name="pos.add_product" id="pos_add_product"  menu="False"/>
+		<wizard string="Payment" model="pos.order"
+				name="pos.payment" id="pos_payment" menu="False"/>
 
-      <!--<wizard string="Cancel" model="pos.order"
-        name="pos.cancel" id="pos_cancel" multi="True"/>-->
+			<!--<wizard string="Create Invoices" model="pos.order"
+				name="pos.create_invoice" id="pos_invoice" multi="True"/>-->
 
-    <wizard string="Confirm" model="pos.order"
-        name="pos.confirm" id="pos_confirm" multi="True"/>
+		<wizard string="Add products" model="pos.order"
+				name="pos.add_product" id="pos_add_product"  menu="False"/>
 
-    <wizard string="Discount" model="pos.order"
-        name="pos.discount" id="pos_discount" menu="False"/>
+			<!--<wizard string="Cancel" model="pos.order"
+				name="pos.cancel" id="pos_cancel" multi="True"/>-->
 
-    <wizard string="Get From Order" model="pos.order"
-        name="pos.sale.get" id="pos_sale_get"/>
+		<wizard
+        string="Confirm"
+        model="pos.order"
+				name="pos.confirm"
+        id="pos_confirm"
+			  multi="True"
+			  menu="True"
+        />
 
-    <wizard string="Scan Product" model="pos.order"
-        name="pos.scan_product" id="pos_scan_product"/>
+		<wizard string="Discount" model="pos.order"
+				name="pos.discount" id="pos_discount" menu="False"/>
 
-  </data>
+<!--		<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"/>
+
+		<wizard id="wizard_pos_sales_user_today" menu="False"
+				model="pos.order" name="pos.sales.user.today" string="Sales by Users"/>
+
+		<wizard id="wizard_pos_payment_report_date" menu="False"
+				model="pos.order" name="pos.payment.report.date" string="Sales lines Report"/>
+
+		<wizard id="wizard_pos_payment_report_user" menu="False"
+				model="pos.order" name="pos.payment.report.user" string="Sales lines by Users"/>
+
+		<wizard id="wizard_pos_sales_user_today_current_user" menu="False"
+				model="pos.order" name="pos.sales.user.today.current.user" string="Sales for Current User"/>
+
+		<wizard id="wizard_pos_details" menu="False"
+				model="pos.order" name="pos.details" string="Sales Details"/>
+
+<!--		<wizard string="Get From Order" model="pos.order"
+				name="pos.sale.get" id="pos_sale_get"/>
+
+		<wizard string="Scan Product" model="pos.order"
+				name="pos.scan_product" id="pos_scan_product"/-->
+  		<wizard
+        	id="close_statement"
+        	model="account.bank.statement"
+        	menu="False"
+        	name="statement.close"
+        	string="Close Statements"/>
+  		<wizard
+        	id="open_statement"
+        	model="account.bank.statement"
+        	menu="False"
+        	name="statement.open"
+        	string="Open Statements"/>
+
+
+       <wizard
+        	id="wizard_all_closed_cashbox_of_the_day"
+        	model="account.bank.statement"
+        	menu="False"
+        	name="all.closed.cashbox.of.the.day"
+        	string="All Cashboxes Of the day"/>
+
+
+	</data>
 </openerp>
diff --git a/addons/point_of_sale/pos_workflow.xml b/addons/point_of_sale/pos_workflow.xml
index 9b43b1fb659..d3f1313c13f 100644
--- a/addons/point_of_sale/pos_workflow.xml
+++ b/addons/point_of_sale/pos_workflow.xml
@@ -58,8 +58,6 @@
 	<record model="workflow.transition" id="trans_draft_paid">
 	  <field name="act_from" ref="act_draft"/>
 	  <field name="act_to" ref="act_paid"/>
-	  <field name="trigger_model">pos.payment</field>
-	  <field name="trigger_expr_id">payment_get()</field>
 	  <field name="condition">test_paid()</field>
 	  <field name="signal">paid</field>
 	</record>
@@ -68,7 +66,7 @@
 		<field name="act_from" ref="act_paid"/>
 		<field name="act_to" ref="act_done"/>
 		<field name="signal">done</field>
-		<field name="role_id" ref="role_pos"/>
+	<!--	<field name="role_id" ref="role_pos"/-->
 	</record>
 
 	<record model="workflow.transition" id="trans_paid_invoice">
diff --git a/addons/point_of_sale/pos_workflow.xml.orig b/addons/point_of_sale/pos_workflow.xml.orig
new file mode 100644
index 00000000000..a6375642fa8
--- /dev/null
+++ b/addons/point_of_sale/pos_workflow.xml.orig
@@ -0,0 +1,239 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+	<record model="workflow" id="wkf_pos">
+	  <field name="name">Pos workflow</field>
+	  <field name="osv">pos.order</field>
+	  <field name="on_create">True</field>
+	</record>
+
+    <!-- Roles definition -->
+
+	<record model="res.roles" id="role_pos">
+		<field name="name">POS - Confirmation</field>
+	</record>
+
+    <!--Activities-->
+
+	<record model="workflow.activity" id="act_draft">
+	  <field name="wkf_id" ref="wkf_pos"/>
+	  <field name="flow_start">True</field>
+	  <field name="name">draft</field>
+	</record>
+
+    <record model="workflow.activity" id="act_payment">
+        <field name="wkf_id" ref="wkf_pos" />
+        <field name="name">payment</field>
+        <field name="kind">function</field>
+        <field name="action">write({'state': 'payment'})</field>
+    </record>
+
+    <record model="workflow.activity" id="act_rebate">
+        <field name="wkf_id" ref="wkf_pos" />
+        <field name="name">rebate</field>
+        <field name="kind">function</field>
+        <field name="action">write({'state': 'rebate'})</field>
+    </record>
+
+    <record model="workflow.activity" id="act_unbalanced">
+        <field name="wkf_id" ref="wkf_pos" />
+        <field name="name">unbalanced</field>
+        <field name="kind">function</field>
+        <field name="action">write({'state': 'unbalanced'})</field>
+    </record>
+
+    <record model="workflow.activity" id="act_cofinoga">
+        <field name="wkf_id" ref="wkf_pos" />
+        <field name="name">cofinoga</field>
+        <field name="kind">function</field>
+        <field name="action">write({'state': 'cofinoga'})</field>
+    </record>
+
+    <record model="workflow.activity" id="act_collectivites">
+        <field name="wkf_id" ref="wkf_pos" />
+        <field name="name">collectivites</field>
+        <field name="kind">function</field>
+        <field name="action">write({'state': 'collectivites'})</field>
+    </record>
+
+    <record model="workflow.activity" id="act_cadeaux">
+        <field name="wkf_id" ref="wkf_pos" />
+        <field name="name">cadeaux</field>
+        <field name="kind">function</field>
+        <field name="action">write({'state': 'cadeaux'})</field>
+    </record>
+
+    <record model="workflow.activity" id="act_collectivites">
+        <field name="wkf_id" ref="wkf_pos" />
+        <field name="name">collectivites</field>
+        <field name="kind">function</field>
+        <field name="action">write({'state': 'collectivites', 'invoice_wanted': True})</field>
+    </record>
+
+    <record model="workflow.activity" id="act_cadeaux">
+        <field name="wkf_id" ref="wkf_pos" />
+        <field name="name">cadeaux</field>
+        <field name="kind">function</field>
+        <field name="action">write({'state': 'cadeaux'})</field>
+    </record>
+
+	<record model="workflow.activity" id="act_paid">
+        <field name="wkf_id" ref="wkf_pos"/>
+        <field name="name">paid</field>
+        <field name="action">action_paid()</field>
+        <field name="kind">function</field>
+	</record>
+
+	<record model="workflow.activity" id="act_done">
+	  <field name="wkf_id" ref="wkf_pos"/>
+	  <field name="name">done</field>
+	  <field name="flow_stop">True</field>
+	  <field name="action">action_done()</field>
+	  <field name="kind">function</field>
+	</record>
+
+	<record model="workflow.activity" id="act_invoiced">
+	  <field name="wkf_id" ref="wkf_pos"/>
+	  <field name="name">invoiced</field>
+	  <field name="flow_stop">True</field>
+	  <field name="action">action_invoice()</field>
+	  <field name="kind">function</field>
+	</record>
+
+	<record model="workflow.activity" id="act_cancel">
+	  <field name="wkf_id" ref="wkf_pos"/>
+	  <field name="name">cancel</field>
+	  <field name="flow_stop">True</field>
+	  <field name="action">action_cancel()</field>
+	  <field name="kind">function</field>
+	</record>
+
+
+    <!--Transitions-->
+
+    <record model="workflow.transition" id="trans_draft_payment">
+        <field name="act_from" ref="act_draft" />
+        <field name="act_to" ref="act_payment" />
+        <field name="signal">start_payment</field>
+    </record>
+
+	<record model="workflow.transition" id="trans_payment_paid">
+        <field name="act_from" ref="act_payment"/>
+        <field name="act_to" ref="act_paid"/>
+        <field name="condition">test_paid() and not(test_rebate() or test_cofinoga() or test_cadeaux() or test_collectivites())</field>
+        <field name="signal">payment</field>
+	</record>
+
+    <record model="workflow.transition" id="trans_payment_rebate">
+        <field name="act_from" ref="act_payment" />
+        <field name="act_to" ref="act_rebate" />
+        <field name="condition">test_rebate()</field>
+        <field name="signal">payment</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_rebate_paid">
+        <field name="act_from" ref="act_rebate" />
+        <field name="act_to" ref="act_paid" />
+        <field name="signal">ok_rebate</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_payment_unbalanced">
+        <field name="act_from" ref="act_payment" />
+        <field name="act_to" ref="act_unbalanced" />
+        <field name="condition">not test_paid()</field>
+        <field name="signal">payment</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_unbalanced">
+        <field name="act_from" ref="act_unbalanced" />
+        <field name="act_to" ref="act_paid" />
+        <field name="condition">test_paid()</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_payment_cofinoga">
+        <field name="act_from" ref="act_payment" />
+        <field name="act_to" ref="act_cofinoga" />
+        <field name="condition">test_cofinoga()</field>
+        <field name="signal">payment</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_cofinoga_paid">
+        <field name="act_from" ref="act_cofinoga" />
+        <field name="act_to" ref="act_paid" />
+        <field name="signal">ok_cofinoga</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_payment_collectivites">
+        <field name="act_from" ref="act_payment" />
+        <field name="act_to" ref="act_collectivites" />
+        <field name="condition">test_collectivites()</field>
+        <field name="signal">payment</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_collectivites_paid">
+        <field name="act_from" ref="act_collectivites" />
+        <field name="act_to" ref="act_paid" />
+        <field name="signal">ok_collectivites</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_payment_cadeaux">
+        <field name="act_from" ref="act_payment" />
+        <field name="act_to" ref="act_cadeaux" />
+        <field name="condition">test_cadeaux()</field>
+        <field name="signal">payment</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_cadeaux_paid">
+        <field name="act_from" ref="act_cadeaux" />
+        <field name="act_to" ref="act_paid" />
+        <field name="signal">ok_cadeaux</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_payment_collectivites">
+        <field name="act_from" ref="act_payment" />
+        <field name="act_to" ref="act_collectivites" />
+        <field name="condition">test_collectivites()</field>
+        <field name="signal">payment</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_collectivites_paid">
+        <field name="act_from" ref="act_collectivites" />
+        <field name="act_to" ref="act_invoiced" />
+        <field name="signal">ok_collectivites</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_payment_cadeaux">
+        <field name="act_from" ref="act_payment" />
+        <field name="act_to" ref="act_cadeaux" />
+        <field name="condition">test_cadeaux()</field>
+        <field name="signal">payment</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_cadeaux_paid">
+        <field name="act_from" ref="act_cadeaux" />
+        <field name="act_to" ref="act_paid" />
+        <field name="signal">ok_cadeaux</field>
+    </record>
+
+	<record model="workflow.transition" id="trans_paid_done">
+		<field name="act_from" ref="act_paid"/>
+		<field name="act_to" ref="act_done"/>
+		<field name="signal">done</field>
+	<!--	<field name="role_id" ref="role_pos"/-->
+	</record>
+
+	<record model="workflow.transition" id="trans_paid_invoice">
+	  <field name="act_from" ref="act_paid"/>
+	  <field name="act_to" ref="act_invoiced"/>
+	  <field name="signal">invoice</field>
+	</record>
+
+	<record model="workflow.transition" id="trans_paid_cancel">
+	  <field name="act_from" ref="act_paid"/>
+	  <field name="act_to" ref="act_cancel"/>
+	  <field name="signal">cancel</field>
+	</record>
+
+
+  </data>
+</openerp>
diff --git a/addons/point_of_sale/posr_data.xml b/addons/point_of_sale/posr_data.xml
new file mode 100644
index 00000000000..de0ec465950
--- /dev/null
+++ b/addons/point_of_sale/posr_data.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+		<record id="ir_rule_group_pos0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_pos_order"/>
+			<field eval="&quot;&quot;&quot;pos&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+		<record id="ir_rule_0" model="ir.rule">
+			<field eval="&quot;&quot;&quot;=&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_pos_order_company_id"/>
+			<field name="rule_group" ref="ir_rule_group_pos0"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="res_groups_pos0" model="res.groups">
+			<field eval="[(6,0,[ref('base.menu_base_partner'),ref('base.next_id_50'),ref('account.menu_action_account_period_close_tree'),ref('point_of_sale.menu_point_config'),ref('base.menu_config'),ref('base.menu_base_config'),ref('base.next_id_11'),ref('base.menu_partner_category_main'),ref('product.menu_config_product'),ref('product.menu_product_category_action'),ref('product.menu_product_category_action_form'),ref('product.menu_product_pricelist_action2'),ref('account.menu_finance_configuration'),ref('account.menu_wizard_fy_close'),ref('stock.menu_stock_configuration'),ref('sale.menu_shop_configuration'),ref('sale.menu_action_order_tree5'),ref('sale.menu_action_order_tree10'),ref('board_manufacturing.menu_board_manufacturing'),ref('base.menu_custom'),ref('base.menu_partner_form'),ref('product.menu_product_pricelist_main'),ref('product.menu_product_pricelist_action'),ref('account.menu_finance_entries'),ref('account.menu_wizard_open_closed_fy'),ref('stock.menu_traceability'),ref('sale.menu_action_order_tree4'),ref('sale.menu_action_order_tree9'),ref('base.next_id_4'),ref('account.menu_finance_periodical_processing'),ref('base.menu_translation'),ref('base.menu_translation_app'),ref('base.menu_translation_export'),ref('product.menu_product_ul_form_action'),ref('mrp.menu_mrp_reordering'),ref('delivery.menu_delivery'),ref('product.menu_product_uom_categ_form_action'),ref('hr.menu_hr_configuration'),ref('account.menu_action_move_journal_line_form'),ref('product_margin.menu_action_product_margin'),ref('base.menu_users'),ref('account.menu_finance_charts'),ref('account.menu_bank_statement_tree'),ref('base.menu_security'),ref('account.menu_finance_reporting'),ref('account.menu_finance_legal_statement'),ref('account.menu_generic_report'),ref('base.menu_low_workflow'),ref('base.menu_partner_function_form'),ref('base.menu_partner_address_form'),ref('base.menu_partner_title'),ref('base.menu_partner_title_partner'),ref('base.menu_partner_title_contact'),ref('base.menu_partner_customer_form'),ref('base.menu_partner_supplier_form'),ref('base.menu_partner_other_form'),ref('base.menu_partner_category_form'),ref('base.menu_localisation'),ref('base.menu_country_partner'),ref('base.menu_country_state_partner'),ref('base.next_id_14'),ref('base.menu_res_partner_canal-act'),ref('base.menu_res_partner_event_type-act'),ref('base.menu_res_partner_som-act'),ref('base.next_id_15'),ref('base.menu_ir_property_form'),ref('base.menu_ir_property_form_all'),ref('base.maintenance'),ref('base.menu_maintenance_contract_add'),ref('process.menu_process'),ref('process.menu_process_form'),ref('process.menu_process_node_form'),ref('process.menu_process_transition_form'),ref('base.reporting_menu'),ref('board.menu_view_board_form'),ref('product.menu_main_product'),ref('product.next_id_16'),ref('product.menu_product_uom_form_action'),ref('product.menu_price'),ref('product.menu_product_price_type_action'),ref('product.menu_product_pricelist_type_action'),ref('hr.menu_department_tree'),ref('hr.menu_department_def'),ref('account.menu_finance_invoice'),ref('account.menu_automatic_reconcile'),ref('account.menu_finance'),ref('account.menu_finance_accounting'),ref('account.menu_analytic_accounting'),ref('account.menu_wizard_fy_close_state'),ref('account.next_id_20'),ref('account.menu_reconcile_select'),ref('account.menu_unreconcile_select'),ref('account.menu_generate_subscription'),ref('account.next_id_22'),ref('account.menu_aged_trial_balance'),ref('account.menu_partner_balance'),ref('account.menu_third_party_ledger'),ref('account.menu_validate_account_moves'),ref('account.menu_account_use_model'),ref('account.menu_account_balance_report'),ref('account.menu_general_ledger'),ref('account.menu_print_journal'),ref('account.menu_central_journal'),ref('account.menu_general_journal'),ref('account.next_id_23'),ref('account.menu_action_account_fiscalyear_form'),ref('account.menu_action_account_period_form'),ref('account.account_account_menu'),ref('account.menu_action_account_form'),ref('account.menu_action_account_tree'),ref('account.menu_action_account_journal_form'),ref('account.menu_bank_statement_draft_tree'),ref('account.menu_bank_statement_tree2'),ref('account.menu_action_account_type_form'),ref('account.next_id_27'),ref('account.menu_action_tax_form'),ref('account.next_id_29'),ref('account.menu_action_move_line_form'),ref('account.menu_encode_entries_by_move'),ref('account.menu_action_move_line_search'),ref('account.menu_action_account_tree2'),ref('account.next_id_30'),ref('account.menu_action_account_bank_reconcile_tree'),ref('account.menu_action_account_bank_reconcile_check_tree'),ref('account.menu_action_account_journal_period_tree'),ref('account.menu_action_model_form'),ref('account.menu_action_payment_term_form'),ref('account.menu_action_subscription_form'),ref('account.menu_action_subscription_form_running'),ref('account.menu_action_subscription_form_new'),ref('account.account_template_folder'),ref('account.menu_action_account_template_form'),ref('account.menu_action_account_chart_template_form'),ref('account.menu_wizard'),ref('account.menu_action_invoice_tree1'),ref('account.menu_action_invoice_tree1_new'),ref('account.menu_action_invoice_tree2'),ref('account.menu_action_invoice_tree2_new'),ref('account.menu_action_invoice_tree3'),ref('account.menu_action_invoice_tree3_new'),ref('account.menu_action_invoice_tree4'),ref('account.menu_action_invoice_tree4_new'),ref('account.menu_invoice_draft'),ref('account.menu_action_invoice_tree6'),ref('account.menu_action_invoice_tree7'),ref('account.menu_action_invoice_tree8'),ref('account.menu_action_invoice_tree9'),ref('account.menu_action_invoice_tree10'),ref('account.menu_action_invoice_tree11'),ref('account.menu_action_invoice_tree12'),ref('account.menu_action_invoice_tree13'),ref('account.menu_tax_report'),ref('account.menu_wizard_vat_declaration'),ref('account.account_analytic_def_account'),ref('account.account_analytic_def_chart'),ref('account.account_analytic_chart'),ref('account.account_analytic_form'),ref('account.next_id_40'),ref('account.account_analytic_chart_balance'),ref('account.next_id_41'),ref('account.account_entries_analytic_entries'),ref('account.account_def_analytic_journal'),ref('account.account_analytic_journal_print'),ref('account.account_analytic_journal_entries'),ref('account.next_id_42'),ref('account.report_account_analytic_journal_print'),ref('account.next_id_43'),ref('account.report_account_analytic_journal_print_month'),ref('product_margin.menu_product_reporting'),ref('point_of_sale.menu_point_root'),ref('point_of_sale.menu_point_ofsale'),ref('point_of_sale.menu_wizard_default_journal'),ref('point_of_sale.menu_action_pos_order_tree2'),ref('point_of_sale.menu_action_pos_order_tree3'),ref('point_of_sale.menu_action_pos_order_line'),ref('point_of_sale.menu_action_pos_order_line_day'),ref('point_of_sale.menu_point_rep'),ref('point_of_sale.menu_trans_pos_tree_today'),ref('point_of_sale.menu_trans_pos_tree_month'),ref('point_of_sale.menu_trans_pos_tree'),ref('base_report_creator.menu_base_report_creator_action_config'),ref('base_report_creator.menu_base_report_creator_action'),ref('base_module_record.menu_wizard_base_mod_rec'),ref('base_module_record.menu_wizard_base_mod_rec_rec'),ref('base_module_record.menu_wizard_base_module_record'),ref('base_module_record.menu_wizard_base_module_record_stop'),ref('base_module_record.menu_wizard_base_module_save'),ref('base_module_record.menu_wizard_base_module_record_objects'),ref('base.menu_action_res_bank_form'),ref('account.menu_action_tax_code_list'),ref('account.menu_action_tax_code_tree'),ref('account.menu_action_account_tax_template_form'),ref('account.menu_action_account_tax_code_template_form'),ref('account.menu_finance_recurrent_entries'),ref('base.menu_action_res_company_tree'),ref('stock.menu_action_picking_tree4'),ref('product.menu_products'),ref('stock.menu_action_picking_tree6'),ref('stock.menu_action_picking_tree'),ref('base.menu_administration'),ref('base.custom_shortcuts'),ref('base.menu_custom_action'),ref('base.menu_action_currency_form'),ref('account.menu_account_end_year_treatments'),ref('account.menu_action_account_fiscal_position_form_template'),ref('account.menu_action_account_fiscal_position_form'),ref('stock.menu_action_picking_tree_delivery'),ref('mrp.menu_production_orders_start_gantt'),ref('hr.menu_hr_reporting'),ref('base.menu_partner_customer_form_new'),ref('board.menu_view_board_note_form'),ref('mrp.mrp_Sched_all')])]" name="menu_access"/>
+			<field eval="[(6,0,[ref('ir_rule_group_pos0')])]" name="rule_groups"/>
+			<field eval="[(6,0,[ref('base.user_root')])]" name="users"/>
+			<field eval="&quot;&quot;&quot;POS&quot;&quot;&quot;" name="name"/>
+		</record>
+		<record id="ir_model_access_pospayment0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_payment"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos payment&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_pos0"/>
+		</record>
+		<record id="ir_model_access_posline0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos line&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_pos0"/>
+		</record>
+		<record id="ir_model_access_pos0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_pos0"/>
+		</record>
+		<record id="ir_model_access_posjournal0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_config_journal"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos journal&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="0" name="perm_create"/>
+			<field name="group_id" ref="res_groups_pos0"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="res_users_viral0" model="res.users">
+			<field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
+			<field eval="[(6,0,[ref('base.group_user'),ref('res_groups_pos0')])]" name="groups_id"/>
+			<field eval="[(6,0,[])]" name="roles_id"/>
+			<field eval="1" name="active"/>
+			<field eval="&quot;&quot;&quot;vir&quot;&quot;&quot;" name="password"/>
+			<field eval="&quot;&quot;&quot;en_US&quot;&quot;&quot;" name="context_lang"/>
+			<field eval="&quot;&quot;&quot;viral&quot;&quot;&quot;" name="name"/>
+			<field name="company_id" ref="second_company"/>
+			<field eval="&quot;&quot;&quot;vir&quot;&quot;&quot;" name="login"/>
+			<field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
+		</record>
+	</data>
+</openerp>
diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
new file mode 100644
index 00000000000..8aba2dde486
--- /dev/null
+++ b/addons/point_of_sale/posrule_data.xml
@@ -0,0 +1,589 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+        <!-- <record id="res_partner_tinyshop0" model="res.partner">
+            <field eval="0" name="customer"/>
+            <field eval="0" name="supplier"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;Tiny Shop 1&quot;&quot;&quot;" name="name"/>
+        </record>
+        <record id="res_partner_address_fabien0" model="res.partner.address">
+            <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;92000&quot;&quot;&quot;" name="zip"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field name="partner_id" ref="stock.res_partner_tinyshop0"/>
+            <field name="country_id" ref="base.fr"/>
+            <field eval="&quot;&quot;&quot;Avenue de Paris&quot;&quot;&quot;" name="street"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
+        </record>
+        <record id="res_company_shop0" model="res.company">
+            <field eval="5.0" name="security_lead"/>
+            <field name="currency_id" ref="base.EUR"/>
+            <field eval="1.0" name="po_lead"/>
+            <field name="partner_id" ref="res_partner_tinyshop0"/>
+            <field eval="1.0" name="manufacturing_lead"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field eval="80.0" name="schedule_range"/>
+            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+
+        </record>
+        <record id="res_partner_tinyshop1" model="res.partner">
+            <field eval="1" name="customer"/>
+            <field eval="0" name="supplier"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;Tiny Shop 2&quot;&quot;&quot;" name="name"/>
+       </record>
+        <record id="res_partner_address_eric0" model="res.partner.address">
+            <field eval="&quot;&quot;&quot;Eric&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;1500&quot;&quot;&quot;" name="zip"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field name="country_id" ref="base.fr"/>
+            <field eval="&quot;&quot;&quot;Avenue de la Resistance&quot;&quot;&quot;" name="street"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field eval="1" name="active"/>
+        </record>-->
+<!--        <record id="res_company_tinyshop0" model="res.company">-->
+<!--            <field name="currency_id" ref="base.EUR"/>-->
+<!--            <field eval="1.0" name="po_lead"/>-->
+<!--            <field name="partner_id" ref="res_partner_tinyshop1"/>-->
+<!--            <field eval="1.0" name="manufacturing_lead"/>-->
+<!--            <field name="parent_id" ref="base.main_company"/>-->
+<!--            <field eval="80.0" name="schedule_range"/>-->
+<!--            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>-->
+<!--        </record>-->
+
+
+   		<record id="res_users_shopuser0" model="res.users">
+            <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
+            <field eval="[(6,0,[ref('base.group_partner_manager')])]" name="groups_id"/>
+            <field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/>
+            <field eval="[(6,0,[ref('purchase.res_roles_purchase0'),ref('sale.res_roles_salesman0')])]" name="roles_id"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;shop1&quot;&quot;&quot;" name="password"/>
+            <field eval="&quot;&quot;&quot;en_US&quot;&quot;&quot;" name="context_lang"/>
+            <field eval="&quot;&quot;&quot;Shop 1 User&quot;&quot;&quot;" name="name"/>
+            <field name="company_id" ref="stock.res_company_shop0"/>
+            <field eval="&quot;&quot;&quot;shop1&quot;&quot;&quot;" name="login"/>
+            <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
+        </record>
+        <record id="res_users_shopuser1" model="res.users">
+            <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
+            <field eval="[(6,0,[ref('base.group_partner_manager')])]" name="groups_id"/>
+            <field model="res.partner.address" name="address_id" search="[('name','=','Eric')]"/>
+            <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="password"/>
+            <field eval="&quot;&quot;&quot;Shop 2 User&quot;&quot;&quot;" name="name"/>
+            <field name="company_id" ref="stock.res_company_tinyshop0"/>
+            <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="login"/>
+            <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
+        </record>
+		<record id="ir_rule_group_posline0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="&quot;&quot;&quot;POS line&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+		<record id="ir_rule_0" model="ir.rule">
+			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
+			<field name="rule_group" ref="ir_rule_group_posline0"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="res_groups_posuserposline0" model="res.groups">
+			<field eval="[(6,0,[ref('point_of_sale.menu_action_pos_order_line'),ref('point_of_sale.menu_action_pos_order_line_day')])]" name="menu_access"/>
+			<field eval="[(6,0,[ref('ir_rule_group_posline0')])]" name="rule_groups"/>
+			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
+			<field eval="&quot;&quot;&quot;POS_user_pos_line&quot;&quot;&quot;" name="name"/>
+		</record>
+		<record id="ir_model_access_posorderline0_1" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos.order.line&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuserposline0"/>
+		</record>
+		<record id="ir_model_access_posorder0_1" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos.order&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuserposline0"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="ir_rule_group_point0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_pos_order"/>
+			<field eval="&quot;&quot;&quot;point&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+		<record id="ir_rule_0" model="ir.rule">
+			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_pos_order_company_id"/>
+			<field name="rule_group" ref="ir_rule_group_point0"/>
+		</record>
+
+
+		 <record id="ir_rule_group_poslinecompany0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="&quot;&quot;&quot;POS line company&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+		<record id="ir_rule_4" model="ir.rule">
+			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
+			<field name="rule_group" ref="ir_rule_group_poslinecompany0"/>
+		</record>
+
+		<record id="ir_rule_group_posreporting0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>
+			<field eval="&quot;&quot;&quot;POS Reporting&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+
+		<record id="ir_rule_5" model="ir.rule">
+			<field eval="&quot;&quot;&quot;=&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_report_transaction_pos_user_id"/>
+			<field name="rule_group" ref="ir_rule_group_posreporting0"/>
+		</record>
+
+	</data>
+
+	<data>
+		<record id="res_groups_posuser0" model="res.groups">
+			<field eval="[(6,0,[ref('point_of_sale.menu_point_ofsale'),
+	 		ref('point_of_sale.menu_point_config'),
+      ref('stock.menu_action_location_form'),
+	 		ref('stock.menu_action_location_tree'),
+      ref('stock.menu_picking_waiting'),
+	 		ref('stock.menu_action_picking_tree3'),
+      ref('stock.menu_action_picking_tree5'),
+	 		ref('stock.menu_action_picking_form'),
+      ref('stock.menu_action_picking_tree7'),
+	 		ref('stock.menu_action_picking_tree8'),
+      ref('stock.menu_action_picking_tree9'),
+	 		ref('mrp.menu_mrp_procurement_action3'),
+	 		ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
+			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
+ 				<field eval="[(6,0,[ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
+			<field eval="&quot;&quot;&quot;POS_user&quot;&quot;&quot;" name="name"/>
+		</record>
+		<record id="ir_model_access_point0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos.order&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_reporttransacationpos0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;report.transacation.pos&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_posorderline0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos.order.line&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_modelsmrp_pdt0" model="ir.model.access">
+			<field name="model_id" ref="mrp.model_mrp_procurement"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;MRP - Procurement&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_modelsupp_pdt0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_supplierinfo"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product - Supplier Infos&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_modeluom_pdt0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_uom"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product - UOM&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_accountmoveline0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_move_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Move Line&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_accountmove0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_move"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Move&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_accountjournal0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_journal"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Journal&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_saleshop0" model="ir.model.access">
+			<field name="model_id" ref="sale.model_sale_shop"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;sale.shop&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stockwarehouse0" model="ir.model.access">
+			<field name="model_id" ref="stock.model_stock_warehouse"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.warehouse&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stockwarehouseorderpoint0" model="ir.model.access">
+			<field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.warehouse.orderpoint&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stocklocation0" model="ir.model.access">
+			<field name="model_id" ref="stock.model_stock_location"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.location&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_saleorder0" model="ir.model.access">
+			<field name="model_id" ref="sale.model_sale_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;sale.order&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+		</record>
+
+		<record id="ir_model_access_saleorderline0" model="ir.model.access">
+			<field name="model_id" ref="sale.model_sale_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;sale.order.line&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_purchaseorder0" model="ir.model.access">
+			<field name="model_id" ref="purchase.model_purchase_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;purchase.order&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_purchaseorderlines0" model="ir.model.access">
+			<field name="model_id" ref="purchase.model_purchase_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Purchase Order lines&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_inv0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_invoice"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_invorderlines0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_invoice_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Invoice lines&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_acc0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_account"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_period0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_period"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Period&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_journalperiod0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_journal_period"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Journal - Period&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_values0" model="ir.model.access">
+			<field name="model_id" ref="base.model_ir_values"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;values&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_prop0" model="ir.model.access">
+			<field name="model_id" ref="base.model_ir_property"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;properties&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_pdt_pdt0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_product"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product - Product&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_pdt_tmplt0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_template"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product - Template&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_accountinvtax0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_invoice_tax"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Invoice Tax&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_productpricelist0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_pricelist"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;product.pricelist&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_productpricelisttype0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_pricelist_type"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;product.pricelist.type&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_productpricetype0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_price_type"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;product.price.type&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_productcategory0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_category"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;product.category&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stockpicking0" model="ir.model.access">
+			<field name="model_id" ref="stock.model_stock_picking"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.picking&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stockmove0" model="ir.model.access">
+			<field name="model_id" ref="stock.model_stock_move"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.move&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_productunitofmeasure0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_uom"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product Unit of Measure&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_journalview0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_journal_view"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Journal View&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_journalcolumn0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_journal_column"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Journal Column&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_paymenttermline0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_payment_term_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Payment Term Line&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_paymentterm0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_payment_term"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Payment Term&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_rescompany0" model="ir.model.access">
+			<field name="model_id" ref="base.model_res_company"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;res.company&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_accounttype0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_account_type"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Type&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+        <record id="ir_model_access_procurement0" model="ir.model.access">
+            <field name="model_id" ref="mrp.model_mrp_procurement" />
+            <field eval="1" name="perm_read" />
+            <field eval="1" name="perm_write" />
+            <field eval="1" name="perm_create" />
+            <field eval="0" name="perm_unlink" />
+            <field name="name" eval="&quot;&quot;&quot;mrp.procurement&quot;&quot;&quot;" />
+			<field name="group_id" ref="res_groups_posuser0"/>
+        </record>
+        <record id="ir_model_access_tax0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_tax"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;TAX&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<menuitem
+            id="stock.next_id_61"
+            name="Reporting"
+            parent="stock.menu_stock_root" groups="base.group_user"/>
+        <menuitem
+            id="stock.next_id_62"
+            name="Traceability"
+            parent="stock.next_id_61" groups="base.group_user"/>
+        <menuitem id="stock.menu_traceability_low" name="Low Level" parent="stock.menu_traceability" groups="base.group_user"/>
+		<menuitem action="stock.action_picking_tree" id="stock.menu_action_picking_tree" parent="stock.menu_stock_root" sequence="19" groups="res_groups_posuser0"/>
+        <menuitem id="mrp.menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4" groups="base.group_user"/>
+        <menuitem parent="stock.next_id_61" action="stock.action_stock_line_date" id="stock.menu_report_stock_line_date" groups="base.group_user"/>
+
+	</data>
+</openerp>
+
diff --git a/addons/point_of_sale/posrule_data2.xml b/addons/point_of_sale/posrule_data2.xml
new file mode 100644
index 00000000000..170bce20374
--- /dev/null
+++ b/addons/point_of_sale/posrule_data2.xml
@@ -0,0 +1,592 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+        <record id="res_partner_tinyshop0" model="res.partner">
+            <field eval="0" name="customer"/>
+            <field eval="0" name="supplier"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;Tiny Shop 1&quot;&quot;&quot;" name="name"/>
+        </record>
+        <record id="res_partner_address_fabien0" model="res.partner.address">
+            <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;92000&quot;&quot;&quot;" name="zip"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field name="partner_id" ref="res_partner_tinyshop0"/>
+            <field name="country_id" ref="base.fr"/>
+            <field eval="&quot;&quot;&quot;Avenue de Paris&quot;&quot;&quot;" name="street"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
+        </record>
+        <record id="res_company_shop0" model="res.company">
+            <field eval="5.0" name="security_lead"/>
+            <field name="currency_id" ref="base.EUR"/>
+            <field eval="1.0" name="po_lead"/>
+            <field name="partner_id" ref="res_partner_tinyshop0"/>
+            <field eval="1.0" name="manufacturing_lead"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field eval="80.0" name="schedule_range"/>
+            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+
+        </record>
+        <record id="res_partner_tinyshop1" model="res.partner">
+            <field eval="1" name="customer"/>
+            <field eval="0" name="supplier"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;Tiny Shop 2&quot;&quot;&quot;" name="name"/>
+       </record>
+        <record id="res_partner_address_eric0" model="res.partner.address">
+            <field eval="&quot;&quot;&quot;Eric&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;1500&quot;&quot;&quot;" name="zip"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field name="country_id" ref="base.fr"/>
+            <field eval="&quot;&quot;&quot;Avenue de la Resistance&quot;&quot;&quot;" name="street"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_company_tinyshop0" model="res.company">
+            <field name="currency_id" ref="base.EUR"/>
+            <field eval="1.0" name="po_lead"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field eval="1.0" name="manufacturing_lead"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field eval="80.0" name="schedule_range"/>
+            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
+        </record>
+
+
+        <record id="res_users_shopuser0" model="res.users">
+            <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
+            <field eval="[(6,0,[ref('base.group_partner_manager')])]" name="groups_id"/>
+            <field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/>
+            <field eval="[(6,0,[ref('purchase.res_roles_purchase0'),ref('sale.res_roles_salesman0')])]" name="roles_id"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;shop1&quot;&quot;&quot;" name="password"/>
+            <field eval="&quot;&quot;&quot;en_US&quot;&quot;&quot;" name="context_lang"/>
+            <field eval="&quot;&quot;&quot;Shop 1 User&quot;&quot;&quot;" name="name"/>
+            <field name="company_id" ref="res_company_shop0"/>
+            <field eval="&quot;&quot;&quot;shop1&quot;&quot;&quot;" name="login"/>
+            <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
+        </record>
+        <record id="res_users_shopuser1" model="res.users">
+            <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
+            <field eval="[(6,0,[ref('base.group_partner_manager')])]" name="groups_id"/>
+            <field model="res.partner.address" name="address_id" search="[('name','=','Eric')]"/>
+            <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="password"/>
+            <field eval="&quot;&quot;&quot;Shop 2 User&quot;&quot;&quot;" name="name"/>
+            <field name="company_id" ref="res_company_tinyshop0"/>
+            <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="login"/>
+            <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
+        </record>
+
+
+
+		<record id="ir_rule_group_posline0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="&quot;&quot;&quot;POS line&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+		<record id="ir_rule_0" model="ir.rule">
+			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
+			<field name="rule_group" ref="ir_rule_group_posline0"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="res_groups_posuserposline0" model="res.groups">
+			<field eval="[(6,0,[ref('point_of_sale.menu_action_pos_order_line'),ref('point_of_sale.menu_action_pos_order_line_day')])]" name="menu_access"/>
+			<field eval="[(6,0,[ref('ir_rule_group_posline0')])]" name="rule_groups"/>
+			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
+			<field eval="&quot;&quot;&quot;POS_user_pos_line&quot;&quot;&quot;" name="name"/>
+		</record>
+		<record id="ir_model_access_posorderline0_1" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos.order.line&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuserposline0"/>
+		</record>
+		<record id="ir_model_access_posorder0_1" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos.order&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuserposline0"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="ir_rule_group_point0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_pos_order"/>
+			<field eval="&quot;&quot;&quot;point&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+		<record id="ir_rule_0" model="ir.rule">
+			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_pos_order_company_id"/>
+			<field name="rule_group" ref="ir_rule_group_point0"/>
+		</record>
+
+
+		 <record id="ir_rule_group_poslinecompany0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="&quot;&quot;&quot;POS line company&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+		<record id="ir_rule_4" model="ir.rule">
+			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
+			<field name="rule_group" ref="ir_rule_group_poslinecompany0"/>
+		</record>
+
+		<record id="ir_rule_group_posreporting0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>
+			<field eval="&quot;&quot;&quot;POS Reporting&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+
+		<record id="ir_rule_5" model="ir.rule">
+			<field eval="&quot;&quot;&quot;=&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_report_transaction_pos_user_id"/>
+			<field name="rule_group" ref="ir_rule_group_posreporting0"/>
+		</record>
+
+	</data>
+
+	<data>
+		<record id="res_groups_posuser0" model="res.groups">
+			<field eval="[(6,0,[ref('point_of_sale.menu_point_ofsale'),
+	 		ref('point_of_sale.menu_point_config'),
+      ref('stock.menu_action_location_form'),
+	 		ref('stock.menu_action_location_tree'),
+      ref('stock.menu_picking_waiting'),
+	 		ref('stock.menu_action_picking_tree3'),
+      ref('stock.menu_action_picking_tree5'),
+	 		ref('stock.menu_action_picking_form'),
+      ref('stock.menu_action_picking_tree7'),
+	 		ref('stock.menu_action_picking_tree8'),
+      ref('stock.menu_action_picking_tree9'),
+	 		ref('mrp.menu_mrp_procurement_action3'),
+	 		ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
+ 				<field eval="[(6,0,[ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
+			<field eva="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
+			<field eval="&quot;&quot;&quot;POS_user&quot;&quot;&quot;" name="name"/>
+		</record>
+		<record id="ir_model_access_point0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos.order&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_reporttransacationpos0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;report.transacation.pos&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_posorderline0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos.order.line&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_modelsmrp_pdt0" model="ir.model.access">
+			<field name="model_id" ref="mrp.model_mrp_procurement"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;MRP - Procurement&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_modelsupp_pdt0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_supplierinfo"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product - Supplier Infos&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_modeluom_pdt0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_uom"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product - UOM&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_accountmoveline0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_move_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Move Line&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_accountmove0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_move"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Move&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_accountjournal0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_journal"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Journal&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_saleshop0" model="ir.model.access">
+			<field name="model_id" ref="sale.model_sale_shop"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;sale.shop&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stockwarehouse0" model="ir.model.access">
+			<field name="model_id" ref="stock.model_stock_warehouse"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.warehouse&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stockwarehouseorderpoint0" model="ir.model.access">
+			<field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.warehouse.orderpoint&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stocklocation0" model="ir.model.access">
+			<field name="model_id" ref="stock.model_stock_location"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.location&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_saleorder0" model="ir.model.access">
+			<field name="model_id" ref="sale.model_sale_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;sale.order&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_saleorderline0" model="ir.model.access">
+			<field name="model_id" ref="sale.model_sale_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;sale.order.line&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_purchaseorder0" model="ir.model.access">
+			<field name="model_id" ref="purchase.model_purchase_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;purchase.order&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_purchaseorderlines0" model="ir.model.access">
+			<field name="model_id" ref="purchase.model_purchase_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Purchase Order lines&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_inv0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_invoice"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_invorderlines0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_invoice_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Invoice lines&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_acc0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_account"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_period0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_period"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Period&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_journalperiod0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_journal_period"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Journal - Period&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_values0" model="ir.model.access">
+			<field name="model_id" ref="base.model_ir_values"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;values&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_prop0" model="ir.model.access">
+			<field name="model_id" ref="base.model_ir_property"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;properties&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_pdt_pdt0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_product"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product - Product&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_pdt_tmplt0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_template"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product - Template&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_accountinvtax0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_invoice_tax"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Invoice Tax&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_productpricelist0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_pricelist"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;product.pricelist&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_productpricelisttype0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_pricelist_type"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;product.pricelist.type&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_productpricetype0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_price_type"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;product.price.type&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_productcategory0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_category"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;product.category&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stockpicking0" model="ir.model.access">
+			<field name="model_id" ref="stock.model_stock_picking"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.picking&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stockmove0" model="ir.model.access">
+			<field name="model_id" ref="stock.model_stock_move"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.move&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_productunitofmeasure0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_uom"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product Unit of Measure&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_journalview0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_journal_view"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Journal View&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_journalcolumn0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_journal_column"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Journal Column&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_paymenttermline0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_payment_term_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Payment Term Line&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_paymentterm0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_payment_term"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Payment Term&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_rescompany0" model="ir.model.access">
+			<field name="model_id" ref="base.model_res_company"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;res.company&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_accounttype0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_account_type"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Type&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+        <record id="ir_model_access_procurement0" model="ir.model.access">
+            <field name="model_id" ref="mrp.model_mrp_procurement" />
+            <field eval="1" name="perm_read" />
+            <field eval="1" name="perm_write" />
+            <field eval="1" name="perm_create" />
+            <field eval="0" name="perm_unlink" />
+            <field name="name" eval="&quot;&quot;&quot;mrp.procurement&quot;&quot;&quot;" />
+			<field name="group_id" ref="res_groups_posuser0"/>
+        </record>
+        <record id="ir_model_access_tax0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_tax"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;TAX&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<menuitem
+            id="stock.next_id_61"
+            name="Reporting"
+            parent="stock.menu_stock_root" groups="base.group_user"/>
+        <menuitem
+            id="stock.next_id_62"
+            name="Traceability"
+            parent="stock.next_id_61" groups="base.group_user"/>
+        <menuitem id="stock.menu_traceability_low" name="Low Level" parent="stock.menu_traceability" groups="base.group_user"/>
+		<menuitem action="stock.action_picking_tree" id="stock.menu_action_picking_tree" parent="stock.menu_stock_root" sequence="19" groups="res_groups_posuser0"/>
+        <menuitem parent="stock.next_id_61" action="stock.action_stock_line_date" id="stock.menu_report_stock_line_date" groups="base.group_user"/>
+
+	</data>
+</openerp>
+
diff --git a/addons/point_of_sale/report/__init__.py b/addons/point_of_sale/report/__init__.py
index 3fa614943b5..a5798add7b4 100644
--- a/addons/point_of_sale/report/__init__.py
+++ b/addons/point_of_sale/report/__init__.py
@@ -1,29 +1,40 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
+import pos_users_product
+import account_statement
+import all_closed_cashbox_of_the_day
 import pos_receipt
 import pos_invoice
 import pos_lines
 import pos_details
 import pos_details_summary
-
+import pos_payment_report
+import pos_sales_user
+import pos_sales_user_today
+import pos_payment_report_date
+import pos_payment_report_user
+import pos_sales_user_today_current_user
+import pos_receipt_with_remboursment
+import pos_receipt_without_remboursment
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/report/account_statement.py b/addons/point_of_sale/report/account_statement.py
new file mode 100644
index 00000000000..6b863a40469
--- /dev/null
+++ b/addons/point_of_sale/report/account_statement.py
@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+
+class account_statement(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(account_statement, self).__init__(cr, uid, name, context)
+        self.total = 0.0
+        self.localcontext.update({
+                'time': time,
+                'get_total':self._get_total,
+                })
+    def _get_total(self,statement_line_ids):
+        total = 0.0
+        for line in statement_line_ids:
+            total += line.amount
+        return total
+report_sxw.report_sxw('report.account.statement', 'account.bank.statement', 'addons/statement/report/account_statement.rml', parser=account_statement)
diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
new file mode 100644
index 00000000000..90d3fcf7d78
--- /dev/null
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -0,0 +1,296 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_tbl">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_data">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_header">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_data1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_total">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Drawing" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Times-Roman"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Times-Roman"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Times-Roman"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="terp_default_8">[[ repeatIn(objects,'statement') ]]</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="120.0,120.0,120.0,121.0" style="statement_tbl">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Statement Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Journal</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">User</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="120.0,120.0,120.0,121.0" style="statement_data">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ statement.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ statement.journal_id.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ statement.company_id.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ statement.user_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="120.0,120.0,120.0,121.0" style="statement_header">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Opening Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Closing Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Starting Balance</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Ending Balance</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="120.0,120.0,120.0,121.0" style="statement_data1">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.date,date_time=True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date_time=True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="163.0,257.0,62.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Partner</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Amount</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+    <para style="terp_default_9">[[ repeatIn(statement.line_ids,'line_ids') ]]</para>
+    <blockTable colWidths="163.0,257.0,62.0" style="Table2">
+      <tr>
+        <td>
+
+          <para style="terp_default_9">[[ line_ids.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ line_ids.partner_id.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(line_ids.amount) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    </section>
+    <blockTable colWidths="163.0,218.0,39.0,62.0" style="statement_total">
+      <tr>
+        <td>
+          <para style="P1">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P1">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total : </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement.line_ids)) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
new file mode 100644
index 00000000000..854acfde3a9
--- /dev/null
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
@@ -0,0 +1,141 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+
+class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(all_closed_cashbox_of_the_day, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+                'time': time,
+                'get_data':self._get_data,
+                'get_bal':self._get_bal,
+                'get_lines':self._get_lines,
+                'get_partner':self._get_partner,
+                'get_net_total':self._get_net_total,
+                'get_user':self._get_user,
+                'get_sub_total':self._get_sub_total,
+                'get_net_total_starting':self._get_net_total_starting,
+                })
+    def _get_user(self,line_ids):
+        sql = "select name from res_users where id = %d"%(line_ids['create_uid'])
+        self.cr.execute(sql)
+        user = self.cr.fetchone()
+        return user[0]
+
+    def _get_data(self,user):
+        data = {}
+        sql = """ SELECT abs.journal_id,abs.id,abs.date,abs.closing_date,abs.name as statement,aj.name as journal,ap.name as period,ru.name as user,rc.name as company,
+                       abs.state,abs.balance_end_real FROM account_bank_statement as abs
+                       LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
+                       LEFT JOIN account_period as ap ON ap.id = abs.period_id
+                       LEFT JOIN res_users as ru ON ru.id = abs.user_id
+                       LEFT JOIN res_company as rc ON rc.id = abs.company_id
+                       WHERE to_char(date_trunc('day',abs.date),'YYYY-MM-DD')::date  = current_date and abs.state in ('confirm','open') and abs.user_id = %d"""%(user.id)
+        self.cr.execute(sql)
+        data = self.cr.dictfetchall()
+        return data
+
+    def _get_lines(self,statement):
+        data = {}
+        sql = """ select absl.* from account_bank_statement_line as absl, account_bank_statement as abs
+                           where absl.statement_id = abs.id and abs.id = %d"""%(statement['id'])
+        self.cr.execute(sql)
+        data = self.cr.dictfetchall()
+        return data
+
+    def _get_bal(self,data):
+        res = {}
+        sql =""" select sum(pieces*number) as bal from singer_statement where starting_id = %d """%(data['id'])
+        self.cr.execute(sql)
+        res = self.cr.dictfetchall()
+        if res :
+            return res[0]['bal']
+        else :
+            return False
+
+    def _get_sub_total(self,user,data,date):
+        res={}
+        self.cr.execute(""" select sum(absl.amount) from account_bank_statement as abs
+                            LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
+                            WHERE abs.journal_id = %d
+                            and abs.state in ('confirm','open')
+                            and abs.date = '%s'
+                            and abs.user_id = %d
+                            """%(data,date,user.id))
+        res = self.cr.fetchall()
+        if res[0][0]:
+            return res[0][0]
+        else:
+            return False
+    def _get_partner(self,statement):
+        res = {}
+        sql =""" select rp.name  from account_bank_statement_line as absl,res_partner as rp
+                                        where absl.partner_id = rp.id
+                                        and absl.pos_statement_id = %d"""%(statement['pos_statement_id'])
+        self.cr.execute(sql)
+        res = self.cr.dictfetchall()
+        if res :
+            return res[0]['name']
+        else :
+            return 0.00
+
+
+    def _get_net_total_starting(self,user):
+        lst = []
+        res={}
+        total_ending_bal = 0.0
+        total_starting_bal = 0.0
+        sql = """ SELECT abs.id,abs.balance_end_real as net_total FROM account_bank_statement as abs
+                    WHERE to_char(date_trunc('day',abs.date),'YYYY-MM-DD')::date  = current_date
+                    and abs.state in ('confirm','open') 
+                    and abs.user_id = %d"""%(user.id)
+        self.cr.execute(sql)
+        res = self.cr.dictfetchall()
+        for r in res :
+            total_ending_bal += (r['net_total'] or 0.0)
+            sql1 =""" select sum(pieces*number) as bal from singer_statement where starting_id = %d"""%(r['id'])
+            self.cr.execute(sql1)
+            data = self.cr.dictfetchall()
+            if data[0]['bal']:
+                total_starting_bal += data[0]['bal']
+        lst.append(total_ending_bal)
+        lst.append(total_starting_bal)
+        return lst
+
+    def _get_net_total(self,user):
+        lst = []
+        res={}
+        total_ending_bal = 0.0
+        total_starting_bal = 0.0
+        sql = """select sum(absl.amount) as net_total from account_bank_statement as abs
+                    LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
+                    where abs.state in ('confirm','open') and abs.user_id = %d
+                    and to_char(date_trunc('day',abs.date),'YYYY-MM-DD')::date  = current_date """%(user.id)
+
+        self.cr.execute(sql)
+        res = self.cr.dictfetchall()
+        return res[0]['net_total'] or 0.0
+
+report_sxw.report_sxw('report.all.closed.cashbox.of.the.day', 'account.bank.statement', 'addons/statement/report/all_closed_cashbox_of_the_day.rml', parser=all_closed_cashbox_of_the_day)
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
new file mode 100644
index 00000000000..63bae7c798f
--- /dev/null
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
@@ -0,0 +1,299 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_tbl">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_data">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_header">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_data1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1_detail">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="1,0"/>
+    </blockTableStyle>
+
+    <blockTableStyle id="Table2_detail">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_total">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8_centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8_right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Drawing" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Times-Roman"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Times-Roman"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Times-Roman"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="258.0,258.0" style="statement_tbl">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">User</para>
+        </td>
+            </tr>
+    </blockTable>
+
+
+    <blockTable colWidths="258.0,258.0" style="statement_data">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ user.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+ <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="70.0,90.0,100.0,100.0,80.0,80.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General">St.Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Journal</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Opening Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Closing Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Right">Starting Balance</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Right">Ending Balance</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_tblheader_General">Total : </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre"></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre"></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre"></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total_starting(user)[1]) ]]</u></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total(user)) ]]</u></para>
+        </td>
+      </tr>
+    </blockTable>
+
+ <section>
+<para style="terp_default_8">[[ repeatIn(get_data(user),'statement') ]]</para>
+    <blockTable colWidths="70.0,90.0,100.0,100.0,80.0,80.0" style="Table1_detail">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_8">[[ statement['statement'] ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_8_centre">[[ statement['journal'] ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_8_centre">[[ statement['date'] ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_8_centre">[[ statement['closing_date'] ]]</para>
+        </td>
+         <td>
+          <para style="terp_default_Bold_8_right"><u> [[ (get_bal(statement)) or '0.00' ]]</u></para>
+        </td>
+        <td>
+        	<para style="terp_default_Bold_8_right"><u>[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]]</u></para>
+        </td>
+      </tr>
+    </blockTable>
+
+	<section>
+	<para style="terp_default_9">[[ repeatIn(get_lines(statement),'line_ids') ]]</para>
+     <blockTable colWidths="129.0,150.0,83.0,80.0,80.0" style="Table2_detail">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_9"><font>[[ get_partner(line_ids) or removeParentNode('font') ]]</font></para>
+        </td>
+		<td>
+		   <para style="terp_default_9"><font>[[ get_user(line_ids) or removeParentNode('font') ]]</font></para>
+		</td>
+		<td></td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(line_ids['amount']) ]]</para>
+        </td>
+      </tr>
+     </blockTable>
+</section>
+    </section>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 3ed3baa217b..3ab4055f04d 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,16 +26,83 @@ from report import report_sxw
 
 class pos_details(report_sxw.rml_parse):
 
-    def _get_qty_total(self, objects):
-        #code for the sum of qty_total
-        return reduce(lambda acc, object:
-                                        acc + reduce(
-                                                lambda sum_qty, line:
-                                                        sum_qty + line.qty,
-                                                object.lines,
-                                                0),
-                                    objects,
-                                    0)
+    def _get_invoice(self,inv_id,user):
+        res={}
+        self.cr.execute("select name from account_invoice as ac where id = %d" %(inv_id))
+        res = self.cr.fetchone()
+        if res:
+            return res[0]
+        else:
+            return  ''
+
+    def _pos_sales_details(self,form,user):
+        data={}
+        self.cr.execute ("select po.name as pos_name,po.date_order,pt.name ,pol.qty,pol.price_unit,pol.discount,po.invoice_id,sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as Total " \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,res_users as ru,res_company as rc " \
+                         "where  pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state  in ('done','paid','invoiced') " \
+                         "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  <= %s " \
+                         "and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
+                         "group by po.name,pol.qty,po.date_order,pt.name,pol.price_unit,pol.discount,po.invoice_id " \
+                             ,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
+        data=self.cr.dictfetchall()
+        if data:
+            for d in data:
+                self.total += d['total']
+                self.qty += d['qty']
+                return data
+        else:
+            return {}
+
+    def _get_qty_total_2(self, form,user):
+        qty=[]
+        self.cr.execute("select sum(pol.qty) as qty " \
+                        "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,res_users as ru,res_company as rc " \
+                        "where  pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state  in ('done','paid','invoiced') " \
+                        " and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  <= %s " \
+                        "and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
+                         ,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
+        qty = self.cr.fetchone()
+        return qty[0] or 0.00
+
+    def _get_sales_total_2(self, form,user):
+        self.cr.execute("sELECT sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as Total from  pos_order_line as pol , pos_order po, product_product as pp,product_template as pt  where po.company_id='%s' and po.id=pol.order_id and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  >= '%s' and  to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  <= '%s' and po.state in ('paid','invoiced','done') and pt.id=pp.product_tmpl_id and pol.product_id=pp.id"% (str(user.company_id.id),form['date_start'],form['date_end']))
+        res2=self.cr.fetchone()
+        return res2 and res2[0] or 0.0
+
+    def _get_sum_invoice_2(self,form,user):
+        res2=[]
+        self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))" \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt ,res_users as ru,res_company as rc " \
+                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state  in('invoiced')  " \
+                         "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  <= %s " \
+                         "and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
+                         ,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
+        res2=self.cr.fetchone()
+        self.total_invoiced=res2[0]
+        return res2[0] or False
+
+    def _paid_total_2(self,form,user):
+        res3=[]
+        self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))" \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt, res_users as ru,res_company as rc " \
+                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state  in('paid','invoiced','done')  " \
+                         "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  <= %s " \
+                         "and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
+                         ,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
+        res3=self.cr.fetchone()
+        self.total_paid=res3[0]
+        return res3[0] or False
+
+#    def _get_qty_total(self, objects):
+#        #code for the sum of qty_total
+#        return reduce(lambda acc, object:
+#                                        acc + reduce(
+#                                                lambda sum_qty, line:
+#                                                        sum_qty + line.qty,
+#                                                object.lines,
+#                                                0),
+#                                    objects,
+#                                    0)
 
     def _get_sum_discount(self, objects):
         #code for the sum of discount value
@@ -47,29 +115,54 @@ class pos_details(report_sxw.rml_parse):
                                     objects,
                                     0.0)
 
-    def _get_payments(self, objects, ignore_gift=False):
+    def _get_payments(self, form,user, ignore_gift=False):
+#        gift_journal_id = None
+#        if ignore_gift:
+#            config_journal_ids = self.pool.get("pos.config.journal").search(self.cr, self.uid, [('code', '=', 'GIFT')])
+#            if len(config_journal_ids):
+#                config_journal = self.pool.get("pos.config.journal").browse(self.cr, self.uid, config_journal_ids, {})[0]
+#                gift_journal_id = config_journal.journal_id.id
+#
+#        result = {}
+#        for obj in objects:
+#            for payment in obj.statement_ids:
+#                result[payment.journal_id] = result.get(payment.journal_id, 0.0) + payment.amount
+#        return result
+        statement_line_obj = self.pool.get("account.bank.statement.line")
         gift_journal_id = None
         if ignore_gift:
             config_journal_ids = self.pool.get("pos.config.journal").search(self.cr, self.uid, [('code', '=', 'GIFT')])
             if len(config_journal_ids):
                 config_journal = self.pool.get("pos.config.journal").browse(self.cr, self.uid, config_journal_ids, {})[0]
                 gift_journal_id = config_journal.journal_id.id
+        pos_ids=self.pool.get("pos.order").search(self.cr, self.uid, [('date_order','>=',form['date_start'] + ' 00:00:00'),('date_order','<=',form['date_end'] + ' 23:59:59'),('state','in',['paid','invoiced','done']),('user_id','=',self.uid)])
+        data={}
+        if pos_ids:
+            st_line_ids = statement_line_obj.search(self.cr, self.uid, [('pos_statement_id', 'in', pos_ids)])
+            if st_line_ids:
+                st_id = statement_line_obj.browse(self.cr, self.uid, st_line_ids)
+                a_l=[]
+                for r in st_id :
+                    a_l.append(r['id'])
+                    a = ','.join(map(str,a_l))
+                self.cr.execute("select aj.name,sum(amount) from account_bank_statement_line as absl,account_bank_statement as abs,account_journal as aj " \
+                                "where absl.statement_id = abs.id and abs.journal_id = aj.id  and absl.id in (%s) " \
+                                "group by aj.name " \
+                                %(a))
 
-        result = {}
-        for obj in objects:
-            for payment in obj.payments:
-                if gift_journal_id and gift_journal_id == payment.journal_id.id:
-                    continue
-                result[payment.journal_id.name] = result.get(payment.journal_id.name, 0.0) + payment.amount
-        return result
-
-    def _paid_total(self, objects):
-        return sum(self._get_payments(objects, True).values(), 0.0)
+                data=self.cr.dictfetchall()
+                return data
+        else:
+            return {}
 
     def _total_of_the_day(self, objects):
-        total_paid = sum(self._get_payments(objects, True).values(), 0.0)
-        total_invoiced = self._sum_invoice(objects)
-        return total_paid - total_invoiced
+        if self.total_paid:
+             if self.total_paid == self.total_invoiced :
+                 return self.total_paid
+             else:
+                 return ((self.total_paid or 0.00) - (self.total_invoiced or 0.00))
+        else:
+            return False
 
     def _sum_invoice(self, objects):
         return reduce(lambda acc, obj:
@@ -87,47 +180,63 @@ class pos_details(report_sxw.rml_parse):
     def _strip_name(self, name, maxlen=50):
         return self._ellipsis(name, maxlen, ' ...')
 
-    def _get_tax_amount(self, objects):
+    def _get_tax_amount(self, form,user):
         res = {}
+        temp={}
         list_ids = []
-        for order in objects:
+        c=[]
+        temp2 = 0.0
+        pos_ids=self.pool.get("pos.order").search(self.cr, self.uid, [('date_order','>=',form['date_start'] + ' 00:00:00'),('date_order','<=',form['date_end'] + ' 23:59:59'),('state','in',['paid','invoiced','done']),('user_id','=',self.uid)])
+        temp.update({'name':''})
+        for order in self.pool.get("pos.order").browse(self.cr, self.uid, pos_ids):
+            temp2 +=order.amount_tax
             for line in order.lines:
                 if len(line.product_id.taxes_id):
                     tax = line.product_id.taxes_id[0]
                     res[tax.name] = (line.price_unit * line.qty * (1-(line.discount or 0.0) / 100.0)) + (tax.id in list_ids and res[tax.name] or 0)
                     list_ids.append(tax.id)
-        return res
+                    temp.update({'name':tax.name})
+        temp.update({'amount':temp2})
+        return [temp] or False
 
-    def _get_sales_total(self, objects):
-        return reduce(lambda x, o: x + len(o.lines), objects, 0)
+#    def _get_period(self, form):
+#        min_date = form['date_start']
+#        max_date = form['date_end']
+#        if min_date == max_date:
+#            return '%s' % min_date
+#        else:
+#            return '%s - %s' % (min_date, max_date)
+    def _get_period(self, form):
+        return form['date_start']
 
-    def _get_period(self, objects):
-        date_orders = [obj.date_order for obj in objects]
-        min_date = min(date_orders)
-        max_date = max(date_orders)
-        if min_date == max_date:
-            return '%s' % min_date
-        else:
-            return '%s - %s' % (min_date, max_date)
+    def _get_period2(self,form):
+        return form['date_end']
 
     def __init__(self, cr, uid, name, context):
-        super(pos_details, self).__init__(cr, uid, name, context=context)
+        super(pos_details, self).__init__(cr, uid, name, context)
         self.total = 0.0
+        self.qty = 0.0
+        self.invoice_id = ''
+        self.total_paid = 0.0
+        self.total_invoiced = 0.0
         self.localcontext.update({
             'time': time,
             'strip_name': self._strip_name,
             'getpayments': self._get_payments,
-            'getqtytotal': self._get_qty_total,
             'getsumdisc': self._get_sum_discount,
-            'getpaidtotal': self._paid_total,
             'gettotalofthaday': self._total_of_the_day,
-            'getsuminvoice': self._sum_invoice,
             'gettaxamount': self._get_tax_amount,
-            'getsalestotal': self._get_sales_total,
             'getperiod': self._get_period,
+            'getperiod2':self._get_period2,
+            'pos_sales_details':self._pos_sales_details,
+            'getqtytotal2': self._get_qty_total_2,
+            'getsalestotal2': self._get_sales_total_2,
+            'getsuminvoice2':self._get_sum_invoice_2,
+            'getpaidtotal2': self._paid_total_2,
+            'getinvoice':self._get_invoice,
         })
 
-report_sxw.report_sxw('report.pos.details', 'pos.order', 'addons/point_of_sale/report/pos_details.rml', parser=pos_details, header=None)
+report_sxw.report_sxw('report.pos.details', 'pos.order', 'addons/point_of_sale_singer/report/pos_details.rml', parser=pos_details, header=None)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index 0fdbc060f79..10bfb2435dc 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -6,6 +6,73 @@
         </pageTemplate>
     </template>
     <stylesheet>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+
+    </blockTableStyle>
+
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+
+    </blockTableStyle>
+
+	<blockTableStyle id="Tableau7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
+	  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,0"/>
+
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+	  <lineStyle kind="LINEABOVE" colorName="#000000" start="0,-1" stop="-1,-1"/>
+
+    </blockTableStyle>
         <blockTableStyle id="Standard_Outline">
             <blockAlignment value="LEFT"/>
             <blockValign value="TOP"/>
@@ -22,10 +89,7 @@
             <lineStyle kind="GRID" colorName="grey"/>
             <blockBackground colorName="#e6e6e6" start="0,-1" stop="-1,-1"/>
         </blockTableStyle>
-        <blockTableStyle id="Tableau7">
-            <blockAlignment value="LEFT"/>
-            <blockValign value="TOP"/>
-        </blockTableStyle>
+
         <blockTableStyle id="Table1">
             <blockAlignment value="LEFT"/>
             <blockValign value="TOP"/>
@@ -51,6 +115,20 @@
         <initialize>
             <paraStyle name="all" alignment="justify"/>
         </initialize>
+        <paraStyle name="terp_tblheader_Details_Center" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="Center" spaceBefore="6.0" spaceAfter="6.0"/>
+        <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+        <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+        <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+        <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+        <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_Left_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="-6.0" spaceAfter="6.0"/>
+        <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    	<paraStyle name="terp_default_Right_9_bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    	<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
         <paraStyle name="P1" fontName="Times-Roman" fontSize="11.0" leading="14"/>
         <paraStyle name="P2" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
         <paraStyle name="P3" fontName="Times-Roman" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -77,134 +155,242 @@
         <paraStyle name="Index" fontName="Times-Roman"/>
     </stylesheet>
     <story>
-        <para style="Heading">
-            <font face="Times-Roman" size="11.0">Detail of Sales</font>
-        </para>
-        <para style="Heading1">
-            <font face="Times-Roman" size="11.0"> </font>
-        </para>
-        <para style="P12">
-            <font face="Times-Roman" size="11.0">Company: [[ company.name ]]</font>
-        </para>
-        <para style="P12">
-            <font face="Times-Roman" size="11.0">Print Date: [[time.strftime('%Y-%m-%d')]]</font>
-        </para>
-        <para style="P12">
-            <font face="Times-Roman" size="11.0">Period: [[ '%s' % getperiod(objects) ]]</font>
-        </para>
+    <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+	<para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+     <para style="terp_header"> Detail of Sales </para>
+     <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+     <blockTable colWidths="178.0,178.0,178.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Period </para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="178.0,178.0,178.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(getperiod(data['form']),date = True) ]] - [[ formatLang(getperiod2(data['form']),date = True) ]] </para>
+        </td>
+
+      </tr>
+    </blockTable>
+	  <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+        <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+
+      <!--<blockTable colWidths="95,42,180,40,27,37,37,40,40"  style="Table7" rowHeights="0.5cm">
 
-        <blockTable colWidths="80,57,180,40,27,37,37,40,40" style="Tableau8" rowHeights="0.5cm">
             <tr>
-                <td> <para style="P3">Date</para> </td>
-                <td> <para style="P3">Code</para> </td>
-                <td> <para style="P3">Product</para> </td>
-                <td> <para style="P3">Price</para> </td>
-                <td> <para style="P3">Qty</para> </td>
-                <td> <para style="P3">Disc</para> </td>
-                <td> <para style="P3">VAT(%)</para> </td>
-                <td> <para style="P3">VAT</para> </td>
-                <td> <para style="P3">Invoiced</para> </td>
+                <td> <para style="terp_tblheader_Details">Date</para> </td>
+                <td> <para style="terp_tblheader_Details">Code</para> </td>
+                <td> <para style="terp_tblheader_Details">Product</para> </td>
+                <td> <para style="terp_tblheader_Details">Price</para> </td>
+                <td> <para style="terp_tblheader_Details">Qty</para> </td>
+                <td> <para style="terp_tblheader_Details">Disc</para> </td>
+                <td> <para style="terp_tblheader_Details">VAT(%)</para> </td>
+                <td> <para style="terp_tblheader_Details">VAT</para> </td>
+                <td> <para style="terp_tblheader_Details">Invoiced</para> </td>
+            </tr>
+        </blockTable> -->
+        <blockTable colWidths="100,52,170,60,34,37,85"  style="Table7" rowHeights="0.5cm">
+
+            <tr>
+                <td> <para style="terp_tblheader_Details">Date</para> </td>
+                <td> <para style="terp_tblheader_Details">Code</para> </td>
+                <td> <para style="terp_tblheader_Details">Product</para> </td>
+                <td> <para style="terp_tblheader_Details_Right">Price</para> </td>
+                <td> <para style="terp_tblheader_Details_Right">Qty</para> </td>
+                <td> <para style="terp_tblheader_Details_Right">Disc</para> </td>
+                <td> <para style="terp_tblheader_Details_Center">Invoiced</para> </td>
             </tr>
         </blockTable>
         <section>
+        <para style="terp_default_8">[[ repeatIn(pos_sales_details(data['form'],user), 'line_ids') ]]</para>
+			<blockTable colWidths="100,52,170,60,34,37,85" style="Tableau7">
+	        <tr>
+	          <td>
+	            <para style="terp_default_9">[[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
+	          </td>
+	          <td>
+	            <para style="terp_default_9">[[ line_ids['pos_name'] ]]</para>
+	          </td>
+	          <td>
+	            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+	          </td>
+	          <td>
+	            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
+	          </td>
+	           <td>
+	            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+	          </td>
+	          <td>
+	            <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
+	          </td>
+			  <td>
+			  <para style="terp_default_Right_9"><font>[[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]</font></para>
+	            <!--<para style="terp_default_Right_9">[[ line_ids['invoice_id'] ]]</para-->
+	          </td>
+	        </tr>
+	      </blockTable>
+	      </section>
+
+        <!--<section>
             [[ repeatIn(objects,'o') ]]
-            <blockTable colWidths="80,57,180,40,27,37,37,40,40" style="Tableau6" rowHeights="0.5cm">
+            <blockTable colWidths="95,42,180,40,27,37,37,40,40" style="Table8" rowHeights="0.5cm">
                 <tr>
-                    <td>[[ repeatIn(o.lines,'line') ]]<para style="P5">[[line.create_date ]]</para> </td>
+                    <td>[[ repeatIn(o.lines,'line') ]]<para style="terp_default_9">[[line.create_date ]]</para> </td>
                     <td> </td>
-                    <td> <para style="P5"> [[strip_name(line.product_id.name, 32) ]] </para></td>
-                    <td> <para style="P16"> [[ '%.2f' % (line.price_subtotal,) ]]</para></td>
-                    <td> <para style="P16"> [[ '%d' % line.qty ]]</para></td>
-                    <td> <para style="P16"> [[ '%d%%' % (line.discount) ]]</para></td>
-                    <td> <para style="P16"> [[ len(line.product_id.taxes_id) > 0 and ('%d%%' % (line.product_id.taxes_id[0].amount * 100)) or '' ]] </para></td>
+                    <td> <para style="terp_default_9"> [[strip_name(line.product_id.name, 32) ]] </para></td>
+                    <td> <para style="terp_default_Right_9"> [[ '%.2f' % (line.price_subtotal,) ]]</para></td>
+                    <td> <para style="terp_default_Right_9"> [[ '%d' % line.qty ]]</para></td>
+                    <td> <para style="terp_default_Right_9"> [[ '%d%%' % (line.discount) ]]</para></td>
+                    <td> <para style="terp_default_Right_9"> [[ len(line.product_id.taxes_id) > 0 and ('%d%%' % (line.product_id.taxes_id[0].amount * 100)) or '' ]] </para></td>
                     <td></td>
                     <td></td>
                 </tr>
                 <tr>
-                    <td> <para style="P5">[[ o.date_order ]] </para></td>
-                    <td> <para style="P5">[[ o.name ]] </para></td>
-                    <td> <para style="P5">[[ o.user_id.name ]] </para></td>
-                    <td> <para style="P17">[[ '%.2f' % (o.amount_total,) ]]</para></td>
+                    <td> <para style="terp_default_9">[[ o.date_order ]] </para></td>
+                    <td> <para style="terp_default_9">[[ o.name ]] </para></td>
+                    <td> <para style="terp_default_9">[[ o.user_id.name ]] </para></td>
+                    <td> <para style="terp_default_Right_9">[[ '%.2f' % (o.amount_total,) ]]</para></td>
                     <td></td>
                     <td></td>
                     <td></td>
-                    <td><para style="P16">[[ o.amount_tax ]] </para></td>
-                    <td><para style="P16">[[ o.invoice_id and o.invoice_id.number or '']]</para></td>
+                    <td><para style="terp_default_Right_9">[[ o.amount_tax ]] </para></td>
+                    <td><para style="terp_default_Right_9">[[ o.invoice_id and o.invoice_id.number or '']]</para></td>
                 </tr>
             </blockTable>
-        </section>
+        </section>-->
         <para>
             <font color="white"> </font>
         </para>
         <para>
             <font color="white"> </font>
         </para>
-        <blockTable colWidths="238.0,238.0" style="tmpTable2">
-            <tr>
-                <td>
-                    <blockTable colWidths="150,50" style="Tableau8">
+        <blockTable colWidths="267.0,267.0" style="Table4">
                         <tr>
                             <td>
-                                <para style="P3">
+                                <para style="terp_tblheader_Details">
                                     <font face="Helvetica-Bold" size="10.0">Mode of Taxes</font>
                                 </para>
                             </td>
                             <td></td>
                         </tr>
-                        <tr>[[ repeatIn(gettaxamount(objects).items(), 'p') ]]
-                            <td>[[ p[0] ]]</td>
-                            <td><para style="P17">[[ '%.2f' % (p[1],) ]]</para></td>
+                        <tr><para>[[ repeatIn(gettaxamount(data['form'],user), 'p') ]]</para>
+                            <td>[[ p['name'] or removeParentNode('tr') ]]</td>
+                            <td><para style="terp_default_Right_9"><font>[[  formatLang(p['amount']) or removeParentNode('font') ]]</font></para></td>
                         </tr>
-                    </blockTable>
-                    <para style="P2"><font color="white" /> </para>
-                    <blockTable colWidths="150,50" style="Tableau8">
+       </blockTable>
+
+       <blockTable colWidths="267.0,267.0" style="Table4">
                         <tr>
                             <td>
-                                <para style="P3">
+                                <para style="terp_tblheader_Details">
                                     <font face="Helvetica-Bold" size="10.0">Mode of payment</font>
                                 </para>
                             </td>
                             <td></td>
                         </tr>
-                        <tr>[[ repeatIn(getpayments(objects).items(), 'p') ]]
-                            <td>[[ p[0] ]]</td>
-                            <td><para style="P17">[[ '%.2f' % (p[1],) ]]</para></td>
+                        <tr>[[ repeatIn(getpayments(data['form'],user), 'p') ]]
+                            <td>[[ p['name'] or removeParentNode('tr') ]]</td>
+                            <td><para style="terp_default_Right_9">[[ formatLang(p['sum']) or removeParentNode('tr') ]]</para></td>
+                            <!--<td>[[ p.statement_id.journal_id.name ]]</td>
+                            <td><para style="terp_default_Right_9">[[ formatLang(p.amount) ]]</para></td>-->
                         </tr>
                     </blockTable>
-                </td>
-                <td>
-                    <blockTable colWidths="150.0,50.0" style="Tableau8">
-                        <tr>
-                            <td colspan="2"><para style="P3"><font face="Helvetica-Bold" size="10.0">Summary</font></para></td>
-                        </tr>
-                        <tr>
-                            <td>Sales total</td>
-                            <td><para style="P17">[[ '%d' % getsalestotal(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td>Qty of product</td>
-                            <td><para style="P17">[[ '%d' % getqtytotal(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td>Total invoiced</td>
-                            <td><para style="P17">[[ '%.2f' % getsuminvoice(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td>Total discount</td>
-                            <td><para style="P17">[[ '%.2f' % getsumdisc(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td>Total paid</td>
-                            <td><para style="P17">[[ '%.2f' % getpaidtotal(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td>Total of the day</td>
-                            <td><para style="P17">[[ '%.2f' % gettotalofthaday(objects) ]]</para></td>
-                        </tr>
-                    </blockTable>
-                </td>
+
+		<para style="terp_default_8">
+            <font color="white"> </font>
+    	</para>
+    	<para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+			<section>
+
+         <blockTable colWidths="267.0,267.0" style="Table5">
+         	<tr>
+            	<td colspan="2">
+                	<para style="terp_default_Left_9_Bold"><font face="Helvetica-Bold" size="10.0">Summary</font></para></td>
             </tr>
-        </blockTable>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Sales total</para></td>
+
+                            <td><para style="terp_default_Right_9_bold">[[ formatLang(getsalestotal2(data['form'],user)) ]]</para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Qty of product</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ formatLang(getqtytotal2(data['form'],user)) ]]</para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Total invoiced</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ formatLang(getsuminvoice2(data['form'],user)) ]]</para></td>
+                        </tr>
+                        <!--<tr>
+                            <td><para style="terp_tblheader_Details">Total discount</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[  formatLang(getsumdisc(objects)) ]]</para></td>
+                        </tr>-->
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Total paid</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ formatLang(getpaidtotal2(data['form'],user))  ]]</para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Total of the day</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ formatLang(gettotalofthaday(data['form'])) ]]</para></td>
+                        </tr>
+                    </blockTable>
+                    </section>
+         <!--<blockTable colWidths="267.0,267.0" style="Table5">
+         	<tr>
+            	<td colspan="2">
+                	<para style="terp_default_Left_9_Bold"><font face="Helvetica-Bold" size="10.0">Summary</font></para></td>
+            </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Sales total</para></td>
+                            terp_tblheader_Details
+                            <td><para style="terp_default_Right_9_bold">[[ '%d' % getsalestotal(objects) ]]</para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Qty of product</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ '%d' % getqtytotal(objects) ]]</para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Total invoiced</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ '%.2f' % getsuminvoice(objects) ]]</para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Total discount</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ '%.2f' % getsumdisc(objects) ]]</para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Total paid</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ '%.2f' % getpaidtotal(objects) ]]</para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Total of the day</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ '%.2f' % gettotalofthaday(objects) ]]</para></td>
+                        </tr>
+                    </blockTable> -->
     </story>
 </document>
 
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index 9ac04d70235..826844effd6 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -108,7 +109,7 @@ class pos_details_summary(report_sxw.rml_parse):
             return '%s - %s' % (min_date, max_date)
 
     def __init__(self, cr, uid, name, context):
-        super(pos_details_summary, self).__init__(cr, uid, name, context=context)
+        super(pos_details_summary, self).__init__(cr, uid, name, context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 50f70778ab1..254f397b6b6 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -6,6 +6,48 @@
         </pageTemplate>
     </template>
     <stylesheet>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+    </blockTableStyle>
+	<blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+
+    </blockTableStyle>
+
+	<blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+
+    </blockTableStyle>
+
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,0"/>
+
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+
+    </blockTableStyle>
+
         <blockTableStyle id="Standard_Outline">
             <blockAlignment value="LEFT"/>
             <blockValign value="TOP"/>
@@ -51,6 +93,13 @@
         <initialize>
             <paraStyle name="all" alignment="justify"/>
         </initialize>
+        <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+        <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+        <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_Left_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
         <paraStyle name="P1" fontName="Times-Roman" fontSize="11.0" leading="14"/>
         <paraStyle name="P2" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
         <paraStyle name="P3" fontName="Times-Roman" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -77,35 +126,59 @@
         <paraStyle name="Index" fontName="Times-Roman"/>
     </stylesheet>
     <story>
-        <para style="Heading">
-            <font face="Times-Roman" size="11.0">Detail of Sales</font>
-        </para>
-        <para style="Heading1">
-            <font face="Times-Roman" size="11.0"> </font>
-        </para>
-        <para style="P12">
-            <font face="Times-Roman" size="11.0">Company: [[ company.name ]]</font>
-        </para>
-        <para style="P12">
-            <font face="Times-Roman" size="11.0">Print Date: [[time.strftime('%Y-%m-%d')]]</font>
-        </para>
-        <para style="P12">
-            <font face="Times-Roman" size="11.0">Period: [[ '%s' % getperiod(objects) ]]</font>
-        </para>
 
-        <para>
+     <para style="terp_default_8">
             <font color="white"> </font>
-        </para>
-        <para>
+          </para>
+	<para style="terp_default_8">
             <font color="white"> </font>
-        </para>
-        <blockTable colWidths="238.0,238.0" style="tmpTable2">
-            <tr>
-                <td>
-                    <blockTable colWidths="150,50" style="Tableau8">
+          </para>
+     <para style="terp_header"> Detail of Sales </para>
+     <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+     <blockTable colWidths="178.0,178.0,178.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Period </para>
+        </td>
+      </tr>
+    </blockTable>
+	<blockTable colWidths="178.0,178.0,178.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[time.strftime('%Y-%m-%d')]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ '%s' % getperiod(objects) ]]</para>
+        </td>
+
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+            <font color="white"> </font>
+    </para>
+
+	<para style="terp_default_8">
+            <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+            <font color="white"> </font>
+    </para>
+
+	<blockTable colWidths="267.0,267.0" style="Table4">
                         <tr>
                             <td>
-                                <para style="P3">
+                                <para style="terp_tblheader_Details">
                                     <font face="Helvetica-Bold" size="10.0">Mode of Taxes</font>
                                 </para>
                             </td>
@@ -115,12 +188,12 @@
                             <td>[[ p[0] ]]</td>
                             <td><para style="P17">[[ '%.2f' % (p[1],) ]]</para></td>
                         </tr>
-                    </blockTable>
-                    <para style="P2"><font color="white" /> </para>
-                    <blockTable colWidths="150,50" style="Tableau8">
+       </blockTable>
+
+       <blockTable colWidths="267.0,267.0" style="Table4">
                         <tr>
                             <td>
-                                <para style="P3">
+                                <para style="terp_tblheader_Details">
                                     <font face="Helvetica-Bold" size="10.0">Mode of payment</font>
                                 </para>
                             </td>
@@ -131,40 +204,48 @@
                             <td><para style="P17">[[ '%.2f' % (p[1],) ]]</para></td>
                         </tr>
                     </blockTable>
-                </td>
-                <td>
-                    <blockTable colWidths="150.0,50.0" style="Tableau8">
+
+		<para style="terp_default_8">
+            <font color="white"> </font>
+    	</para>
+    	<para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+         <blockTable colWidths="267.0,267.0" style="Table5">
+         	<tr>
+            	<td colspan="2">
+                	<para style="terp_default_Left_9_Bold"><font face="Helvetica-Bold" size="10.0">Summary</font></para></td>
+            </tr>
                         <tr>
-                            <td colspan="2"><para style="P3"><font face="Helvetica-Bold" size="10.0">Summary</font></para></td>
+                            <td><para style="terp_tblheader_Details">Sales total</para></td>
+                            terp_tblheader_Details
+                            <td><para style="terp_default_Right_9">[[ '%d' % getsalestotal(objects) ]]</para></td>
                         </tr>
                         <tr>
-                            <td>Sales total</td>
-                            <td><para style="P17">[[ '%d' % getsalestotal(objects) ]]</para></td>
+                            <td><para style="terp_tblheader_Details">Qty of product</para></td>
+                            <td><para style="terp_default_Right_9">[[ '%d' % getqtytotal(objects) ]]</para></td>
                         </tr>
                         <tr>
-                            <td>Qty of product</td>
-                            <td><para style="P17">[[ '%d' % getqtytotal(objects) ]]</para></td>
+                            <td><para style="terp_tblheader_Details">Total invoiced</para></td>
+                            <td><para style="terp_default_Right_9">[[ '%.2f' % getsuminvoice(objects) ]]</para></td>
                         </tr>
                         <tr>
-                            <td>Total invoiced</td>
-                            <td><para style="P17">[[ '%.2f' % getsuminvoice(objects) ]]</para></td>
+                            <td><para style="terp_tblheader_Details">Total discount</para></td>
+                            <td><para style="terp_default_Right_9">[[ '%.2f' % getsumdisc(objects) ]]</para></td>
                         </tr>
                         <tr>
-                            <td>Total discount</td>
-                            <td><para style="P17">[[ '%.2f' % getsumdisc(objects) ]]</para></td>
+                            <td><para style="terp_tblheader_Details">Total paid</para></td>
+                            <td><para style="terp_default_Right_9">[[ '%.2f' % getpaidtotal(objects) ]]</para></td>
                         </tr>
                         <tr>
-                            <td>Total paid</td>
-                            <td><para style="P17">[[ '%.2f' % getpaidtotal(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td>Total of the day</td>
-                            <td><para style="P17">[[ '%.2f' % gettotalofthaday(objects) ]]</para></td>
+                            <td><para style="terp_tblheader_Details">Total of the day</para></td>
+                            <td><para style="terp_default_Right_9">[[ '%.2f' % gettotalofthaday(objects) ]]</para></td>
                         </tr>
                     </blockTable>
-                </td>
-            </tr>
-        </blockTable>
+
     </story>
 </document>
 
diff --git a/addons/point_of_sale/report/pos_invoice.py b/addons/point_of_sale/report/pos_invoice.py
index cddfc678c84..d9f345ca185 100644
--- a/addons/point_of_sale/report/pos_invoice.py
+++ b/addons/point_of_sale/report/pos_invoice.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -28,10 +29,11 @@ from tools.translate import _
 class pos_invoice(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_invoice, self).__init__(cr, uid, name, context=context)
+        super(pos_invoice, self).__init__(cr, uid, name, context)
         self.localcontext.update({
             'time': time,
         })
+        print
 
     def set_context(self, objects, data, ids, report_type=None):
         super(pos_invoice, self).set_context(objects, data, ids, report_type)
diff --git a/addons/point_of_sale/report/pos_lines.py b/addons/point_of_sale/report/pos_lines.py
index 753b5821af6..1abec66dc80 100644
--- a/addons/point_of_sale/report/pos_lines.py
+++ b/addons/point_of_sale/report/pos_lines.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -26,7 +27,7 @@ from report import report_sxw
 class pos_lines(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_lines, self).__init__(cr, uid, name, context=context)
+        super(pos_lines, self).__init__(cr, uid, name, context)
         self.total = 0.0
         self.localcontext.update({
                 'time': time,
diff --git a/addons/point_of_sale/report/pos_payment_report.py b/addons/point_of_sale/report/pos_payment_report.py
new file mode 100644
index 00000000000..f27add1e208
--- /dev/null
+++ b/addons/point_of_sale/report/pos_payment_report.py
@@ -0,0 +1,79 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+
+class pos_payment_report(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(pos_payment_report, self).__init__(cr, uid, name, context)
+        self.total = 0.0
+        self.localcontext.update({
+                'time': time,
+                'pos_payment': self._pos_payment,
+                'pos_payment_total':self._pos_payment_total,
+                })
+
+    def _pos_payment(self,obj):
+        data={}
+        sql = """ select id from pos_order where id = %d"""%(obj.id)
+        self.cr.execute(sql)
+        if self.cr.fetchone():
+            self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+                                 "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
+                                 "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
+                                 "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                                 "and po.state in ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date and po.id=%d"%(obj.id))
+            data=self.cr.dictfetchall()
+        else :
+            self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+                                 "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
+                                 "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
+                                 "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                                 "and po.state in ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date")
+            data=self.cr.dictfetchall()
+        print data
+        for d in data:
+            self.total += d['price_unit'] * d['qty']
+        return data
+
+
+    def _pos_payment_total(self,o):
+#        res=[]
+#        self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) " \
+#                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
+#                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
+#                         "and po.state='paid' and po.date_order = current_date and po.id=%d"%(o.id))
+#        res=self.cr.fetchone()[0]
+        return self.total
+
+
+report_sxw.report_sxw('report.pos.payment.report', 'pos.order', 'addons/point_of_sale/report/pos_payment_report.rml', parser=pos_payment_report)
+
+
+
+
+
+
+
+
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
new file mode 100644
index 00000000000..ebe30bdf3bc
--- /dev/null
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -0,0 +1,216 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="2.0" y1="57.0" width="537" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+
+	<para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="268.0,268.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="268.0,268.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Product</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Qty</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total</para>
+        </td>
+     </tr>
+    </blockTable>
+    <section>
+	<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+	<section>
+      <para style="terp_default_8">[[ repeatIn(pos_payment(o), 'line_ids') ]]</para>
+      <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Tableau7">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]]</para>
+          </td>
+
+        </tr>
+      </blockTable>
+       </section>
+       </section>
+      <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">Net Total </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(pos_payment_total(o)) or removeParentNode('blockTable')]]</para>
+        </td>
+      </tr>
+      </blockTable>
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/pos_payment_report_date.py b/addons/point_of_sale/report/pos_payment_report_date.py
new file mode 100644
index 00000000000..1578f0e6958
--- /dev/null
+++ b/addons/point_of_sale/report/pos_payment_report_date.py
@@ -0,0 +1,71 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+
+class pos_payment_report_date(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(pos_payment_report_date, self).__init__(cr, uid, name, context)
+        self.total = 0.0
+        self.localcontext.update({
+                'time': time,
+                'pos_payment_date': self.__pos_payment_date__,
+                'pos_payment_date_total':self.__pos_payment_date__total__,
+                })
+
+    def __pos_payment_date__(self,form):
+        dt1 = form['date_start'] + ' 00:00:00'
+        dt2 = form['date_end'] + ' 23:59:59'
+        data={}
+        self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+                         "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
+                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                         "and po.state in ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s and po.user_id in %s " \
+                         ,(dt1,dt2,tuple(form['user_id'][0][-1])))
+        data=self.cr.dictfetchall()
+        return data
+
+    def __pos_payment_date__total__(self,form):
+        dt1 = form['date_start'] + ' 00:00:00'
+        dt2 = form['date_end'] + ' 23:59:59'
+        res=[]
+        self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) " \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
+                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
+                         "and po.state in ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s and po.user_id in %s " \
+                         ,(dt1,dt2,tuple(form['user_id'][0][-1])))
+        res=self.cr.fetchone()[0]
+        return res
+
+
+report_sxw.report_sxw('report.pos.payment.report.date', 'pos.order', 'addons/point_of_sale/report/pos_payment_report_date.rml', parser=pos_payment_report_date)
+
+
+
+
+
+
+
+
diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml
new file mode 100644
index 00000000000..f83d985b6b4
--- /dev/null
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -0,0 +1,213 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="2.0" y1="57.0" width="537" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+	<para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="268.0,268.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="268.0,268.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Product</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Qty</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total</para>
+        </td>
+     </tr>
+    </blockTable>
+    <section>
+
+      <para style="terp_default_8">[[ repeatIn(pos_payment_date(data['form']), 'line_ids') ]]</para>
+      <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Tableau7">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]]</para>
+          </td>
+
+        </tr>
+      </blockTable>
+       </section>
+      <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total : </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(pos_payment_date_total(data['form'])) or removeParentNode('blockTable')]]</para>
+        </td>
+      </tr>
+      </blockTable>
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/pos_payment_report_user.py b/addons/point_of_sale/report/pos_payment_report_user.py
new file mode 100644
index 00000000000..cde5162425e
--- /dev/null
+++ b/addons/point_of_sale/report/pos_payment_report_user.py
@@ -0,0 +1,80 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+class pos_payment_report_user(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(pos_payment_report_user, self).__init__(cr, uid, name, context)
+        self.total = 0.0
+        self.localcontext.update({
+                'time': time,
+                'pos_payment_user': self.__pos_payment_user__,
+                'pos_payment_user_total':self.__pos_payment_user__total__,
+                })
+
+    def __pos_payment_user__(self,form):
+        data={}
+        ids = form['user_id'][0][-1]
+        idss = map(str, ids)
+        sql = "select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+                         "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
+                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                         "and po.state in ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date " \
+                         "and po.user_id in (%s)" % (",".join(idss), )
+        self.cr.execute (sql)
+        data=self.cr.dictfetchall()
+        return data
+    def __pos_payment_user__total__(self,form):
+        res=[]
+        ids = form['user_id'][0][-1]
+        idss = map(str, ids)
+        self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) " \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
+                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
+                         "and po.state='paid' and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date " \
+                         "and po.user_id in (%s)" % (",".join(idss), ))
+        res=self.cr.fetchone()
+        res = res and res[0] or None
+
+        return res
+
+
+report_sxw.report_sxw('report.pos.payment.report.user', 'pos.order', 'addons/point_of_sale/report/pos_payment_report_user.rml', parser=pos_payment_report_user)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml
new file mode 100644
index 00000000000..f3a9311e186
--- /dev/null
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -0,0 +1,215 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="2.0" y1="57.0" width="537" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+	<para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="268.0,268.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="268.0,268.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Product</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Qty</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total</para>
+        </td>
+     </tr>
+    </blockTable>
+    <section>
+
+      <para style="terp_default_8">[[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]</para>
+      <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Tableau7">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]]</para>
+          </td>
+
+        </tr>
+      </blockTable>
+       </section>
+      <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total : </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]]</para>
+        </td>
+      </tr>
+      </blockTable>
+
+
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/pos_receipt.py b/addons/point_of_sale/report/pos_receipt.py
index e21bf514b6d..fbceae7ebf4 100644
--- a/addons/point_of_sale/report/pos_receipt.py
+++ b/addons/point_of_sale/report/pos_receipt.py
@@ -1,51 +1,53 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import time
 from report import report_sxw
-from mx.DateTime.ISO import ParseAny
 import pooler
 
+def titlize(journal_name):
+    res = []
+    words = journal_name.split()
+    while words.pop() != 'journal':
+        continue
+    return ' '.join(words)
 
 class order(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(order, self).__init__(cr, uid, name, context=context)
+        super(order, self).__init__(cr, uid, name, context)
 
         user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid)
         partner = user.company_id.partner_id
 
         self.localcontext.update({
             'time': time,
-            'dformat': '%Y/%m/%d %H:%M:%S',
             'disc': self.discount,
             'net': self.netamount,
-            'formatdate': self.formatdate,
+            'get_journal_amt': self._get_journal_amt,
             'address': partner.address and partner.address[0] or False,
+            'titlize': titlize
         })
 
-    def formatdate(self, datestr):
-        dateobj = ParseAny(datestr)
-        return dateobj.strftime(self.localcontext['dformat'])
-
     def netamount(self, order_line_id):
         sql = 'select (qty*price_unit) as net_price from pos_order_line where id = %s'
         self.cr.execute(sql, (order_line_id,))
@@ -62,6 +64,16 @@ class order(report_sxw.rml_parse):
                 dsum = dsum +(line[2] * (line[0]*line[1]/100))
         return dsum
 
+    def _get_journal_amt(self, order_id):
+        data={}
+        sql = """ select aj.name,absl.amount as amt from account_bank_statement as abs
+                        LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
+                        LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
+                        WHERE absl.pos_statement_id =%d"""%(order_id)
+        self.cr.execute(sql)
+        data = self.cr.dictfetchall()
+        return data
+
 report_sxw.report_sxw('report.pos.receipt', 'pos.order', 'addons/point_of_sale/report/pos_receipt.rml', parser=order, header=False)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 6dd8df26924..ecf1aa8c52a 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -1,185 +1,197 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(224.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="0.0" y1="0.0" width="224" height="842"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
-      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
-      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Dicount_Total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Amount">
-      <blockAlignment value="LEFT"/>
-          <blockValign value="TOP"/>
-    </blockTableStyle>
+    <template pageSize="(204.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+        <pageTemplate id="first">
+            <frame id="first" x1="0.0" y1="0.0" width="204" height="842"/>
+        </pageTemplate>
+    </template>
+    <stylesheet>
+        <blockTableStyle id="Standard_Outline">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+        </blockTableStyle>
+        <blockTableStyle id="Tableau2" dash = "3,2">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+            <blockBackground colorName="#ffffff" start="0,0" stop="0,0"/>
+            <blockBackground colorName="#ffffff" start="1,0" stop="1,0"/>
+            <blockBackground colorName="#ffffff" start="2,0" stop="2,0"/>
+            <lineStyle kind="LINEBELOW" colorName="lightgrey" start="0,-1" stop="2,-1"  thickness="0.25"/>
+        </blockTableStyle>
+        <blockTableStyle id="Tableau3">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+        </blockTableStyle>
+        <blockTableStyle id="Table1">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
 
-    <blockTableStyle id="Table_Discount_Total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_1" fontName="Helvetica-Bold" fontSize="9.0" leading="7" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_8a" fontName="Helvetica" fontSize="7.0" leading="8.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9b" fontName="Helvetica" fontSize="8.5" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9b" fontName="Helvetica-Bold" fontSize="12.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right1" fontName="Helvetica-Bold" fontSize="9.0" leading="10.5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-  </stylesheet>
-  <images/>
-  <story>
-    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
-    <para style="terp_default_8">[[ setLang(o.user_id.context_lang) ]]</para>
-    <para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
-    <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
-    <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
-    <para style="terp_default_Centre_9">Fax : [[ address and address.fax ]]</para>
-    <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
-    <para style="terp_default_Centre_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_Centre_9b">OPERATION N° : [[ o.name ]]</para>
-    <para style="terp_default_Centre_9">Date : [[ formatdate(o.date_order) ]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="125.0,25.0,35.0" repeatRows="1" style="Tableau2">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Description</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Qty</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Price</para>
-        </td>
-      </tr>
-    </blockTable>
-    <section>
-      <para style="terp_default_8">[[ repeatIn(o.lines,'line') ]]</para>
-      <blockTable colWidths="125.0,25.0,35.0" style="Tableau3">
-        <tr>
-          <td>
-            <para style="terp_default_9b">[[ len(line.product_id.name) > 39 and line.product_id.name[:39] + '...' or line.product_id.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ '%.f' % line.qty ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ '%.2f' % net(line.id) ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <blockTable colWidths="185.0" style="Table_Dicount_Total">
-      <tr>
-        <td>
-          <blockTable colWidths="97.0,88.0" style="Table_Total">
-            <tr>
-              <td>
-                <para style="terp_tblheader_Details">Discount : </para>
-              </td>
-              <td>
-                <para style="terp_default_Bold_9_Right">[[ not(disc(o.id)) and removeParentNode('blockTable') or disc(o.id) ]] [[ o.pricelist_id.currency_id.name ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="100.0,85.0" style="Table_Discount_Total">
-            <tr>
-              <td>
-                <para style="terp_tblheader_Details">Total :</para>
-              </td>
-              <td>
-                <para style="terp_default_Bold_9_Right">[[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-	<blockTable colWidths="105.0,78.0" style="Table_Amount">
-	      <tr>
-	        <td>
-	          <para style="terp_default_2">[[ repeatIn(o.payments,'d') or removeParentNode('blockTable') ]]</para>
-	          <para style="terp_default_Bold_9_Right1">[[ d.journal_id.name ]]:</para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9_Right2">[[ d.amount ]]</para>
-	        </td>
-	      </tr>
-		</blockTable>
-          <para style="terp_default_2">
+        </blockTableStyle>
+
+        <blockTableStyle id="Table3">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+            <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0" dash = '3,2'/>
+            <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
+
+        </blockTableStyle>
+
+        <blockTableStyle id="Table4">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+            <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="-1,0" dash = '3,2'/>
+            <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+        </blockTableStyle>
+
+        <blockTableStyle id="Table5">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+            <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
+            <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
+        </blockTableStyle>
+
+        <blockTableStyle id="Table6">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+        </blockTableStyle>
+
+        <initialize>
+            <paraStyle name="all" alignment="justify"/>
+        </initialize>
+        <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="10.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="10.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="10.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_8" fontName="Courier" fontSize="10.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="P30" fontName="Courier-Oblique" fontSize="10.0" leading="9" alignment="LEFT"/>
+        <paraStyle name="P31" fontName="Courier-Bold" fontSize="10.0" leading="9" alignment="CENTER" backColor="#dddddd"/>
+        <paraStyle name="P4" fontName="Courier-Bold" fontSize="10.0" leading="10" alignment="CENTER"/>
+        <paraStyle name="P4b" fontName="Courier-Bold" fontSize="10.0" leading="1" alignment="CENTER"/>
+        <paraStyle name="P5" fontName="Courier-Bold" fontSize="10.0" leading="10" alignment="LEFT"/>
+        <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="10.0" leading="10" alignment="RIGHT"/>
+        <paraStyle name="P6a" fontName="Helvetica" fontSize="10.0" leading="10" alignment="RIGHT"/>
+        <paraStyle name="P7" fontName="Courier-Bold" fontSize="10.0" leading="10" alignment="RIGHT"/>
+        <paraStyle name="P7a" fontName="Courier" fontSize="10.0" leading="10" alignment="RIGHT"/>
+        <paraStyle name="P8" fontName="Courier-Bold" fontSize="10.0" leading="8" alignment="LEFT"/>
+        <paraStyle name="P9" fontName="Courier-Oblique" fontSize="6.0" leading="0" alignment="LEFT"/>
+        <paraStyle name="terp_default_Bold_9_Right1" fontName="Helvetica" fontSize="9.0" leading="10.5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_Bold_9_Right2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_9b" fontName="Helvetica" fontSize="8.5" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="P10" fontName="Courier-Oblique" fontSize="6.0" leading="9" alignment="RIGHT"/>
+        <paraStyle name="P11" rightIndent="0.0" leftIndent="-3.0" fontName="Courier-Bold" fontSize="10.0" leading="10" alignment="CENTER"/>
+        <paraStyle name="P12" rightIndent="0.0" leftIndent="-2.0" fontName="Courier-Bold" fontSize="10.0" leading="10" alignment="CENTER"/>
+        <paraStyle name="P13" fontName="Courier-Bold" fontSize="10.0" leading="10" alignment="RIGHT"/>
+        <paraStyle name="terp_header_Centre" fontName="Courier-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+        <paraStyle name="P14" fontName="Courier-Bold" fontSize="10.0" leading="10" alignment="LEFT"/>
+        <paraStyle name="Standard" fontName="Courier-Oblique"/>
+        <paraStyle name="Text body" fontName="Courier-Oblique" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="Heading" fontName="Courier" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+        <paraStyle name="List" fontName="Courier-Oblique" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="Table Contents" fontName="Courier-Oblique"/>
+        <paraStyle name="Table Heading" fontName="Courier-Oblique" alignment="CENTER"/>
+        <paraStyle name="Caption" fontName="Courier-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+        <paraStyle name="Index" fontName="Courier-Oblique"/>
+    </stylesheet>
+    <story>
+
+        <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+        <para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
+        <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
+        <para style="terp_default_Centre_9">[[ address and address.country_id.name ]]</para>
+        <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
+        <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
+        <para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
+        <para style="terp_default_Centre_9">Vendeur : [[ o.user_id1.name ]]</para>
+        <para style="terp_default_Centre_9">Date : [[ o.date_order ]]</para>
+        <para style="P4">
             <font color="white"> </font>
-          </para>
-          <para style="terp_default_2">
+        </para>
+        <para style="P4">
             <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-  </story>
+        </para>
+        <para style="P4">[[o.type_rec]]</para>
+        <para style="P4b">
+            <font color="white"> </font>
+        </para>
+        <para style="P4"> N° : [[ o.name ]]</para>
+        <para style="P4"> Contract : [[ o.contract_number ]]</para>
+
+        <blockTable colWidths="115.0,30.0,40.0" repeatRows="1" style="Table3">
+            <tr>
+                <td>
+                    <para style="P5">Description</para>
+                </td>
+                <td>
+                    <para style="P7">Qty</para>
+                </td>
+                <td>
+                    <para style="P7">Price</para>
+                </td>
+            </tr>
+            <tr>
+                <td><para style="P8">[[ repeatIn(o.lines,'line') ]]</para>
+                    <para style="terp_default_9b">[[ len(line.product_id.name) > 39 and line.product_id.name[:39] + '...' or line.product_id.name ]]</para>
+                    
+                </td>
+                <td>
+                    <para style="terp_default_Right_9">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]]</para>
+                    
+                </td>
+                <td>
+                    <para style="terp_default_Right_9">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % net(line.id) ]] <font> [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.2f' % line.discount ]]%)</font></para>
+                </td>
+            </tr>
+        </blockTable>
+        <blockTable colWidths="140.0,43.0" style="Table4">
+            <tr>
+                <td>
+                    <para style="P6a">Taxes :</para>
+                </td>
+                <td>
+                    <para style="P7a">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_tax ]]</para>
+                </td>
+            </tr>
+        </blockTable>
+        <blockTable colWidths="115.0,35.0,45.0" style="Table6">
+            <tr>
+                <td>
+                </td>
+                <td>
+                    <para style="P6">Total :</para>
+                </td>
+                <td>
+                    <para style="P7">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_total ]]</para>
+                </td>
+            </tr>
+        </blockTable>
+
+        <blockTable colWidths="115.0,30.0,40.0" style="Table5">
+            <tr>
+                <td>
+                    <para style="P5">Payment Mode</para>
+                </td>
+                <td></td>
+                <td>
+                    <para style="P13">Amount</para>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <para style="P9">[[ repeatIn(get_journal_amt(o),'d') ]]</para>
+                    <para style="terp_default_Bold_9_Right1">[[ d['name'] ]]</para>
+                </td>
+                <td></td>
+                <td>
+                    <para style="terp_default_Bold_9_Right2">[[ '%.2f' %(d['amt'] or 0) ]]</para>
+                </td>
+            </tr>
+        </blockTable>
+        <para style="P31">
+            [[o.note_2]]
+        </para>
+
+    </story>
 </document>
+
diff --git a/addons/point_of_sale/report/pos_receipt_bis.rml b/addons/point_of_sale/report/pos_receipt_bis.rml
new file mode 100644
index 00000000000..1080a69ea65
--- /dev/null
+++ b/addons/point_of_sale/report/pos_receipt_bis.rml
@@ -0,0 +1,186 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(224.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="0.0" y1="0.0" width="224" height="842"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Dicount_Total">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Amount">
+      <blockAlignment value="LEFT"/>
+          <blockValign value="TOP"/>
+    </blockTableStyle>
+
+    <blockTableStyle id="Table_Discount_Total">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+	  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Total">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_1" fontName="Helvetica-Bold" fontSize="9.0" leading="7" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8a" fontName="Helvetica" fontSize="7.0" leading="8.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9b" fontName="Helvetica" fontSize="8.5" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9b" fontName="Helvetica-Bold" fontSize="12.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right1" fontName="Helvetica-Bold" fontSize="9.0" leading="10.5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_default_8">[[ setLang(o.user_id.context_lang) ]]</para>
+    <para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
+    <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
+    <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
+    <para style="terp_default_Centre_9">Fax : [[ address and address.fax ]]</para>
+    <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
+    <para style="terp_default_Centre_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_Centre_9b">Operation N° : [[ o.name ]]</para>
+    <para style="terp_default_Centre_9">Date : [[ o.date_order ]]</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="115.0,25.0,35.0" repeatRows="1" style="Tableau2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Qty</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(o.lines,'line') ]]</para>
+      <blockTable colWidths="115.0,25.0,35.0" style="Tableau3">
+        <tr>
+          <td>
+            <para style="terp_default_9b">[[ len(line.product_id.name) > 39 and line.product_id.name[:39] + '...' or line.product_id.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ '%.f' % line.qty ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ '%.2f' % net(line.id) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="175.0" style="Table_Dicount_Total">
+      <tr>
+        <td>
+          <blockTable colWidths="97.0,78.0" style="Table_Total">
+            <tr>
+              <td>
+                <para style="terp_tblheader_Details">Discount : </para>
+              </td>
+              <td>
+                <para style="terp_default_Bold_9_Right">[[ not(disc(o.id)) and removeParentNode('blockTable') or disc(o.id) ]] [[ o.pricelist_id.currency_id.name ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="97.0,78.0" style="Table_Discount_Total">
+            <tr>
+              <td>
+                <para style="terp_tblheader_Details">Total :</para>
+              </td>
+              <td>
+                <para style="terp_default_Bold_9_Right">[[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+    <blockTable colWidths="97.0,78.0" style="Table_Amount">
+      <tr>
+        <td>
+          <para style="terp_default_2">[[ repeatIn(o.payments,'d') ]]</para>
+          <para style="terp_default_Bold_9_Right1">[[ d.name ]]:</para>
+          </td>
+        <td>
+          <para style="terp_default_Bold_9_Right2">[[ d.amount ]]</para>
+        </td>
+      </tr>
+	</blockTable>
+
+          <para style="terp_default_2">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/pos_receipt_with_remboursment.py b/addons/point_of_sale/report/pos_receipt_with_remboursment.py
new file mode 100644
index 00000000000..539f2d1548d
--- /dev/null
+++ b/addons/point_of_sale/report/pos_receipt_with_remboursment.py
@@ -0,0 +1,80 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from report import report_sxw
+import pooler
+
+
+class order(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(order, self).__init__(cr, uid, name, context)
+
+        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid)
+        partner = user.company_id.partner_id
+
+        self.localcontext.update({
+            'time': time,
+            'disc': self.discount,
+            'net': self.netamount,
+            'get_journal_amt': self._get_journal_amt,
+            'address': partner.address and partner.address[0] or False,
+        })
+
+    def netamount(self, order_line_id):
+        sql = 'select (qty*price_unit) as net_price from pos_order_line where id = %s'
+        self.cr.execute(sql, (order_line_id,))
+        res = self.cr.fetchone()
+        return res[0]
+
+    def discount(self, order_id):
+        sql = 'select discount, price_unit, qty from pos_order_line where order_id = %s '
+        self.cr.execute(sql, (order_id,))
+        res = self.cr.fetchall()
+        dsum = 0
+        for line in res:
+            if line[0] != 0:
+                dsum = dsum +(line[2] * (line[0]*line[1]/100))
+        return dsum
+    def _get_journal_amt(self, order_id):
+        lst=[]
+        sql = """ select aj.name from account_bank_statement as abs
+                    LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
+                    LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
+                    WHERE absl.pos_statement_id = %d"""%(order_id.id)
+        self.cr.execute(sql)
+        res = self.cr.fetchone()
+        lst.append(res[0])
+        sql2 = """ select sum(absl.amount) as amt from account_bank_statement as abs
+                    LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
+                    LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
+                    where aj.name = '%s' """%(res[0])
+        self.cr.execute(sql2)
+        res1 = self.cr.fetchone()
+        lst.append(res1[0])
+        return lst
+
+report_sxw.report_sxw('report.pos.receipt.with.remboursment', 'pos.order', 'addons/point_of_sale/report/pos_receipt_with_remboursment.rml', parser=order, header=False)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/report/pos_receipt_with_remboursment.rml b/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
new file mode 100644
index 00000000000..01fa0e4ac1e
--- /dev/null
+++ b/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
@@ -0,0 +1,131 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(224.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="0.0" y1="0.0" width="224" height="842"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#ffffff" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#ffffff" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#ffffff" start="2,0" stop="2,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+        <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+
+    <paraStyle name="P2" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P3" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="CENTER"/>
+    <paraStyle name="P30" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT"/>
+    <paraStyle name="P31" fontName="Times-Bold" fontSize="8.0" leading="9" alignment="CENTER" backColor="#dddddd"/>
+    <paraStyle name="P4" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P5" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="30"/>
+    <paraStyle name="P6" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P7" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P8" fontName="Times-BoldItalic" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <paraStyle name="P9" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <paraStyle name="P10" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT"/>
+    <paraStyle name="P11" rightIndent="0.0" leftIndent="-3.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P12" rightIndent="0.0" leftIndent="-2.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P13" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    [[ repeatIn(objects,'o') ]]
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
+    <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
+    <para style="terp_default_Centre_9">[[ address and address.country_id.name ]]</para>
+    <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
+    <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
+    <para style="terp_default_Centre_9">Salesman : [[ o.user_id.name ]]</para>
+    <para style="terp_default_Centre_9">Sale Date : [[ o.date_order ]]</para>
+	  <para style="P5">Refund Receipt: [[o.name]]</para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="118.0,30.0,38.0" repeatRows="1" style="Tableau2">
+
+      <tr>
+        <td>
+          <para style="P5">Description</para>
+        </td>
+        <td>
+          <para style="P11">Qty</para>
+        </td>
+        <td>
+          <para style="P12">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="P8">[[ repeatIn(o.lines,'line') ]]</para>
+      <blockTable colWidths="100.0,30.0,55.0" style="Tableau3">
+
+        <tr>
+          <td>
+            <para style="P9">[[ line.product_id.name ]]</para>
+          </td>
+          <td>
+            <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]]</para>
+          </td>
+          <td>
+            <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % net(line.id) ]] <font> [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.f' % line.discount ]]%)</font></para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="149.0,37.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P13">Disc : </para>
+        </td>
+        <td>
+          <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % (disc(o.id) or 0.0,) ]] </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P6">Total :</para>
+        </td>
+        <td>
+          <para style="P7">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[0] ]] : [[ get_journal_amt(o)[1] ]]</para>
+  </story>
+</document>
+
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.py b/addons/point_of_sale/report/pos_receipt_without_remboursment.py
new file mode 100644
index 00000000000..843041f3863
--- /dev/null
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.py
@@ -0,0 +1,81 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from report import report_sxw
+import pooler
+
+
+class order(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(order, self).__init__(cr, uid, name, context)
+
+        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid)
+        partner = user.company_id.partner_id
+
+        self.localcontext.update({
+            'time': time,
+            'disc': self.discount,
+            'net': self.netamount,
+            'get_journal_amt': self._get_journal_amt,
+            'address': partner.address and partner.address[0] or False,
+        })
+
+    def netamount(self, order_line_id):
+        sql = 'select (qty*price_unit) as net_price from pos_order_line where id = %s'
+        self.cr.execute(sql, (order_line_id,))
+        res = self.cr.fetchone()
+        return res[0]
+
+    def discount(self, order_id):
+        sql = 'select discount, price_unit, qty from pos_order_line where order_id = %s '
+        self.cr.execute(sql, (order_id,))
+        res = self.cr.fetchall()
+        dsum = 0
+        for line in res:
+            if line[0] != 0:
+                dsum = dsum +(line[2] * (line[0]*line[1]/100))
+        return dsum
+
+    def _get_journal_amt(self, order_id):
+        lst=[]
+        sql = """ select aj.name from account_bank_statement as abs
+                    LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
+                    LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
+                    WHERE absl.pos_statement_id = %d"""%(order_id.id)
+        self.cr.execute(sql)
+        res = self.cr.fetchone()
+        lst.append(res[0])
+        sql2 = """ select sum(absl.amount) as amt from account_bank_statement as abs
+                    LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
+                    LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
+                    where aj.name = '%s' """%(res[0])
+        self.cr.execute(sql2)
+        res1 = self.cr.fetchone()
+        lst.append(res1[0])
+        return lst
+
+report_sxw.report_sxw('report.pos.receipt.without.remboursment', 'pos.order', 'addons/point_of_sale/report/pos_receipt_without_remboursment.rml', parser=order, header=False)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
new file mode 100644
index 00000000000..d863efd40f3
--- /dev/null
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
@@ -0,0 +1,138 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(224.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="0.0" y1="0.0" width="224" height="842"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#ffffff" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#ffffff" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#ffffff" start="2,0" stop="2,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+        <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+
+    <paraStyle name="P2" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P3" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="CENTER"/>
+    <paraStyle name="P30" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT"/>
+    <paraStyle name="P31" fontName="Times-Bold" fontSize="8.0" leading="9" alignment="CENTER" backColor="#dddddd"/>
+    <paraStyle name="P4" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P5" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P6" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P7" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P8" fontName="Times-BoldItalic" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <paraStyle name="P9" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <paraStyle name="P10" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT"/>
+    <paraStyle name="P11" rightIndent="0.0" leftIndent="-3.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P12" rightIndent="0.0" leftIndent="-2.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P13" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    [[ repeatIn(objects,'o') ]]
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
+    <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
+    <para style="terp_default_Centre_9">[[ address and address.country_id.name ]]</para>
+    <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
+    <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
+    <para style="terp_default_Centre_9">Salesman : [[ o.user_id.name ]]</para>
+    <para style="terp_default_Centre_9">Sale Date : [[ o.date_order ]]</para>
+	  <para style="P5">Purchase Voucher : [[o.name]]</para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="118.0,30.0,38.0" repeatRows="1" style="Tableau2">
+
+      <tr>
+        <td>
+          <para style="P5">Description</para>
+        </td>
+        <td>
+          <para style="P11">Qty</para>
+        </td>
+        <td>
+          <para style="P12">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="P8">[[ repeatIn(o.lines,'line') ]]</para>
+      <blockTable colWidths="100.0,30.0,55.0" style="Tableau3">
+
+        <tr>
+          <td>
+            <para style="P9">[[ line.product_id.name ]]</para>
+          </td>
+          <td>
+            <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]]</para>
+          </td>
+          <td>
+            <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % net(line.id) ]] <font> [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.f' % line.discount ]]%)</font></para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="149.0,37.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P13">Disc : </para>
+        </td>
+        <td>
+          <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % (disc(o.id) or 0.0,) ]] </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P6">Total :</para>
+        </td>
+        <td>
+          <para style="P7">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[0] ]] : [[ get_journal_amt(o)[1] ]]</para>
+
+	<section>
+		[[ repeatIn((o.state=='cancel' and o.statement_ids) and [1] or [], 'p') ]]
+		<para style="P31">
+			Ce bon est valide jusqu'au [[ time.strftime('%d/%m/%Y', time.strptime(o.date_validity,'%Y-%m-%d')) ]].
+		</para>
+	</section>
+  </story>
+</document>
+
diff --git a/addons/point_of_sale/report/pos_sales_user.py b/addons/point_of_sale/report/pos_sales_user.py
new file mode 100644
index 00000000000..034587a8ae4
--- /dev/null
+++ b/addons/point_of_sale/report/pos_sales_user.py
@@ -0,0 +1,58 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+
+class pos_sales_user(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(pos_sales_user, self).__init__(cr, uid, name, context)
+        self.total = 0.0
+        self.localcontext.update({
+                'time': time,
+                'get_data':self._get_data,
+
+                })
+
+    def _get_data(self,form):
+        dt1 = form['date_start'] + ' 00:00:00'
+        dt2 = form['date_end'] + ' 23:59:59'
+        data={}
+        self.cr.execute("select po.name as pos,po.date_order,ru.name as user,po.state,rc.name " \
+                        "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])))
+
+        data = self.cr.dictfetchall()
+        return data
+
+report_sxw.report_sxw('report.pos.sales.user', 'pos.order', 'addons/point_of_sale/report/pos_sales_user.rml', parser=pos_sales_user)
+
+
+
+
+
+
+
+
diff --git a/addons/point_of_sale/report/pos_sales_user.rml b/addons/point_of_sale/report/pos_sales_user.rml
new file mode 100644
index 00000000000..b6a3dae9685
--- /dev/null
+++ b/addons/point_of_sale/report/pos_sales_user.rml
@@ -0,0 +1,188 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="2.0" y1="57.0" width="537" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+	<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+	<para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="268.0,268.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="268.0,268.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="218.0,101.0,87.0,57.0,73.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Date Order</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">User</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">State</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Company</para>
+        </td>
+     </tr>
+    </blockTable>
+     <section>
+
+      <para style="terp_default_8">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
+      <blockTable colWidths="218.0,101.0,87.0,57.0,73.0" style="Tableau7">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ line_ids['pos'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ line_ids['user'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ line_ids['state'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ line_ids['name'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+       </section>
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/pos_sales_user_today.py b/addons/point_of_sale/report/pos_sales_user_today.py
new file mode 100644
index 00000000000..4e06a936116
--- /dev/null
+++ b/addons/point_of_sale/report/pos_sales_user_today.py
@@ -0,0 +1,58 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+
+class pos_sales_user_today(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(pos_sales_user_today, self).__init__(cr, uid, name, context)
+        self.total = 0.0
+        self.localcontext.update({
+                'time': time,
+                'get_data':self._get_data,
+
+                })
+
+    def _get_data(self,form):
+        data={}
+        ids = form['user_id'][0][-1]
+        idss = map(str, ids)
+
+        self.cr.execute("select po.name as pos,po.date_order,ru.name as user,po.state,rc.name " \
+                        "from pos_order as po,res_users as ru,res_company as rc " \
+                        "where to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date " \
+                        "and po.company_id=rc.id and po.user_id=ru.id and po.user_id in (%s)"% (",".join(idss), ))
+
+        data = self.cr.dictfetchall()
+        return data
+
+report_sxw.report_sxw('report.pos.sales.user.today', 'pos.order', 'addons/point_of_sale/report/pos_sales_user_today.rml', parser=pos_sales_user_today)
+
+
+
+
+
+
+
+
diff --git a/addons/point_of_sale/report/pos_sales_user_today.rml b/addons/point_of_sale/report/pos_sales_user_today.rml
new file mode 100644
index 00000000000..7db76e33ff4
--- /dev/null
+++ b/addons/point_of_sale/report/pos_sales_user_today.rml
@@ -0,0 +1,187 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="2.0" y1="57.0" width="537" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+	<para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="268.0,268.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="268.0,268.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="218.0,101.0,87.0,57.0,73.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Date Order</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">User</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">State</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Company</para>
+        </td>
+     </tr>
+    </blockTable>
+     <section>
+
+      <para style="terp_default_8">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
+      <blockTable colWidths="218.0,101.0,87.0,57.0,73.0" style="Tableau7">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ line_ids['pos'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ line_ids['user'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ line_ids['state'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ line_ids['name'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+       </section>
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/pos_sales_user_today_current_user.py b/addons/point_of_sale/report/pos_sales_user_today_current_user.py
new file mode 100644
index 00000000000..3ee371dcd43
--- /dev/null
+++ b/addons/point_of_sale/report/pos_sales_user_today_current_user.py
@@ -0,0 +1,84 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+
+class pos_sales_user_today_current_user(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(pos_sales_user_today_current_user, self).__init__(cr, uid, name, context)
+        self.total = 0.0
+        self.qty = 0.0
+        self.localcontext.update({
+                'time': time,
+                'get_user':self._get_user,
+                'get_data_current_user':self._get_data_current_user,
+                'get_data_current_user_tot':self._get_data_current_user_tot,
+                'get_data_current_user_qty':self._get_data_current_user_qty,
+                })
+
+    def _get_user(self, user):
+        pos_user={}
+        self.cr.execute("select name from res_users where id = %s",str(self.uid))
+        pos_user=self.cr.dictfetchone()
+        return pos_user['name']
+
+    def _get_data_current_user(self, user):
+        data={}
+        self.cr.execute("select po.name,po. state,sum(pol.qty)as Qty,sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as Total " \
+                        "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt ,res_users as ru,res_company as rc  " \
+                        "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                        "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date  and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
+                        "group by po.name, po.state " \
+                        ,(str(user.company_id.id),str(self.uid)))
+
+        data = self.cr.dictfetchall()
+        for d in data:
+            self.total += d['total']
+            self.qty += d['qty']
+        return data
+
+    def _get_data_current_user_tot(self, user):
+#        res={}
+#        self.cr.execute("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) " \
+#                        "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt ,res_users as ru,res_company as rc  " \
+#                        "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
+#                        "and po.date_order = current_date and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
+#                         ,(str(self.uid),str(user.company_id.id)))
+#
+#        res=self.cr.dictfetchone()
+#        return res['sum']
+        return self.total
+
+    def _get_data_current_user_qty(self, user):
+        return self.qty
+
+report_sxw.report_sxw('report.pos.sales.user.today.current.user', 'pos.order', 'addons/point_of_sale/report/pos_sales_user_today_current_user.rml', parser=pos_sales_user_today_current_user)
+
+
+
+
+
+
+
+
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
new file mode 100644
index 00000000000..469fc5cdd33
--- /dev/null
+++ b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
@@ -0,0 +1,202 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="2.0" y1="57.0" width="537" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+       <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="2,0"/>
+
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+	<para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="178.0,178.0,178.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">User</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="178.0,178.0,178.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
+        </td>
+        <td>
+        	<para style="terp_default_Centre_8">[[ (get_user(user)) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="338.0,52.0,72.0,72.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">State</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Qty</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total</para>
+        </td>
+     </tr>
+    </blockTable>
+     <section>
+
+      <para style="terp_default_8">[[ repeatIn(get_data_current_user(user), 'line_ids')]]</para>
+      <blockTable colWidths="338.0,52.0,72.0,72.0" style="Tableau7">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ line_ids['state'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+       </section>
+       <blockTable colWidths="338.0,52.0,72.0,72.0" style="Table1">
+        <tr>
+          <td>
+            <para style="terp_default_9"></para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Total : </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_qty(user))) ]]</para>
+          </td>
+          <td>
+           <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_tot(user))) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/pos_users_product.py b/addons/point_of_sale/report/pos_users_product.py
new file mode 100644
index 00000000000..2fcf35988c9
--- /dev/null
+++ b/addons/point_of_sale/report/pos_users_product.py
@@ -0,0 +1,66 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+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)
+        self.total = 0.0
+        self.localcontext.update({
+                'time': time,
+                'get_data':self._get_data,
+                'get_user':self._get_user,
+                'get_total':self._get_total,
+
+                })
+    def _get_data(self,o):
+        data={}
+        sql1=""" SELECT distinct(o.id) from account_bank_statement s, account_bank_statement_line l,pos_order o,pos_order_line i where  i.order_id=o.id and o.state='paid' and l.statement_id=s.id and l.pos_statement_id=o.id and s.id=%d"""%(o.id)
+        self.cr.execute(sql1)
+        data = self.cr.dictfetchall()
+        a_l=[]
+        for r in data:
+            a_l.append(r['id'])
+        a = ','.join(map(str,a_l))
+        if len(a):
+            sql2="""SELECT sum(qty) as qty,l.price_unit*sum(l.qty) as amt,t.name as name from product_product p, product_template t, pos_order_line l where order_id in (%s) and p.product_tmpl_id=t.id and l.product_id=p.id group by t.name, l.price_unit"""%(a)
+            self.cr.execute(sql2)
+            data = self.cr.dictfetchall()
+        for d in data:
+            self.total += d['amt']
+        return data
+
+    def _get_user(self,object):
+        for o in object :
+            sql = """select ru.name from account_bank_statement as abs,res_users ru
+                                    where abs.user_id = ru.id
+                                    and abs.id = %d"""%(o.id)
+            self.cr.execute(sql)
+            data = self.cr.fetchone()
+            return data[0]
+    def _get_total(self):
+        return self.total
+
+report_sxw.report_sxw('report.pos.user.product', 'account.bank.statement', 'addons/statement/report/pos_users_product.rml', parser=pos_user_product)
diff --git a/addons/point_of_sale/report/pos_users_product.py.WORK b/addons/point_of_sale/report/pos_users_product.py.WORK
new file mode 100644
index 00000000000..f26be9c7172
--- /dev/null
+++ b/addons/point_of_sale/report/pos_users_product.py.WORK
@@ -0,0 +1,71 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+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)
+        self.total = 0.0
+        self.localcontext.update({
+                'time': time,
+                'get_data':self._get_data,
+                'get_user':self._get_user,
+                'get_total':self._get_total,
+
+                })
+    def _get_data(self,object):
+        data={}
+        for o in object :
+            sql1=""" SELECT distinct(o.id) from account_bank_statement s, account_bank_statement_line l,pos_order o,pos_order_line i where  i.order_id=o.id and o.state in ('paid','invoiced') and l.statement_id=s.id and l.pos_statement_id=o.id and s.id=%d"""%(o.id)
+            print sql1
+            self.cr.execute(sql1)
+            data = self.cr.dictfetchall()
+            print "DATA",data
+            a_l=[]
+            for r in data:
+                if r['id']:
+                    a_l.append(r['id'])
+            a = ','.join(map(str,a_l))
+            print a_l, a
+            if len(a_l):
+                sql2="""SELECT sum(qty) as qty,l.price_unit*sum(l.qty) as amt,t.name as name from product_product p, product_template t, pos_order_line l where order_id in (%s) and p.product_tmpl_id=t.id and l.product_id=p.id group by t.name, l.price_unit"""%(a)
+                self.cr.execute(sql2)
+                data = self.cr.dictfetchall()
+            for d in data:
+                self.total += d['amt']
+            return data
+
+    def _get_user(self,object):
+        for o in object :
+            sql = """select ru.name from account_bank_statement as abs,res_users ru
+                                    where abs.user_id = ru.id
+                                    and abs.id = %d"""%(o.id)
+            self.cr.execute(sql)
+            data = self.cr.fetchone()
+            return data[0]
+    def _get_total(self):
+        return self.total
+
+report_sxw.report_sxw('report.pos.user.product', 'account.bank.statement', 'addons/statement/report/pos_users_product.rml', parser=pos_user_product)
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
new file mode 100644
index 00000000000..cbb309ceef2
--- /dev/null
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -0,0 +1,233 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="2.0" y1="57.0" width="537" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
+    </blockTableStyle>
+
+    <blockTableStyle id="Table_total">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+<para style="terp_default_9">[[ repeatIn(objects,'o') ]]</para><para style="terp_default_9"><font color="white"> </font></para>
+	<para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="108.0,108.0,108.0,108.0,108.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">User</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Starting Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Ending Date</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="108.0,108.0,108.0,108.0,108.0" style="Table4">
+      <tr>
+     	 <td>
+          <para style="terp_default_Centre_8">[[  get_user(objects) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(o.date,date_time = True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(o.closing_date,date_time = True) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="396.0,70.0,70.0" style="Tableau6">
+      <tr>
+
+        <td>
+         <para style="terp_tblheader_General">Product</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Qty</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Amount</para>
+        </td>
+       </tr>
+    </blockTable>
+     <section>
+      <para style="terp_default_8">[[ repeatIn(get_data(o), 'line_ids')]]</para>
+      <blockTable colWidths="396.0,70.0,70.0" style="Tableau7">
+        <tr>
+
+          <td>
+            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ formatLang(line_ids['qty']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['amt']) ]]</para>
+          </td>
+
+
+
+        </tr>
+      </blockTable>
+       </section>
+       <blockTable colWidths="396.0,70.0,70.0" style="Table_total">
+        <tr>
+          <td>
+            <para style="terp_default_9"><font color="white"> </font>
+          </para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Total</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(get_total()) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+  </story>
+</document>
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index fa9cd428691..38d754a31af 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -1,6 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_pos_config_journal","pos.config.journal","model_pos_config_journal","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_config_journal_manager","pos.config.journal","model_pos_config_journal","point_of_sale.group_pos_manager",1, 1, 1, 1
 "access_pos_order","pos.order","model_pos_order","point_of_sale.group_pos_user",1,1,1,1
 "access_pos_order_line","pos.order.line","model_pos_order_line","point_of_sale.group_pos_user",1,1,1,1
 "access_pos_payment","pos.payment","model_pos_payment","point_of_sale.group_pos_user",1,1,1,1
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 29e7bfe9b96..d70fd1caa85 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-  <data noupdate="1">
+<data noupdate="1">
 
     <record id="group_pos_manager" model="res.groups">
         <field name="name">Point of Sale / Manager</field>
@@ -8,13 +8,6 @@
     <record id="group_pos_user" model="res.groups">
         <field name="name">Point of Sale / User</field>
     </record>
-  </data>
 
-  <data>
-
-    <record id="menu_point_config" model="ir.ui.menu">
-      <field eval="[(6,0,[ref('group_pos_manager')])]" name="groups_id"/>
-    </record>
-
-  </data>
+</data>
 </openerp>
diff --git a/addons/point_of_sale/singer_statement_demo.xml b/addons/point_of_sale/singer_statement_demo.xml
new file mode 100644
index 00000000000..edc8299c609
--- /dev/null
+++ b/addons/point_of_sale/singer_statement_demo.xml
@@ -0,0 +1,335 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+
+		<record id="ir_sequence_accountjournal0" model="ir.sequence">
+			<field eval="&quot;&quot;&quot;account.journal&quot;&quot;&quot;" name="code"/>
+			<field eval="&quot;&quot;&quot;Account Journal&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="number_next"/>
+			<field eval="1" name="number_increment"/>
+			<field eval="1" name="active"/>
+		</record>
+		<record id="ir_sequence_vis0" model="ir.sequence">
+			<field eval="&quot;&quot;&quot;account.journal&quot;&quot;&quot;" name="code"/>
+			<field eval="&quot;&quot;&quot;vis&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="number_next"/>
+			<field eval="3" name="padding"/>
+			<field eval="1" name="number_increment"/>
+			<field eval="&quot;&quot;&quot;vis&quot;&quot;&quot;" name="prefix"/>
+			<field eval="1" name="active"/>
+			<field eval="&quot;&quot;&quot;001&quot;&quot;&quot;" name="suffix"/>
+		</record>
+
+		<record id="ir_sequence_tra0" model="ir.sequence">
+			<field eval="&quot;&quot;&quot;account.journal&quot;&quot;&quot;" name="code"/>
+			<field eval="&quot;&quot;&quot;tra&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="number_next"/>
+			<field eval="3" name="padding"/>
+			<field eval="1" name="number_increment"/>
+			<field eval="&quot;&quot;&quot;tra&quot;&quot;&quot;" name="prefix"/>
+			<field eval="1" name="active"/>
+			<field eval="&quot;&quot;&quot;001&quot;&quot;&quot;" name="suffix"/>
+		</record>
+
+		<record id="ir_sequence_ch0" model="ir.sequence">
+			<field eval="&quot;&quot;&quot;account.journal&quot;&quot;&quot;" name="code"/>
+			<field eval="&quot;&quot;&quot;ch&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="number_next"/>
+			<field eval="3" name="padding"/>
+			<field eval="1" name="number_increment"/>
+			<field eval="&quot;&quot;&quot;ch&quot;&quot;&quot;" name="prefix"/>
+			<field eval="1" name="active"/>
+			<field eval="&quot;&quot;&quot;001&quot;&quot;&quot;" name="suffix"/>
+		</record>
+
+		<record id="account_journal_xtransfer0" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;TRA&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_tra0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;CashBox&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+
+		<record id="account_journal_xvisa0" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;Carte de crédit&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_vis0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;x Visa&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+		<record id="account_journal_xcheque0" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;CHQ&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_ch0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;x Voucher&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+  <record id="s_product_pos" model="product.product">
+  <field name="name">CashOut</field>
+  <field name="categ_id" ref="product.cat1"/>
+  <field name="type">service</field>
+  <field name="expense_pdt">True</field>
+  <field name="list_price">0.0</field>
+  <field name="standard_price">0.0</field>
+  <field name="uom_id" ref="product.product_uom_unit"/>
+  <field name="company_id" ref="base.main_company"/>
+  <field name="uom_po_id" ref="product.product_uom_unit"/>
+  </record>
+
+  <record id="e_product_pos" model="product.product">
+  <field name="name">CashIn</field>
+  <field name="categ_id" ref="product.cat1"/>
+  <field name="type">service</field>
+  <field name="income_pdt">True</field>
+  <field name="list_price">0.0</field>
+  <field name="standard_price">0.0</field>
+  <field name="uom_id" ref="product.product_uom_unit"/>
+  <field name="company_id" ref="base.main_company"/>
+  <field name="uom_po_id" ref="product.product_uom_unit"/>
+  </record>
+    
+		<record id="account_journal_xtransfer1" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;TRA&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_tra0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="res_company_tinyshop0"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;CashBox Shop2&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+
+		<record id="account_journal_xvisa1" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;Carte de crédit&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_vis0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="res_company_tinyshop0"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;Credit Card Shop2&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+		<record id="account_journal_xcheque1" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;CHQ&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_ch0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="res_company_tinyshop0"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;Voucher Shop2&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+         <record id="sales_journal_cof" model="account.journal">
+            <field name="name">Cofinoga  Shop2</field>
+            <field name="code">COF</field>
+            <field name="type">cash</field>
+            <field name="view_id" ref="account.account_journal_view"/>
+            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="company_id" ref="res_company_tinyshop0"/>
+        </record>
+      <record id="sales_journal_comp" model="account.journal">
+            <field name="name">Sales Journal Shop 2</field>
+            <field name="code">SAJ</field>
+            <field name="type">sale</field>
+            <field name="view_id" ref="account.account_journal_view"/>
+            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="company_id" ref="res_company_tinyshop0"/>
+        </record>
+
+		<record id="account_journal_xtransfer2" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;TRA&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_tra0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="res_company_shop0"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;CashBox Shop 1&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+
+		<record id="account_journal_xvisa2" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;Carte de crédit&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_vis0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="res_company_shop0"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;Credit Card Shop1&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+		<record id="account_journal_xcheque2" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;CHQ&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_ch0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="res_company_shop0"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;x Voucher Shop1&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+         <record id="sales_journal_cof2" model="account.journal">
+            <field name="name">Cofinoga Shop1</field>
+            <field name="code">COF</field>
+            <field name="type">cash</field>
+            <field name="view_id" ref="account.account_journal_view"/>
+            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+      <record id="sales_journal_comp2" model="account.journal">
+            <field name="name">Sales Journal Shop1</field>
+            <field name="code">SAJ</field>
+            <field name="type">sale</field>
+            <field name="view_id" ref="account.account_journal_view"/>
+            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+
+         <record id="sales_journal_cofm" model="account.journal">
+            <field name="name">Cofinoga Central</field>
+            <field name="code">COF</field>
+            <field name="type">cash</field>
+            <field name="view_id" ref="account.account_journal_view"/>
+            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+
+        <record id="base.main_company" model="res.company">
+            <field name="account_receivable" ref="account.a_recv"/>
+        </record>
+          <record id="point_of_sale.pos_order_posadvance" model="pos.order">
+      <field name="sale_journal" ref="sales_journal_comp2"/>
+    </record>
+
+
+        <record id="base.main_company" model="res.company">
+            <field name="account_receivable" ref="account.a_recv"/>
+        </record>
+          <record id="point_of_sale.pos_order_posadvance" model="pos.order">
+      <field name="sale_journal" ref="sales_journal_comp2"/>
+    </record>
+
+	</data>
+</openerp>
diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml
new file mode 100644
index 00000000000..7da96075fab
--- /dev/null
+++ b/addons/point_of_sale/statement_data.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+
+		<record id="ir_model_access_statemt" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_bank_statement"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;account.bank.statement&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="point_of_sale.res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_statemtline" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_bank_statement_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;account.bank.statement.line&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="point_of_sale.res_groups_posuser0"/>
+		</record>
+		<record id="ir_rule_group_bankstatementcompany0" model="ir.rule.group">
+			<field name="model_id" ref="account.model_account_bank_statement"/>
+			<field eval="&quot;&quot;&quot;Bank Statement company&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+
+		<record id="ir_rule_group_bankstatementlinecompany0" model="ir.rule.group">
+			<field name="model_id" ref="account.model_account_bank_statement_line"/>
+			<field eval="&quot;&quot;&quot;Bank Statement line Company&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+		<record id="point_of_sale.res_groups_posuser0" model="res.groups">
+ 		<field eval="[(6,0,[ref('product.menu_config_product'),ref('product.menu_product_category_action_form'),ref('point_of_sale.menu_point_ofsale'),ref('point_of_sale.menu_point_config'),ref('point_of_sale.menu_statement_tree_all'),ref('stock.menu_stock_root'),ref('stock.menu_action_location_form'),ref('stock.menu_action_location_tree'),ref('stock.menu_picking_waiting'),ref('stock.menu_action_picking_tree3'),ref('stock.menu_action_picking_tree5'),ref('stock.menu_action_picking_form'),ref('stock.menu_action_picking_tree7'),ref('stock.menu_action_picking_tree8'),ref('stock.menu_action_picking_tree9'),ref('mrp.menu_mrp_procurement_action3'),ref('mrp.menu_mrp_procurement_new'),ref('report_mrp.next_id_77'),ref('report_mrp.menu_report_workcenter_load'),ref('report_mrp.menu_report_in_out_picking'),ref('sale.menu_sale_root'),ref('sale.menu_action_shop_form'),ref('sale.menu_sale_order'),ref('sale.menu_action_order_tree'),ref('sale.menu_action_order_tree_all'),ref('sale.menu_action_order_tree2'),ref('sale.menu_action_order_tree3'),ref('sale.menu_action_order_tree7'),ref('sale.menu_action_order_tree8'),ref('sale.menu_action_order_line_tree1'),ref('delivery.menu_action_delivery_carrier_form'),ref('delivery.menu_action_delivery_grid_form'),ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
+			<field eval="[(6,0,[ref('ir_rule_group_bankstatementcompany0'),ref('ir_rule_group_bankstatementlinecompany0'),ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
+			<field eval="&quot;&quot;&quot;POS_user&quot;&quot;&quot;" name="name"/>
+		</record>
+	</data>
+</openerp>
diff --git a/addons/point_of_sale/statement_report.xml b/addons/point_of_sale/statement_report.xml
new file mode 100644
index 00000000000..256d0644583
--- /dev/null
+++ b/addons/point_of_sale/statement_report.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<openerp>
+	<data>
+
+		<report
+			id="pos_users_product_re"
+			string="User's Product"
+			model="account.bank.statement"
+			name="pos.user.product"
+			auto="False"
+			multi="True"
+			rml="statement/report/pos_users_product.rml"
+			 />
+
+		<report
+			id="account_statement"
+			string="Statement"
+			model="account.bank.statement"
+			name="account.statement"
+			auto="False"
+			multi="True"
+			rml="statement/report/account_statement.rml"
+			 />
+
+		<report
+			id="all_closed_cashbox_of_the_day"
+			string="All Cloded CashBOx"
+			model="account.bank.statement"
+			name="all.closed.cashbox.of.the.day"
+			auto="False"
+			multi="True"
+			menu = 'False'
+			rml="statement/report/all_closed_cashbox_of_the_day.rml"
+			 />
+		<report
+			id="pos_users_product_re"
+			string="User's Product"
+			model="account.bank.statement"
+			name="pos.user.product"
+			auto="False"
+			multi="True"
+			rml="statement/report/pos_users_product.rml"
+			 />
+
+		<report
+			id="account_statement"
+			string="Statement"
+			model="account.bank.statement"
+			name="account.statement"
+			auto="False"
+			multi="True"
+			rml="statement/report/account_statement.rml"
+			 />
+
+		<report
+			id="all_closed_cashbox_of_the_day"
+			string="All Cloded CashBOx"
+			model="account.bank.statement"
+			name="all.closed.cashbox.of.the.day"
+			auto="False"
+			multi="True"
+			menu = 'False'
+			rml="statement/report/all_closed_cashbox_of_the_day.rml"
+			 />
+
+	</data>
+</openerp>
diff --git a/addons/point_of_sale/statement_rules.xml b/addons/point_of_sale/statement_rules.xml
new file mode 100644
index 00000000000..eba649f3ec5
--- /dev/null
+++ b/addons/point_of_sale/statement_rules.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+</data>
+</openerp>
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
new file mode 100644
index 00000000000..e7e7119583d
--- /dev/null
+++ b/addons/point_of_sale/statement_view.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_account_journal_form">
+            <field name="name">Journal</field>
+            <field name="model">account.journal</field>
+            <field name="type">form</field>
+            <field name="priority">10</field>
+            <field name="inherit_id" ref="account.view_account_journal_form"/>
+            <field name="arch" type="xml">
+              <field name="invoice_sequence_id" position="after">
+                    <field  name="statement_sequence_id"/>
+                    <field  name="auto_cash"/>
+                    <field  name="check_dtls"/>
+                    <field  name="special_journal"/>
+              </field>
+            </field>
+          </record>
+
+<!-- Bank Statement -->
+
+       <record id="view_bank_statement_tree" model="ir.ui.view">
+            <field name="name">account.bank.statement.tree</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end)" string="Statement">
+                    <field name="date"/>
+                    <field name="name"/>
+                    <field name="journal_id"/>
+                    <field name="period_id"/>
+                    <field name="balance_start"/>
+                    <field name="balance_end_real"/>
+                    <field name="balance_end"/>
+                    <field name="user_id"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_bank_statement_form2" model="ir.ui.view">
+            <field name="name">account.bank.statement.form</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Statement">
+                    <field name="name" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="company_id" select="1"/>
+                    <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash'),('auto_cash','=',False)]" select="1" />
+                    <newline/>
+                    <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                    <field name="closing_date" select="1" attrs="{'readonly':[('state','=','confirm')]}"/>
+                    <field name="balance_start"/>
+                    <field name="balance_end_real"/>
+                    <notebook colspan="4">
+                    <page string="Starting Details">
+                    	<field name="starting_details_ids" nolabel = "1" colspan="4">
+                    		<tree string = "Starting Details" editable="bottom">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub2(pieces,number, parent.balance_end)"/>
+                        		<field name="subtotal" sum="Total"/>
+                    		</tree>
+                    		<form string = "Ending Details">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub2(pieces,number, parent.balance_end)"/>
+                        		<field name="subtotal"/>
+                    		</form>
+                    	</field>
+                    </page>
+                    <page string="Ending Details">
+                    	<field name="ending_details_ids" nolabel = "1" colspan="4">
+                    		<tree string = "Ending Details" editable="bottom">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub2(pieces,number, parent.balance_end)"/>
+                        		<field name="subtotal" sum="Total"/>
+                    		</tree>
+                    		<form string = "Ending Details">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub2(pieces,number, parent.balance_end)"/>
+                        		<field name="subtotal"/>
+                    		</form>
+                    	</field>
+                    </page>
+                        <page string="Entry encoding">
+                            <field colspan="4" name="line_ids" nolabel="1">
+                                <tree editable="bottom" string="Statement lines">
+                                    <field name="name"/>
+                                    <field name="ref"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field name="amount"/>
+                                </tree>
+                                <form string="Statement lines">
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field name="amount"/>
+                                    <field name="name"/>
+                                    <field name="ref"/>
+                                    <separator colspan="4" string="Notes"/>
+                                    <field colspan="4" name="note" nolabel="1"/>
+                                </form>
+                            </field>
+                        </page>
+                    </notebook>
+                    <group col="7" colspan="4">
+                        <field name="state" select="2" colspan="4"/>
+                        <field name="total_entry_encoding"/>
+                        </group>
+                        <group colspan="4">
+                        <button name="button_dummy" states="draft" string="Compute"/>
+                        <button name="button_confirm" states="open" string="Close CashBox" type="object"/>
+                        <button name="button_open" states="draft" string="Open CashBox" type="object"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" groups="base.group_extended"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_bank_statement_form1" model="ir.ui.view">
+            <field name="name">account.bank.statement.form</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Statement">
+                    <field name="name" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="company_id" select="1"/>
+                    <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash')]" select="1" readonly="1"/>
+                    <newline/>
+                    <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                    <field name="closing_date" select="1" attrs="{'readonly':[('state','=','confirm')]}"/>
+                    <field name="balance_start"/>
+                    <field name="balance_end_real"/>
+                    <notebook colspan="4">
+                    <page string="Details">
+                    	<field name="ending_details_ids" nolabel = "1" colspan="4">
+                    		<tree string = "Ending Details" editable="bottom">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub2(pieces,number, parent.balance_end)"/>
+                        		<field name="subtotal" sum="Total"/>
+                    		</tree>
+                    		<form string = "Ending Details">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub2(pieces,number, parent.balance_end)"/>
+                        		<field name="subtotal"/>
+                    		</form>
+                    	</field>
+                    </page>
+                        <page string="Entry encoding">
+                            <field colspan="4" name="line_ids" nolabel="1">
+                                <tree editable="bottom" string="Statement lines">
+                                    <field name="name"/>
+                                    <field name="ref"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field name="amount"/>
+                                </tree>
+                                <form string="Statement lines">
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field name="amount"/>
+                                    <field name="name"/>
+                                    <field name="ref"/>
+                                    <separator colspan="4" string="Notes"/>
+                                    <field colspan="4" name="note" nolabel="1"/>
+                                </form>
+                            </field>
+                        </page>
+                    </notebook>
+                    <group col="7" colspan="4">
+                        <field name="state" select="2" colspan="4"/>
+                        <field name="total_entry_encoding"/>
+                        </group>
+                        <group colspan="4">
+                        <button name="button_dummy" states="draft" string="Compute"/>
+                        <button name="button_confirm" states="open" string="Close CashBox" type="object"/>
+                        <button name="button_open" states="draft" string="Open CashBox" type="object"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" groups="base.group_extended"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="action_bank_statement_tree_all" model="ir.actions.act_window">
+            <field name="name">My CashBoxes</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_bank_statement_tree"/>
+            <field name="domain">[('user_id','=',uid)]</field>
+        </record>
+		<record model="ir.actions.act_window.view" id="act_statement1_all">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">tree</field>
+					<field name="view_id" ref="view_bank_statement_tree"/>
+					<field name="act_window_id" ref="action_bank_statement_tree_all"/>
+		</record>
+		<record model="ir.actions.act_window.view" id="act_statement2_all">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">form</field>
+					<field name="view_id" ref="view_bank_statement_form1"/>
+					<field name="act_window_id" ref="action_bank_statement_tree_all"/>
+		</record>
+
+       <!-- <menuitem action="action_bank_statement_tree_all" id="menu_statement_tree_all" parent="point_of_sale.menu_point_root" sequence="2"/-->
+<!--        <menuitem action="action_bank_statement_tree_all" id="menu_statement_tree_all" parent="point_of_sale.menu_point_root" sequence="2"/>
+-->
+        <menuitem name="Cashboxes" parent="point_of_sale.menu_point_root" id="menu_statement_tree_all" sequence="3"/>
+
+        <record id="action_bank_statement_tree1" model="ir.actions.act_window">
+            <field name="name">My Cashboxes to Close</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_bank_statement_tree"/>
+            <field name="domain">[('state','=','open'), ('user_id','=',uid)]</field>
+
+
+        </record>
+		<record model="ir.actions.act_window.view" id="act_statement1">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">tree</field>
+					<field name="view_id" ref="view_bank_statement_tree"/>
+					<field name="act_window_id" ref="action_bank_statement_tree1"/>
+		</record>
+		<record model="ir.actions.act_window.view" id="act_statement2">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">form</field>
+					<field name="view_id" ref="view_bank_statement_form1"/>
+					<field name="act_window_id" ref="action_bank_statement_tree1"/>
+		</record>
+
+<!--        <menuitem action="action_bank_statement_tree1" id="menu_statement_tree1" parent="menu_statement_tree_all" sequence="2"/>-->
+
+        <record id="view_bank_statement_form3" model="ir.ui.view">
+            <field name="name">account.bank.statement.form</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Statement">
+                    <field name="name" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="company_id" select="1"/>
+                    <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash')]" select="1" readonly="1"/>
+                    <newline/>
+                    <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                    <field name="closing_date" select="1" attrs="{'readonly':[('state','=','confirm')]}"/>
+                    <field name="balance_start"/>
+                    <field name="balance_end_real"/>
+                    <notebook colspan="4">
+                        <page string="Entry encoding">
+                            <field colspan="4" name="line_ids" nolabel="1">
+                                <tree editable="bottom" string="Statement lines">
+                                    <field name="name"/>
+                                    <field name="ref"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field name="amount" />
+                                </tree>
+                                <form string="Statement lines">
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field name="amount"/>
+                                    <field name="name"/>
+                                    <field name="ref"/>
+                                    <separator colspan="4" string="Notes"/>
+                                    <field colspan="4" name="note" nolabel="1"/>
+                                </form>
+                            </field>
+                        </page>
+                    <page string="Starting Details">
+                        <field name="balance_end" colspan="4" nolabel="1"/>
+                        <newline/>
+                    	<field name="starting_details_ids" nolabel = "1" colspan="4">
+                    		<tree string = "Starting Details" editable="bottom">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub(pieces,number)"/>
+                        		<field name="subtotal" sum="Total"/>
+                    		</tree>
+                    		<form string = "Starting Details">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub(pieces,number)"/>
+                        		<field name="subtotal"/>
+                    		</form>
+                    	</field>
+                    </page>
+                    <page string="Ending Details">
+                    	<field name="ending_details_ids" nolabel = "1" colspan="4">
+                    		<tree string = "Ending Details" editable="bottom">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub(pieces,number)"/>
+                        		<field name="subtotal" sum="Total"/>
+                    		</tree>
+                    		<form string = "Ending Details">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub(pieces,number)"/>
+                        		<field name="subtotal"/>
+                    		</form>
+                    	</field>
+                    </page>
+                    </notebook>
+                    <group col="7" colspan="4">
+                        <field name="state" select="2" colspan="4"/>
+                        <field name="total_entry_encoding"/>
+                      </group>
+                      <group colspan="4">
+                        <button name="button_dummy" states="draft" string="Compute"/>
+                        <button name="button_open" states="draft" string="Open CashBox" type="object" />
+                        <button name="button_confirm" states="open" string="Confirm" type="object" />
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" groups="base.group_extended"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+       <record id="view_bank_statement_tree2" model="ir.ui.view">
+            <field name="name">account.bank.statement.tree</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end)" string="Statement">
+                    <field name="date"/>
+                    <field name="name"/>
+                    <field name="journal_id"/>
+                    <field name="period_id"/>
+                    <field name="balance_start"/>
+                    <field name="balance_end_real"/>
+                    <field name="balance_end"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+        <record id="action_bank_statement_treenew" model="ir.actions.act_window">
+            <field name="name">Open a CashBox</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_bank_statement_form2"/>
+            <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
+
+        </record>
+		<record model="ir.actions.act_window.view" id="act_statement12">
+					<field name="sequence" eval="2"/>
+					<field name="view_mode">tree</field>
+					<field name="view_id" ref="view_bank_statement_tree2"/>
+					<field name="act_window_id" ref="action_bank_statement_treenew"/>
+		</record>
+		<record model="ir.actions.act_window.view" id="act_statement22">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">form</field>
+					<field name="view_id" ref="view_bank_statement_form2"/>
+					<field name="act_window_id" ref="action_bank_statement_treenew"/>
+		</record>
+       <!-- <menuitem action="action_bank_statement_treenew" id="menu_statement_tree2" parent="menu_statement_tree_all" sequence="1"/>-->
+
+
+        <menuitem action="action_bank_statement_treenew" id="menu_statement_tree2" parent="menu_statement_tree_all" sequence="1"/>
+
+		<record model="ir.actions.act_window" id="action_pos_account_bank_statment">
+            <field name="name">All Cashboxes</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+        </record>
+		<record model="ir.actions.act_window.view" id="act_statement_a1">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">tree</field>
+					<field name="view_id" ref="view_bank_statement_tree"/>
+					<field name="act_window_id" ref="action_pos_account_bank_statment"/>
+		</record>
+		<record model="ir.actions.act_window.view" id="act_statement_a2">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">form</field>
+					<field name="view_id" ref="view_bank_statement_form3"/>
+					<field name="act_window_id" ref="action_pos_account_bank_statment"/>
+		</record>
+		<menuitem name="All Cashboxes" parent="menu_point_report_register"
+		 		action="action_pos_account_bank_statment" id="menu_pos_bank_statment_tree" groups="base.group_extended" sequence="4"/>
+
+		<record model="ir.actions.act_window" id="action_my_all_pos_account_bank_statment">
+            <field name="name">All My Cashboxes</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('user_id','=',uid)]</field>
+        </record>
+        <record model="ir.actions.act_window.view" id="act_my_all_statement_a1">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">tree</field>
+					<field name="view_id" ref="view_bank_statement_tree"/>
+					<field name="act_window_id" ref="action_my_all_pos_account_bank_statment"/>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="act_my_all_statement_a2">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">form</field>
+					<field name="view_id" ref="view_bank_statement_form1"/>
+					<field name="act_window_id" ref="action_my_all_pos_account_bank_statment"/>
+		</record>
+<!--		 <menuitem name="All My Cashboxes" parent="menu_statement_tree_all"-->
+<!--		 		action="action_my_all_pos_account_bank_statment" id="menu_my_pos_bank_statment_tree" sequence="3"/>-->
+
+		<record model="ir.actions.act_window" id="action_cashboxes_to_close">
+            <field name="name">Cashboxes to Close</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft')]</field>
+        </record>
+		<record model="ir.actions.act_window.view" id="act_statement_a5">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">tree</field>
+					<field name="view_id" ref="view_bank_statement_tree"/>
+					<field name="act_window_id" ref="action_cashboxes_to_close"/>
+		</record>
+		<record model="ir.actions.act_window.view" id="act_statement_a6">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">form</field>
+					<field name="view_id" ref="view_bank_statement_form1"/>
+					<field name="act_window_id" ref="action_cashboxes_to_close"/>
+		</record>
+
+		<menuitem name="Cashboxes to Close" parent="menu_pos_bank_statment_tree"
+		 		action="action_cashboxes_to_close" id="menu_cashboxes_to_close_tree" groups="base.group_extended"/>
+
+		<menuitem
+            name="Open Statements" parent="point_of_sale.menu_point_config"
+            string="Open Statements"
+            action="open_statement"
+            type="wizard"
+            id="menu_open_statement" sequence="3" />
+       <menuitem icon="STOCK_PRINT"
+       			 action="wizard_all_closed_cashbox_of_the_day"
+				 id="menu_all_closed_cashbox_of_the_day"
+				 parent="menu_statement_tree_all"
+				 type="wizard"/>
+
+		<menuitem
+            name="Close Statements" parent="point_of_sale.menu_point_config"
+            string="Close Statements"
+            action="close_statement"
+            type="wizard"
+            id="menu_close_statement" sequence="3" />
+	</data>
+</openerp>
diff --git a/addons/point_of_sale/statement_wizard.xml b/addons/point_of_sale/statement_wizard.xml
new file mode 100644
index 00000000000..f3bffb15ce1
--- /dev/null
+++ b/addons/point_of_sale/statement_wizard.xml
@@ -0,0 +1,42 @@
+<openerp>
+	<data>
+  		<wizard
+        	id="close_statement"
+        	model="account.bank.statement"
+        	menu="False"
+        	name="statement.close"
+        	string="Close Statements"/>
+		<menuitem
+            name="Close Register" parent="point_of_sale.menu_point_config"
+            string="Close Register"
+            action="close_statement"
+            type="wizard"
+            id="menu_close_statement" sequence="4" />
+  		<wizard
+        	id="open_statement"
+        	model="account.bank.statement"
+        	menu="False"
+        	name="statement.open"
+        	string="Open Register"/>
+
+		<menuitem
+            name="Open Register" parent="point_of_sale.menu_point_config"
+            string="Open Register"
+            action="open_statement"
+            type="wizard"
+            id="menu_open_statement" sequence="1" />
+
+       <wizard
+        	id="wizard_all_closed_cashbox_of_the_day"
+        	model="account.bank.statement"
+        	menu="False"
+        	name="all.closed.cashbox.of.the.day"
+        	string="All Cashboxes Of the day"/>
+
+       <menuitem icon="STOCK_PRINT"
+       			 action="wizard_all_closed_cashbox_of_the_day"
+				 id="menu_all_closed_cashbox_of_the_day"
+				 parent="menu_point_report_register"
+				 type="wizard"/>
+    </data>
+</openerp>
diff --git a/addons/point_of_sale/stock.py b/addons/point_of_sale/stock.py
index 206497a24e9..95630569a7c 100644
--- a/addons/point_of_sale/stock.py
+++ b/addons/point_of_sale/stock.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,31 +24,14 @@ from osv import osv, fields
 import time
 import netsvc
 
-class stock_move(osv.osv):
-    _inherit = 'stock.move'
-    
-    _columns = {
-        'pos_line_id': fields.many2one('pos.order.line',
-            'Pos Order Line', ondelete='set null', select=True,
-            readonly=True),
-    }
-    
-stock_move()
-
 
 class stock_picking(osv.osv):
 
     _inherit = 'stock.picking'
     _columns = {
         'pos_order': fields.many2one('pos.order', 'Pos order'),
+     #   'company_id':fields.many2one('res.company', 'Company', required=True),
     }
-    
-    def _get_discount_invoice(self, cursor, user, move_line):
-        if move_line.pos_line_id:
-           return move_line.pos_line_id.discount
-        return super(stock_picking, self)._get_discount_invoice(cursor, user,
-               move_line)
-
 stock_picking()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 0d77b783e5d..1ff9c124861 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,6 +28,16 @@ import wizard_confirm
 import wizard_discount
 import wizard_get_sale
 import wizard_scan_product
-
-from wizard import except_wizard
+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
+import wizard_pos_sales_user_current_user
+import wizard_pos_details
+import wizard_open_statement
+import wizard_all_closed_cashbox_of_the_day
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/wizard_add_product.py b/addons/point_of_sale/wizard/wizard_add_product.py
index c4776e86f2a..0daa0bdf0db 100644
--- a/addons/point_of_sale/wizard/wizard_add_product.py
+++ b/addons/point_of_sale/wizard/wizard_add_product.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/point_of_sale/wizard/wizard_all_closed_cashbox_of_the_day.py b/addons/point_of_sale/wizard/wizard_all_closed_cashbox_of_the_day.py
new file mode 100644
index 00000000000..bdb7f72cb93
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_all_closed_cashbox_of_the_day.py
@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import pooler
+import netsvc
+import wizard
+import time
+
+
+class wizard_all_closed_cashbox_of_the_day(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'print', 'report':'all.closed.cashbox.of.the.day', 'state':'end'}
+             },
+    }
+
+wizard_all_closed_cashbox_of_the_day('all.closed.cashbox.of.the.day')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/wizard_confirm.py b/addons/point_of_sale/wizard/wizard_confirm.py
index 476e2dbfe64..b819c840ae5 100644
--- a/addons/point_of_sale/wizard/wizard_confirm.py
+++ b/addons/point_of_sale/wizard/wizard_confirm.py
@@ -1,45 +1,75 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 
 import wizard
 import netsvc
+import pooler
+import time
 
+_form = """<?xml version="1.0"?>
+<form string="Open Statements">
+     <label string="Are you sure you want to close your sales ?" colspan="2"/>
+</form>
+"""
+_fields = {}
 
 def _confirm(self, cr, uid, data, context):
-    wf_service = netsvc.LocalService("workflow")
+    pool = pooler.get_pool(cr.dbname)
+    company_id=pool.get('res.users').browse(cr,uid,uid).company_id
+    order_obj = pool.get('pos.order')
+    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
+        if  order_id.state =='paid':
+            order_obj.write(cr,uid,[order_id.id],{'journal_entry':True})
+            order_obj.create_account_move(cr, uid, [order_id.id], context=context)
 
+    wf_service = netsvc.LocalService("workflow")
     for i in data['ids']:
         wf_service.trg_validate(uid, 'pos.order', i, 'done', cr)
     return {}
 
-
+def _get_state(self, cr, uid, data, context):
+    action = 'invoice'
+    return action
 class pos_confirm(wizard.interface):
-    states = {
-        'init': {'actions' : [_confirm],
+
+ states = {
+        'init': {
+            'actions': [],
             'result': {
-                'type': 'state',
-                'state': 'end',
+                'type': 'form',
+                'arch': _form,
+                'fields': _fields,
+                'state': (('end', 'No','gtk-cancel'),
+                          ('open', 'Yes', 'gtk-ok', True)
+                         )
             }
         },
+        'open': {
+            'actions': [_confirm],
+            'result': {
+                       'type': 'state',
+                       'state':'end'}
+        },
     }
 
 pos_confirm('pos.confirm')
diff --git a/addons/point_of_sale/wizard/wizard_default_journal.py b/addons/point_of_sale/wizard/wizard_default_journal.py
index 161ef5d3214..bfe59251f45 100644
--- a/addons/point_of_sale/wizard/wizard_default_journal.py
+++ b/addons/point_of_sale/wizard/wizard_default_journal.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/point_of_sale/wizard/wizard_discount.py b/addons/point_of_sale/wizard/wizard_discount.py
index da405cf3d45..035c387793c 100644
--- a/addons/point_of_sale/wizard/wizard_discount.py
+++ b/addons/point_of_sale/wizard/wizard_discount.py
@@ -1,35 +1,42 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-
 import pooler
-
 import wizard
 
-
 _form = """<?xml version="1.0"?>
 <form string="Discount :">
     <field name="discount"/>
 </form>
 """
+disc_form = """<?xml version="1.0"?>
+
+<form string="Discount Notes :">
+    <label colspan="2" string="Reason For Giving Discount" align="0.0"/>
+    <newline/>
+    <field name="note" nolabel="1"/>
+</form>
+"""
+
 
 _fields = {
     'discount': {
@@ -40,19 +47,59 @@ _fields = {
     },
 }
 
-
-def apply_discount(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_ref = pool.get('pos.order')
-    order_line_ref = pool.get('pos.order.line')
-    for order in order_ref.browse(cr, uid, data['ids'], context=context):
-        order_line_ref.write(cr, uid, [line.id for line in order.lines],
-                            {'discount': data['form']['discount']},
-                            context=context,)
-    return {}
-
+disc_fields = {
+    'note': {
+        'string': 'Discount Notes',
+        'type': 'char',
+        'size': 128,
+        'required': True
+    },
+}
 
 class discount_wizard(wizard.interface):
+
+    def apply_discount(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        order_ref = pool.get('pos.order')
+        order_line_ref = pool.get('pos.order.line')
+        for order in order_ref.browse(cr, uid, data['ids'], context=context):
+            for line in order.lines :
+                company_discount = order.company_id.company_discount
+                applied_discount =data['form']['discount']
+                if applied_discount == 0.00:
+                    notice = 'No Discount'
+                elif company_discount >=  applied_discount:
+                    notice = 'Minimum Discount'
+                else:
+                    notice = data['form']['note']
+                if self.check_discount(cr, uid, data, context) == 'apply_discount':
+                    order_line_ref.write(cr, uid, [line.id],
+                            {'discount': data['form']['discount'],
+                            'price_ded':line.price_unit*line.qty*(data['form']['discount'] or 0)*0.01 or 0.0,
+                            'notice':notice
+                            },
+                            context=context,)
+                else :
+                    order_line_ref.write(cr, uid, [line.id],
+                            {'discount': data['form']['discount'],
+                            'notice': notice,
+                            'price_ded':line.price_unit*line.qty*(data['form']['discount'] or 0)*0.01 or 0.0 
+                            },
+                            context=context,)
+        return {}
+
+    def check_discount(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        order_ref = pool.get('pos.order')
+        for order in order_ref.browse(cr, uid, data['ids'], context=context):
+            company_disc = order.company_id.company_discount
+            for line in order.lines :
+                prod_disc = data['form']['discount']
+                if prod_disc <= company_disc :
+                   return 'apply_discount'
+                else :
+                    return 'disc_discount'
+
     states = {
         'init': {
             'actions': [],
@@ -60,6 +107,23 @@ class discount_wizard(wizard.interface):
                 'type': 'form',
                 'arch': _form,
                 'fields': _fields,
+                'state': (('end', 'Cancel'),
+                          ('check_disc', 'Apply Discount', 'gtk-ok', True)
+                         )
+            }
+        },
+
+        'check_disc': {
+            'actions': [],
+            'result': {'type':'choice','next_state':check_discount}
+        },
+
+        'disc_discount': {
+            'actions': [],
+            'result': {
+                'type': 'form',
+                'arch': disc_form,
+                'fields':disc_fields,
                 'state': (('end', 'Cancel'),
                           ('apply_discount', 'Apply Discount', 'gtk-ok', True)
                          )
diff --git a/addons/point_of_sale/wizard/wizard_get_sale.py b/addons/point_of_sale/wizard/wizard_get_sale.py
index ac758dfb445..de686c11d49 100644
--- a/addons/point_of_sale/wizard/wizard_get_sale.py
+++ b/addons/point_of_sale/wizard/wizard_get_sale.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/point_of_sale/wizard/wizard_open_statement.py b/addons/point_of_sale/wizard/wizard_open_statement.py
new file mode 100644
index 00000000000..09205a97b08
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_open_statement.py
@@ -0,0 +1,147 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import pooler
+import wizard
+from tools.translate import _
+import time
+
+statement_form = """<?xml version="1.0"?>
+<form string="Open Statements">
+     <label string="Are you sure you want to open the statements ?" colspan="2"/>
+</form>
+"""
+statement_form_close = """<?xml version="1.0"?>
+<form string="Close Statements">
+     <label string="Are you sure you want to close the statements ?" colspan="2"/>
+</form>
+"""
+
+statement_fields = {}
+
+def _close_statement(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    company_id=pool.get('res.users').browse(cr,uid,uid).company_id.id
+    statement_obj = pool.get('account.bank.statement')
+    singer_obj = pool.get('singer.statement')
+    journal_obj=pool.get('account.journal')
+    journal_lst=journal_obj.search(cr,uid,[('company_id','=',company_id),('auto_cash','=',True),('check_dtls','=',False)])
+    journal_ids=journal_obj.browse(cr,uid, journal_lst)
+    for journal in journal_ids:
+        ids = statement_obj.search(cr, uid, [('state','!=','confirm'),('user_id','=',uid),('journal_id','=',journal.id)])
+        statement_obj.button_confirm(cr,uid,ids)
+    return {}
+def _open_statement(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    company_id=pool.get('res.users').browse(cr,uid,uid).company_id.id
+    statement_obj = pool.get('account.bank.statement')
+    singer_obj = pool.get('singer.statement')
+    journal_obj=pool.get('account.journal')
+    journal_lst=journal_obj.search(cr,uid,[('company_id','=',company_id),('auto_cash','=',True)])
+    journal_ids=journal_obj.browse(cr,uid, journal_lst)
+    for journal in journal_ids:
+        ids = statement_obj.search(cr, uid, [('state','!=','confirm'),('user_id','=',uid),('journal_id','=',journal.id)])
+        if len(ids):
+            raise wizard.except_wizard(_('Message'),_('You can not open a Cashbox for "%s". \n Please close the cashbox related to. '%(journal.name) ))
+        sql = """ Select id from account_bank_statement
+                                where journal_id=%d
+                                and company_id =%d
+                                order by id desc limit 1"""%(journal.id,company_id)
+        singer_ids=None
+        cr.execute(sql)
+        st_id = cr.fetchone()
+        number=''
+        if journal.statement_sequence_id:
+            number = pool.get('ir.sequence').get_id(cr, uid, journal.id)
+        else:
+            number = pool.get('ir.sequence').get(cr, uid,
+                            'account.bank.statement')
+
+#        statement_id=statement_obj.create(cr,uid,{'journal_id':journal.id,
+#                                                  'company_id':company_id,
+#                                                  'user_id':uid,
+#                                                  'state':'open',
+#                                                  'name':number
+#                                                  })
+        period=statement_obj._get_period(cr,uid,context) or None
+        cr.execute("INSERT INTO account_bank_statement(journal_id,company_id,user_id,state,name, period_id,date) VALUES(%d,%d,%d,'open','%s',%d,'%s')"%(journal.id,company_id,uid,number, period, time.strftime('%Y-%m-%d %H:%M:%S')))
+        cr.commit()
+        cr.execute("select id from account_bank_statement where journal_id=%d and company_id=%d and user_id=%d and state='open' and name='%s'"%(journal.id,company_id,uid,number))
+        statement_id=cr.fetchone()[0]
+        if st_id:
+            statemt_id=statement_obj.browse(cr,uid,st_id[0])
+            if statemt_id and statemt_id.ending_details_ids:
+                statement_obj.write(cr, uid,[statement_id], {'balance_start':statemt_id.balance_end,
+                                                            'state':'open'})
+                if statemt_id.ending_details_ids:
+                    for i in statemt_id.ending_details_ids:
+                        c=singer_obj.create(cr,uid, { 'pieces':i.pieces,
+                                                    'number':i.number,
+                                                    'starting_id':statement_id,
+                            })
+        cr.commit()
+    return {}
+
+class statement_open(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {
+                'type': 'form',
+                'arch': statement_form,
+                'fields': statement_fields,
+                'state': (('end', 'No','gtk-cancel'),
+                          ('open', 'Yes', 'gtk-ok', True)
+                         )
+            }
+        },
+        'open': {
+            'actions': [_open_statement],
+            'result': {
+                       'type': 'state',
+#                       'action' :_open_statement,
+                       'state':'end'}
+        },
+    }
+statement_open('statement.open')
+class statement_close(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {
+                'type': 'form',
+                'arch': statement_form_close,
+                'fields': statement_fields,
+                'state': (('end', 'No','gtk-cancel'),
+                          ('open', 'Yes', 'gtk-ok', True)
+                         )
+            }
+        },
+        'open': {
+            'actions': [_close_statement],
+            'result': {
+                       'type': 'state',
+                       'state':'end'}
+        },
+    }
+statement_close('statement.close')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/wizard_pos_details.py b/addons/point_of_sale/wizard/wizard_pos_details.py
new file mode 100644
index 00000000000..80a0593c08e
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_pos_details.py
@@ -0,0 +1,67 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+import time
+import ir
+from mx import DateTime
+import datetime
+import pooler
+from tools import config
+import wizard
+import netsvc
+
+
+pos_details_res_form= """<?xml version="1.0"?>
+<form string="Sale by User">
+     <field name="date_start" />
+     <field name="date_end" />
+</form>
+"""
+
+pos_details_res_field= {
+    'date_start': {'string':'Start Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
+    'date_end': {'string':'End Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
+
+
+}
+
+
+class wizard_pos_details(wizard.interface):
+
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'form',
+                    'arch' : pos_details_res_form,
+                    'fields' : pos_details_res_field,
+                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
+        },
+        'print_report' : {
+            'actions' : [],
+            'result' : {'type' : 'print',
+                   'report':'pos.details',
+                    'state' : 'end'}
+        },
+    }
+wizard_pos_details('pos.details')
diff --git a/addons/point_of_sale/wizard/wizard_pos_payment.py b/addons/point_of_sale/wizard/wizard_pos_payment.py
index d41c0405b5a..b184d1184be 100644
--- a/addons/point_of_sale/wizard/wizard_pos_payment.py
+++ b/addons/point_of_sale/wizard/wizard_pos_payment.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,12 +24,14 @@ import pooler
 import netsvc
 import wizard
 import time
+from decimal import Decimal
 
 
 def _get_journal(self, cr, uid, context):
     pool = pooler.get_pool(cr.dbname)
     obj = pool.get('account.journal')
-    ids = obj.search(cr, uid, [('type', '=', 'cash')])
+    c=pool.get('res.users').browse(cr,uid,uid).company_id.id
+    ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', c)])
     res = obj.read(cr, uid, ids, ['id', 'name'], context)
     res = [(r['id'], r['name']) for r in res]
     return res
@@ -36,67 +39,64 @@ def _get_journal(self, cr, uid, context):
 
 payment_form = """<?xml version="1.0"?>
 <form string="Add payment :">
+<group colspan="4" label="Payment">
     <field name="amount" />
     <field name="journal"/>
-    <field name="payment_id" />
     <field name="payment_date" />
-    <field name="payment_nb" />
     <field name="payment_name" />
     <field name="invoice_wanted" />
+    <field name="num_sale" />
+    <field name="is_acc" />
+    <group attrs="{'readonly':[('is_acc','=',False)]}" colspan="4" cols="2">
+    <field name="product_id" attrs="{'required':[('is_acc', '=', True)]}" domain="[('type','=','service')]"/>
+    </group>
+    </group>
 </form>
 """
 
 payment_fields = {
     'amount': {'string': 'Amount', 'type': 'float', 'required': True},
+    'is_acc': {'string': 'Accompte', 'type': 'boolean'},
     'invoice_wanted': {'string': 'Invoice', 'type': 'boolean'},
     'journal': {'string': 'Journal',
-            'type': 'selection',
-            'selection': _get_journal,
-            'required': True,
-        },
-    'payment_id': {'string': 'Payment Term', 'type': 'many2one', 'relation': 'account.payment.term', 'required': True},
+                'type': 'selection',
+                'selection': _get_journal,
+                'required': True,
+               },
     'payment_date': {'string': 'Payment date', 'type': 'date', 'required': True},
-    'payment_name': {'string': 'Payment name', 'type': 'char', 'size': '32'},
-    'payment_nb': {'string': 'Piece number', 'type': 'char', 'size': '32'},
+    'payment_name': {'string': 'Payment name', 'type': 'char', 'size': '32', 'required':True, 'default':'Payment'},
+    'num_sale': {'string': 'Num.File', 'type': 'char', 'size': '32'},
+    'product_id': {'string':'Acompte','type': 'many2one', 'relation': 'product.product'},
     }
 
 
 def _pre_init(self, cr, uid, data, context):
-
     def _get_journal(pool, order):
         j_obj = pool.get('account.journal')
-
-        journal_to_fetch = 'DEFAULT'
-        if order.amount_total < 0:
-            journal_to_fetch = 'GIFT'
+        c = pool.get('res.users').browse(cr,uid,uid).company_id.id
+        journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', c)])
+        if journal:
+            journal = journal[0]
         else:
-            if order.amount_paid > 0:
-                journal_to_fetch = 'REBATE'
-
-        pos_config_journal = pool.get('pos.config.journal')
-        ids = pos_config_journal.search(cr, uid, [('code', '=', journal_to_fetch)])
-        objs = pos_config_journal.browse(cr, uid, ids)
-        journal = None
-        if objs:
-            journal = objs[0].journal_id.id
-        else:
-            existing = [payment.journal_id.id for payment in order.payments]
-            ids = j_obj.search(cr, uid, [('type', '=', 'cash')])
-            for i in ids:
-                if i not in existing:
-                    journal = i
-                    break
-            if not journal:
-                journal = ids[0]
-
+            journal = None
         return journal
 
+    wf_service = netsvc.LocalService("workflow")
+   # wf_service.trg_validate(uid, 'pos.order', data['id'], 'start_payment', cr)
+
     pool = pooler.get_pool(cr.dbname)
     order = pool.get('pos.order').browse(cr, uid, data['id'], context)
-
-    # get amount to pay:
+    #get amount to pay
+    #amount = Decimal(str(order.amount_total)) - Decimal(str(order.amount_paid))
     amount = order.amount_total - order.amount_paid
 
+    if amount<=0:
+        context.update({'flag':True})
+        pool.get('pos.order').action_paid(cr,uid,data['ids'],context)
+    elif order.amount_paid > 0:
+        pool.get('pos.order').write(cr, uid, data['id'],{'state':'advance'})
+
+
     # get journal:
     journal = _get_journal(pool, order)
 
@@ -113,8 +113,13 @@ def _pre_init(self, cr, uid, data, context):
 def _add_pay(self, cr, uid, data, context):
     pool = pooler.get_pool(cr.dbname)
     order_obj = pool.get('pos.order')
+    jrnl_obj = pool.get('account.journal')
     result = data['form']
     invoice_wanted = data['form']['invoice_wanted']
+    jrnl_used=False
+    if data['form'] and data['form'].get('journal',False):
+        jrnl_used=jrnl_obj.browse(cr,uid,data['form']['journal'])
+
     # add 'invoice_wanted' in 'pos.order'
     order_obj.write(cr, uid, [data['id']], {'invoice_wanted': invoice_wanted})
 
@@ -122,16 +127,6 @@ def _add_pay(self, cr, uid, data, context):
     return {}
 
 
-def _validate(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    order = order_obj.browse(cr, uid, data['id'], context)
-#    if not order.amount_total:
-#       return 'receipt'
-    order_obj.test_order_lines(cr, uid, order, context=context)
-    return {}
-
-
 def _check(self, cr, uid, data, context):
     """Check the order:
     if the order is not paid: continue payment,
@@ -140,61 +135,42 @@ def _check(self, cr, uid, data, context):
     pool = pooler.get_pool(cr.dbname)
     order_obj = pool.get('pos.order')
     order = order_obj.browse(cr, uid, data['id'], context)
+    amount = order.amount_total - order.amount_paid
+    if amount<=0:
+        context.update({'flag':True})
+        pool.get('pos.order').action_paid(cr,uid,data['ids'],context)
+
     action = 'ask_pay'
-    if order.state == 'paid':
+    if order_obj.test_paid(cr, uid, [data['id']]):
         if order.partner_id:
             if order.invoice_wanted:
                 action = 'invoice'
             else:
                 action = 'paid'
-        else:
+        elif order.date_payment:
             action = 'receipt'
+        else:
+            action = 'paid'
     return action
 
 
-def _test_no_line(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order = pool.get('pos.order').browse(cr, uid, data['id'], context)
-
-    if not order.lines:
-        raise wizard.except_wizard(_('Error'), _('No order lines defined for this sale.'))
-
-    if not order.lines:
-        raise wizard.except_wizard(_('Error'), _('No order lines defined for this sale.'))
-
-    return {}
-
-
 def create_invoice(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    order = order_obj.browse(cr, uid, data['id'], context)
-    if not order.invoice_id:
-        inv_id = order_obj.action_invoice(cr, uid, [data['id']])
-        #raise wizard.except_wizard(_('Error !'), _('Please create an invoice for this sale.'))
-#    wf_service = netsvc.LocalService("workflow")
-#    for i in data['ids']:
-#        wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
+    wf_service = netsvc.LocalService("workflow")
+    for i in data['ids']:
+        wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
     return {}
 
-
-def create_invoice(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    order = order_obj.browse(cr, uid, data['id'], context)
-    if not order.invoice_id:
-        inv_id = order_obj.action_invoice(cr, uid, [data['id']])
-        #raise wizard.except_wizard(_('Error !'), _('Please create an invoice for this sale.'))
-#    wf_service = netsvc.LocalService("workflow")
-#    for i in data['ids']:
-#        wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
+def _trigger_wkf(self, cr, uid, data, context):
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'pos.order', data['id'], 'payment', cr)
     return {}
 
 
+
 class pos_payment(wizard.interface):
     states = {
         'init': {
-            'actions': [_validate],
+            'actions': [],
             'result': {
                 'type': 'choice',
                 'next_state': _check,
@@ -206,8 +182,7 @@ class pos_payment(wizard.interface):
                 'type': 'form',
                 'arch': payment_form,
                 'fields': payment_fields,
-                'state': (('end', 'Cancel'), ('add_pay', 'Ma_ke payment', 'gtk-ok', True)
-                         )
+                'state': (('end', 'Cancel'), ('finish', 'Finish'), ('add_pay', 'Ma_ke payment', 'gtk-ok', True))
             }
         },
         'add_pay': {
@@ -222,7 +197,7 @@ class pos_payment(wizard.interface):
             'result': {
                 'type': 'print',
                 'report': 'pos.invoice',
-                'state': 'end'
+                'state': 'finish'
             }
         },
         'receipt': {
@@ -230,11 +205,19 @@ class pos_payment(wizard.interface):
             'result': {
                 'type': 'print',
                 'report': 'pos.receipt',
-                'state': 'end'
+                'state': 'finish'
             }
         },
         'paid': {
             'actions': [],
+            'result': {
+                'type': 'print',
+                'report': 'pos.receipt',
+                'state': 'finish'
+            }
+        },
+        'finish': {
+            'actions': [_trigger_wkf],
             'result': {
                 'type': 'state',
                 'state': 'end'
diff --git a/addons/point_of_sale/wizard/wizard_pos_payment_report.py b/addons/point_of_sale/wizard/wizard_pos_payment_report.py
new file mode 100644
index 00000000000..1f6ed1afda5
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_pos_payment_report.py
@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import pooler
+import netsvc
+import wizard
+import time
+
+
+class wizard_pos_payment_report(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'print', 'report':'pos.payment.report', 'state':'end'}
+             },
+    }
+
+wizard_pos_payment_report('pos.payment.report')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/wizard_pos_payment_report_date.py b/addons/point_of_sale/wizard/wizard_pos_payment_report_date.py
new file mode 100644
index 00000000000..570b6de9ad7
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_pos_payment_report_date.py
@@ -0,0 +1,64 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import pooler
+import netsvc
+import wizard
+import time
+
+pos_payment_report_date_form= """<?xml version="1.0"?>
+<form string="Sale by User">
+     <field name="date_start" />
+     <field name="date_end"/>
+     <field name="user_id"/>
+</form>
+"""
+
+pos_payment_report_date_field= {
+
+    'date_start': {'string':'Start Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
+    'date_end': {'string':'End Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
+    'user_id': {'string': 'Salesman', 'type': 'many2many', 'relation': 'res.users', 'required': True},
+}
+
+
+class wizard_pos_payment_report_date(wizard.interface):
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'form',
+                    'arch' : pos_payment_report_date_form,
+                    'fields' : pos_payment_report_date_field,
+                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
+        },
+        'print_report' : {
+            'actions' : [],
+            'result' : {'type' : 'print',
+                   'report':'pos.payment.report.date',
+                    'state' : 'end'}
+        },
+    }
+
+wizard_pos_payment_report_date('pos.payment.report.date')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/wizard_pos_payment_report_user.py b/addons/point_of_sale/wizard/wizard_pos_payment_report_user.py
new file mode 100644
index 00000000000..aaad1d328c5
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_pos_payment_report_user.py
@@ -0,0 +1,66 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+import time
+import ir
+from mx import DateTime
+import datetime
+import pooler
+from tools import config
+import wizard
+import netsvc
+
+
+pos_payment_report_user_form= """<?xml version="1.0"?>
+<form string="Sale by User">
+     <field name="user_id" />
+
+</form>
+"""
+
+pos_payment_report_user_field= {
+
+    'user_id': {'string': 'Salesman', 'type': 'many2many', 'relation': 'res.users', 'required': True},
+
+}
+
+
+class wizard_pos_payment_report_user(wizard.interface):
+
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'form',
+                    'arch' : pos_payment_report_user_form,
+                    'fields' : pos_payment_report_user_field,
+                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
+        },
+        'print_report' : {
+            'actions' : [],
+            'result' : {'type' : 'print',
+                   'report':'pos.payment.report.user',
+                    'state' : 'end'}
+        },
+    }
+wizard_pos_payment_report_user('pos.payment.report.user')
diff --git a/addons/point_of_sale/wizard/wizard_pos_sales_user.py b/addons/point_of_sale/wizard/wizard_pos_sales_user.py
new file mode 100644
index 00000000000..35b83148bbd
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_pos_sales_user.py
@@ -0,0 +1,69 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+import time
+import ir
+from mx import DateTime
+import datetime
+import pooler
+from tools import config
+import wizard
+import netsvc
+
+
+sale_forecast_res_form= """<?xml version="1.0"?>
+<form string="Sale by User">
+     <field name="date_start" />
+     <field name="date_end" />
+     <field name="user_id" />
+
+</form>
+"""
+
+sale_forecast_res_field= {
+    'date_start': {'string':'Start Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
+    'date_end': {'string':'End Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
+    'user_id': {'string': 'Salesman', 'type': 'many2many', 'relation': 'res.users', 'required': True},
+
+}
+
+
+class wizard_pos_sales_user(wizard.interface):
+
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'form',
+                    'arch' : sale_forecast_res_form,
+                    'fields' : sale_forecast_res_field,
+                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
+        },
+        'print_report' : {
+            'actions' : [],
+            'result' : {'type' : 'print',
+                   'report':'pos.sales.user',
+                    'state' : 'end'}
+        },
+    }
+wizard_pos_sales_user('pos.sales.user')
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/wizard_pos_sales_user_current_user.py b/addons/point_of_sale/wizard/wizard_pos_sales_user_current_user.py
new file mode 100644
index 00000000000..a76c0c97b59
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_pos_sales_user_current_user.py
@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import pooler
+import netsvc
+import wizard
+import time
+
+
+class wizard_pos_sales_user_today_current_user(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'print', 'report':'pos.sales.user.today.current.user', 'state':'end'}
+             },
+    }
+
+wizard_pos_sales_user_today_current_user('pos.sales.user.today.current.user')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/wizard_pos_sales_user_today.py b/addons/point_of_sale/wizard/wizard_pos_sales_user_today.py
new file mode 100644
index 00000000000..58d990ef4bc
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_pos_sales_user_today.py
@@ -0,0 +1,66 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+import time
+import ir
+from mx import DateTime
+import datetime
+import pooler
+from tools import config
+import wizard
+import netsvc
+
+
+sale_pos_res_form= """<?xml version="1.0"?>
+<form string="Sale by User">
+     <field name="user_id" />
+
+</form>
+"""
+
+sale_pos_res_field= {
+   
+    'user_id': {'string': 'Salesman', 'type': 'many2many', 'relation': 'res.users', 'required': True},
+
+}
+
+
+class wizard_pos_sales_user_today(wizard.interface):
+
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'form',
+                    'arch' : sale_pos_res_form,
+                    'fields' : sale_pos_res_field,
+                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
+        },
+        'print_report' : {
+            'actions' : [],
+            'result' : {'type' : 'print',
+                   'report':'pos.sales.user.today',
+                    'state' : 'end'}
+        },
+    }
+wizard_pos_sales_user_today('pos.sales.user.today')
diff --git a/addons/point_of_sale/wizard/wizard_receipt.py b/addons/point_of_sale/wizard/wizard_receipt.py
new file mode 100644
index 00000000000..64e8a2e5685
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_receipt.py
@@ -0,0 +1,49 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+#import time
+#import netsvc
+#from tools.misc import UpdateableStr
+#import pooler
+import wizard
+import pooler
+from tools.translate import _
+
+def _check(self,cr,uid,data,*a):
+    pool = pooler.get_pool(cr.dbname)
+    order_lst = pool.get('pos.order').browse(cr,uid,data['ids'])
+    for order in order_lst:
+        if order.state_2 in ('to_verify'):
+            raise wizard.except_wizard('Error!', 'Can not print the receipt because of discount and/or payment ')
+    return data
+
+class print_order_receipt(wizard.interface):
+        states = {
+          'init': {
+              'actions': [_check],
+              'result': {'type':'print', 'report':'pos.receipt', 'state':'end'}
+          }
+      }
+
+print_order_receipt('ord.receipt')
+
diff --git a/addons/point_of_sale/wizard/wizard_refund_order.py b/addons/point_of_sale/wizard/wizard_refund_order.py
index e20788bccca..188e7b47690 100644
--- a/addons/point_of_sale/wizard/wizard_refund_order.py
+++ b/addons/point_of_sale/wizard/wizard_refund_order.py
@@ -1,93 +1,232 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 
-#import time
-#import netsvc
-#from tools.misc import UpdateableStr
-#import pooler
+import time
+import netsvc
+from tools.misc import UpdateableStr
 import wizard
 import pooler
+from mx import DateTime
+from tools.translate import _
 
 
-warning_form = '''<?xml version="1.0"?>
-<form string="Refund ">
-<separator string="Refund order :" colspan="4"/>
+entry_form = '''<?xml version="1.0"?>
+<form string="%s">
+<separator string="Please fill these fields for entries to the box:" colspan="4"/>
 <newline/>
-<field name="date_validity"/>
+<field name="name"/>
+<field name="ref"/>
+<field name="journal_id"/>
+<field name="amount"/>
+<field name="product_id"/>
 </form>
 '''
 
-warning_fields = {
-    'date_validity': {'string': 'Validity Date', 'type': 'date'}
+def _get_journal(self,cr,uid,context):
+    pool = pooler.get_pool(cr.dbname)
+    obj = pool.get('account.journal')
+    user = pool.get('res.users').browse(cr, uid, uid)
+    ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', user.company_id.id)])
+    res = obj.read(cr, uid, ids, ['id', 'name'], context)
+    res = [(r['id'], r['name']) for r in res]
+    res.insert(0, ('', ''))
+    return res
+
+def _get_pdt(self,cr,uid,context):
+    pool = pooler.get_pool(cr.dbname)
+    obj = pool.get('product.product')
+    ids = obj.search(cr, uid, [('income_pdt', '=', True)])
+    res = obj.read(cr, uid, ids, ['id', 'name'], context)
+    res = [(r['id'], r['name']) for r in res]
+    res.insert(0, ('', ''))
+    return res
+
+def _get_pdt_exp(self,cr,uid,context):
+    pool = pooler.get_pool(cr.dbname)
+    obj = pool.get('product.product')
+    company_id = pool.get('res.users').browse(cr, uid, uid).company_id.id
+    ids = obj.search(cr, uid, ['&', ('expense_pdt', '=', True), '|', ('company_id', '=', company_id), ('company_id', '=', None)])
+    res = obj.read(cr, uid, ids, ['id', 'name'], context)
+    res = [(r['id'], r['name']) for r in res]
+    res.insert(0, ('', ''))
+    return res
+
+entry_fields = {
+    'journal_id': {'string': 'Journal', 'type': 'selection', 'selection': _get_journal, 'required':True},
+    'product_id': {'string': 'Operation', 'type': 'selection', 'selection':_get_pdt , 'required':True},
+    'amount': {'string': 'Amount', 'type': 'float'},
+    'name': {'string': 'Name', 'type': 'char', 'size': '32', 'required':True},
+    'ref': {'string': 'Ref.', 'type': 'char', 'size': '32'},
+
 }
 
+out_fields = {
+    'journal_id': {'string': 'Journal', 'type': 'selection', 'selection': _get_journal, 'required':True},
+    'product_id': {'string': 'Operation', 'type': 'selection', 'selection':_get_pdt_exp , 'required':True},
+    'amount': {'string': 'Amount', 'type': 'float'},
+    'name': {'string': 'Name', 'type': 'char', 'size': '32', 'required':True},
+    'ref': {'string': 'Ref.', 'type': 'char', 'size': '32'},
+}
 
-def _get_date(self, cr, uid, data, context):
-    order_ref = pooler.get_pool(cr.dbname).get('pos.order')
-    order = order_ref.browse(cr, uid, data['id'], context)
-    return {'date_validity': order.date_validity}
+def _get_out(self, cr, uid, data, context):
+    args = {}
+    pool = pooler.get_pool(cr.dbname)
+    statement_obj= pool.get('account.bank.statement')
+    product_obj= pool.get('product.template')
+    productp_obj= pool.get('product.product')
+    res_obj = pool.get('res.users')
+    curr_company = res_obj.browse(cr,uid,uid).company_id.id
+    statement_id = statement_obj.search(cr,uid, [('journal_id','=',data['form']['journal_id']),('company_id','=',curr_company),('user_id','=',uid),('state','=','open')])
+    monday = (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Monday,0))).strftime('%Y-%m-%d')
+    sunday = (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Sunday,0))).strftime('%Y-%m-%d')
+    done_statmt = statement_obj.search(cr,uid, [('date','>=',monday+' 00:00:00'),('date','<=',sunday+' 23:59:59'),('journal_id','=',data['form']['journal_id']),('company_id','=',curr_company),('user_id','=',uid)])
+    stat_done = statement_obj.browse(cr,uid, done_statmt)
+    address_u = pool.get('res.users').browse(cr,uid,uid).address_id
+    am = 0.0
+    amount_check = productp_obj.browse(cr,uid,data['form']['product_id']).am_out or False
+    for st in stat_done:
+        for s in st.line_ids:
+            if address_u and s.partner_id==address_u.partner_id and s.am_out:
+                am+=s.amount
+    if (-data['form']['amount'] or 0.0)+ am <-(res_obj.browse(cr,uid,uid).company_id.max_diff or 0.0) and amount_check:
+        val = (res_obj.browse(cr,uid,uid).company_id.max_diff or 0.0)+ am
+        raise wizard.except_wizard(_('Error !'), _('The maximum value you can still withdraw is exceeded. \n Remaining value is equal to %d ')%(val))
 
+    acc_id = product_obj.browse(cr,uid,data['form']['product_id']).property_account_income
+    if not acc_id:
+        raise wizard.except_wizard(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr,uid,data['form']['product_id']).name))
+    if not statement_id:
+        raise wizard.except_wizard(_('Error !'), _('You have to open at least one cashbox'))
+    if statement_id:
+        statement_id = statement_id[0]
+    if not statement_id:
+        statement_id = statement_obj.create(cr,uid,{'date':time.strftime('%Y-%m-%d 00:00:00'),
+                                        'journal_id':data['form']['journal_id'],
+                                        'company_id':curr_company,
+                                        'user_id':uid,
+                                        })
+    args['statement_id']= statement_id
+    args['journal_id']= data['form']['journal_id']
+    if acc_id:
+        args['account_id']= acc_id.id
+    amount= data['form']['amount'] or 0.0
+    if data['form']['amount'] > 0:
+        amount= -data['form']['amount']
+    args['amount'] = amount
+    if productp_obj.browse(cr,uid,data['form']['product_id']).am_out:
+        args['am_out'] = True
+    args['ref'] = data['form']['ref'] or ''
+    args['name'] = "%s: %s "%(product_obj.browse(cr,uid,data['form']['product_id']).name, data['form']['name'].decode('utf8'))
+    address_u = pool.get('res.users').browse(cr,uid,uid).address_id
+    if address_u:
+        partner_id = address_u.partner_id and address_u.partner_id.id or None
+        args['partner_id'] = partner_id
+    statement_line_id = pool.get('account.bank.statement.line').create(cr, uid, args)
+    return {}
 
-def _refunding(self, cr, uid, data, context):
-    order_ref = pooler.get_pool(cr.dbname).get('pos.order')
-    clone_list = order_ref.refund(cr, uid, data['ids'], context)
+def _get_in(self, cr, uid, data, context):
+    args = {}
+    pool = pooler.get_pool(cr.dbname)
+    statement_obj = pool.get('account.bank.statement')
+    product_obj = pool.get('product.template')
+    res_obj = pool.get('res.users')
+    curr_company = res_obj.browse(cr,uid,uid).company_id.id
+    statement_id = statement_obj.search(cr,uid, [('journal_id','=',data['form']['journal_id']),('company_id','=',curr_company),('user_id','=',uid),('state','=','open')])
+    if not statement_id:
+        raise wizard.except_wizard(_('Error !'), _('You have to open at least one cashbox'))
 
-    if data['form']['date_validity']:
-        order_ref.write(cr, uid, clone_list, {
-            'date_validity': data['form']['date_validity']
-            })
+    product = pool.get('product.product').browse(cr, uid, data['form']['product_id'])
+    acc_id = product_obj.browse(cr,uid,data['form']['product_id']).property_account_income
+    if not acc_id:
+        raise wizard.except_wizard(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr,uid,data['form']['product_id']).name))
+    if statement_id:
+        statement_id = statement_id[0]
+    if not statement_id:
+        statement_id = statement_obj.create(cr,uid,{'date':time.strftime('%Y-%m-%d 00:00:00'),
+                                                    'journal_id':data['form']['journal_id'],
+                                                    'company_id':curr_company,
+                                                    'user_id':uid,
+                                                   })
 
-    return {
-        'domain': "[('id','in',["+','.join(map(str, clone_list))+"])]",
-        'name': 'Refunded Orders',
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'res_model': 'pos.order',
-        'view_id': False,
-        #'context': "{'journal_id':%d}" % (form['journal_id'],),
-        'type': 'ir.actions.act_window'
-    }
+    args['statement_id'] = statement_id
+    args['journal_id'] =  data['form']['journal_id']
+    if acc_id:
+        args['account_id'] =  acc_id.id
+    args['amount'] = data['form']['amount'] or 0.0
+    args['ref'] = "%s" %(data['form']['ref'] or '')
+    args['name'] = "%s: %s "% (product_obj.browse(cr,uid,data['form']['product_id']).name, data['form']['name'].decode('utf8'))
+    address_u = pool.get('res.users').browse(cr,uid,uid).address_id
+    if address_u:
+        partner_id = address_u.partner_id and address_u.partner_id.id or None
+        args['partner_id'] = partner_id
+    statement_line_id = pool.get('account.bank.statement.line').create(cr, uid, args)
 
+    return {}
 
-class refund_order(wizard.interface):
+class box_entries(wizard.interface):
     states = {
         'init': {
-            'actions': [_get_date],
+            'actions': [],
             'result': {
                 'type': 'form',
-                'arch': warning_form,
-                'fields': warning_fields,
-                'state': [('end', 'Cancel', 'gtk-no'), ('refund_n_quit', 'Ok', 'gtk-yes')]
+                'arch': entry_form % u'Entrée de caisse',
+                'fields': entry_fields,
+                'state': [('end', 'Cancel', 'gtk-cancel'), ('next', 'Make entries in the Cashbox', 'gtk-ok')]
             }
         },
-        'refund_n_quit': {
+        'next': {
             'actions': [],
             'result': {
                 'type': 'action',
-                'action': _refunding,
+                'action': _get_in,
                 'state': 'end'
             }
         },
     }
 
-refund_order('pos.refund_order')
+box_entries('pos.entry')
+
+class box_out(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {
+                'type': 'form',
+                'arch': entry_form % u'Sortie de caisse',
+                'fields': out_fields,
+                'state': [('end', 'Cancel', 'gtk-cancel'), ('next', 'Make Entries in the CashBox', 'gtk-ok')]
+            }
+        },
+        'next': {
+            'actions': [],
+            'result': {
+                'type': 'action',
+                'action': _get_out,
+                'state': 'end'
+            }
+        },
+    }
+
+box_out('pos.out')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/wizard_return.py b/addons/point_of_sale/wizard/wizard_return.py
new file mode 100644
index 00000000000..591fd00b18a
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_return.py
@@ -0,0 +1,546 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import pooler
+from tools.misc import UpdateableStr
+
+import netsvc
+import time
+
+from tools.translate import _
+from decimal import Decimal
+
+
+arch=UpdateableStr()
+fields={}
+
+
+def _get_journal(self, cr, uid, context):
+    pool = pooler.get_pool(cr.dbname)
+    obj = pool.get('account.journal')
+    c=pool.get('res.users').browse(cr,uid,uid).company_id.id
+    ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id','=',c)])
+    res = obj.read(cr, uid, ids, ['id', 'name'], context)
+    res = [(r['id'], r['name']) for r in res]
+    return res
+
+
+payment_form = """<?xml version="1.0"?>
+<form string="Add payment :">
+    <field name="amount" />
+    <field name="journal"/>
+    <field name="payment_date" />
+    <field name="payment_name" />
+    <field name="invoice_wanted" />
+    <field name="num_sale" />
+</form>
+"""
+
+payment_fields = {
+    'amount': {'string': 'Amount', 'type': 'float', 'required': True},
+    'invoice_wanted': {'string': 'Invoice', 'type': 'boolean'},
+    'journal': {'string': 'Journal',
+            'type': 'selection',
+            'selection': _get_journal,
+            'required': True,
+        },
+    'payment_date': {'string': 'Payment date', 'type': 'date', 'required': True},
+    'payment_name': {'string': 'Payment name', 'type': 'char', 'size': '32', 'required':True, 'default':'Payment'},
+    'num_sale': {'string': 'Num.Cof', 'type': 'char', 'size': '32'},
+    }
+
+
+def _pre_init(self, cr, uid, data, context):
+    def _get_journal(pool, order):
+        j_obj = pool.get('account.journal')
+
+        journal_to_fetch = 'DEFAULT'
+        if order.amount_total < 0:
+            journal_to_fetch = 'GIFT'
+        else:
+            if order.amount_paid > 0:
+                journal_to_fetch = 'REBATE'
+
+        pos_config_journal = pool.get('pos.config.journal')
+        ids = pos_config_journal.search(cr, uid, [('code', '=', journal_to_fetch)])
+        objs = pos_config_journal.browse(cr, uid, ids)
+        journal=''
+        if objs:
+            journal = objs[0].journal_id.id
+        else:
+            existing = [payment.journal_id.id for payment in order.payments]
+            ids = j_obj.search(cr, uid, [('type', '=', 'cash')])
+            for i in ids:
+                if i not in existing:
+                    journal = i
+                    break
+            if not journal:
+                journal = ids and ids[0]
+        return journal
+    pool = pooler.get_pool(cr.dbname)
+    order = pool.get('pos.order').browse(cr, uid, data['id'], context)
+    # get amount to pay:
+#    amount = Decimal(str(order.amount_total)) - Decimal(str(order.amount_paid))
+    amount = order.amount_total - order.amount_paid
+    if amount <= 0:
+        pool.get('pos.order').action_paid(cr, uid, data['ids'], context)
+
+    # get journal:
+    journal = _get_journal(pool, order)
+
+    # check if an invoice is wanted:
+    #invoice_wanted_checked = not not order.partner_id # not not -> boolean
+    invoice_wanted_checked = False
+
+    # select the current date
+    current_date = time.strftime('%Y-%m-%d')
+
+    return {'journal': journal, 'amount': amount, 'invoice_wanted': invoice_wanted_checked, 'payment_date': current_date}
+
+
+def _add_pay(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('pos.order')
+    jrnl_obj = pool.get('account.journal')
+    result = data['form']
+    invoice_wanted = data['form']['invoice_wanted']
+    jrnl_used=False
+    if data['form'] and data['form'].get('journal',False):
+        jrnl_used=jrnl_obj.browse(cr,uid,data['form']['journal'])
+
+    # add 'invoice_wanted' in 'pos.order'
+    order_obj.write(cr, uid, [data['id']], {'invoice_wanted': invoice_wanted})
+
+    order_obj.add_payment(cr, uid, data['id'], result, context=context)
+    return {}
+
+
+def _check(self, cr, uid, data, context):
+    """Check the order:
+    if the order is not paid: continue payment,
+    if the order is paid print invoice (if wanted) or ticket.
+    """
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('pos.order')
+    order = order_obj.browse(cr, uid, data['id'], context)
+    order_obj.test_order_lines(cr, uid, order, context=context)
+
+    action = 'ask_pay'
+    if order.state == 'paid':
+        if order.partner_id:
+            if order.invoice_wanted:
+                action = 'invoice'
+            else:
+                action = 'paid'
+        elif order.date_payment:
+            action = 'receipt'
+        else:
+            action='paid'
+
+    if order.amount_total == order.amount_paid:
+        order_obj.write(cr,uid,data['ids'],{'state':'done'})
+        action = 'receipt'
+
+    return action
+
+
+def create_invoice(self, cr, uid, data, context):
+    wf_service = netsvc.LocalService("workflow")
+    for i in data['ids']:
+        wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
+    return {}
+
+
+
+_form = """<?xml version="1.0"?>
+<form string="Add product :">
+<field name="product"/>
+<field name="quantity"/>
+</form>
+"""
+_fields = {
+    'product': {
+        'string': 'Product',
+        'type': 'many2one',
+        'relation': 'product.product',
+        'required': True,
+        'default': False
+    },
+
+    'quantity': {
+        'string': 'Quantity',
+        'type': 'integer',
+        'required': True,
+        'default': 1},
+    }
+
+def make_default(val):
+    def fct(obj, cr, uid):
+        return val
+    return fct
+
+def _get_returns(self, cr, uid, data, context):
+
+    pool = pooler.get_pool(cr.dbname)
+    order_obj=pool.get('pos.order')
+    order=order_obj.browse(cr, uid, [data['id']])[0]
+    res={}
+    fields.clear()
+    arch_lst=['<?xml version="1.0"?>', '<form string="%s">' % _('Return lines'), '<label string="%s" colspan="4"/>' % _('Quantities you enter, match to products that will return to the stock.')]
+    for m in [line for line in order.lines]:
+        quantity=m.qty
+        arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
+        fields['return%s' % m.id]={'string':m.product_id.name, 'type':'float', 'required':True, 'default':quantity}
+        res.setdefault('returns', []).append(m.id)
+    arch_lst.append('</form>')
+    arch.string='\n'.join(arch_lst)
+    return res
+
+def _create_returns(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('pos.order')
+    lines_obj = pool.get('pos.order.line')
+    picking_obj = pool.get('stock.picking')
+    stock_move_obj = pool.get('stock.move')
+    move_obj = pool.get('stock.move')
+    picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', data['ids']), ('state', '=', 'done')])
+    clone_list = []
+    date_cur=time.strftime('%Y-%m-%d')
+    uom_obj = pool.get('product.uom')
+    wf_service = netsvc.LocalService("workflow")
+    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
+        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
+        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
+        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+        res=cr.fetchone()
+        location_id=res and res[0] or None
+        stock_dest_id = int(val.split(',')[1])
+
+        order_obj.write(cr,uid,[order_id.id],{'type_rec':'Exchange'})
+        if order_id.invoice_id:
+            pool.get('account.invoice').refund(cr, uid, [order_id.invoice_id.id],time.strftime('%Y-%m-%d'), False, order_id.name)
+        new_picking=picking_obj.create(cr,uid,{
+                                'name':'%s (return)' %order_id.name,
+                                'move_lines':[], 'state':'draft',
+                                'type':'in',
+                                'date':date_cur,   })
+        for line in order_id.lines:
+            for r in data['form'].get('returns',[]):
+                if line.id==r and (data['form']['return%s' %r]!=0.0):
+                    new_move=stock_move_obj.create(cr, uid,{
+                        'product_qty': data['form']['return%s' %r],
+                        'product_uos_qty': uom_obj._compute_qty(cr, uid,data['form']['return%s' %r] ,line.product_id.uom_id.id),
+                        'picking_id':new_picking,
+                        'product_uom':line.product_id.uom_id.id,
+                        'location_id':location_id,
+                        'product_id':line.product_id.id,
+                        'location_dest_id':stock_dest_id,
+                        'name':'%s (return)' %order_id.name,
+                        'date':date_cur,
+                        'date_planned':date_cur,})
+                    lines_obj.write(cr,uid,[line.id],{'qty_rfd':(line.qty or 0.0) + data['form']['return%s' %r],
+                                                    'qty':line.qty-(data['form']['return%s' %r] or 0.0)
+                    })
+        wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
+        picking_obj.force_assign(cr, uid, [new_picking], context)
+    return res
+
+def _create_returns2(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('pos.order')
+    line_obj = pool.get('pos.order.line')
+    picking_obj = pool.get('stock.picking')
+    stock_move_obj = pool.get('stock.move')
+    picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', data['ids']), ('state', '=', 'done')])
+    clone_list = []
+    date_cur=time.strftime('%Y-%m-%d')
+    uom_obj = pool.get('product.uom')
+    wf_service = netsvc.LocalService("workflow")
+    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
+        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
+        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
+        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+        res=cr.fetchone()
+        location_id=res and res[0] or None
+        stock_dest_id = int(val.split(',')[1])
+
+        new_picking=picking_obj.copy(cr, uid, order_id.last_out_picking.id, {'name':'%s (return)' % order_id.name,
+                                                                            'move_lines':[], 'state':'draft', 'type':'in',
+                                                                            'type':'in',
+                                                                            'date':date_cur,   })
+        new_order=order_obj.copy(cr,uid,order_id.id, {'name': 'Refund %s'%order_id.name,
+                                                      'lines':[],
+                                                      'statement_ids':[],
+                                                      'last_out_picking':[]})
+        for line in order_id.lines:
+            for r in data['form'].get('returns',[]):
+                if line.id==r and (data['form']['return%s' %r]!=0.0):
+                    new_move=stock_move_obj.create(cr, uid,{
+                        'product_qty': data['form']['return%s' %r],
+                        'product_uos_qty': uom_obj._compute_qty(cr, uid,data['form']['return%s' %r] ,line.product_id.uom_id.id),
+                        'picking_id':new_picking,
+                        'product_uom':line.product_id.uom_id.id,
+                        'location_id':location_id,
+                        'product_id':line.product_id.id,
+                        'location_dest_id':stock_dest_id,
+                        'name':'%s (return)' %order_id.name,
+                        'date':date_cur,
+                        'date_planned':date_cur,})
+                    line_obj.copy(cr,uid,line.id,{'qty':-data['form']['return%s' %r],
+                                                'order_id': new_order,
+                    })
+        order_obj.write(cr,uid, new_order, {'state':'done'})
+        wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
+        picking_obj.force_assign(cr, uid, [new_picking], context)
+    act = {
+        'domain': "[('id', 'in', ["+str(new_order)+"])]",
+        'name': 'Refunded Orders',
+        'view_type': 'form',
+        'view_mode': 'form,tree',
+        'res_model': 'pos.order',
+        'auto_refresh':0,
+        'res_id':new_order,
+        'view_id': False,
+        'type': 'ir.actions.act_window'
+    }
+    return act
+def test(self,cr,uid,data,context={}):
+  #  import pdb; pdb.set_trace()
+    data['id']=data['res_id']
+    return {'id':data['res_id']}
+
+#def _raise(self,cr,uid,data,context={}):
+#    return datas
+#    raise wizard.except_wizard(_('Message'),_('You can not exchange products more than total paid amount.'))
+
+
+#def _test_exist1(self,cr,uid,data,context={}):
+#    return 'choice'
+
+def _test_exist(self,cr,uid,data,context={}):
+#    order_obj= pooler.get_pool(cr.dbname).get('pos.order')
+#    order_line_obj= pooler.get_pool(cr.dbname).get('pos.order.line')
+#    obj=order_obj.browse(cr,uid, data['ids'])[0]
+#    am_tot=obj._amount_total(cr, uid, data['ids'])
+#    order_obj.write(cr,uid,data['ids'],{'state':'done'})
+#    if obj.amount_total == obj.amount_paid:
+#        return 'receipt'
+#    elif obj.amount_total > obj.amount_paid:
+#        sql = """select max(id) from pos_order_line where order_id = %d """%(obj.id)
+#        cr.execute(sql)
+#        res = cr.fetchone()
+#        cr.execute("delete from pos_order_line where id = %d"%(res[0]))
+#        cr.commit()
+#        return 'choice_raise'
+#    else:
+    return 'add_p'
+
+def _close(self,cr,uid,data,context={}):
+    order_obj= pooler.get_pool(cr.dbname).get('pos.order')
+    order_line_obj= pooler.get_pool(cr.dbname).get('pos.order.line')
+    obj=order_obj.browse(cr,uid, data['ids'])[0]
+    order_obj.write(cr,uid,data['ids'],{'state':'done'})
+    if obj.amount_total != obj.amount_paid:
+        return 'ask_pay'
+    else :
+        return 'receipt'
+
+
+
+
+def _add_pdct(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('pos.order')
+    line_obj = pool.get('pos.order.line')
+    picking_obj = pool.get('stock.picking')
+    wf_service = netsvc.LocalService("workflow")
+    prod_obj = pool.get('product.product')
+    stock_move_obj = pool.get('stock.move')
+    uom_obj = pool.get('product.uom')
+    date_cur=time.strftime('%Y-%m-%d')
+    order_obj.add_product(cr, uid, data['id'], data['form']['product'],
+                            data['form']['quantity'], context=context)
+    cr.commit()
+    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
+        prod=data['form']['product']
+        qty=data['form']['quantity']
+        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
+        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
+        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+        res=cr.fetchone()
+        location_id=res and res[0] or None
+        stock_dest_id = int(val.split(',')[1])
+
+        prod_id=prod_obj.browse(cr,uid,prod)
+        new_picking=picking_obj.create(cr,uid,{
+                                'name':'%s (Added)' %order_id.name,
+                                'move_lines':[],
+                                'state':'draft',
+                                'type':'out',
+                                'date':date_cur,   })
+        new_move=stock_move_obj.create(cr, uid,{
+                        'product_qty': qty,
+                        'product_uos_qty': uom_obj._compute_qty(cr, uid,prod_id.uom_id.id, qty, prod_id.uom_id.id),
+                        'picking_id':new_picking,
+                        'product_uom':prod_id.uom_id.id,
+                        'location_id':location_id,
+                        'product_id':prod_id.id,
+                        'location_dest_id':stock_dest_id,
+                        'name':'%s (return)' %order_id.name,
+                        'date':date_cur,
+                        'date_planned':date_cur,})
+
+        wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
+        picking_obj.force_assign(cr, uid, [new_picking], context)
+       # order_obj.write(cr,uid,data['id'],{'state':'done','last_out_picking':new_picking})
+        order_obj.write(cr,uid,data['id'],{'last_out_picking':new_picking})
+    return {}
+
+
+
+
+class wizard_return_picking(wizard.interface):
+    states={
+        'init':{
+            'actions':[_get_returns],
+            'result':{'type':'form',
+                    'arch':arch,
+                    'fields':fields,
+                    'state':[('end','Cancel', 'gtk-cancel'),('return','Return goods and Exchange', 'gtk-ok'),('return_w','Return without Refund','gtk-ok')]
+                    }
+        },
+        'return':{
+            'actions':[],
+            'result':{ 'type': 'action',
+                       'action' : _create_returns,
+                       'state':'prod'}
+        },
+        'prod':{
+            'actions':[],
+            'result': {
+                'type': 'form',
+                'arch': _form,
+                'fields':_fields,
+                'state': [('close','Close'),('choice','Continue')]
+            }
+        },
+#        'choice1' : {
+#            'actions' : [_add_pdct],
+#            'result' : {'type' : 'choice', 'next_state': _test_exist1 }
+#        },
+        'choice' : {
+            'actions' : [],
+            'result' : {'type' : 'choice', 'next_state': _test_exist }
+        },
+#        'choice_raise':{
+#                        'actions':[],
+#            'result':{ 'type': 'action',
+#                       'action' : _raise,
+#                       'state':'end'}
+#        },
+        'add_p' :{
+            'actions':[],
+            'result':{
+            'type':'action',
+            'action': _add_pdct,
+            'state': 'prod'}
+        },
+#        'add_pp' :{
+#            'actions':[],
+#            'result':{
+#            'type':'action',
+#            'action': _add_pdct,
+#            'state': 'end'}
+#        },
+        'receipt':{
+            'result': {
+                'type': 'print',
+                'report': 'pos.receipt',
+                'state': 'end'
+            }
+        },
+        'return_w':{
+            'actions':[],
+            'result':{'type':'action', 'action':_create_returns2, 'state':'end'}
+        },
+
+        'close':{
+            'actions' : [],
+            'result' : {'type' : 'choice', 'next_state': _close }
+        },
+
+       'check': {
+            'actions': [],
+            'result': {
+                'type': 'choice',
+                'next_state': _check,
+            }
+        },
+
+        'ask_pay': {
+            'actions': [_pre_init],
+            'result': {
+                'type': 'form',
+                'arch': payment_form,
+                'fields': payment_fields,
+                'state': (('end', 'Cancel'), ('add_pay', 'Ma_ke payment', 'gtk-ok', True)
+                         )
+            }
+        },
+        'add_pay': {
+            'actions': [_add_pay],
+            'result': {
+                'type': 'state',
+                'state': "check",
+            }
+        },
+
+
+        'invoice': {
+            'actions': [create_invoice],
+            'result': {
+                'type': 'print',
+                'report': 'pos.invoice',
+                'state': 'end'
+            }
+        },
+        'receipt': {
+            'actions': [],
+            'result': {
+                'type': 'print',
+                'report': 'pos.receipt',
+                'state': 'end'
+            }
+        },
+        'paid': {
+            'actions': [],
+            'result': {
+                'type': 'state',
+                'state': 'end'
+            }
+        },
+
+    }
+wizard_return_picking('pos.return.picking')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/wizard_scan_product.py b/addons/point_of_sale/wizard/wizard_scan_product.py
index 64180a626a2..40a8a5b1246 100644
--- a/addons/point_of_sale/wizard/wizard_scan_product.py
+++ b/addons/point_of_sale/wizard/wizard_scan_product.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    Copyright (c) 2008 Sylëam Info Services. (http://www.syleam.fr) All Rights Reserved.
 #
 #    This program is free software: you can redistribute it and/or modify
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index cee6d9ac2e2..b0f7ca4df52 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -151,14 +151,14 @@
         <!--<menuitem id="menu_all_project" parent="project.menu_main" name="Projects"/> -->
 
         <record id="open_view_project_all" model="ir.actions.act_window">
-            <field name="name">All projects</field>
+            <field name="name">Projects</field>
             <field name="res_model">project.project</field>
             <field name="view_type">form</field>
             <field name="domain">[]</field>
             <field name="view_id" ref="view_project"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
         </record>
-        <!--<menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_all_project"/> -->
+        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
 
         <record id="open_view_template_project" model="ir.actions.act_window">
             <field name="name">Templates of Projects</field>
@@ -503,7 +503,7 @@
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
         <!--<menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_tasks"/> -->
-		<menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" name="Tasks"/>
+		<menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" name="Tasks" sequence="2"/>
 
         <record id="action_view_task_overpassed_draft" model="ir.actions.act_window">
             <field name="name">Overpassed Tasks</field>
diff --git a/addons/project_long_term/project_view.xml b/addons/project_long_term/project_view.xml
index eb968e38312..b2219f8f281 100644
--- a/addons/project_long_term/project_view.xml
+++ b/addons/project_long_term/project_view.xml
@@ -92,10 +92,9 @@
         res_model="project.task"
         src_model="project.phase"
         view_mode="tree,form"
-        domain="[('phase_id','=',active_id)]"/>
-        
-        <menuitem id="project.menu_all_project" parent="project.menu_main" name="Projects"/>
-        <menuitem action="act_project_phase" id="menu_project_phase" parent="project.menu_all_project"/>
+        domain="[('phase_id','=',active_id)]"/>        
+
+        <menuitem action="act_project_phase" id="menu_project_phase" parent="project.menu_project_management" sequence="4"/>
 
 
     </data>
diff --git a/addons/purchase_tender/__init__.py b/addons/purchase_tender/__init__.py
new file mode 100644
index 00000000000..68f1f7ae5bc
--- /dev/null
+++ b/addons/purchase_tender/__init__.py
@@ -0,0 +1,22 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+import purchase_tender
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/purchase_tender/__terp__.py b/addons/purchase_tender/__terp__.py
new file mode 100644
index 00000000000..723ec148162
--- /dev/null
+++ b/addons/purchase_tender/__terp__.py
@@ -0,0 +1,37 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+{
+    "name" : "Purchase - Purchase Tender",
+    "version" : "0.1",
+    "author" : "Tiny",
+    "category" : "Generic Modules/Purchase",
+    "website" : "http://www.openerp.com",
+    "description": """ This module allows you to manage your Purchase Tenders. When a purchase order is created, you now have the opportunity to save the related tender. 
+    This new object will regroup and will allow you to easily keep track and order all your purchase orders.
+""",
+    "depends" : ["purchase"],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : ["purchase_tender_view.xml","purchase_tender_sequence.xml"],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/purchase_tender/i18n/fr_BE.po b/addons/purchase_tender/i18n/fr_BE.po
new file mode 100644
index 00000000000..5b9c10ca2cb
--- /dev/null
+++ b/addons/purchase_tender/i18n/fr_BE.po
@@ -0,0 +1,134 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_tender
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-25 14:07:40+0000\n"
+"PO-Revision-Date: 2009-11-25 14:07:40+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: purchase_tender
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML incorrect pour l'Architecture des Vues!"
+
+#. module: purchase_tender
+#: field:purchase.tender,date_end:0
+msgid "Date End"
+msgstr "Date de fin"
+
+#. module: purchase_tender
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr "Le nom de l'Objet doit commencer par x_ et ne pas comporter de caractères spéciaux !"
+
+#. module: purchase_tender
+#: view:purchase.tender:0
+#: field:purchase.tender,description:0
+msgid "Description"
+msgstr "Description"
+
+#. module: purchase_tender
+#: model:ir.model,name:purchase_tender.model_purchase_tender
+#: field:purchase.order,tender_id:0
+#: view:purchase.tender:0
+msgid "Purchase Tender"
+msgstr "Appel d'Offre"
+
+#. module: purchase_tender
+#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender
+#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1
+#: model:ir.ui.menu,name:purchase_tender.menu_purchase_tender
+msgid "Purchase Tenders"
+msgstr "Appels d'offre"
+
+#. module: purchase_tender
+#: selection:purchase.tender,state:0
+msgid "Open"
+msgstr "Ouvert"
+
+#. module: purchase_tender
+#: field:purchase.tender,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: purchase_tender
+#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender_draft
+#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1_draft
+msgid "Draft Purchase Tenders"
+msgstr "Appels d'Offre brouillons"
+
+#. module: purchase_tender
+#: field:purchase.tender,state:0
+msgid "State"
+msgstr "Etat"
+
+#. module: purchase_tender
+#: selection:purchase.tender,state:0
+msgid "Draft"
+msgstr "Brouillon"
+
+#. module: purchase_tender
+#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender_open
+#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1_open
+msgid "Open Purchase Tenders"
+msgstr "Appels d'offre ouverts"
+
+#. module: purchase_tender
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom de modèle incorrect pour la définition de l'action"
+
+#. module: purchase_tender
+#: model:ir.module.module,shortdesc:purchase_tender.module_meta_information
+msgid "Purchase - Purchase Tender"
+msgstr "Achat - Appel d'offre"
+
+#. module: purchase_tender
+#: field:purchase.tender,name:0
+msgid "Tender Reference"
+msgstr "Référence"
+
+#. module: purchase_tender
+#: selection:purchase.tender,state:0
+msgid "Close"
+msgstr "Clôturé"
+
+#. module: purchase_tender
+#: field:purchase.tender,date_start:0
+msgid "Date Start"
+msgstr "Date de début"
+
+#. module: purchase_tender
+#: view:purchase.tender:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase_tender
+#: model:ir.module.module,description:purchase_tender.module_meta_information
+msgid " This module allows you to manage your Purchase Tenders. When a purchase order is created, you now have the opportunity to save the related tender. \n"
+"    This new object will regroup and will allow you to easily keep track and order all your purchase orders.\n"
+""
+msgstr "Ce module vous permet de gérer des appels d'offre. Quand un appel d'offre est créé, vous avez maintenant l'opportunité de conserver une trace. \n"
+"    Ce nouvel objet regroupe et conserve la trace de tous vos appels d'offre.\n"
+""
+
+#. module: purchase_tender
+#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender_new
+#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1_new
+msgid "New Purchase Tenders"
+msgstr "Nouveaux Appels d'Offre"
+
+#. module: purchase_tender
+#: field:purchase.tender,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "Bons d'achat"
+
diff --git a/addons/purchase_tender/purchase_tender.py b/addons/purchase_tender/purchase_tender.py
new file mode 100644
index 00000000000..d68281f3a6f
--- /dev/null
+++ b/addons/purchase_tender/purchase_tender.py
@@ -0,0 +1,63 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields,osv
+from osv import orm
+import netsvc
+import time
+
+class purchase_tender(osv.osv):
+    _name = "purchase.tender"
+    _description="Purchase Tender"
+    _columns = {
+        'name': fields.char('Tender Reference', size=32,required=True),
+        'date_start': fields.datetime('Date Start'),
+        'date_end': fields.datetime('Date End'),
+        'user_id': fields.many2one('res.users', 'Responsible'),
+        'description': fields.text('Description'),
+        'purchase_ids' : fields.one2many('purchase.order','tender_id','Purchase Orders'),
+        'state': fields.selection([('draft','Draft'),('open','Open'),('close','Close')], 'State', required=True)
+    }
+    _defaults = {
+        'date_start': lambda *args: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'state': lambda *args: 'open',
+        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order.tender'),
+    }
+purchase_tender()
+
+class purchase_order(osv.osv):
+    _inherit = "purchase.order"
+    _description = "purchase order"
+    _columns = {
+        'tender_id' : fields.many2one('purchase.tender','Purchase Tender')
+    }
+    def wkf_confirm_order(self, cr, uid, ids, context={}):
+        res = super(purchase_order, self).wkf_confirm_order(cr, uid, ids, context)
+        for po in self.browse(cr, uid, ids, context):
+            if po.tender_id:
+                for order in po.tender_id.purchase_ids:
+                    if order.id<>po.id:
+                        wf_service = netsvc.LocalService("workflow")
+                        wf_service.trg_validate(uid, 'purchase.order', order.id, 'purchase_cancel', cr)
+                    self.pool.get('purchase.tender').write(cr, uid, [po.tender_id.id], {'state':'close'})
+        return res
+purchase_order()
diff --git a/addons/purchase_tender/purchase_tender_sequence.xml b/addons/purchase_tender/purchase_tender_sequence.xml
new file mode 100644
index 00000000000..222e3f46282
--- /dev/null
+++ b/addons/purchase_tender/purchase_tender_sequence.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- Sequences for purchase.order --> 
+        <record id="seq_type_purchase_tender_order" model="ir.sequence.type">
+            <field name="name">Purchase Tender Order</field>
+            <field name="code">purchase.order.tender</field>
+        </record>
+        <record id="seq_purchase_tender_order" model="ir.sequence">
+            <field name="name">Purchase Tender Order</field>
+            <field name="code">purchase.order.tender</field>
+            <field name="prefix">TE</field>
+            <field name="padding">5</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/purchase_tender/purchase_tender_view.xml b/addons/purchase_tender/purchase_tender_view.xml
new file mode 100644
index 00000000000..a91c36a7201
--- /dev/null
+++ b/addons/purchase_tender/purchase_tender_view.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+    <record model="ir.ui.view" id="purchase_order_tree_inherit">
+        <field name="name">purchase.order.tree.inherit</field>
+        <field name="type">tree</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.purchase_order_tree"/>
+        <field name="arch" type="xml">
+            <field name="name" position="after">
+                <field name="tender_id"/>
+            </field>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="purchase_order_form_inherit">
+        <field name="name">purchase.order.form.inherit</field>
+        <field name="type">form</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.purchase_order_form"/>
+        <field name="arch" type="xml">
+            <field name="partner_ref" position="after">
+                <field name="tender_id" select="2"/>
+            </field>
+        </field>
+    </record>
+
+        <record model="ir.ui.view" id="view_purchase_tender_form">
+            <field name="name">purchase.tender.form</field>
+            <field name="type">form</field>
+            <field name="model">purchase.tender</field>
+            <field name="arch" type="xml">
+                <form string="Purchase Tender">
+                    <field name="name" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="date_start" select="2"/>
+                    <field name="date_end" select="2"/>
+                    <notebook colspan="4">
+                        <page string="Description">
+                            <field name="description" colspan="4" nolabel="1" select="2"/>
+                        </page>
+                        <page string="Quotations">
+                            <field name="purchase_ids" nolabel="1" colspan="4"/>
+                        </page>
+                    </notebook>
+                    <field name="state" select="1"/>
+                </form>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_purchase_tender_tree">
+            <field name="name">purchase.tender.tree</field>
+            <field name="type">tree</field>
+            <field name="model">purchase.tender</field>
+            <field name="arch" type="xml">
+                <tree string="Purchase Tender">
+                    <field name="name"/>
+                    <field name="user_id"/>
+                    <field name="date_start"/>
+                    <field name="date_end"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="action_purchase_tender">
+            <field name="name">Purchase Tenders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.tender</field>
+            <field name="view_type">form</field>
+        </record>
+<!--        <menuitem name="Purchase Tenders" id="menu_purchase_tender" parent="purchase.menu_purchase_root"/>-->
+<!--        <menuitem id="menu_purchase_Tender1" parent="menu_purchase_tender" action="action_purchase_tender"/>-->
+		<menuitem id="menu_purchase_Tender_pro_mgt" parent="purchase.menu_procurement_management" action="action_purchase_tender"/>
+        <record model="ir.actions.act_window" id="action_purchase_tender_draft">
+            <field name="name">Draft Purchase Tenders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.tender</field>
+            <field name="domain">[('state','=','draft')]</field>
+            <field name="view_type">form</field>
+        </record>
+<!--        <menuitem id="menu_purchase_Tender1_draft" parent="menu_purchase_Tender1" action="action_purchase_tender_draft"/>-->
+
+        <record model="ir.actions.act_window" id="action_purchase_tender_open">
+            <field name="name">Open Purchase Tenders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.tender</field>
+            <field name="domain">[('state','=','open')]</field>
+            <field name="view_type">form</field>
+        </record>
+<!--        <menuitem id="menu_purchase_Tender1_open" parent="menu_purchase_Tender1" action="action_purchase_tender_open"/>-->
+
+        <record model="ir.actions.act_window" id="action_purchase_tender_new">
+            <field name="name">New Purchase Tenders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.tender</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+        </record>
+<!--        <menuitem id="menu_purchase_Tender1_new" parent="menu_purchase_tender" action="action_purchase_tender_new"/>-->
+
+    </data>
+</openerp>
diff --git a/addons/report_analytic_planning/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml
index 7a92460a893..5d5c6aa37aa 100644
--- a/addons/report_analytic_planning/report_analytic_planning_view.xml
+++ b/addons/report_analytic_planning/report_analytic_planning_view.xml
@@ -217,12 +217,13 @@
 			<field name="view_mode">tree,form</field>
 			<field name="search_view_id" ref="account_analytic_planning_view_search"/>
 		</record>
-		<menuitem id="menu_pm_planning" name="Planning" parent="project.menu_main" sequence="5"/>
+		<menuitem id="base.menu_pm_planning" name="Planning" parent="project.menu_main" sequence="5"/>
 		<menuitem id="planning_main" name="Long Term Planning"
-			parent="menu_pm_planning" />
+			parent="base.menu_pm_planning" />
 
 		<menuitem action="action_account_analytic_planning_form"
 			id="menu_report_account_analytic_planning" parent="planning_main" />
+		<menuitem action="resource.action_resource_resource_tree" id="base.menu_resource_resource_tree" parent="planning_main" />
 
 		<!--
 			Planning statistics
diff --git a/addons/report_task/report_task_view.xml b/addons/report_task/report_task_view.xml
index 2b5c56bee8a..e86abd878e6 100644
--- a/addons/report_task/report_task_view.xml
+++ b/addons/report_task/report_task_view.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+          <menuitem
+            id="hr.menu_hr_reporting"
+            name="Reporting"
+            parent="hr.menu_hr_root"
+            sequence="40" />
 
         <!-- Tasks by projects and users -->
 
diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml
index e88f8865dba..ed9c0666c48 100644
--- a/addons/report_timesheet/report_timesheet_view.xml
+++ b/addons/report_timesheet/report_timesheet_view.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
+        <menuitem
+            id="hr.menu_hr_reporting"
+            name="Reporting"
+            parent="hr.menu_hr_root"
+            sequence="40" />
         <!-- Statistics report on timesheet by user -->
 
         <record id="view_timesheet_user_graph" model="ir.ui.view">
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 80d0650e0c8..2c53237a60a 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-hr" id="menu_resource_root" name="Resources Management"/>
-        <menuitem
-            id="menu_resource_reporting"
-            name="Reporting"
-            parent="menu_resource_root"
-            sequence="40" />
-        <menuitem
-            id="menu_resource_configuration"
-            name="Configuration"
-            parent="menu_resource_root"
-            sequence="5"/>
-
+<!--        <menuitem icon="terp-hr" id="base.menu_resource_root" name="Resources Management"/> -->
+<!--        <menuitem-->
+<!--            id="menu_resource_reporting"-->
+<!--            name="Reporting"-->
+<!--            parent="menu_resource_root"-->
+<!--            sequence="40" />-->
+<!--        <menuitem-->
+<!--            id="menu_resource_configuration"-->
+<!--            name="Configuration"-->
+<!--            parent="menu_resource_root"-->
+<!--            sequence="5"/>-->
 
         <record id="resource_calendar_form" model="ir.ui.view">
             <field name="name">resource.calendar.form</field>
@@ -34,7 +33,7 @@
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
         </record>
-        <menuitem string="Resource Calendar" action="action_resource_calendar_form" id="menu_resource_calendar_form" parent="menu_resource_configuration"/>
+<!--        <menuitem string="Resource Calendar" action="action_resource_calendar_form" id="menu_resource_calendar_form" parent="menu_resource_configuration"/>-->
 
         <record id="view_resource_calendar_week_tree" model="ir.ui.view">
             <field name="name">resource.calendar.week.tree</field>
@@ -130,7 +129,9 @@
             <field name="res_model">resource.resource</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_resource_resource_tree" id="menu_resource_resource_tree" parent="menu_resource_root"/>
+        <menuitem icon="terp-project" id="base.menu_main" name="Project Management"/>
+        <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main" sequence="3"/>
+        <menuitem action="action_resource_resource_tree" id="base.menu_resource_resource_tree" parent="base.menu_pm_planning" />
 
         <record id="resource_calendar_leave_form" model="ir.ui.view">
             <field name="name">resource.calendar.leaves.form</field>
@@ -167,7 +168,7 @@
             <field name="res_model">resource.calendar.leaves</field>
             <field name="view_mode">tree,form,calendar</field>
         </record>
-        <menuitem action="action_resource_calendar_leave_tree" id="menu_resource_calendar_leave_tree" parent="menu_resource_root"/>
+<!--        <menuitem action="action_resource_calendar_leave_tree" id="menu_resource_calendar_leave_tree" parent="menu_resource_root"/>-->
 
 
     </data>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 9fa87223cc9..0466d4501cf 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>
-        <menuitem id="next_id_45" name="Recurring Events" parent="subscription.menu_tools" sequence="2"/>
+        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools"/>
+       <!-- <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>-->
+        <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="2"/>
 <!--        <menuitem id="menu_subscription_config" name="Configuration" parent="next_id_45"/>-->
         <!--
 	=======================================================