diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index 57276219861..612826705fb 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -132,8 +132,6 @@ class account_bank_statement(osv.osv):
     _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"),
@@ -244,17 +242,8 @@ class account_bank_statement(osv.osv):
                     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()
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/multi_company_demo.xml b/addons/point_of_sale/multi_company_demo.xml
index dfc59cc09c8..37a4ebf58bb 100644
--- a/addons/point_of_sale/multi_company_demo.xml
+++ b/addons/point_of_sale/multi_company_demo.xml
@@ -2,11 +2,10 @@
 <openerp>
     <data noupdate="0">
         <record id="second_partner" model="res.partner">
-            <field name="name">Tiny Editor</field>
+            <field name="name">OpenERP Editor</field>
         </record>
-
         <record id="second_company" model="res.company">
-            <field name="name">Tiny Editor</field>
+            <field name="name">OpenERP 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>
@@ -15,7 +14,6 @@
             <field name="currency_id" ref="base.EUR"/>
 
         </record>
-
         <record id="ter_partner" model="res.partner">
             <field name="name">Tiny Integrator</field>
         </record>
@@ -28,11 +26,7 @@
             <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
index 539a27ff1a2..a74ea0a56e9 100644
--- a/addons/point_of_sale/multi_company_stock_data.xml
+++ b/addons/point_of_sale/multi_company_stock_data.xml
@@ -2,104 +2,6 @@
 <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')]"/>
diff --git a/addons/point_of_sale/pos_data.xml b/addons/point_of_sale/pos_data.xml
index 8ff4697804e..b36bd0827c2 100644
--- a/addons/point_of_sale/pos_data.xml
+++ b/addons/point_of_sale/pos_data.xml
@@ -11,7 +11,6 @@
             <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>
 
@@ -22,7 +21,6 @@
             <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>
 
diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml
index 789d96b897d..f3573abc791 100644
--- a/addons/point_of_sale/pos_demo.xml
+++ b/addons/point_of_sale/pos_demo.xml
@@ -57,8 +57,8 @@
 			<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 name="user_saleman" ref="base.user_root"/>
+			<field name="sale_manager" 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"/>
@@ -93,8 +93,8 @@
       <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 name="user_saleman" ref="res_users_sofia0"/>
+			<field name="sale_manager" 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"/>
@@ -135,8 +135,8 @@
 			<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 name="user_saleman" ref="res_users_sofia0"/>
+			<field name="sale_manager" 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"/>
@@ -144,16 +144,6 @@
 			<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"/>
@@ -194,12 +184,6 @@ 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 2e9ff5e6107..9123502d288 100644
--- a/addons/point_of_sale/pos_report.xml
+++ b/addons/point_of_sale/pos_report.xml
@@ -1,39 +1,6 @@
 <?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"
-			multi="True"
-			/-->
-
-
-<!--
-		<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_invoice_report"
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index a4cd8fc9f10..b72848e2131 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -58,28 +58,14 @@
                                     states="paid, draft"
                                         attrs="{'invisible':[('state_2','=','accepted')]}"/>
                               </group>
-
                             <separator colspan="4" string="Actions"/>
                             <group colspan="4" col="6">
-
                                 <field name="state" select="1"/>
-
-                                <!--
-                                <button name="%(pos_add_product)d" string="_Add product" type="action" states="draft"/>
-                                -->
-
                                 <button name="%(action_pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" context="{'record_id':'active_id'}" />
                                 <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
-
-
-                                <!--
-                                <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 Picking" type="action" icon="gtk-ok" states="paid"
                                     attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}"/>
-
                             </group>
                         </page>
 
@@ -122,7 +108,6 @@
                                 </form>
                             </field>
                         </page>
-
                         <page string="Notes" >
                             <separator string="Notes" colspan="4" />
                             <group colspan="4">
@@ -135,8 +120,6 @@
                 </form>
             </field>
         </record>
