From 8baf16f25e2f0c158f75527105ba1a712677e0f8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 18:21:54 +0200
Subject: [PATCH] [IMP] access rights. Remove bad stuff on point of sale

bzr revid: fp@tinyerp.com-20100612162154-f9dgju8wsmn79gq0
---
 addons/account/security/ir.model.access.csv   |   3 +-
 .../base_setup/security/ir.model.access.csv   |   6 +-
 addons/crm/crm_lead_menu.xml                  |   1 -
 addons/crm/crm_meeting_menu.xml               |  34 +-
 addons/crm/crm_opportunity_menu.xml           |  10 +-
 .../email_template_account_view.xml           | 138 ++--
 .../email_template_mailbox_view.xml           | 154 ++---
 addons/email_template/email_template_view.xml | 294 ++++-----
 .../email_template_workflow.xml               |  18 +-
 .../security/email_template_security.xml      |  19 +-
 addons/hr/security/ir.model.access.csv        |   2 +-
 addons/knowledge/security/ir.model.access.csv |   2 +-
 addons/l10n_be/security/ir.model.access.csv   |  10 +-
 addons/mrp/security/ir.model.access.csv       |   2 +-
 addons/point_of_sale/multi_company_demo.xml   |  25 -
 .../multi_company_stock_data.xml              |  36 --
 addons/point_of_sale/pos_data.xml             |  52 --
 addons/point_of_sale/pos_demo.xml             | 186 +-----
 addons/point_of_sale/pos_report.xml           | 198 +++---
 addons/point_of_sale/pos_sequence.xml         |  66 +-
 addons/point_of_sale/pos_view.xml             |  25 +-
 addons/point_of_sale/pos_workflow.xml         | 124 ++--
 addons/point_of_sale/posr_data.xml            |  74 +--
 addons/point_of_sale/posrule_data.xml         | 502 +--------------
 addons/point_of_sale/posrule_data2.xml        | 591 +-----------------
 .../point_of_sale/singer_statement_demo.xml   | 321 +---------
 addons/point_of_sale/statement_data.xml       |  39 +-
 addons/point_of_sale/statement_report.xml     | 116 ++--
 addons/point_of_sale/statement_rules.xml      |   5 +-
 addons/point_of_sale/statement_view.xml       | 298 ++++-----
 addons/point_of_sale/statement_wizard.xml     |  25 +-
 addons/product/product_view.xml               |   4 +-
 .../security/ir.model.access.csv              |   2 +-
 addons/project/project_view.xml               |  52 +-
 addons/project/security/ir.model.access.csv   |  18 +-
 addons/project/security/project_security.xml  |   8 +-
 .../project_gtd/security/ir.model.access.csv  |   4 +
 addons/project_long_term/project_long_term.py | 108 ----
 .../project_long_term_demo.xml                |  28 +-
 .../project_long_term_view.xml                |  34 +-
 .../security/ir.model.access.csv              |   4 +-
 .../wizard/project_compute_tasks.py           |   4 +-
 .../wizard/project_schedule_tasks.py          |   2 +-
 .../security/ir.model.access.csv              |   2 +-
 addons/purchase/security/ir.model.access.csv  |   4 +
 .../security/ir.model.access.csv              |   2 +-
 addons/resource/security/ir.model.access.csv  |   8 +-
 addons/sale/security/sale_security.xml        |   4 +-
 addons/scrum/security/ir.model.access.csv     |   6 +-
 addons/stock/security/ir.model.access.csv     |   2 +-
 addons/stock/security/stock_security.xml      |  20 +-
 addons/stock_planning/stock_planning_view.xml |  20 +-
 .../thunderbird/security/ir.model.access.csv  |   2 +-
 53 files changed, 885 insertions(+), 2829 deletions(-)

diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 329135d29a7..826e2076033 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -70,7 +70,6 @@
 "access_account_add_tmpl_wizard_system_manager","account.addtmpl.wizard system manager","model_account_addtmpl_wizard","base.group_system",1,1,1,1
 "access_account_invoice_user","account.invoice user","model_account_invoice","base.group_user",1,0,0,0
 "access_account_invoice_user","account.invoice.line user","model_account_invoice_line","base.group_user",1,0,0,0
-"access_account_invoice_user","account.invoice.tax user","model_account_invoice_tax","base.group_user",1,0,0,0
 "access_account_payment_term_partner_manager","account.payment.term partner manager","model_account_payment_term","base.group_user",1,0,0,0
 "access_account_payment_term_line_partner_manager","account.payment.term.line partner manager","model_account_payment_term_line","base.group_user",1,0,0,0
 "access_account_account_product_manager","account.account product manager","model_account_account","product.group_product_manager",1,0,0,0
@@ -86,7 +85,7 @@
 "access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,1,1,1
 "access_account_sequence_fiscal_year","account.sequence.fiscalyear","model_account_sequence_fiscalyear","account.group_account_user",1,1,1,1
 "access_account_sequence_fiscal_year_user","account.sequence.fiscalyear user","model_account_sequence_fiscalyear","base.group_user",1,0,0,0
-"access_account_installer","account.installer","model_account_installer","base.group_user",1,0,0,0
+"access_account_installer","account.installer","model_account_installer","base.group_system",1,1,1,1
 "access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_account_manager",1,0,0,0
 "access_temp_range","temp.range","model_temp_range","account.group_account_manager",1,0,0,0
 "access_report_aged_receivable","report.aged.receivable","model_report_aged_receivable","account.group_account_manager",1,0,0,0
diff --git a/addons/base_setup/security/ir.model.access.csv b/addons/base_setup/security/ir.model.access.csv
index 912e3c1c634..9cc4e8bda68 100644
--- a/addons/base_setup/security/ir.model.access.csv
+++ b/addons/base_setup/security/ir.model.access.csv
@@ -1,4 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-"access_base_setup_installer","base.setup.installer","model_base_setup_installer",,1,0,0,0
-"access_base_setup_company","base.setup.company","model_base_setup_company",,1,0,0,0
-"access_base_setup_config","base.setup.config","model_base_setup_config",,1,0,0,0
+"access_base_setup_installer","base.setup.installer","model_base_setup_installer",base.group_system,1,1,1,1
+"access_base_setup_company","base.setup.company","model_base_setup_company",base.group_system,1,1,1,1
+"access_base_setup_config","base.setup.config","model_base_setup_config",base.group_system,1,1,1,1
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index aad27f9eb14..cea854427dc 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -29,7 +29,6 @@
 
     <menuitem id="base.menu_sales" name="Sales"
         parent="base.menu_base_partner" sequence="1" />
-        
 
     <menuitem parent="base.menu_sales" name="Leads"
         groups="base.group_extended"
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index aaae9541613..ec58c116baf 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -38,7 +38,7 @@
         <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
     </record>
 
-	<record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet_partner">
+    <record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet_partner">
         <field name="sequence" eval="3"/>
         <field name="view_mode">gantt</field>
         <field name="view_id" ref="crm_case_gantt_view_meet"/>
@@ -85,33 +85,33 @@
 <!-- ALL MEETINGS -->
 
     <menuitem name="Meetings" id="menu_meeting_sale"
-    	parent="base.menu_base_partner" sequence="3" />
+        parent="base.menu_base_partner" sequence="3" />
 
     <menuitem name="Meetings" id="menu_crm_case_categ_meet"
-    	action="crm_case_categ_meet" parent="menu_meeting_sale"
-    	sequence="1" />
+        action="crm_case_categ_meet" parent="menu_meeting_sale"
+        sequence="1" />
 
-	<record id="ir_ui_view_sc_calendar0" model="ir.ui.view_sc">
+    <record id="ir_ui_view_sc_calendar0" model="ir.ui.view_sc">
         <field name="name">Calendar</field>
         <field name="resource">ir.ui.menu</field>
         <field name="user_id" ref="base.user_root"/>
         <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
-	</record>
+    </record>
     <record id="action_view_attendee_form" model="ir.actions.act_window">
-	 	<field name="name">Meeting Invitations</field>
-	 	<field name="type">ir.actions.act_window</field>
-	 	<field name="res_model">calendar.attendee</field>
-	 	<field name="view_type">form</field>
-	 	<field name="view_mode">tree,form</field>
-	 	<field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
+         <field name="name">Meeting Invitations</field>
+         <field name="type">ir.actions.act_window</field>
+         <field name="res_model">calendar.attendee</field>
+         <field name="view_type">form</field>
+         <field name="view_mode">tree,form</field>
+         <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
         <field name="domain">[('ref','like','crm.meeting,')]</field>
-	 	<field name="context">{'default_sent_by_uid': uid}</field>
-	 </record>
+         <field name="context">{'default_sent_by_uid': uid}</field>
+     </record>
 
     <menuitem id="menu_attendee_invitations"
-			name="Meeting Invitations" parent="crm.menu_meeting_sale"
-			sequence="10" action="action_view_attendee_form"
-			groups="base.group_extended" />
+            name="Meeting Invitations" parent="crm.menu_meeting_sale"
+            sequence="10" action="action_view_attendee_form"
+            groups="base.group_extended" />
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index a1cdce906af..0d81a3bc3ec 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data noupdate="1">
 
-	 <act_window
+     <act_window
             id="act_crm_opportunity_crm_phonecall_new"
             name="Phone calls"
             res_model="crm.phonecall"
@@ -12,7 +12,7 @@
             domain="[('user_id','=',uid),('opportunity_id', '=', active_id)]"
             view_type="form"/>
 
-	<act_window
+    <act_window
             id="act_crm_opportunity_crm_meeting_new"
             name="Meetings"
             res_model="crm.meeting"
@@ -55,11 +55,11 @@
      </record>
 
      <menuitem id="base.menu_sales" name="Sales"
-     	parent="base.menu_base_partner" sequence="1" />
+         parent="base.menu_base_partner" sequence="1" />
 
      <menuitem name="Opportunities" id="menu_crm_case_opp"
-     	parent="base.menu_sales" action="crm_case_category_act_oppor11"
-     	sequence="2" />
+         parent="base.menu_sales" action="crm_case_category_act_oppor11"
+         sequence="2" />
 
 </data>
 </openerp>
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 7a0bc84538f..9a35328b25c 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -1,69 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
+    <data>
 
         <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/>
         <menuitem name="Email Template" id="menu_email_template" parent="base.menu_tools"/>
 
