diff --git a/addons/portal_customer/__openerp__.py b/addons/portal_customer/__openerp__.py
index b3c346aa9a9..95684874770 100644
--- a/addons/portal_customer/__openerp__.py
+++ b/addons/portal_customer/__openerp__.py
@@ -37,9 +37,9 @@
     "demo_xml" : [ 
     ],
     "update_xml" : [
-        #"security/ir_model_access.csv",
+        "security/portal_security.xml",
+        "security/ir.model.access.csv",
         "portal_customer_view.xml",
-        "portal_demo.xml"
     ],
     'installable': True,
 }
diff --git a/addons/portal_customer/portal_customer_view.xml b/addons/portal_customer/portal_customer_view.xml
index 7ebfc9ac843..3dfe3ef69c0 100644
--- a/addons/portal_customer/portal_customer_view.xml
+++ b/addons/portal_customer/portal_customer_view.xml
@@ -2,23 +2,25 @@
 <openerp>
 
     <data>
-      <menuitem name="Customer Portal" id="customer_portal" />
-        
-        <menuitem name="Address Book" id="customer_portal_address_book" parent="customer_portal"/>
-        
-        <menuitem name="Track Orders" id="customer_portal_track_orders" parent="customer_portal"/>
-            <menuitem name="Quotation" id="customer_portal_quotation" parent="customer_portal_track_orders"/>
-            <menuitem name="Sales Orders" id="customer_portal_sales_orders" parent="customer_portal_track_orders"/>
-            <menuitem name="Delivery Orders" id="customer_portal_delivery" parent="customer_portal_track_orders"/>
-            <menuitem name="Registration" id="customer_portal_registration" parent="customer_portal_track_orders"/>
+      <menuitem name="Customer Portal" id="customer_portal"/>
+      
+          <menuitem name="Address Book" id="customer_portal_address_book_main" parent="customer_portal"/>        
+              <menuitem name="Contacts" id="customer_portal_address_book" parent="customer_portal_address_book_main" action="base.action_partner_form"/>
+              
+          <menuitem name="Track Orders" id="customer_portal_track_orders" parent="customer_portal"/>
+          
+              <menuitem name="Quotation" id="customer_portal_quotation" parent="customer_portal_track_orders" action="sale.action_order_tree5"/>
+              <menuitem name="Sales Orders" id="customer_portal_sales_orders" parent="customer_portal_track_orders" action="sale.action_order_form"/>
+              <menuitem name="Delivery Orders" id="customer_portal_delivery" parent="customer_portal_track_orders" action="stock.action_picking_tree"/>
+              <menuitem name="Registration" id="customer_portal_registration" parent="customer_portal_track_orders"/>
         
         <menuitem name="Invoice and Payments" id="customer_portal_invoice_payements" parent="customer_portal"/>
-            <menuitem name="Invoice" id="customer_portal_invoice" parent="customer_portal_invoice_payements"/>
-            <menuitem name="Payments" id="customer_portal_payments" parent="customer_portal_invoice_payements"/>
+            <menuitem name="Invoice" id="customer_portal_invoice" parent="customer_portal_invoice_payements" action="account.action_invoice_tree1"/>
+            <menuitem name="Payments" id="customer_portal_payments" parent="customer_portal_invoice_payements" action="account_voucher.action_vendor_receipt"/>
             
         <menuitem name="Services" id="customer_portal_services" parent="customer_portal"/>
             <menuitem name="Events" id="customer_portal_events" parent="customer_portal_services"/>
-            <menuitem name="Products" id="customer_portal_products" parent="customer_portal_services"/>
+            <menuitem name="Products" id="customer_portal_products" parent="customer_portal_services" action="product.product_normal_action_sell"/>
             <menuitem name="Tasks" id="customer_portal_tasks" parent="customer_portal_services"/>
         
         <menuitem name="After Sales Services" id="customer_portal_after_sales" parent="customer_portal"/>
@@ -28,7 +30,35 @@
 
         <menuitem name="Contact Us" id="customer_portal_contact" parent="customer_portal"/>
         