-
-
         <record model="ir.actions.act_window" id="action_pos_pos_form">
             <field name="name">Point of Sale</field>
             <field name="type">ir.actions.act_window</field>
@@ -145,8 +128,6 @@
             <field name="view_id" ref="view_pos_pos_form"/>
             <field name="domain">[['date_order','>=',time.strftime('%Y-%m-%d')]]</field>
         </record>
-
-
         <record model="ir.ui.view" id="view_pos_order_tree">
             <field name="name">Sales</field>
             <field name="model">pos.order</field>
@@ -208,7 +189,6 @@
 			<field name="search_view_id" ref="view_pos_order_filter"/>	             
  				           
         </record>
-invoiced
 
         <record model="ir.actions.act_window" id="action_pos_order_tobinvoiced">
             <field name="name">Sales to Invoice</field>
@@ -242,8 +222,6 @@ invoiced
  			<field name="search_view_id" ref="view_pos_order_filter"/>	               
         </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">Point of Sale</field>
             <field name="type">ir.actions.act_window</field>
@@ -252,8 +230,6 @@ invoiced
             <field name="view_mode">tree,form</field>
 			<field name="search_view_id" ref="view_pos_order_filter"/>            
         </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>
@@ -699,53 +675,6 @@ invoiced
             </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"/>
-              </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>
@@ -778,7 +707,6 @@ invoiced
                         <field name="default_code" select="1"/>
                         <field groups="base.group_extended" name="ean13"/>
                     </group>
-
                    </group>
                    <notebook colspan="4">
                         <page string="Information">
@@ -859,13 +787,6 @@ invoiced
                     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"/>
@@ -875,22 +796,12 @@ invoiced
             action="action_box_entries"
             id="menu_wizard_enter_jrnl" sequence="3" />
             
-    <!--    <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="action_box_out"
             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>
@@ -918,8 +829,6 @@ invoiced
             <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>
@@ -942,7 +851,6 @@ invoiced
             <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"/>
@@ -956,8 +864,6 @@ invoiced
                         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"/>
 
@@ -1005,11 +911,6 @@ invoiced
         <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="action_report_pos_sale_user"
                 id="menu_pos_sales_user" parent="menu_trans_pos_tree" sequence="3" groups="base.group_extended" />
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 50e3630c4d7..956316b4e97 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -8,67 +8,7 @@
         name="pos.return.picking"
         string="Return Goods"/>
 
-
-
-<!--		<wizard string="Box Entries" model="account.bank.statement"
-				name="pos.entry" id="pos_entry" menu="False"/>-->
-
-<!--		<wizard string="Payment" model="pos.order"
-				name="pos.payment" id="pos_payment" menu="False"/>-->
-
-			<!--<wizard string="Create Invoices" model="pos.order"
-				name="pos.create_invoice" id="pos_invoice" multi="True"/>-->
-
 		<wizard string="Add products" model="pos.order"
 				name="pos.add_product" id="pos_add_product"  menu="False"/>
-
-			<!--<wizard string="Cancel" model="pos.order"
-				name="pos.cancel" id="pos_cancel" multi="True"/>-->
-
-<!--
-		<wizard string="Discount" model="pos.order"
-				name="pos.discount" id="pos_discount" menu="False"/>-->
-
-<!--		<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_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="True"
-        	name="statement.close"
-        	string="Close 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 d3f1313c13f..11cd9481343 100644
--- a/addons/point_of_sale/pos_workflow.xml
+++ b/addons/point_of_sale/pos_workflow.xml
@@ -66,7 +66,6 @@
 		<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">
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index c44ce4773ef..515b10e8a33 100755
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -94,6 +94,10 @@
  		<field name="search_view_id"  ref="view_stock_search"/>
  	
     </record>
+		<menuitem
+            id="stock.next_id_61"
+            name="Reporting"
+            parent="stock.menu_stock_root" groups="base.group_user"/>    
 	<menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="5"/>
 </data>
 </openerp>
\ No newline at end of file