-		<record model="ir.ui.view" id="email_template_account_form">
-			<field name="name">email_template.account.form</field>
-			<field name="model">email_template.account</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Email Account Configuration">
-					<group colspan="2">
-						<field name="name" select="1" />
-					</group>
-					<notebook colspan="4">
-						<page string="Outgoing">
-							<separator string="Server Information" colspan="4" />
-							<group colspan="4">
-								<field name="smtpserver" select="1" colspan="2" />
-								<field name="smtpport" select="2" colspan="2" />
-								<field name="smtpssl" select="2" colspan="2" />
-								<field name="smtptls" select="2" colspan="2" />
-							</group>
-							<button name="check_outgoing_connection" type="object" string="Check Outgoing Connection" />
-							<separator string="User Information" colspan="4" />
-							<group col="2" colspan="2">
-								<field name="email_id" select="1" on_change="on_change_emailid(name,email_id)" colspan="2" />
-								<field name="smtppass" password="True" colspan="2" />
-								<field name="company" select="2" colspan="2" />
-							</group>
-							<group col="2" colspan="2">
-								<field name="smtpuname" select="1" colspan="2" />
-								<field name="user" select="2" colspan="2" />
-								<field name="send_pref" colspan="2" />
-							</group>
-						</page>
-					</notebook>
-					<group colspan="4" col="10">
-						<field name="state" select="1"/>
-						<button string="Approve Account" name="button_approval" states="draft" type="workflow"/>
-						<button string="Suspend Account" name="button_suspended" states="approved" type="workflow"  />
-						<button string="Request Re-activation" name="get_reapprove" states="suspended" type="workflow" />
-						<button string="Send/Receive" name="send_receive" states="approved" type="object" />
-					</group>
-				</form>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="email_template_account_form">
+            <field name="name">email_template.account.form</field>
+            <field name="model">email_template.account</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Email Account Configuration">
+                    <group colspan="2">
+                        <field name="name" select="1" />
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Outgoing">
+                            <separator string="Server Information" colspan="4" />
+                            <group colspan="4">
+                                <field name="smtpserver" select="1" colspan="2" />
+                                <field name="smtpport" select="2" colspan="2" />
+                                <field name="smtpssl" select="2" colspan="2" />
+                                <field name="smtptls" select="2" colspan="2" />
+                            </group>
+                            <button name="check_outgoing_connection" type="object" string="Check Outgoing Connection" />
+                            <separator string="User Information" colspan="4" />
+                            <group col="2" colspan="2">
+                                <field name="email_id" select="1" on_change="on_change_emailid(name,email_id)" colspan="2" />
+                                <field name="smtppass" password="True" colspan="2" />
+                                <field name="company" select="2" colspan="2" />
+                            </group>
+                            <group col="2" colspan="2">
+                                <field name="smtpuname" select="1" colspan="2" />
+                                <field name="user" select="2" colspan="2" />
+                                <field name="send_pref" colspan="2" />
+                            </group>
+                        </page>
+                    </notebook>
+                    <group colspan="4" col="10">
+                        <field name="state" select="1"/>
+                        <button string="Approve Account" name="button_approval" states="draft" type="workflow"/>
+                        <button string="Suspend Account" name="button_suspended" states="approved" type="workflow"  />
+                        <button string="Request Re-activation" name="get_reapprove" states="suspended" type="workflow" />
+                        <button string="Send/Receive" name="send_receive" states="approved" type="object" />
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="email_template_account_tree">
-			<field name="name">email_template.account.tree</field>
-			<field name="model">email_template.account</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="SMTP Server">
-					<field name="name" select="2" />
-					<field name="email_id" select="2" />
-					<field name="smtpuname" select="2" />
-					<field name="user" select="2" />
-					<field name="smtpserver" select="2" />
-					<field name="smtpport" select="2" />
-					<field name="state" select="2" />
-				</tree>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="email_template_account_tree">
+            <field name="name">email_template.account.tree</field>
+            <field name="model">email_template.account</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="SMTP Server">
+                    <field name="name" select="2" />
+                    <field name="email_id" select="2" />
+                    <field name="smtpuname" select="2" />
+                    <field name="user" select="2" />
+                    <field name="smtpserver" select="2" />
+                    <field name="smtpport" select="2" />
+                    <field name="state" select="2" />
+                </tree>
+            </field>
+        </record>
 
        <record id="view_email_template_account_search" model="ir.ui.view">
            <field name="name">email_template.account.search</field>
@@ -85,21 +85,21 @@
            </field>
         </record>
 
-		<record model="ir.actions.act_window" id="action_email_template_account_tree_all">
-			<field name="name">Accounts</field>
-			<field name="res_model">email_template.account</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" ref="email_template_account_tree" />
+        <record model="ir.actions.act_window" id="action_email_template_account_tree_all">
+            <field name="name">Accounts</field>
+            <field name="res_model">email_template.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="email_template_account_tree" />
             <field name="context">{'group_by': [], 'search_default_draft': 1, 'search_default_my': 1}</field>
             <field name="search_view_id" ref="view_email_template_account_search"/>
-		</record>
+        </record>
 
-		<menuitem name="Configuration" id="menu_email_template_configuration" parent="menu_email_template" />
+        <menuitem name="Configuration" id="menu_email_template_configuration" parent="menu_email_template" />
 
-		<menuitem name="All Accounts" id="menu_email_template_account_all" parent="menu_email_template_configuration" action="action_email_template_account_tree_all" groups="res_groups_email_template_manager" />
+        <menuitem name="Email Accounts" id="menu_email_template_account_all" parent="menu_email_template_configuration" action="action_email_template_account_tree_all"/>
 
-	</data>
+    </data>
 </openerp>
 
 
diff --git a/addons/email_template/email_template_mailbox_view.xml b/addons/email_template/email_template_mailbox_view.xml
index c521320bf3a..93a1a9958d4 100644
--- a/addons/email_template/email_template_mailbox_view.xml
+++ b/addons/email_template/email_template_mailbox_view.xml
@@ -1,81 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-	<data>
-		<!-- Email Template-->
-		<record model="ir.ui.view" id="email_template_mailbox_form">
-			<field name="name">email_template.mailbox.form</field>
-			<field name="model">email_template.mailbox</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Outbox">
-					<group col="4" colspan="2">
-						<field name="email_from" colspan="4" select="1"/>
-						<field name="email_cc" colspan="4" select="1"/>
-						<field name="date_mail" colspan="4" select="2"/>
-					</group>
-					<group col="4" colspan="2">
-						<field name="email_to" colspan="4" required="1" select="1" />
-						<field name="email_bcc" colspan="4" select="2"/>
-						<field name="subject" colspan="4" select="1"/>
-					</group>
-					<notebook colspan="4">
-						<page string="Standard Body">
-							<separator colspan="4" string="Standard Body" />
-							<notebook colspan="4">
-								<page string="Standard Body (Text)">
-									<field name="body_text" nolabel="1" colspan="4" select="1"/>
-								</page>
-								<page string="Body (HTML-Web Client Only)">
-									<field name="body_html" nolabel="1" colspan="4" />
-									<!--<label string="Note: HTML body can't be edited with GTK desktop client." colspan="4"/>
-								--></page>
+    <data>
+        <!-- Email Template-->
+        <record model="ir.ui.view" id="email_template_mailbox_form">
+            <field name="name">email_template.mailbox.form</field>
+            <field name="model">email_template.mailbox</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Outbox">
+                    <group col="4" colspan="2">
+                        <field name="email_from" colspan="4" select="1"/>
+                        <field name="email_cc" colspan="4" select="1"/>
+                        <field name="date_mail" colspan="4" select="2"/>
+                    </group>
+                    <group col="4" colspan="2">
+                        <field name="email_to" colspan="4" required="1" select="1" />
+                        <field name="email_bcc" colspan="4" select="2"/>
+                        <field name="subject" colspan="4" select="1"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Standard Body">
+                            <separator colspan="4" string="Standard Body" />
+                            <notebook colspan="4">
+                                <page string="Standard Body (Text)">
+                                    <field name="body_text" nolabel="1" colspan="4" select="1"/>
+                                </page>
+                                <page string="Body (HTML-Web Client Only)">
+                                    <field name="body_html" nolabel="1" colspan="4" />
+                                    <!--<label string="Note: HTML body can't be edited with GTK desktop client." colspan="4"/>
+                                --></page>
 
-							</notebook>
-						</page>
+                            </notebook>
+                        </page>
 
 
-						<page string="Attachments">
-							<group col="4">
-								<separator colspan="4" string="Attachments" />
-								<field name="attachments_ids" colspan="4" nolabel="1" />
-							</group>
-						</page>
-						<page string="Advanced">
-							<group col="4">
-								<field name="account_id" colspan="2" />
-								<field name="server_ref" colspan="2" />
-								<field name="mail_type" colspan="2" />
-								<field name="folder" colspan="2" select="2"/>
-								<separator string="History" colspan="4" />
-								<field name="history" nolabel="1" colspan="4"/>
-							</group>
-						</page>
-					</notebook>
-					<separator colspan="4" string="" />
-					<group col="4" colspan="4">
-						<field name="state" readonly="1" />
-						<button name="complete_mail" type="object" string="Download Full Mail"  states="read,unread" />
-						<button name="send_this_mail" type="object" string="Send Mail" />
-					</group>
-				</form>
-			</field>
-		</record>
+                        <page string="Attachments">
+                            <group col="4">
+                                <separator colspan="4" string="Attachments" />
+                                <field name="attachments_ids" colspan="4" nolabel="1" />
+                            </group>
+                        </page>
+                        <page string="Advanced">
+                            <group col="4">
+                                <field name="account_id" colspan="2" />
+                                <field name="server_ref" colspan="2" />
+                                <field name="mail_type" colspan="2" />
+                                <field name="folder" colspan="2" select="2"/>
+                                <separator string="History" colspan="4" />
+                                <field name="history" nolabel="1" colspan="4"/>
+                            </group>
+                        </page>
+                    </notebook>
+                    <separator colspan="4" string="" />
+                    <group col="4" colspan="4">
+                        <field name="state" readonly="1" />
+                        <button name="complete_mail" type="object" string="Download Full Mail"  states="read,unread" />
+                        <button name="send_this_mail" type="object" string="Send Mail" />
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<!--============================================= TREE VIEWS =============================================-->
-		 <record id="view_email_template_mailbox_tree" model="ir.ui.view">
-			<field name="name">email_template.mailbox.tree</field>
-			<field name="model">email_template.mailbox</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Drafts">
-					<field name="user" />
-					<field name="email_from" select="1" />
-					<field name="subject" select="1" />
-					<field name="attachments_ids" select="2" />
-					<field name="date_mail" select="2" />
-				</tree>
-			</field>
-		</record>
+        <!--============================================= TREE VIEWS =============================================-->
+         <record id="view_email_template_mailbox_tree" model="ir.ui.view">
+            <field name="name">email_template.mailbox.tree</field>
+            <field name="model">email_template.mailbox</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Drafts">
+                    <field name="user" />
+                    <field name="email_from" select="1" />
+                    <field name="subject" select="1" />
+                    <field name="attachments_ids" select="2" />
+                    <field name="date_mail" select="2" />
+                </tree>
+            </field>
+        </record>
 
         <record id="view_email_template_mailbox_search" model="ir.ui.view">
            <field name="name">email_template.mailbox.search</field>
@@ -109,14 +109,14 @@
             <field name="search_view_id" ref="view_email_template_mailbox_search"/>
         </record>
 
-		<!--======================================== MENUS ========================================-->
-		<menuitem name="MailBox" id="menu_email_template_mailbox_all_main2" parent="menu_email_template" />
-		<menuitem name="Personal" id="menu_email_template_personal" parent="menu_email_template_mailbox_all_main2" />
+        <!--======================================== MENUS ========================================-->
+        <menuitem name="MailBox" id="menu_email_template_mailbox_all_main2" parent="menu_email_template" />
+        <menuitem name="Personal" id="menu_email_template_personal" parent="menu_email_template_mailbox_all_main2" />
         <menuitem name="Mails" id="menu_email_template_personal_mails" parent="menu_email_template_personal" action="action_email_template_mailbox"/>
-		<menuitem name="Company" id="menu_email_template_company" parent="menu_email_template_mailbox_all_main2" />
+        <menuitem name="Company" id="menu_email_template_company" parent="menu_email_template_mailbox_all_main2" />
         <menuitem name="Mails" id="menu_email_template_company_mails" parent="menu_email_template_company" action="action_email_template_mailbox"/>
 