-            
+        
+        <menuitem id="base.menu_partner_form" parent="base.menu_sales" action="base.action_partner_form" sequence="1" groups="base.group_sale_salesman_all_leads"/>
+        <menuitem id="base.menu_base_config" name="Configuration" parent="base.menu_base_partner" sequence="30" groups="base.group_sale_salesman_all_leads"/>
+        <menuitem action="product.product_uom_categ_form_action" id="product.menu_product_uom_categ_form_action" parent="base.menu_base_config" sequence="25" groups="base.group_sale_salesman_all_leads"/>
+        <menuitem action="sale.action_shop_form" id="sale.menu_action_shop_form" parent="base.menu_base_config" sequence="35" groups="base.group_sale_salesman_all_leads"/>
+        <menuitem action="product.product_pricelist_action2" id="product.menu_product_pricelist_action2" parent="base.menu_base_config" sequence="20" groups="base.group_sale_salesman_all_leads"/>
+        <menuitem action="product.product_uom_form_action" id="product.menu_product_uom_form_action" parent="base.menu_base_config" sequence="30" groups="base.group_sale_salesman_all_leads"/>
+        <menuitem action="stock.action_picking_tree4" id="stock.menu_action_picking_tree4" parent="stock.menu_stock_warehouse_mgmt" sequence="1" groups="base.group_sale_salesman_all_leads"/>
+        <menuitem action="stock.action_location_tree" id="stock.menu_action_location_tree" parent="stock.menu_stock_inventory_control" sequence="20" groups="stock.group_stock_user"/>
+        <menuitem name="Products by Category" id="stock.menu_product_by_category_stock_form" action="product.product_category_action" parent="stock.menu_stock_product" sequence="0" groups="stock.group_stock_user"/>
+        <menuitem action="product.product_normal_action" id="stock.menu_stock_products_menu" parent="stock.menu_stock_product" sequence="1" groups="stock.group_stock_user"/>
+        <menuitem id="account.menu_account_customer" name="Customers" parent="account.menu_finance_receivables" action="base.action_partner_customer_form" sequence="100" groups="account.group_account_user"/>
+        <menuitem action="account.action_invoice_tree2" id="account.menu_action_invoice_tree2" parent="account.menu_finance_payables" groups="account.group_account_user"/>
+        <menuitem action="account.action_invoice_tree4" id="account.menu_action_invoice_tree4" parent="account.menu_finance_payables" groups="account.group_account_user"/>
+        <menuitem id="account.menu_account_supplier" name="Suppliers" parent="account.menu_finance_payables" action="base.action_partner_supplier_form" sequence="100" groups="account.group_account_user"/>
+        <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1" groups="base.group_sale_salesman_all_leads"/>
+        <menuitem action="product.product_normal_action_sell" id="product.menu_products" parent="base.menu_product" sequence="1" groups="base.group_sale_salesman_all_leads"/>
+        <menuitem id="mail.mail_feeds" name="Feeds" parent="mail.mail_feeds_main" groups="base.group_sale_salesman_all_leads"/>
+        <menuitem action="account.action_account_invoice_report_all" id="account.menu_action_account_invoice_report_all" parent="account.menu_finance_statistic_report_statement" sequence="0" groups="account.group_account_user"/>
+        <menuitem id="account.menu_finance_statistic_report_statement" name="Statistic Reports" parent="account.menu_finance_reporting" sequence="300" groups="account.group_account_user"/>
+        <menuitem id="account.menu_finance_reporting" name="Accounting" parent="base.menu_reporting" sequence="35" groups="account.group_account_user"/>
+        <record id="mail.mail_feeds_main" model="ir.ui.menu">
+            <field name="name">Feeds</field>
+            <field name="sequence">0</field>
+            <field name="action" ref="mail.action_mail_all_feeds"/>
+            <field eval="[(4, ref('account.group_account_user'))]" name="groups_id"/>
+        </record>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman_all_leads"/>
+        <menuitem id="base.menu_base_partner" action="sale.open_board_sales" name="Sales" groups="base.group_sale_salesman_all_leads"/>      
     </data>
     
 </openerp>