-	</data>
+    </data>
 </openerp>
 
 
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 5158d7a5544..49090bd62c5 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -1,147 +1,147 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-	<data>
-		<!-- Email Template PReview -->
-		<record model="ir.ui.view" id="email_template_preview_form">
-			<field name="name">email_template.preview.form</field>
-			<field name="model">email_template.preview</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Email Preview">
-					<field name="rel_model" />
-					<newline />
-					<field name="rel_model_ref" on_change="on_change_ref(rel_model_ref, context)" />
-					<newline />
-					<field name="to" />
-					<newline />
-					<field name="cc" />
-					<newline />
-					<field name="bcc" />
-					<newline />
-					<field name="subject" />
-					<newline />
-					<field name="body_text" />
-					<newline />
-					<!-- <field name="body_html" widget="text_html" />-->
-					<!-- 
-					Removed text_html because it doesnt work in GTK
-					And TinyMCE messes up the HTML in Web Client
-					 -->
-					<field name="body_html"/>
-					<newline />
-					<field name="report" />
-					<group>
-						<button icon="gtk-ok" special="cancel" string="OK" />
-					</group>
-				</form>
-			</field>
-		</record>
+    <data>
+        <!-- Email Template PReview -->
+        <record model="ir.ui.view" id="email_template_preview_form">
+            <field name="name">email_template.preview.form</field>
+            <field name="model">email_template.preview</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Email Preview">
+                    <field name="rel_model" />
+                    <newline />
+                    <field name="rel_model_ref" on_change="on_change_ref(rel_model_ref, context)" />
+                    <newline />
+                    <field name="to" />
+                    <newline />
+                    <field name="cc" />
+                    <newline />
+                    <field name="bcc" />
+                    <newline />
+                    <field name="subject" />
+                    <newline />
+                    <field name="body_text" />
+                    <newline />
+                    <!-- <field name="body_html" widget="text_html" />-->
+                    <!-- 
+                    Removed text_html because it doesnt work in GTK
+                    And TinyMCE messes up the HTML in Web Client
+                     -->
+                    <field name="body_html"/>
+                    <newline />
+                    <field name="report" />
+                    <group>
+                        <button icon="gtk-ok" special="cancel" string="OK" />
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<record id="wizard_email_template_preview" model="ir.actions.act_window">
-			<field name="name">Template Preview</field>
-			<field name="res_model">email_template.preview</field>
-			<field name="src_model">email_template.preview</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>
-			<field name="context">{'ids':active_id}</field>
-		</record>
-		<!--EMail client Form view  -->
+        <record id="wizard_email_template_preview" model="ir.actions.act_window">
+            <field name="name">Template Preview</field>
+            <field name="res_model">email_template.preview</field>
+            <field name="src_model">email_template.preview</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>
+            <field name="context">{'ids':active_id}</field>
+        </record>
+        <!--EMail client Form view  -->
 
-		<record model="ir.ui.view" id="email_template_form">
-			<field name="name">email.template.form</field>
-			<field name="model">email.template</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Email Templates">
-					<field name="name" />
-					<field name="object_name" required="1"
-						on_change="change_model(object_name)" />
-					<field name="model_int_name" invisible="1" />
-					<notebook colspan="4">
-						<page string="Mail Details">
-							<field name="enforce_from_account" required= "1"/>
-							<group col="4" colspan="2">
-							    <field name="from_email"/>
-								<field name="def_to" colspan="4" required="1" />
-								<field name="def_cc" colspan="4" />
-								<field name="def_bcc" colspan="4" />
-							</group>
-							<group col="2" colspan="2">
-								<field name="def_subject" colspan="4" required="1" />
-								<field name="use_sign" colspan="4" />
-								<field name="lang" colspan="4" />
-							</group>
-							<separator colspan="3" string="Standard Body" />
-							<separator colspan="1" string="Expression Builder" />
+        <record model="ir.ui.view" id="email_template_form">
+            <field name="name">email.template.form</field>
+            <field name="model">email.template</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Email Templates">
+                    <field name="name" />
+                    <field name="object_name" required="1"
+                        on_change="change_model(object_name)" />
+                    <field name="model_int_name" invisible="1" />
+                    <notebook colspan="4">
+                        <page string="Mail Details">
+                            <field name="enforce_from_account" required= "1"/>
+                            <group col="4" colspan="2">
+                                <field name="from_email"/>
+                                <field name="def_to" colspan="4" required="1" />
+                                <field name="def_cc" colspan="4" />
+                                <field name="def_bcc" colspan="4" />
+                            </group>
+                            <group col="2" colspan="2">
+                                <field name="def_subject" colspan="4" required="1" />
+                                <field name="use_sign" colspan="4" />
+                                <field name="lang" colspan="4" />
+                            </group>
+                            <separator colspan="3" string="Standard Body" />
+                            <separator colspan="1" string="Expression Builder" />
 
-							<notebook>
-								<page string="Body (Text)">
-									<field name="def_body_text" colspan="4" nolabel="1" />
-								</page>
-								<page string="Body (Raw HTML)">
-									<field name="def_body_html" colspan="4" nolabel="1" />
-									<label string="Note: This is Raw HTML." colspan="4" />
-								</page>
-							</notebook>
-							<group col="4">
-								<field name="template_language"
-									on_change="onchange_null_value(model_object_field,sub_model_object_field,null_value,template_language,context)" />
-								<notebook>
-									<page string="Insert Simple Field">
+                            <notebook>
+                                <page string="Body (Text)">
+                                    <field name="def_body_text" colspan="4" nolabel="1" />
+                                </page>
+                                <page string="Body (Raw HTML)">
+                                    <field name="def_body_html" colspan="4" nolabel="1" />
+                                    <label string="Note: This is Raw HTML." colspan="4" />
+                                </page>
+                            </notebook>
+                            <group col="4">
+                                <field name="template_language"
+                                    on_change="onchange_null_value(model_object_field,sub_model_object_field,null_value,template_language,context)" />
+                                <notebook>
+                                    <page string="Insert Simple Field">
 
-										<field name="model_object_field"
-											domain="[('model_id','=',object_name),('ttype','!=','one2many'),('ttype','!=','many2many')]"
-											on_change="onchange_model_object_field(model_object_field, template_language,context)"
-											colspan="4" />
-										<field name="sub_object" readonly="1" colspan="4" />
-										<field name="sub_model_object_field"
-											domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]"
-											colspan="4"
-											attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}"
-											on_change="onchange_sub_model_object_field(model_object_field,sub_model_object_field,template_language,context)" />
-										<field name="null_value" colspan="4"
-											on_change="onchange_null_value(model_object_field,sub_model_object_field,null_value,template_language,context)" />
-										<field name="copyvalue" colspan="4" />
-									</page>
-								</notebook>
-								<button name="%(wizard_email_template_preview)d" string="Preview Template"
-									type="action" colspan="4" target="new" />
-							</group>
-						</page>
-						<page string="Advanced">
-							<field name="ref_ir_act_window" />
-							<field name="ref_ir_value" />
-							<separator string="Attachments (Report to attach)" colspan="4"/>
-							<field name="file_name" colspan="2" />
-							<field name="report_template" colspan="2"
-									domain="[('model','=',model_int_name)]" />
-						</page>
-					</notebook>
-				</form>
-			</field>
-		</record>
+                                        <field name="model_object_field"
+                                            domain="[('model_id','=',object_name),('ttype','!=','one2many'),('ttype','!=','many2many')]"
+                                            on_change="onchange_model_object_field(model_object_field, template_language,context)"
+                                            colspan="4" />
+                                        <field name="sub_object" readonly="1" colspan="4" />
+                                        <field name="sub_model_object_field"
+                                            domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]"
+                                            colspan="4"
+                                            attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}"
+                                            on_change="onchange_sub_model_object_field(model_object_field,sub_model_object_field,template_language,context)" />
+                                        <field name="null_value" colspan="4"
+                                            on_change="onchange_null_value(model_object_field,sub_model_object_field,null_value,template_language,context)" />
+                                        <field name="copyvalue" colspan="4" />
+                                    </page>
+                                </notebook>
+                                <button name="%(wizard_email_template_preview)d" string="Preview Template"
+                                    type="action" colspan="4" target="new" />
+                            </group>
+                        </page>
+                        <page string="Advanced">
+                            <field name="ref_ir_act_window" />
+                            <field name="ref_ir_value" />
+                            <separator string="Attachments (Report to attach)" colspan="4"/>
+                            <field name="file_name" colspan="2" />
+                            <field name="report_template" colspan="2"
+                                    domain="[('model','=',model_int_name)]" />
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="email_template_tree">
-			<field name="name">email.template.tree</field>
-			<field name="model">email.template</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Email Templates">
-					<field name="name" select="1" />
-					<field name="object_name" required="1" select="1" />
-					<field name="def_to" colspan="4" select="2" />
-					<field name="def_cc" colspan="4" select="2" />
-					<field name="def_bcc" colspan="4" select="2" />
-					<field name="def_subject" colspan="4" select="2" />
-					<field name="use_sign" colspan="4" select="2" />
-					<field name="file_name" colspan="4" />
-					<field name="enforce_from_account" />
-				</tree>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="email_template_tree">
+            <field name="name">email.template.tree</field>
+            <field name="model">email.template</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Email Templates">
+                    <field name="name" select="1" />
+                    <field name="object_name" required="1" select="1" />
+                    <field name="def_to" colspan="4" select="2" />
+                    <field name="def_cc" colspan="4" select="2" />
+                    <field name="def_bcc" colspan="4" select="2" />
+                    <field name="def_subject" colspan="4" select="2" />
+                    <field name="use_sign" colspan="4" select="2" />
+                    <field name="file_name" colspan="4" />
+                    <field name="enforce_from_account" />
+                </tree>
+            </field>
+        </record>
 
         <record id="view_email_template_search" model="ir.ui.view">
            <field name="name">email.template.search</field>
@@ -161,19 +161,19 @@
            </field>
         </record>
 
-		<record model="ir.actions.act_window" id="action_email_template_tree_all">
-			<field name="name">Email Templates</field>
-			<field name="res_model">email.template</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" ref="email_template_tree" />
+        <record model="ir.actions.act_window" id="action_email_template_tree_all">
+            <field name="name">Email Templates</field>
+            <field name="res_model">email.template</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="email_template_tree" />
             <field name="search_view_id" ref="view_email_template_search"/>
-		</record>
+        </record>
 
-		<menuitem name="E-MAIL Templates" id="menu_email_template_all"
-			parent="menu_email_template_configuration" action="action_email_template_tree_all" />
+        <menuitem name="E-MAIL Templates" id="menu_email_template_all"
+            parent="menu_email_template_configuration" action="action_email_template_tree_all" />
 
-	</data>
+    </data>
 </openerp>
 
 
diff --git a/addons/email_template/email_template_workflow.xml b/addons/email_template/email_template_workflow.xml
index 4d3176f0ae0..911b8bf49ff 100644
--- a/addons/email_template/email_template_workflow.xml
+++ b/addons/email_template/email_template_workflow.xml
@@ -11,24 +11,24 @@
             <field name="osv">email_template.account</field>
             <field name="on_create">True</field>
         </record>
-        
+
         <!--Activity -->
-        
+
          <record id="act_draft" model="workflow.activity">
             <field name="wkf_id" ref="wkf_email_template_setting"/>
             <field name="flow_start">True</field>
             <field name="name">draft</field>
-	    <field name="kind">function</field>
+        <field name="kind">function</field>
             <field name="action">write({'state':'draft'})</field>
         </record>
-       
+
         <record id="act_approved" model="workflow.activity">
             <field name="name">approval</field>
             <field name="wkf_id" ref="wkf_email_template_setting"/>
             <field name="kind">function</field>
             <field name="action">do_approval()</field>
         </record>
-        
+
         <record id="act_suspended" model="workflow.activity">
             <field name="name">suspended</field>
             <field name="wkf_id" ref="wkf_email_template_setting"/>
@@ -40,16 +40,16 @@
             <field name="wkf_id" ref="wkf_email_template_setting"/>
             <field name="flow_stop">True</field>
         </record>
-        
+
         <!-- Transition -->
-        
+
         <record id="trans_awaiting_approved" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_approved"/>
             <field name="signal">button_approval</field>
             <field name="role_id" ref="PE_ADMIN"/>
         </record>
-        
+
         <record id="trans_approved_suspended" model="workflow.transition">
             <field name="act_from" ref="act_approved"/>
             <field name="act_to" ref="act_suspended"/>
@@ -67,6 +67,6 @@
             <field name="act_to" ref="act_dummy"/>
             <field name="signal">get_never</field>
             <field name="role_id" ref="PE_ADMIN"/>
-        </record>        
+        </record>
     </data>
 </openerp>
diff --git a/addons/email_template/security/email_template_security.xml b/addons/email_template/security/email_template_security.xml
index 1883ff793e6..9dc788f6780 100755
--- a/addons/email_template/security/email_template_security.xml
+++ b/addons/email_template/security/email_template_security.xml
@@ -1,23 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data noupdate="0">
+    <data noupdate="0">
 
         <record id="res_groups_email_template_admin" model="res.groups">
-            <field name="name">Email Template / Admin</field>
+            <field name="name">Marketing / Email Template</field>
         </record>
 
-		<record id="res_groups_email_template_manager" model="res.groups">
-			<field name="name">Email Template / Settings_Manager</field>
-		</record>
-
-		<record id="res_groups_email_template_userse" model="res.groups">
-			<field name="name">Email Template / External_users</field>
-		</record>
-
-		<record id="res_groups_email_template_usersi" model="res.groups">
-			<field name="name">Email Template / Internal_users</field>
-		</record>
-
-
-	</data>
+    </data>
 </openerp>
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 3853a6e8e38..95fca268763 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -6,4 +6,4 @@
 "access_hr_department_manager","hr.department.manager","model_hr_department","hr.group_hr_manager",1,1,1,1
 "access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","hr.group_hr_user",1,1,1,1
 "access_hr_job","hr.job","model_hr_job","hr.group_hr_user",1,0,0,0
-"access_hr_installer","hr.installer","model_hr_installer","hr.group_hr_user",1,0,0,0
\ No newline at end of file
+"access_hr_installer","hr.installer","model_hr_installer","base.group_system",1,1,1,1
diff --git a/addons/knowledge/security/ir.model.access.csv b/addons/knowledge/security/ir.model.access.csv
index 4fcaaad82cd..9abb2d03be7 100644
--- a/addons/knowledge/security/ir.model.access.csv
+++ b/addons/knowledge/security/ir.model.access.csv
@@ -1,2 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_knowledge_installer","knowledge.installer","model_knowledge_installer",base.group_user,1,0,0,0
+"access_knowledge_installer","knowledge.installer","model_knowledge_installer",base.group_system,1,1,1,1
diff --git a/addons/l10n_be/security/ir.model.access.csv b/addons/l10n_be/security/ir.model.access.csv
index fbb5c74c18c..04d498b5785 100644
--- a/addons/l10n_be/security/ir.model.access.csv
+++ b/addons/l10n_be/security/ir.model.access.csv
@@ -1,6 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_vat_listing_clients","vat.listing.clients","model_vat_listing_clients",,1,1,1,1
-"access_partner_vat_intra","partner.vat.intra","model_partner_vat_intra",,1,1,1,1
-"access_partner_vat","partner.vat","model_partner_vat",,1,1,1,1
-"access_partner_vat_list","partner.vat.list","model_partner_vat_list",,1,1,1,1
-"access_l1on_be_vat_declaration","l1on_be.vat.declaration","model_l1on_be_vat_declaration",,1,1,1,1
+"access_vat_listing_clients","vat.listing.clients","model_vat_listing_clients",account.group_account_user,1,1,1,1
+"access_partner_vat_intra","partner.vat.intra","model_partner_vat_intra",account.group_account_user,1,1,1,1
+"access_partner_vat","partner.vat","model_partner_vat",account.group_account_user,1,1,1,1
+"access_partner_vat_list","partner.vat.list","model_partner_vat_list",account.group_account_user,1,1,1,1
+"access_l1on_be_vat_declaration","l1on_be.vat.declaration","model_l1on_be_vat_declaration",account.group_account_user,1,1,1,1
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 8f58f7179ad..8089be4a431 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -24,7 +24,7 @@
 "access_hr_timesheet_group_mrp_worker","resource.calendar mrp_worker","resource.model_resource_calendar","mrp.group_mrp_user",1,0,0,0
 "access_procurement_stock_worker","procurement.order stock_worker","model_procurement_order","stock.group_stock_user",1,1,1,1
 "access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
-"access_mrp_installer","mrp.installer","model_mrp_installer","mrp.group_mrp_user",1,0,0,0
+"access_mrp_installer","mrp.installer","model_mrp_installer","base.group_system",1,1,1,1
 "access_mrp_product_produce","mrp.product.produce","model_mrp_product_produce","mrp.group_mrp_user",1,0,0,0
 "access_mrp_change_production_qty","change.production.qty","model_change_production_qty","mrp.group_mrp_user",1,0,0,0
 "access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_user",1,0,0,0
diff --git a/addons/point_of_sale/multi_company_demo.xml b/addons/point_of_sale/multi_company_demo.xml
index e0e58ad75d7..9ae66800ff9 100644
--- a/addons/point_of_sale/multi_company_demo.xml
+++ b/addons/point_of_sale/multi_company_demo.xml
@@ -1,32 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="0">
-        <record id="second_partner" model="res.partner">
-            <field name="name">OpenERP Editor</field>
-        </record>
-        <record id="second_company" model="res.company">
-            <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>
-            <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">OpenERP Integrator</field>
-        </record>
-
-        <record id="ter_company" model="res.company">
-            <field name="name">OpenERP 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
index a74ea0a56e9..cc8d30d080d 100644
--- a/addons/point_of_sale/multi_company_stock_data.xml
+++ b/addons/point_of_sale/multi_company_stock_data.xml
@@ -1,41 +1,5 @@
 <?xml version="1.0"?>
 <openerp>
-
-<data>
-        <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_data.xml b/addons/point_of_sale/pos_data.xml
index b36bd0827c2..14710cf8f37 100644
--- a/addons/point_of_sale/pos_data.xml
+++ b/addons/point_of_sale/pos_data.xml
@@ -1,58 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
     <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="uom_po_id" ref="product.product_uom_unit"/>
-        </record>
 
-        <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="uom_po_id" ref="product.product_uom_unit"/>
-        </record>
-
-        <record id="product_category_voucher" model="product.category">
-            <field name="name">Bon</field>
-        </record>
-
-        <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>
-
-        <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
index b548f12d8e7..14710cf8f37 100644
--- a/addons/point_of_sale/pos_demo.xml
+++ b/addons/point_of_sale/pos_demo.xml
@@ -1,190 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
+    <data>
 
-	<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 name="company_ids" eval="[(4, 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_salesman_id" 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"/>
-			<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_salesman_id" 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"/>
-			<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_salesman_id" 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"/>
-			<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="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>
-
-  </data>
 </openerp>
diff --git a/addons/point_of_sale/pos_report.xml b/addons/point_of_sale/pos_report.xml
index 9123502d288..b079f6b9177 100644
--- a/addons/point_of_sale/pos_report.xml
+++ b/addons/point_of_sale/pos_report.xml
@@ -1,112 +1,112 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <openerp>
-	<data>
+    <data>
 
-		<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_invoice_report"
+            string="Invoice"
+            model="pos.order"
+            name="pos.invoice"
+            auto="False"
+            multi="True"
+            rml="account/report/invoice.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"
-			 />
+        <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"
+             />
 
-		<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_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_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_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"
+            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_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"
-			 />
+        <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>
+    </data>
 </openerp>
diff --git a/addons/point_of_sale/pos_sequence.xml b/addons/point_of_sale/pos_sequence.xml
index 42bc4334b89..691b35a8f1a 100644
--- a/addons/point_of_sale/pos_sequence.xml
+++ b/addons/point_of_sale/pos_sequence.xml
@@ -2,42 +2,42 @@
 <openerp>
 <data noupdate="1">
 
-	#
-	# Sequences for pos.order
-	#
+    #
+    # Sequences for pos.order
+    #
 
-	<record model="ir.sequence.type" id="seq_type_pos_order">
-		<field name="name">POS Order</field>
-		<field name="code">pos.order</field>
-	</record>
-	<record model="ir.sequence" id="seq_pos_order">
-		<field name="name">POS Order</field>
-		<field name="code">pos.order</field>
-		<field name="prefix">POS/</field>
-		<field name="padding">3</field>
-	</record>
+    <record model="ir.sequence.type" id="seq_type_pos_order">
+        <field name="name">POS Order</field>
+        <field name="code">pos.order</field>
+    </record>
+    <record model="ir.sequence" id="seq_pos_order">
+        <field name="name">POS Order</field>
+        <field name="code">pos.order</field>
+        <field name="prefix">POS/</field>
+        <field name="padding">3</field>
+    </record>
 
-	<record model="ir.sequence.type" id="seq_type_pos_payment">
-		<field name="name">POS Payment</field>
-		<field name="code">pos.payment</field>
-	</record>
-	<record model="ir.sequence" id="seq_pos_payment">
-		<field name="name">POS Payment</field>
-		<field name="code">pos.payment</field>
-		<field name="prefix">Payment/</field>
-		<field name="padding">2</field>
-	</record>
+    <record model="ir.sequence.type" id="seq_type_pos_payment">
+        <field name="name">POS Payment</field>
+        <field name="code">pos.payment</field>
+    </record>
+    <record model="ir.sequence" id="seq_pos_payment">
+        <field name="name">POS Payment</field>
+        <field name="code">pos.payment</field>
+        <field name="prefix">Payment/</field>
+        <field name="padding">2</field>
+    </record>
 
-	<record model="ir.sequence.type" id="seq_type_pos_order_line">
-		<field name="name">POS order line</field>
-		<field name="code">pos.order.line</field>
-	</record>
-	<record model="ir.sequence" id="seq_pos_order_line">
-		<field name="name">POS order line</field>
-		<field name="code">pos.order.line</field>
-		<field name="prefix">Order Line/</field>
-		<field name="padding">2</field>
-	</record>
+    <record model="ir.sequence.type" id="seq_type_pos_order_line">
+        <field name="name">POS order line</field>
+        <field name="code">pos.order.line</field>
+    </record>
+    <record model="ir.sequence" id="seq_pos_order_line">
+        <field name="name">POS order line</field>
+        <field name="code">pos.order.line</field>
+        <field name="prefix">Order Line/</field>
+        <field name="padding">2</field>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index b3c784f6ea2..026b268eed0 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -9,11 +9,11 @@
             <field name="arch" type="xml">
                 <form string="Sales Order POS">
                     <group col="6" colspan="4">
-						<field name="user_salesman_id" />
-						<field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
-						<field name="contract_number" groups="base.group_extended"/>
+                        <field name="user_salesman_id" />
+                        <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
+                        <field name="contract_number" groups="base.group_extended"/>
 
-                	</group>
+                    </group>
                      <notebook colspan="4">
                       <page string="Sale Order ">
                             <field name="lines" colspan="4" nolabel="1">
@@ -112,7 +112,7 @@
                         </page>
 
                         <page string="Notes" >
-							<field colspan="4" name="note" nolabel="1"/>
+                            <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
 
@@ -169,7 +169,8 @@
             </field>
         </record>
 
-        <menuitem name="Point of Sale" id="menu_point_root" sequence="10"/>
+        <menuitem name="Point of Sale" id="menu_point_root" sequence="10"
+            groups="group_pos_manager,group_pos_user"/>
         <menuitem name="Point of Sale" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
         <menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
         <menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="2" />