diff --git a/addons/portal_customer/security/ir.model.access.csv b/addons/portal_customer/security/ir.model.access.csv
new file mode 100644
index 00000000000..9ba5a09311d
--- /dev/null
+++ b/addons/portal_customer/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_voucher,account.voucher,account_voucher.model_account_voucher,portal_customer.group_sales_portal,1,1,1,1
\ No newline at end of file
diff --git a/addons/portal_customer/security/ir_model_access.csv b/addons/portal_customer/security/ir_model_access.csv
new file mode 100644
index 00000000000..1f08770ea45
--- /dev/null
+++ b/addons/portal_customer/security/ir_model_access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sale_order_portal,sale.order,model_sale_order,portal_customer.group_res_portal_demo,1,0,0,0
diff --git a/addons/portal_customer/security/portal_security.xml b/addons/portal_customer/security/portal_security.xml
new file mode 100644
index 00000000000..b204107f49f
--- /dev/null
+++ b/addons/portal_customer/security/portal_security.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<openerp>
+    
+    <data>
+    
+        <!-- 
+            Sale Portal Demo
+        -->
+        
+        <record id="portal_sale_order_user_rule" model="ir.rule">
+            <field name="name">Personal Quotations/Sales</field>
+            <field ref="sale.model_sale_order" name="model_id"/>
+            <field name="domain_force">['|',('partner_id.email','=',user.login),('user_id','=',False)]</field>
+            <field name="global" eval="True"/>
+        </record>
+        
+        <record id="portal_stock_picking_user_rule" model="ir.rule">
+            <field name="name">Personal Delivery Orders</field>
+            <field ref="stock.model_stock_picking" name="model_id"/>
+            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
+            <field name="global" eval="True"/>
+        </record>
+        
+        <record id="portal_account_invoice_user_rule" model="ir.rule">
+            <field name="name">Personal Account Invoices</field>
+            <field ref="account.model_account_invoice" name="model_id"/>
+            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
+            <field name="global" eval="True"/>
+        </record>
+        
+        <record id="portal_personal_payment" model="ir.rule">
+            <field name="name">Personal Payments</field>
+            <field ref="account_voucher.model_account_voucher" name="model_id"/>
+            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
+            <field name="global" eval="True"/>
+        </record>
+        
+        <record id="portal_personal_contact" model="ir.rule">
+            <field name="name">Personal Contacts</field>
+            <field ref="base.model_res_partner" name="model_id"/>
+            <field name="domain_force">[('email','=',user.login)]</field>
+            <field name="global" eval="True"/>
+        </record>
+        
+        <record id="group_sales_portal" model="res.groups">
+            <field name="name">Sales Portal Group</field>
+            <field ref="base.module_category_sales_management" name="category_id"/>
+            <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
+            <field name="rule_groups" eval="[(4, ref('portal_sale_order_user_rule')), (4, ref('portal_stock_picking_user_rule')), (4, ref('portal_account_invoice_user_rule'))]"/>
+        </record>
+        
+        <record id="portal_customer" model="res.portal">
+            <field name="name">Sales Portal</field>
+            <field name="group_id" ref="group_sales_portal"/>
+        </record>
+        
+    </data>
+    
+</openerp>
\ No newline at end of file
diff --git a/addons/portal_customer/portal_demo.xml b/addons/portal_customer/security/security_customer_portal.xml
similarity index 86%
rename from addons/portal_customer/portal_demo.xml
rename to addons/portal_customer/security/security_customer_portal.xml
index 3bc08fe9e76..2706b75ad5e 100644
--- a/addons/portal_customer/portal_demo.xml
+++ b/addons/portal_customer/security/security_customer_portal.xml
@@ -2,10 +2,8 @@
 <openerp>
     
     <data>
-    
-        <!-- 
-            Sale Portal Demo
-        -->
+
+        <!-- model access  -->
         
         <record id="portal_sale_order_access_right" model="ir.model.access">
             <field name="name">Sale Order</field>
@@ -46,7 +44,7 @@
             <field name="perm_unlink">True</field-->
         </record>
         
-        
+       <!--rules--> 
         <record id="portal_sale_order_user_rule" model="ir.rule">
             <field name="name">Personal Leads</field>
             <field ref="sale.model_sale_order" name="model_id"/>
@@ -67,15 +65,19 @@
             <field name="domain_force">[('partner_id.email','=',user.login)]</field>
             <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
         </record>
+
+       <!-- I create a portal with rules and acces right--> 
         
         <record id="res_portal_demo" model="res.portal">
             <field name="name">Sales Portal</field>
-            <field name="menu_access" eval="[(4, ref('sale.menu_sale_quotations')), (4, ref('sale.menu_sale_order')), (4, ref('base.menu_product')), (4, ref('stock.menu_action_picking_tree')), (4, ref('account.menu_action_invoice_tree1')), (4, ref('account.menu_finance')), (4, ref('stock.menu_stock_root'))]"/>
-            <!--field name="implied_ids" eval="[(4, ref('base.group_sale_salesman')), (4, ref('account.group_account_invoice')), (4, ref('stock.group_stock_user'))]"/-->
+            <!-- give access to customer portal menu-->
+            <field name="menu_access" eval="[(4, ref('customer_portal'))]"/>
+            <!--give rules-->
             <field name="rule_groups" eval="[(4, ref('portal_sale_order_user_rule')), (4, ref('portal_stock_picking_user_rule')), (4, ref('portal_account_invoice_user_rule'))]"/>
+            <!-- give access rights-->
             <field name="model_access" eval="[(6,0,[ref('portal_sale_order_access_right'), ref('portal_sale_order_line_access_right'), ref('portal_stock_picking_access_right'), ref('portal_account_invoice_access_right'), ref('portal_account_invoice_line_access_right')])]"/>
         </record>
         
     </data>
     
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 0cb55fb0d30..2309cd628e4 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -84,7 +84,7 @@
     <record id="sale_order_personal_rule" model="ir.rule">
         <field name="name">Personal Orders</field>
         <field ref="model_sale_order" name="model_id"/>
-        <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
+        <field name="domain_force">['|',('partner_id.email','=',user.login),('user_id','=',False)]</field>
         <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
     <record id="sale_order_see_all" model="ir.rule">