@@ -186,7 +187,7 @@
             <field name="view_id" ref="view_pos_order_tree"/>
             <field name="domain">['|',('state_2','=','to_verify'),('state','=','advance')]</field>
             <field name="context">{"search_default_user_id":uid}</field>
-			<field name="search_view_id" ref="view_pos_order_filter"/>
+            <field name="search_view_id" ref="view_pos_order_filter"/>
 
         </record>
 
@@ -199,7 +200,7 @@
             <field name="view_id" ref="view_pos_order_tree"/>
             <field name="domain">[('state','!=', 'invoiced')]</field>
             <field name="context">{"search_default_user_id":uid}</field>
-			<field name="search_view_id" ref="view_pos_order_filter"/>
+            <field name="search_view_id" ref="view_pos_order_filter"/>
 
         </record>
         <menuitem name="Invoicing" id="menu_point_of_sale_invoicing" parent="menu_point_root" sequence="4" />
@@ -212,7 +213,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=', 'paid')]</field>
             <field name="context">{"search_default_user_id":uid}</field>
- 			<field name="search_view_id" ref="view_pos_order_filter"/>
+             <field name="search_view_id" ref="view_pos_order_filter"/>
         </record>
         <record model="ir.actions.act_window" id="action_pos_order_tree2">
             <field name="name">Point of Sale</field>
@@ -222,7 +223,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('date_order','&lt;=', time.strftime('%Y-%m-%d 23:59:59'))]</field>
             <field name="context">{"search_default_user_id":uid}</field>
- 			<field name="search_view_id" ref="view_pos_order_filter"/>
+             <field name="search_view_id" ref="view_pos_order_filter"/>
         </record>
 
         <record model="ir.actions.act_window" id="action_pos_order_tree3">
@@ -232,7 +233,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="context">{"search_default_user_id":uid}</field>
-			<field name="search_view_id" ref="view_pos_order_filter"/>
+            <field name="search_view_id" ref="view_pos_order_filter"/>
         </record>
         <record model="ir.actions.act_window" id="action_pos_order_tree_open">
             <field name="name">Opened Sales</field>
@@ -241,7 +242,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
             <field name="context">{"search_default_user_id":uid}</field>
-			<field name="search_view_id" ref="view_pos_order_filter"/>
+            <field name="search_view_id" ref="view_pos_order_filter"/>
         </record>
 
         <record model="ir.ui.view" id="view_pos_order_line">
diff --git a/addons/point_of_sale/pos_workflow.xml b/addons/point_of_sale/pos_workflow.xml
index 11cd9481343..189b38e348f 100644
--- a/addons/point_of_sale/pos_workflow.xml
+++ b/addons/point_of_sale/pos_workflow.xml
@@ -1,84 +1,84 @@
 <?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>
+    <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 -->
+        <!-- Roles definition -->
 
-	<record model="res.roles" id="role_pos">
-		<field name="name">POS - Confirmation</field>
-	</record>
+    <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_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_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_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_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_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>
+    <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_paid">
-	  <field name="act_from" ref="act_draft"/>
-	  <field name="act_to" ref="act_paid"/>
-	  <field name="condition">test_paid()</field>
-	  <field name="signal">paid</field>
-	</record>
+    <record model="workflow.transition" id="trans_draft_paid">
+      <field name="act_from" ref="act_draft"/>
+      <field name="act_to" ref="act_paid"/>
+      <field name="condition">test_paid()</field>
+      <field name="signal">paid</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>
-	</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>
+    </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_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>
+    <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>
diff --git a/addons/point_of_sale/posr_data.xml b/addons/point_of_sale/posr_data.xml
index de0ec465950..3ba8df59b13 100644
--- a/addons/point_of_sale/posr_data.xml
+++ b/addons/point_of_sale/posr_data.xml
@@ -1,74 +1,6 @@
 <?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>
+    <data>
+
+    </data>
 </openerp>
diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
index 905e78e6e7a..f2ac2d664af 100644
--- a/addons/point_of_sale/posrule_data.xml
+++ b/addons/point_of_sale/posrule_data.xml
@@ -1,505 +1,7 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <data>
 
-   		<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 name="company_ids" eval="[(4, 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 name="company_ids" eval="[(4, 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_0" model="ir.rule">
-			<field name="name">POS line</field>
-	        <field name="model_id" ref="model_pos_order_line"/>
-	        <field name="global" eval="True"/>
-	        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-		</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_0')])]" 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_0" model="ir.rule">		
-    	<field eval="&quot;&quot;&quot;point&quot;&quot;&quot;" name="name"/>
-		<field name="model_id" ref="model_pos_order"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-	</record>     
-		<record id="ir_rule_group_posreporting0" model="ir.rule">
-			<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 name="global" eval="True"/>
-		</record>
-
-		<record id="ir_rule_5" model="ir.rule">
-			<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>		
-			<field name="domain_force">['|',('user_id','=',False),('user_id','=',[user.id])]</field>			
-		</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('procurement.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="procurement.model_procurement_order"/>
-			<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;Ledger Posting&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="procurement.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="procurement.model_procurement_order" />
-            <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;procurement.order&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 action="stock.action_picking_tree" id="stock.menu_action_picking_tree" parent="stock.menu_stock_warehouse_mgmt" sequence="19" groups="res_groups_posuser0"/>
-<!--        <menuitem id="procurement.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>
+    </data>
 </openerp>
 
diff --git a/addons/point_of_sale/posrule_data2.xml b/addons/point_of_sale/posrule_data2.xml
index 7ac787db54c..1010f75d055 100644
--- a/addons/point_of_sale/posrule_data2.xml
+++ b/addons/point_of_sale/posrule_data2.xml
@@ -1,592 +1,17 @@
 <?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"/>
+    <data>
 
-        </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('procurement.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="procurement.model_procurement_order"/>
-			<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;Ledger Posting&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="procurement.model_procurement_order" />
-            <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;procurement.order&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
+        <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>
+        <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/singer_statement_demo.xml b/addons/point_of_sale/singer_statement_demo.xml
index 68f889cddee..43b25437173 100644
--- a/addons/point_of_sale/singer_statement_demo.xml
+++ b/addons/point_of_sale/singer_statement_demo.xml
@@ -1,324 +1,7 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <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="point_of_sale.pos_order_posadvance" model="pos.order">
-      <field name="sale_journal" ref="sales_journal_comp2"/>
-    </record>
-
-	</data>
+    </data>
 </openerp>
diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml
index 5172e0e70d4..3ba8df59b13 100644
--- a/addons/point_of_sale/statement_data.xml
+++ b/addons/point_of_sale/statement_data.xml
@@ -1,41 +1,6 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <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">
-			<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">
-			<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('procurement.menu_mrp_procurement_action3'),ref('procurement.menu_mrp_procurement_new'),ref('mrp.next_id_77'),ref('mrp.menu_report_workcenter_load'),ref('mrp.menu_report_in_out_picking'),ref('base.menu_sales'),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>
+    </data>
 </openerp>
diff --git a/addons/point_of_sale/statement_report.xml b/addons/point_of_sale/statement_report.xml
index 73b2c914dd3..fb1be16419e 100644
--- a/addons/point_of_sale/statement_report.xml
+++ b/addons/point_of_sale/statement_report.xml
@@ -1,69 +1,69 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <openerp>
-	<data>
+    <data>
 
-		<report
-			id="pos_users_product_re"
-			string="User's Product"
-			model="account.bank.statement"
-			name="pos.user.product"
-			auto="False"
-			multi="True"
-			rml="point_of_sale/report/pos_users_product.rml"
-			 />
+        <report
+            id="pos_users_product_re"
+            string="User's Product"
+            model="account.bank.statement"
+            name="pos.user.product"
+            auto="False"
+            multi="True"
+            rml="point_of_sale/report/pos_users_product.rml"
+             />
 
-		<report
-			id="account_statement"
-			string="Statement"
-			model="account.bank.statement"
-			name="account.statement"
-			auto="False"
-			multi="True"
-			rml="point_of_sale/report/account_statement.rml"
-			 />
+        <report
+            id="account_statement"
+            string="Statement"
+            model="account.bank.statement"
+            name="account.statement"
+            auto="False"
+            multi="True"
+            rml="point_of_sale/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="point_of_sale/report/all_closed_cashbox_of_the_day.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="point_of_sale/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="point_of_sale/report/pos_users_product.rml"
-			 />
+        <report
+            id="pos_users_product_re"
+            string="User's Product"
+            model="account.bank.statement"
+            name="pos.user.product"
+            auto="False"
+            multi="True"
+            rml="point_of_sale/report/pos_users_product.rml"
+             />
 
-		<report
-			id="account_statement"
-			string="Statement"
-			model="account.bank.statement"
-			name="account.statement"
-			auto="False"
-			multi="True"
-			rml="point_of_sale/report/account_statement.rml"
-			 />
+        <report
+            id="account_statement"
+            string="Statement"
+            model="account.bank.statement"
+            name="account.statement"
+            auto="False"
+            multi="True"
+            rml="point_of_sale/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="point_of_sale/report/all_closed_cashbox_of_the_day.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="point_of_sale/report/all_closed_cashbox_of_the_day.rml"
+             />
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/point_of_sale/statement_rules.xml b/addons/point_of_sale/statement_rules.xml
index eba649f3ec5..3ba8df59b13 100644
--- a/addons/point_of_sale/statement_rules.xml
+++ b/addons/point_of_sale/statement_rules.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-</data>
+    <data>
+
+    </data>
 </openerp>
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index 69c3232f1a0..a4acd7429ec 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -55,32 +55,32 @@
                     <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_sub(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_sub(pieces,number, parent.balance_end)"/>
-                        		<field name="subtotal"/>
-                    		</form>
-                    	</field>
+                        <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, parent.balance_end)"/>
+                                <field name="subtotal" sum="Total"/>
+                            </tree>
+                            <form string = "Ending Details">
+                                <field name="pieces"/>
+                                <field name="number" on_change="on_change_sub(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_sub(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_sub(pieces,number, parent.balance_end)"/>
-                        		<field name="subtotal"/>
-                    		</form>
-                    	</field>
+                        <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, parent.balance_end)"/>
+                                <field name="subtotal" sum="Total"/>
+                            </tree>
+                            <form string = "Ending Details">
+                                <field name="pieces"/>
+                                <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+                                <field name="subtotal"/>
+                            </form>
+                        </field>
                     </page>
                         <page string="Entry encoding">
                             <field colspan="4" name="line_ids" nolabel="1">
@@ -132,18 +132,18 @@
                     <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_sub(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_sub(pieces,number, parent.balance_end)"/>
-                        		<field name="subtotal"/>
-                    		</form>
-                    	</field>
+                        <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, parent.balance_end)"/>
+                                <field name="subtotal" sum="Total"/>
+                            </tree>
+                            <form string = "Ending Details">
+                                <field name="pieces"/>
+                                <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+                                <field name="subtotal"/>
+                            </form>
+                        </field>
                     </page>
                         <page string="Entry encoding">
                             <field colspan="4" name="line_ids" nolabel="1">
@@ -185,18 +185,18 @@
             <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>
+        <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"/>
@@ -213,18 +213,18 @@
 
 
         </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>
+        <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"/>-->
 
@@ -265,32 +265,32 @@
                     <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>
+                        <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>
+                        <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">
@@ -332,45 +332,45 @@
             <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>
+        <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">
+        <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.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">
+        <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>
@@ -378,22 +378,22 @@
             <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>
+                    <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.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">
+        <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>
@@ -401,44 +401,44 @@
             <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>
+        <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="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
+        <menuitem
             name="Open Registers" parent="point_of_sale.menu_point_config"
             string="Open Register"
             action="action_pos_open_statement"
             id="menu_open_statement" sequence="1" />
 
        <menuitem icon="STOCK_PRINT"
-       			 action="action_report_all_closed_cashbox_of_the_day"
-				 id="menu_all_closed_cashbox_of_the_day"
-				 parent="menu_statement_tree_all"/>
+                    action="action_report_all_closed_cashbox_of_the_day"
+                 id="menu_all_closed_cashbox_of_the_day"
+                 parent="menu_statement_tree_all"/>
 
-		<menuitem
+        <menuitem
             name="Close Register" parent="point_of_sale.menu_point_config"
             string="Close Register"
             action="action_pos_close_statement"
             id="menu_close_statement" sequence="2" />
 
        <menuitem icon="STOCK_PRINT"
-       			 action="action_report_all_closed_cashbox_of_the_day"
-				 id="menu_all_closed_cashbox_of_the_day"
-				 parent="menu_point_report_register"/>
+                    action="action_report_all_closed_cashbox_of_the_day"
+                 id="menu_all_closed_cashbox_of_the_day"
+                 parent="menu_point_report_register"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/point_of_sale/statement_wizard.xml b/addons/point_of_sale/statement_wizard.xml
index dd9715db628..8220eda8bed 100644
--- a/addons/point_of_sale/statement_wizard.xml
+++ b/addons/point_of_sale/statement_wizard.xml
@@ -1,12 +1,13 @@
 <openerp>
-	<data>
-<!--  		<wizard
-        	id="close_statement"
-        	model="account.bank.statement"
-        	menu="True"
-        	name="statement.close"
-        	string="Close Statements"/>
-		<menuitem
+    <data>
+
+<!--          <wizard
+            id="close_statement"
+            model="account.bank.statement"
+            menu="True"
+            name="statement.close"
+            string="Close Statements"/>
+        <menuitem
             name="Close Register" parent="point_of_sale.menu_point_config"
             string="Close Register"
             action="close_statement"
@@ -15,11 +16,9 @@
 
 -->
 
-
-       
        <menuitem icon="STOCK_PRINT"
-       			 action="action_report_all_closed_cashbox_of_the_day"
-				 id="menu_all_closed_cashbox_of_the_day"
-				 parent="menu_point_report_register"/>
+                    action="action_report_all_closed_cashbox_of_the_day"
+                 id="menu_all_closed_cashbox_of_the_day"
+                 parent="menu_point_report_register"/>
     </data>
 </openerp>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 93a489245c4..5639315788e 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -466,7 +466,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Variant">
- 					<field name="product_tmpl_id" select="1"/>                
+                     <field name="product_tmpl_id" select="1"/>                
                     <field name="active" select="1"/>
                     <field name="variants" select="1"/>
                     <field name="default_code" select="1"/>
@@ -606,7 +606,7 @@
             <field name="view_id" ref="product_template_tree_view"/>
         </record>
 
-		<record id="ir_ui_view_sc_product0" model="ir.ui.view_sc">
+        <record id="ir_ui_view_sc_product0" model="ir.ui.view_sc">
             <field name="name">Products</field>
             <field name="resource">ir.ui.menu</field>
             <field name="user_id" ref="base.user_root"/>
diff --git a/addons/profile_tools/security/ir.model.access.csv b/addons/profile_tools/security/ir.model.access.csv
index dbe55929ecc..a46b61c89a2 100644
--- a/addons/profile_tools/security/ir.model.access.csv
+++ b/addons/profile_tools/security/ir.model.access.csv
@@ -1,2 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_misc_tools_installer","misc_tools.installer","model_misc_tools_installer",,1,1,1,1
+"access_misc_tools_installer","misc_tools.installer","model_misc_tools_installer",base.group_system,1,1,1,1
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f58f026d484..1e2a0be260f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -40,8 +40,6 @@
                             </group>
 
                             <newline/>
-                            <separator colspan="4" string="Project's members"/>
-                            <field colspan="4" name="members" nolabel="1"/>
                             <group col="9" colspan="8">
                                 <field name="state" select="1"/>
                                 <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
@@ -50,12 +48,16 @@
                                 <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="set_done" string="Done" type="object" states="open,pending" icon="gtk-jump-to"/>
                                 <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
-								<button
+                                <button
                                     string="New Project Based on Template"
                                     name="duplicate_template"  type="object"
                                     states="template" icon="gtk-new"/>
                             </group>
                         </page>
+                        <page string="Members">
+                            <separator colspan="4" string="Project's members"/>
+                            <field colspan="4" name="members" nolabel="1"/>
+                        </page>
                         <page groups="base.group_extended" string="Partner Info">
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
                             <field domain="[('partner_id','=',partner_id)]" name="contact_id"/>
@@ -540,25 +542,25 @@
 
       <!--     User Form-->
       <record id="view_project_users_form_simple" model="ir.ui.view">
-	      <field name="name">res.users.project.form1</field>
-	      <field name="model">res.users</field>
-	      <field name="type">form</field>
-	      <field name="inherit_id" ref="base.view_users_form"/>
-	      <field eval="18" name="priority"/>
-	      <field name="arch" type="xml">
-	          <field name="password" position="after">
-	           <field name="context_project_id" completion="1" widget="selection"/>
-	          </field>
-	      </field>
+          <field name="name">res.users.project.form1</field>
+          <field name="model">res.users</field>
+          <field name="type">form</field>
+          <field name="inherit_id" ref="base.view_users_form"/>
+          <field eval="18" name="priority"/>
+          <field name="arch" type="xml">
+              <field name="password" position="after">
+               <field name="context_project_id" completion="1" widget="selection"/>
+              </field>
+          </field>
      </record>
 
      <record model="ir.ui.view" id="view_users_form_project_modif_inherited1">
-	     <field name="name">view.users.form.project.modif.inherited1</field>
-	     <field name="model">res.users</field>
-	     <field name="inherit_id" ref="base.view_users_form_simple_modif" />
-	     <field name="type">form</field>
-	     <field eval="18" name="priority"/>
-	     <field name="arch" type="xml">
+         <field name="name">view.users.form.project.modif.inherited1</field>
+         <field name="model">res.users</field>
+         <field name="inherit_id" ref="base.view_users_form_simple_modif" />
+         <field name="type">form</field>
+         <field eval="18" name="priority"/>
+         <field name="arch" type="xml">
             <page string="Current Activity" position="inside">
                 <field name="context_project_id" completion="1" widget="selection" context="{'user_prefence':True}"/>
             </page>
@@ -607,11 +609,11 @@
                    <group col="20" colspan="4">
                        <filter domain="[('date','&gt;=',time.strftime('%%Y-%%m-01'))]" icon="terp-go-month" string="This Month" />
                        <filter domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" icon="terp-go-today" string="Today" />
-	                   <separator orientation="vertical"/>
-	                   <field name="subject"/>
-	                   <field name="project_id" select="1" widget="selection"/>
-	                   <field name="user_id" select="1" widget="selection">
-	                   </field>
+                       <separator orientation="vertical"/>
+                       <field name="subject"/>
+                       <field name="project_id" select="1" widget="selection"/>
+                       <field name="user_id" select="1" widget="selection">
+                       </field>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
@@ -639,6 +641,6 @@
 
         <act_window domain="[('user_id', '=', active_id),('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
-		<act_window domain="[('project_id', '=', active_id)]" id="act_project_messages" name="Messages" res_model="project.message" src_model="project.project"/>
+        <act_window domain="[('project_id', '=', active_id)]" id="act_project_messages" name="Messages" res_model="project.message" src_model="project.project"/>
     </data>
 </openerp>
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 0cbe980f2e6..1a2fac38c6a 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -1,9 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_project_project_manager","project.project manager","model_project_project","project.group_project_manager",1,1,1,1
-"access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","project.group_project_user",1,1,1,1
+"access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","project.group_project_manager",1,1,1,1
 "access_project_project","project.project","model_project_project","project.group_project_user",1,0,0,0
 "access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","project.group_project_user",1,0,0,0
-"access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,0,0,1
+"access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,0,0,0
 "access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1
 "access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1
 "access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,1
@@ -11,10 +11,18 @@
 "access_project_task_work_manager","project.task.work.manager","model_project_task_work","project.group_project_manager",1,1,1,1
 "access_config_compute_remaining","project.config.compute.remaining","model_config_compute_remaining","project.group_project_user",1,1,1,1
 "access_config_compute_remaining_manager","project.config.compute.remaining.manager","model_config_compute_remaining","project.group_project_manager",1,1,1,1
-"access_project_message","project.message","model_project_message","project.group_project_user",1,0,0,0
-"access_project_installer","project.installer","model_project_installer","project.group_project_user",1,0,0,0
+"access_project_message","project.message","model_project_message","project.group_project_user",1,1,1,1
+"access_project_installer","project.installer","model_project_installer","base.group_system",1,1,1,1
 "access_report_project_task_user","report.project.task.user","model_report_project_task_user","project.group_project_manager",1,0,0,0
 "access_project_vs_remaining_hours","project.vs.remaining.hours","model_project_vs_remaining_hours","project.group_project_user",1,1,1,1
 "access_task_by_days_vs_planned_hours","task.by.days.vs.planned.hour","model_task_by_days_vs_planned_hours","project.group_project_user",1,1,1,1
 "access_task_by_days","task.by.days","model_task_by_days","project.group_project_user",1,1,1,1
-"access_close_task","close.task","model_close_task","project.group_project_manager",1,1,1,1
+"access_close_task","close.task","model_close_task","project.group_project_user",1,1,1,1
+"access_close_task_manager","close.task manager","model_close_task","project.group_project_manager",1,1,1,1
+"access_resource_calendar_project_user","resource.resource.calendar project user","resource.model_resource_calendar","project.group_project_user",1,0,0,0
+"access_resource_calendar_project_manager","resource.resource.calendar project manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
+"access_fiscalyear_sequence_project_manager","account.sequence.fiscalyear project manager","account.model_account_sequence_fiscalyear","project.group_project_manager",1,1,0,0
+"access_partner_task user","base.res.partner user","base.model_res_partner","project.group_project_user",1,0,0,0
+"access_partner_task manager","base.res.partner manager","base.model_res_partner","project.group_project_manager",1,0,0,0
+"access_partner_address_task user","base.res.partner.address user","base.model_res_partner_address","project.group_project_user",1,0,0,0
+"access_partner_address_task manager","base.res.partner.address manager","base.model_res_partner_address","project.group_project_manager",1,0,0,0
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 447ee1af39e..dbb28db165e 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -13,25 +13,25 @@
     </record>
 
     <record model="ir.ui.menu" id="menu_definitions">
-        <field name="groups_id" eval="[(6,0,[ref('group_project_manager'), ref('group_project_finance')])]"/>
+        <field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
     </record>
 
     <record model="ir.rule" id="project_comp_rule">
-    	<field name="name">Project multi-company</field>
+        <field name="name">Project multi-company</field>
         <field name="model_id" ref="model_project_project"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="task_comp_rule">
-    	<field name="name" >Task multi-company</field>
+        <field name="name" >Task multi-company</field>
         <field name="model_id" ref="model_project_task"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="task_visibility_rule">
-    	<field name="name" >Tasks According to User and Project</field>
+        <field name="name" >Tasks According to User and Project</field>
         <field name="model_id" ref="model_project_task"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|','|','|',('user_id','=',False),('user_id','=',user.id),('project_id.members','=',user.id),('project_id.user_id','=',user.id)]</field>
diff --git a/addons/project_gtd/security/ir.model.access.csv b/addons/project_gtd/security/ir.model.access.csv
index 52e1b466740..0398fbfb0ee 100644
--- a/addons/project_gtd/security/ir.model.access.csv
+++ b/addons/project_gtd/security/ir.model.access.csv
@@ -1,3 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_project_gtd_context","project.gtd.context","model_project_gtd_context","group_project_getting",1,1,1,1
 "access_project_gtd_timebox","project.gtd.timebox","model_project_gtd_timebox","group_project_getting",1,1,1,1
+"access_project_gtd_context_user","project.gtd.context project user","model_project_gtd_context","project.group_project_user",1,0,0,0
+"access_project_gtd_timebox_user","project.gtd.timebox project user","model_project_gtd_timebox","project.group_project_user",1,0,0,0
+"access_project_gtd_context_manager","project.gtd.context project manager","model_project_gtd_context","project.group_project_manager",1,1,1,1
+"access_project_gtd_timebox_manager","project.gtd.timebox project manager","model_project_gtd_timebox","project.group_project_manager",1,1,1,1
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 212af8a30dc..57fbd1abb5f 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -256,115 +256,7 @@ class task(osv.osv):
     _inherit = "project.task"
     _columns = {
         'phase_id': fields.many2one('project.phase', 'Project Phase'),
-        'occupation_rate': fields.float('Occupation Rate', help='The occupation rate fields indicates how much of his time a user is working on a task. A 100% occupation rate means the user works full time on the tasks. The ending date of a task is computed like this: Starting Date + Duration / Occupation Rate.'),
-        'planned_hours': fields.float('Planned Hours', required=True, help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
     }
-    _defaults = {
-         'occupation_rate': '1'
-    }
-
-    def onchange_planned(self, cr, uid, ids, project, user_id=False, planned=0.0, effective=0.0, date_start=None, occupation_rate=0.0):
-        result = {}
-        resource = False
-        resource_obj = self.pool.get('resource.resource')
-        project_pool = self.pool.get('project.project')
-        resource_calendar = self.pool.get('resource.calendar')
-        if not project:
-            return {'value' : result}
-        if date_start:
-            hrs = float(planned / float(occupation_rate))
-            calendar_id = project_pool.browse(cr, uid, project).resource_calendar_id.id
-            dt_start = mx.DateTime.strptime(date_start, '%Y-%m-%d %H:%M:%S')
-            resource_id = resource_obj.search(cr, uid, [('user_id','=',user_id)])
-            if resource_id:
-                resource_data = resource_obj.browse(cr, uid, resource_id)[0]
-                resource = resource_data.id
-                hrs = planned / (float(occupation_rate) * resource_data.time_efficiency)
-                if resource_data.calendar_id.id:
-                    calendar_id = resource_data.calendar_id.id
-            work_times = resource_calendar.interval_get(cr, uid, calendar_id, dt_start, hrs or 0.0, resource or False)
-            if work_times:
-                result['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
-        result['remaining_hours'] = planned - effective
-        return {'value' : result}
-
-    def _check_date_start(self, cr, uid, task, date_end, context={}):
-       """
-       Check And Compute date_end of task if change in date_start < older time.
-       """
-       resource_calendar_obj = self.pool.get('resource.calendar')
-       resource_obj = self.pool.get('resource.resource')
-       calendar_id = task.project_id.resource_calendar_id and task.project_id.resource_calendar_id.id or False
-       hours = task.planned_hours / task.occupation_rate
-       resource_id = resource_obj.search(cr, uid, [('user_id', '=', task.user_id.id)], context=context)
-       if resource_id:
-            resource = resource_obj.browse(cr, uid, resource_id[0], context=context)
-            if resource.calendar_id.id:
-                calendar_id = resource.calendar_id and resource.calendar_id.id or False
-            hours = task.planned_hours / (float(task.occupation_rate) * resource.time_efficiency)
-       work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, date_end, hours or 0.0, resource_id and resource_id[0] or False)
-       dt_start = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S')
-       self.write(cr, uid, [task.id], {'date_start' : dt_start,'date_end' : date_end.strftime('%Y-%m-%d %H:%M:%S')})
-
-    def _check_date_end(self, cr, uid, task, date_start, context={}):
-       """
-       Check And Compute date_end of task if change in date_end > older time.
-       """
-       resource_calendar_obj = self.pool.get('resource.calendar')
-       resource_obj = self.pool.get('resource.resource')
-       calendar_id = task.project_id.resource_calendar_id and task.project_id.resource_calendar_id.id or False
-       hours = task.planned_hours / task.occupation_rate
-       resource_id = resource_obj.search(cr,uid,[('user_id', '=', task.user_id.id)], context=context)
-       if resource_id:
-            resource = resource_obj.browse(cr, uid, resource_id[0], context=context)
-            if resource.calendar_id.id:
-                calendar_id = resource.calendar_id and resource.calendar_id.id or False
-            hours = task.planned_hours / (float(task.occupation_rate) * resource.time_efficiency)
-       work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, date_start, hours or 0.0, resource_id and resource_id[0] or False)
-       dt_end = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
-       self.write(cr, uid, [task.id], {'date_start': date_start.strftime('%Y-%m-%d %H:%M:%S'),'date_end' : dt_end}, context=context)
-
-    def write(self, cr, uid, ids, vals, context={}):
-        resource_calendar_obj = self.pool.get('resource.calendar')
-        resource_obj = self.pool.get('resource.resource')
-        if not context:
-            context = {}
-        if context.get('scheduler',False):
-            return super(task, self).write(cr, uid, ids, vals, context=context)
-
-        # Consider calendar and efficiency if the task is performed by a resource
-        # otherwise consider the project's working calendar
-        task_id = ids
-        if isinstance(ids, list):
-            task_id = ids[0]
-        task_rec = self.browse(cr, uid, task_id, context=context)
-        calendar_id = task_rec.project_id.resource_calendar_id and task_rec.project_id.resource_calendar_id.id or False
-        hrs = task_rec.planned_hours / task_rec.occupation_rate
-        resource_id = resource_obj.search(cr, uid, [('user_id', '=', task_rec.user_id.id)], context=context)
-        if resource_id:
-            resource = resource_obj.browse(cr, uid, resource_id[0], context=context)
-            if resource.calendar_id.id:
-                calendar_id = resource.calendar_id and resource.calendar_id.id or False
-            hrs = task_rec.planned_hours / (float(task_rec.occupation_rate) * resource.time_efficiency)
-
-        # Change the date_start and date_end
-        # for previous and next tasks respectively based on valid condition
-            if vals.get('date_start', False) and vals['date_start'] < task_rec.date_start:
-                dt_start = mx.DateTime.strptime(vals['date_start'], '%Y-%m-%d %H:%M:%S')
-                work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, dt_start, hrs or 0.0, resource.id or False)
-                if work_times:
-                    vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
-                for prv_task in task_rec.parent_ids:
-                   self._check_date_start(cr, uid, prv_task, dt_start)
-            if vals.get('date_end', False) and vals['date_end'] > task_rec.date_end:
-                dt_end = mx.DateTime.strptime(vals['date_end'], '%Y-%m-%d %H:%M:%S')
-                work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, dt_end, hrs or 0.0, resource.id or False)
-                if work_times:
-                    vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S')
-                for next_task in task_rec.child_ids:
-                   self._check_date_end(cr, uid, next_task, dt_end)
-
-        return super(task, self).write(cr, uid, ids, vals, context=context)
 
 task()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 24bc7ff9438..657658eba46 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -404,7 +404,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -424,7 +423,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -444,7 +442,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -464,7 +461,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -484,7 +480,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -504,7 +499,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -524,7 +518,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -544,7 +537,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -564,7 +556,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -584,7 +575,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -604,7 +594,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -623,7 +612,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -642,7 +630,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -661,7 +648,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -680,7 +666,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -699,7 +684,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -718,7 +702,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -737,7 +720,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -756,7 +738,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -776,7 +757,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -796,7 +776,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -816,7 +795,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -836,7 +814,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -856,7 +833,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -876,7 +852,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -897,7 +872,6 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
             <field name="state">draft</field>
-            <field eval="1.0" name="occupation_rate"/>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
             <field eval="[(6,0,[])]" name="child_ids"/>
             <field eval="[(6,0,[])]" name="parent_ids"/>
@@ -909,4 +883,4 @@
             <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index e681b0da57f..cd76382b5d2 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -128,7 +128,7 @@
                                  <tree editable="bottom" string="Project's Tasks">
                                     <field name="name"/>
                                     <field name="user_id"/>
-                                    <field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
+                                    <field name="planned_hours" widget="float_time"/>
                                   </tree>
                                   <form string="Project's Tasks">
                                       <notebook colspan="4">
@@ -142,11 +142,10 @@
                                                   <separator string="Dates" colspan="2"/>
                                                   <field name="date_start"/>
                                                   <field name="date_deadline"/>
-                                                  <field name="occupation_rate"/>
                                             </group>
                                             <group colspan="2" col="2">
                                                   <separator string="Planning" colspan="2"/>
-                                                  <field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
+                                                  <field name="planned_hours" widget="float_time"/>
                                                 <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
                                                 <field name="effective_hours" invisible="1"/>
                                             </group>
@@ -270,32 +269,7 @@
     # Project Task
     # ------------------------------------------------------
 
-        <record id="view_project_phase_task_form1" model="ir.ui.view">
-            <field name="name">project.phase.task.form1</field>
-            <field name="model">project.task</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="project.view_task_form2"/>
-            <field name="arch" type="xml">
-                <field name="planned_hours" position="replace">
-                    <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours, date_start, occupation_rate)"/>
-                </field>
-
-            </field>
-       </record>
-
-        <record id="view_project_phase_task_form2" model="ir.ui.view">
-            <field name="name">project.phase.task.form2</field>
-            <field name="model">project.task</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="project.view_task_form2"/>
-            <field name="arch" type="xml">
-                <field name="date_end" position = "after">
-                      <field name="occupation_rate"/>
-                </field>
-            </field>
-       </record>
-
-        <act_window
+    <act_window
         id="project_phase_task_list"
         name="Related Tasks"
         res_model="project.task"
@@ -303,7 +277,7 @@
         view_mode="tree,form"
         domain="[('phase_id','=',active_id)]"/>
 
-        <act_window
+    <act_window
         domain="[('project_id', '=', active_id)]"
         id="act_project_phases"
         name="Phases"
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 7a91ce257ed..62cd22a2109 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_phase","project.phase","model_project_phase",,1,1,1,1
-"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation",,1,1,1,1
+"access_project_phase","project.phase","model_project_phase",project.group_project_user,1,1,1,1
+"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation",group_project_user,1,1,1,1
diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py
index 9f2eb707c60..0816bf3c3f1 100644
--- a/addons/project_long_term/wizard/project_compute_tasks.py
+++ b/addons/project_long_term/wizard/project_compute_tasks.py
@@ -108,7 +108,7 @@ class project_compute_tasks(osv.osv_memory):
                 # Dynamic Creation of tasks
                 i = 0
                 for each_task in tasks:
-                    hours = str(each_task.planned_hours / each_task.occupation_rate)+ 'H'
+                    hours = str(each_task.planned_hours )+ 'H'
                     if each_task.priority in priority_dict.keys():
                         priorty = priority_dict[each_task.priority]
                     if each_task.user_id:
@@ -139,4 +139,4 @@ class project_compute_tasks(osv.osv_memory):
         return {}
 
 project_compute_tasks()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py
index 8ec2d4c16e0..d4d2da82cec 100644
--- a/addons/project_long_term/wizard/project_schedule_tasks.py
+++ b/addons/project_long_term/wizard/project_schedule_tasks.py
@@ -127,7 +127,7 @@ class project_schedule_task(osv.osv_memory):
                 # Dynamic creation of tasks
                 i = 0
                 for each_task in tasks:
-                    hours = str(each_task.planned_hours / each_task.occupation_rate)+ 'H'
+                    hours = str(each_task.planned_hours )+ 'H'
                     if each_task.priority in priority_dict.keys():
                         priorty = priority_dict[each_task.priority]
                     if each_task.user_id:
diff --git a/addons/project_messages/security/ir.model.access.csv b/addons/project_messages/security/ir.model.access.csv
index 96782d5fc82..b79a32fb2f5 100644
--- a/addons/project_messages/security/ir.model.access.csv
+++ b/addons/project_messages/security/ir.model.access.csv
@@ -1,2 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_messages","project.messages","model_project_messages",,1,1,1,1
+"access_project_messages","project.messages","model_project_messages",project.group_project_user,1,1,1,1
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index f5ac86559cc..c6a09d5d728 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -20,3 +20,7 @@
 "access_product_product_purchase_user","product.product.purchase.user","product.model_product_product","group_purchase_user",1,0,0,0
 "access_account_invoice_purchase","account_invoice purchase","account.model_account_invoice","group_purchase_user",1,1,1,1
 "access_account_invoice_line_purchase","account_invoice.line purchase","account.model_account_invoice_line","group_purchase_user",1,1,1,1
+"access_account_fiscal_position_purchase_user","account.fiscal.position purchase","account.model_account_fiscal_position","group_purchase_user",1,0,0,0
+"access_account_sequence_fiscalyear_purchase_user","account.sequence.fiscalyear purchase","account.model_account_sequence_fiscalyear","group_purchase_user",1,1,1,1
+"access_res_partner_purchase_user","res.partner purchase","base.model_res_partner","group_purchase_user",1,0,0,0
+"access_res_partner_address_purchase_user","res.partner.address purchase","base.model_res_partner_address","group_purchase_user",1,0,0,0
diff --git a/addons/report_designer/security/ir.model.access.csv b/addons/report_designer/security/ir.model.access.csv
index 81d2854dc14..e6500199afe 100644
--- a/addons/report_designer/security/ir.model.access.csv
+++ b/addons/report_designer/security/ir.model.access.csv
@@ -1,2 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_designer_installer","report_designer.installer","model_report_designer_installer",,1,1,1,1
+"access_report_designer_installer","report_designer.installer","model_report_designer_installer",base.group_system,1,1,1,1
diff --git a/addons/resource/security/ir.model.access.csv b/addons/resource/security/ir.model.access.csv
index 796d29dcb94..f52b43adcaa 100644
--- a/addons/resource/security/ir.model.access.csv
+++ b/addons/resource/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_resource_calendar","resource.calendar","model_resource_calendar","base.group_user",1,0,0,0
-"access_resource_calendar_week","resource.calendar.week","model_resource_calendar_week","base.group_user",1,0,0,0
-"access_resource_resource","resource.resource","model_resource_resource","base.group_user",1,0,0,0
-"access_resource_calendar_leaves","resource.calendar.leaves","model_resource_calendar_leaves","base.group_user",1,0,0,0
\ No newline at end of file
+"access_resource_calendar","resource.calendar","model_resource_calendar","base.group_system",1,1,1,1
+"access_resource_calendar_week","resource.calendar.week","model_resource_calendar_week","base.group_system",1,1,1,1
+"access_resource_resource","resource.resource","model_resource_resource","base.group_system",1,1,1,1
+"access_resource_calendar_leaves","resource.calendar.leaves","model_resource_calendar_leaves","base.group_system",1,1,1,1
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index fd8b3e0d3c7..8e5c8360d07 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -14,14 +14,14 @@
     </record>
 
     <record model="ir.rule" id="sale_order_comp_rule">
-    	<field name="name">Sale Order multi-company</field>
+        <field name="name">Sale Order multi-company</field>
         <field name="model_id" ref="model_sale_order"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="sale_order_line_comp_rule">
-    	<field name="name">Sale Order Line multi-company</field>
+        <field name="name">Sale Order Line multi-company</field>
         <field name="model_id" ref="model_sale_order_line"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
diff --git a/addons/scrum/security/ir.model.access.csv b/addons/scrum/security/ir.model.access.csv
index a52a9c2f3f2..76ba229e952 100644
--- a/addons/scrum/security/ir.model.access.csv
+++ b/addons/scrum/security/ir.model.access.csv
@@ -1,7 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_scrum_sprint","scrum.sprint","model_scrum_sprint","project.group_project_user",1,,,
+"access_scrum_sprint","scrum.sprint","model_scrum_sprint","project.group_project_user",1,0,0,0
 "access_scrum_product_backlog","scrum.product.backlog","model_scrum_product_backlog","project.group_project_user",1,1,1,1
-"access_scrum_meeting","scrum.meeting","model_scrum_meeting","project.group_project_user",1,,,
+"access_scrum_meeting","scrum.meeting","model_scrum_meeting","project.group_project_user",1,0,0,0
 "access_scrum_meeting_manager","scrum.meeting.manager","model_scrum_meeting","project.group_project_manager",1,1,1,1
 "access_scrum_sprint_manager","scrum.sprint.manager","model_scrum_sprint","project.group_project_manager",1,1,1,1
 "access_scrum_product_backlog_manager","scrum.product.backlog manager","model_scrum_product_backlog","project.group_project_manager",1,1,1,1
+"access_product_uom_project_manager","product.uom project manager","product.model_product_uom","project.group_project_manager",1,1,1,1
+"access_product_uom_project_user","product.uom project user","product.model_product_uom","project.group_project_user",1,0,0,0
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index ca36c8460a7..4ce32167a21 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -14,7 +14,7 @@
 "access_stock_inventory_line","stock.inventory.line","model_stock_inventory_line","stock.group_stock_user",1,1,1,1
 "access_stock_report_prodlots","stock.report.prodlots","model_stock_report_prodlots","stock.group_stock_manager",1,0,0,0
 "access_stock_location_product_manager","stock.location product manager","model_stock_location","product.group_product_manager",1,0,0,0
-"access_stock_lines_date","report.stock.lines.date all","model_report_stock_lines_date",,1,0,0,0
+"access_stock_lines_date","report.stock.lines.date all","model_report_stock_lines_date",stock.group_stock_user,1,0,0,0
 "access_stock_report_tracklots","stock.report.tracklots","model_stock_report_tracklots","stock.group_stock_user",1,1,1,1
 "access_report_products_to_received_planned","report.products.to.received.planned","model_report_products_to_received_planned","stock.group_stock_user",1,0,0,0
 "access_report_delivery_products_planned","report.delivery.products.planned","model_report_delivery_products_planned","stock.group_stock_user",1,0,0,0
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 4dad60a3c97..07f67119244 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -3,10 +3,10 @@
 <data noupdate="0">
 
     <record id="group_stock_manager" model="res.groups">
-        <field name="name">Stock / Manager</field>
+        <field name="name">Inventory / Manager</field>
     </record>
     <record id="group_stock_user" model="res.groups">
-        <field name="name">Stock / Worker</field>
+        <field name="name">Inventory / Worker</field>
     </record>
 
     <record model='ir.ui.menu' id='menu_stock_root'>
@@ -19,43 +19,43 @@
 
 <!-- multi -->
 
-     <record model="ir.rule" id="stock_picking_rule">
-     	<field name="name">stock_picking multi-company</field>
+    <record model="ir.rule" id="stock_picking_rule">
+        <field name="name">stock_picking multi-company</field>
         <field name="model_id" search="[('model','=','stock.picking')]" model="ir.model"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','=',False)]</field>
-     </record>
+    </record>
 
     <record model="ir.rule" id="stock_warehouse_comp_rule">
-    	<field name="name">Warehouse multi-company</field>
+        <field name="name">Warehouse multi-company</field>
         <field name="model_id" ref="model_stock_warehouse"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="stock_location_comp_rule">
-    	<field name="name">Location multi-company</field>
+        <field name="name">Location multi-company</field>
         <field name="model_id" ref="model_stock_location"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
      <record model="ir.rule" id="stock_move_rule">
-     	<field name="name">stock_move multi-company</field>
+         <field name="name">stock_move multi-company</field>
         <field name="model_id" search="[('model','=','stock.move')]" model="ir.model"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
      </record>
 
     <record model="ir.rule" id="stock_inventory_line_comp_rule">
-    	<field name="name">Inventory Line multi-company</field>
+        <field name="name">Inventory Line multi-company</field>
         <field name="model_id" ref="model_stock_inventory_line"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="stock_inventory_comp_rule">
-    	<field name="name">Inventory multi-company</field>
+        <field name="name">Inventory multi-company</field>
         <field name="model_id" ref="model_stock_inventory"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 1bfb1d0f1aa..e4861120270 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -132,7 +132,7 @@
             <field name="arch" type="xml">
                 <form string="Stock and Sales Forecast">
                     <group colspan = "4" col = "4">
-		        <group colspan = "2" col="2" >
+                <group colspan = "2" col="2" >
                             <field name="company_id" select="1"
                                         groups="base.group_multi_company"
                                         widget="selection"
@@ -140,20 +140,20 @@
                             <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
                             <field name="period_id" />
                             <field name="product_id" on_change="product_id_change(product_id)" />
-			    <field name="product_uom_categ"  invisible = "True"/>
-			    <field name="product_uos_categ"  invisible = "True"/>
+                <field name="product_uom_categ"  invisible = "True"/>
+                <field name="product_uos_categ"  invisible = "True"/>
                             <field name="product_uom"
                                          domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
                                          on_change = "onchange_uom(product_uom, product_qty, active_uom)"/>
                             <field name="active_uom" invisible = "True" />
-		         </group>
-		         <group colspan = "2" col="2" >
+                 </group>
+                 <group colspan = "2" col="2" >
                             <field name="user_id"/>
                             <field name="product_amt" on_change="product_amt_change( product_amt, product_uom)" />
                             <field name="product_qty"  />
                             <field name="state"/>
                             <button name="action_validate" string="Validate" states="draft" type="object" colspan = "2"/>
-		        </group>
+                </group>
                     </group>
                     <separator colspan ="4" string="Sales history"/>
                     <group colspan = "4" col = "5">
@@ -275,7 +275,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Planning">
-		    <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
+            <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
                     <newline/>
                     <field name="period_id2" widget="selection"/>
                     <newline/>
@@ -326,8 +326,8 @@
                             <field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
                             <field name="period_id" />
                             <field name="product_id" on_change="product_id_change(product_id)"  />
-			    <field name="product_uom_categ"  invisible = "True"/>
-			    <field name="product_uos_categ"  invisible = "True"/>
+                <field name="product_uom_categ"  invisible = "True"/>
+                <field name="product_uos_categ"  invisible = "True"/>
                             <field name="product_uom"
                                          domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
                                          on_change = "onchange_uom(product_uom)"/>
@@ -365,7 +365,7 @@
                             <button name="procure_incomming_left" string="Procure Incoming Left" type="object" colspan="2"/>
                             <field name="procure_to_stock"/>
                             <separator colspan ="2" string = "Internal Supply"/>
-			    <button name="internal_supply" string="Supply from Another Warehouse" type="object" colspan="2"/>
+                            <button name="internal_supply" string="Supply from Another Warehouse" type="object" colspan="2"/>
                             <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
                             <field name="stock_supply_location"/>
                         </group>
diff --git a/addons/thunderbird/security/ir.model.access.csv b/addons/thunderbird/security/ir.model.access.csv
index b7cc3262e2d..52f5efbcb7f 100644
--- a/addons/thunderbird/security/ir.model.access.csv
+++ b/addons/thunderbird/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_tinythunderbird_partner","tinythunderbird.partner","model_tinythunderbird_partner",,1,1,1,1
-"access_thunderbird_installer","thunderbird.installer","model_thunderbird_installer","base.group_user",1,1,1,1
+"access_thunderbird_installer","thunderbird.installer","model_thunderbird_installer","base.group_system",1,1,1,1