From 9ed5d05cc03f6f6711e3ec14a29fec84e8e354c1 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Fri, 11 Jun 2010 15:43:55 +0200
Subject: [PATCH 01/37] [REF] mail_gateway: Remove the duplicated import

bzr revid: stephane@openerp.com-20100611134355-2ku851kddw72p4g1
---
 addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
index 95543fcb7f6..c4cad98b046 100755
--- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
@@ -164,7 +164,6 @@ class email_parser(object):
        return s.decode('latin1')
 
     def _decode_header(self, text):
-        from email.Header import decode_header
         if text:
             text = decode_header(text.replace('\r', '')) 
         return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), text or []))

From 43ccf2f7743d55cd01acd4aba62fdb415e4b0fef Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 11 Jun 2010 16:26:31 +0200
Subject: [PATCH 02/37] fix

bzr revid: fp@tinyerp.com-20100611142631-8njuqup1ugudbb3w
---
 addons/account/account_view.xml              |  2 +-
 addons/account/partner_view.xml              | 26 +++++++-------------
 addons/document/document_view.xml            |  2 +-
 addons/purchase/purchase.py                  |  2 +-
 addons/purchase/purchase_view.xml            |  2 +-
 addons/purchase/security/ir.model.access.csv |  3 +++
 6 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b18e3e2f609..2fdb2c5fd07 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1519,7 +1519,7 @@
             res_model="account.addtmpl.wizard"
             context="{'tmpl_ids': active_id}"
             src_model="account.account.template"
-	    view_type="form" view_mode="form"/>
+            view_type="form" view_mode="form"/>
 
         <!-- Account Templates -->
         <menuitem
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index e1e43420d6e..1512bd402b2 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -118,7 +118,6 @@
                             <field name="acc_number"/>
                         </tree>
                     </field>
-                    <field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
                 </page>
                 </notebook>
             </field>
@@ -126,21 +125,14 @@
         
         <!--  Partners info tab view-->
 
-        <record id="view_account_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.account.info.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//notebook[last()]" position="after">
-	                <notebook colspan="4">
-	                    <page string="Project">
-	                        <field name="contract_ids" colspan="4" nolabel="1" />
-	                    </page>
-	                </notebook>
-                </xpath>
-            </field>
-        </record>
-        
+        <act_window 
+            id="action_analytic_open"
+            name="Analytic Accounts"
+            res_model="account.analytic.account"
+            domain="[('partner_id','=',active_id)]"
+            src_model="res.partner"
+            view_type="form"
+            view_mode="tree,form,graph,calendar"/>
+
     </data>
 </openerp>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index b1fa9a510c9..aa37b4472ad 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -3,7 +3,7 @@
     <!--<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
     <menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>-->
 
-    <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document" sequence="4" groups="base.group_user"/>
+    <menuitem name="Knowledge" icon="terp-stock" id="base.menu_document" sequence="4" groups="base.group_user"/>
     <menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
     <menuitem name="Document Management" id="menu_document_management_configuration" parent="base.menu_document_configuration" sequence="1"/>
 
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 08507f9dfac..87f4c3031bb 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -633,7 +633,7 @@ class purchase_order_line(osv.osv):
         prod= self.pool.get('product.product').browse(cr, uid,product)
         lang=False
         if partner_id:
-            lang=self.pool.get('res.partner').read(cr, uid, partner_id)['lang']
+            lang=self.pool.get('res.partner').read(cr, uid, partner_id, ['lang'])['lang']
         context={'lang':lang}
         context['partner_id'] = partner_id
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 502c33bd5f9..d5050c69b18 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -3,7 +3,7 @@
     <data>
         <!--<menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchase Management"
             groups="group_purchase_user"/>-->
-       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management"
+       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases"
             groups="group_purchase_user" sequence="7"/>
        <menuitem id="menu_procurement_management" name="Purchase Management"
             parent="base.menu_purchase_root" sequence="1"/>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 9b0f8bc184e..f5ac86559cc 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -17,3 +17,6 @@
 "access_stock_picking_purchase_user_manager","stock.picking","stock.model_stock_picking","purchase.group_purchase_manager",1,1,1,1
 "access_stock_move_purchase_user_manager","stock.move","stock.model_stock_move","purchase.group_purchase_manager",1,1,1,1
 "access_account_tax_purchase_user_manager","account.tax","account.model_account_tax","purchase.group_purchase_manager",1,0,0,0
+"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

From caca420c82a6aaac1b462bbe0e7c8639a5b850f5 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Fri, 11 Jun 2010 17:53:51 +0200
Subject: [PATCH 03/37] [REF] Use the domain on the one2many fields instead of
 a custom class to manage this case

bzr revid: stephane@openerp.com-20100611155351-i9r1lqml8xvvtlui
---
 addons/mail_gateway/mail_gateway.py | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index c19f1767fa6..c9a264b1d9d 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -21,26 +21,8 @@
 
 from osv import osv, fields
 import time
-import  base64
+import base64
 
-class one2many_domain(fields.one2many):
-    def set(self, cr, obj, id, field, values, user=None, context=None):
-        if not values:
-            return
-        return super(one2many_domain, self).set(cr, obj, id, field, values, 
-                                            user=user, context=context)
-
-    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        if context is None:
-            context = {}
-        res = {}
-        msg_obj = obj.pool.get('mailgate.message')
-        for thread in obj.browse(cr, user, ids, context=context):
-            final = msg_obj.search(cr, user, self._domain + [('thread_id', '=', thread.id)], context=context)
-            res[thread.id] = final
-        return res
-        
-        
 class mailgate_thread(osv.osv):
     '''
     Mailgateway Thread
@@ -51,11 +33,11 @@ class mailgate_thread(osv.osv):
 
     _columns = {
         'thread': fields.char('Thread', size=32, required=False), 
-        'message_ids': one2many_domain('mailgate.message', 'thread_id', 'Messages', domain=[('history', '=', True)], required=False), 
-        'log_ids': one2many_domain('mailgate.message', 'thread_id', 'Logs', domain=[('history', '=', False)], required=False), 
+        'message_ids': fields.one2many('mailgate.message', 'thread_id', 'Messages', domain=[('history', '=', True)], required=False), 
+        'log_ids': fields.one2many('mailgate.message', 'thread_id', 'Logs', domain=[('history', '=', False)], required=False), 
     }
         
-    def __history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=None, context=None):
+    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=None, context=None):
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -118,8 +100,7 @@ class mailgate_thread(osv.osv):
             res = obj.create(cr, uid, data, context)
         return True
     
-    _history = __history
-    history = __history
+    __history = history = _history
     
 
 mailgate_thread()

From 71be09ecc66245e050f25818e0c616a9739238e8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 00:02:09 +0200
Subject: [PATCH 04/37] [IMP] Partners Geo Assignation - new module

bzr revid: fp@tinyerp.com-20100611220209-kerfxsckm6us8yh7
---
 .../wizard/account_invoice_state_view.xml     |  40 +++----
 addons/crm/crm_opportunity_view.xml           |  24 +++-
 addons/partner_geo_assign/__init__.py         |  22 ++++
 addons/partner_geo_assign/__openerp__.py      |  38 ++++++
 .../partner_geo_assign/partner_geo_assign.py  | 113 ++++++++++++++++++
 .../partner_geo_assign/res_partner_view.xml   |  45 +++++++
 addons/purchase/purchase_view.xml             |  51 ++++----
 7 files changed, 288 insertions(+), 45 deletions(-)
 create mode 100644 addons/partner_geo_assign/__init__.py
 create mode 100644 addons/partner_geo_assign/__openerp__.py
 create mode 100644 addons/partner_geo_assign/partner_geo_assign.py
 create mode 100644 addons/partner_geo_assign/res_partner_view.xml

diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index d83c0c6f2dc..e0c22a0007f 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -1,22 +1,22 @@
 <openerp>
     <data>
 
-		<record id="account_invoice_confirm_view" model="ir.ui.view">
+        <record id="account_invoice_confirm_view" model="ir.ui.view">
             <field name="name">account.invoice.confirm.form</field>
             <field name="model">account.invoice.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Confirm Draft Invoices">
-			    <separator string="Confirm Draft Invoices" colspan="4"/>
+            <form string="Confirm Draft Invoices">
+                <separator string="Confirm Draft Invoices" colspan="4"/>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Close"/>
-                    	<button icon="gtk-execute" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1"/>
+                        <button icon="gtk-cancel" special="cancel" string="Close"/>
+                        <button icon="gtk-execute" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
-    	</record>
+        </record>
 
-		<record id="action_account_invoice_confirm" model="ir.actions.act_window">
+        <record id="action_account_invoice_confirm" model="ir.actions.act_window">
             <field name="name">Confirm Draft Invoices</field>
             <field name="res_model">account.invoice.confirm</field>
             <field name="view_type">form</field>
@@ -25,7 +25,7 @@
            <field name="target">new</field>
         </record>
 
-		<record model="ir.values" id="action_account_invoice_confirm_values">
+        <record model="ir.values" id="action_account_invoice_confirm_values">
             <field name="model_id" ref="account.model_account_invoice" />
             <field name="object" eval="1" />
             <field name="name">Confirm Draft Invoices</field>
@@ -33,24 +33,24 @@
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_confirm'))" />
             <field name="key">action</field>
             <field name="model">account.invoice</field>
-		</record>
+        </record>
 
-		<record id="account_invoice_cancel_view" model="ir.ui.view">
+        <record id="account_invoice_cancel_view" model="ir.ui.view">
             <field name="name">account.invoice.cancel.form</field>
             <field name="model">account.invoice.cancel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Cancel Selected Invoices">
-			    <separator string="Cancel Selected Invoices" colspan="4"/>
+            <form string="Cancel Selected Invoices">
+                <separator string="Cancel Selected Invoices" colspan="4"/>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Close"/>
-                    	<button icon="gtk-execute" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
+                        <button icon="gtk-cancel" special="cancel" string="Close"/>
+                        <button icon="gtk-execute" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
-    	</record>
+        </record>
 
-		<record id="action_account_invoice_cancel" model="ir.actions.act_window">
+        <record id="action_account_invoice_cancel" model="ir.actions.act_window">
             <field name="name">Cancel Selected Invoices</field>
             <field name="res_model">account.invoice.cancel</field>
             <field name="view_type">form</field>
@@ -59,7 +59,7 @@
            <field name="target">new</field>
         </record>
 
-		<record model="ir.values" id="action_account_invoice_cancel_values">
+        <record model="ir.values" id="action_account_invoice_cancel_values">
             <field name="model_id" ref="account.model_account_invoice" />
             <field name="object" eval="1" />
             <field name="name">Cancel Selected Invoices</field>
@@ -67,7 +67,7 @@
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_cancel'))" />
             <field name="key">action</field>
             <field name="model">account.invoice</field>
-		</record>
+        </record>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index da111cf9518..95ab6a1d0df 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -83,7 +83,8 @@
                             <field name="date_action"/>
                             <field name="title_action"/>
                             <field name="priority" string="Priority"/>
-                            <field name="type" readonly="1"/>
+                            <newline/>
+                            <field name="type" invisible="1"/>
                         </group>
                         <notebook colspan="4">
                         <page string="Opportunity">
@@ -134,6 +135,27 @@
                                     icon="gtk-convert" />
                             </group>
                         </page>
+                        <page string="Lead">
+                            <group colspan="2" col="4">
+                                <separator string="Contact" colspan="4" col="4"/>
+                                <field name="partner_name" string="Partner Name" colspan="4"/>
+                                <newline/>
+                                <field domain="[('domain', '=', 'contact')]" name="title"/>
+                                <field name="function" />
+                                <field name="street" colspan="4"/>
+                                <field name="street2" colspan="4"/>
+                                <field name="zip"/>
+                                <field name="city"/>
+                                <field name="country_id"/>
+                                <field name="state_id"/>
+                            </group>
+                            <group colspan="2" col="3">
+                                <separator string="Communication" colspan="4" col="3"/>
+                                <field name="fax"/>
+                                <newline/>
+                                <field name="mobile"/>
+                            </group>
+                        </page>
 
                         <page string="Emails" groups="base.group_extended">
                             <group colspan="4">
diff --git a/addons/partner_geo_assign/__init__.py b/addons/partner_geo_assign/__init__.py
new file mode 100644
index 00000000000..e1957dfb286
--- /dev/null
+++ b/addons/partner_geo_assign/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import partner_geo_assign
diff --git a/addons/partner_geo_assign/__openerp__.py b/addons/partner_geo_assign/__openerp__.py
new file mode 100644
index 00000000000..2d18649236e
--- /dev/null
+++ b/addons/partner_geo_assign/__openerp__.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+
+{
+    'name': 'Partner Geo-Localisation',
+    'version': '1.0',
+    'category': 'Generic Modules/Production',
+    'description': """
+This is the module used by OpenERP SA to redirect customers to his partners,
+based on geolocalisation.
+    """,
+    'author': 'OpenERP SA',
+    'depends': ['crm'],
+    'update_xml': ['res_partner_view.xml'],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+    'certificate': False,
+}
diff --git a/addons/partner_geo_assign/partner_geo_assign.py b/addons/partner_geo_assign/partner_geo_assign.py
new file mode 100644
index 00000000000..2ed96e3125d
--- /dev/null
+++ b/addons/partner_geo_assign/partner_geo_assign.py
@@ -0,0 +1,113 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+import urllib,re
+import random, time
+
+def geo_find(addr):
+    import urllib,re
+    regex = '<coordinates>([+-]?[0-9\.]+),([+-]?[0-9\.]+),([+-]?[0-9\.]+)</coordinates>'
+    url = 'http://maps.google.com/maps/geo?q=' + urllib.quote(addr) + '&output=xml&oe=utf8&sensor=false'
+    xml = urllib.urlopen(url).read()
+    if '<error>' in xml:
+        print 'Error'
+        return None
+    result = re.search(regex, xml, re.M|re.I)
+    if not result:
+        print 'No Regex', xml
+        return None
+    return float(result.group(1)),float(result.group(2))
+
+class res_partner(osv.osv):
+    _inherit = "res.partner"
+    _columns = {
+        'partner_latitude': fields.float('Geo Latitude', digits=(16,2)),
+        'partner_longitude': fields.float('Geo Longitude', digits=(16,2)),
+        'partner_weight': fields.integer('Weight',
+            help="Gives the probability to assign a lead to this partner. (0 means no assignation.)"),
+    }
+    _defaults = {
+        'partner_weight': lambda *args: 0
+    }
+    def geo_localize(self, cr, uid, ids, context=None):
+        regex = '<coordinates>([+-]?[0-9\.]+),([+-]?[0-9\.]+),([+-]?[0-9\.]+)</coordinates>'
+        for partner in self.browse(cr, uid, ids, context=context):
+            part = partner.address[0]
+            addr = ', '.join(filter(None, [part.street, part.street2, (part.zip or '')+' '+(part.city or ''), part.state_id and part.state_id.name, part.country_id and part.country_id.name]))
+            result = geo_find(addr)
+            if result:
+                print 'Write', {
+                    'partner_latitude': result[0],
+                    'partner_longitude': result[1]
+                }
+                self.write(cr, uid, [partner.id], {
+                    'partner_latitude': result[0],
+                    'partner_longitude': result[1]
+                }, context=context)
+        return True
+res_partner()
+
+class crm_lead(osv.osv):
+    _inherit = "crm.lead"
+    _columns = {
+        'partner_latitude': fields.float('Geo Latitude', digits=(16,2)),
+        'partner_longitude': fields.float('Geo Longitude', digits=(16,2)),
+        'partner_assigned_id': fields.many2one('res.partner','Assigned Partner')
+        'date_assign': fields.date('Assignation Date')
+    }
+    def assign_partner(self, cr, uid, ids, context=None):
+        for part in self.browse(cr, uid, ids, context=context):
+            if not part.country_id:
+                continue
+            addr = ', '.join(filter(None, [part.street, part.street2, (part.zip or '')+' '+(part.city or ''), part.state_id and part.state_id.name, part.country_id and part.country_id.name]))
+            result = geo_find(addr)
+            if result:
+                self.write(cr, uid, [part.id], {
+                    'partner_latitude': result[0],
+                    'partner_longitude': result[1]
+                }, context=context)
+                
+                part_ids = self.pool.get('res.partner').search(cr, uid, [
+                    ('partner_weight','>',0),
+                    ('partner_latitude','>',result[0]-2), ('partner_latitude','<',result[0]+2),
+                    ('partner_longitude','>',result[1]-1.5), ('partner_longitude','<',result[1]+1.5)
+                ], context=context)
+                if not part_ids:
+                    part_ids = self.pool.get('res.partner').search(cr, uid, [
+                        ('partner_weight','>',0),
+                        ('partner_latitude','>',result[0]-4), ('partner_latitude','<',result[0]+4),
+                        ('partner_longitude','>',result[1]-3), ('partner_longitude','<',result[1]+3)
+                    ], context=context)
+                total = 0
+                toassign = []
+                for part2 in self.pool.get('res.partner').browse(cr, uid, part_ids, context=context):
+                    total += part2.partner_weight
+                    toassign.append( (part2.id, total) )
+                mypartner = random.randint(0,total)
+                for t in toassign:
+                    if mypartner<=t[1]:
+                        self.write(cr, uid, [part.id], {'partner_assigned_id': t[0], 'date_assign': time.strftime('%Y-%m-%d')}, context=context)
+                        break
+        return True
+crm_lead()
+
diff --git a/addons/partner_geo_assign/res_partner_view.xml b/addons/partner_geo_assign/res_partner_view.xml
new file mode 100644
index 00000000000..d5f4f918d98
--- /dev/null
+++ b/addons/partner_geo_assign/res_partner_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record id="view_crm_opportunity_geo_assign_form" model="ir.ui.view">
+            <field name="name">crm.lead.geo_assign.inherit</field>
+            <field name="model">crm.lead</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook[last()]" position="inside">
+                    <page string="Partner Assignation">
+                        <field name="partner_assigned_id"/>
+                        <label string="" colspan="1"/>
+                        <button string="Geo Assign" name="assign_partner" type="object"/>
+                        <newline/>
+                        <field name="partner_latitude"/>
+                        <field name="partner_longitude"/>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_crm_partner_geo_form" model="ir.ui.view">
+            <field name="name">res.partner.geo.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook[last()]" position="inside">
+                    <page string="Partner Association">
+                        <field name="partner_weight"/>
+                        <label string="" colspan="1"/>
+                        <button string="Geo Localize" name="geo_localize" icon="gtk-apply" type="object"/>
+                        <newline/>
+                        <field name="partner_latitude"/>
+                        <field name="partner_longitude"/>
+                        <field name="date_assign"/>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index d5050c69b18..8d3402804a9 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -91,9 +91,9 @@
                                     <field name="product_qty"/>
                                     <field name="product_uom"/>
                                     <field name="price_unit"/>
- 									<field name="price_subtotal" groups="base.group_extended"/>
+                                     <field name="price_subtotal" groups="base.group_extended"/>
                                     <field name="invoiced"/>
-                        			<field name="state"/>
+                                    <field name="state"/>
                                 </tree>
                                 <!-- default form view -->
                             </field>
@@ -233,7 +233,13 @@
                             <field name="date_planned" widget="date"/>
                             <field name="price_unit"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="account_analytic_id" colspan="4" groups="base.group_extended"/>
                             <field name="price_subtotal" readonly="1"/>
+                            <group colspan="4" col="4" groups="base.group_extended">
+                                <separator colspan="4" string="Taxes"/>
+                                <field colspan="4" nolabel="1" name="taxes_id"
+                                    domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
+                            </group>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>
@@ -243,17 +249,14 @@
                                <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
                         </page>
                         <page string="Invoicing" groups="base.group_extended">
-                            <field name="account_analytic_id" colspan="4"/>
-                            <separator colspan="4" string="Taxes"/>
-                            <field colspan="4" nolabel="1" name="taxes_id" domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
-	                        <separator colspan="4" string="Manual Invoices"/>
-	                        <field name="invoiced"/>
-	                        <newline/>
-	                        <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/>
+                            <separator colspan="4" string="Manual Invoices"/>
+                            <field name="invoiced"/>
+                            <newline/>
+                            <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/>
                         </page>
                     </notebook>
-					<group>
-						<field name="state" />
+                    <group>
+                        <field name="state" />
                     </group>
                 </form>
             </field>
@@ -313,7 +316,7 @@
             src_model="product.product"
             groups="base.group_extended"/>
 <!--
-	<record model="ir.values" id="action_merge_purchase_order">
+    <record model="ir.values" id="action_merge_purchase_order">
                 <field name="object" eval="1" />
                 <field name="name">Purchase Order</field>
                 <field name="key2">client_action_multi</field>
@@ -344,22 +347,22 @@
             <field name="view_id" ref="purchase_order_line_form"/>
             <field name="act_window_id" ref="purchase_line_form_action2"/>
         </record>
-         <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_procurement_management_invoice"/>
+        <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_procurement_management_invoice"/>
 
-		<!--
-        	Procurements
+        <!--
+            Procurements
         -->
 
         <record id="view_procurement_form_inherit" model="ir.ui.view">
-        	<field name="name">procurement.order.form.inherit</field>
-        	<field name="model">procurement.order</field>
-        	<field name="inherit_id" ref="procurement.procurement_form_view"/>
-        	<field name="type">form</field>
-        	<field name="arch" type="xml">
-        		<xpath expr="/form/notebook/page/field[@name='close_move']" position="before">
-        			<field name="purchase_id"/>
-        		</xpath>
-        	</field>
+            <field name="name">procurement.order.form.inherit</field>
+            <field name="model">procurement.order</field>
+            <field name="inherit_id" ref="procurement.procurement_form_view"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='close_move']" position="before">
+                    <field name="purchase_id"/>
+                </xpath>
+            </field>
         </record>
 
     </data>

From 57d10ba32c29fd6e9796ad04d301fc8aced92bff Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Sat, 12 Jun 2010 04:45:06 +0100
Subject: [PATCH 05/37] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100612034506-31vpwv883ztrqb28
---
 addons/delivery/i18n/ru.po   |  6 +++---
 addons/google_map/i18n/ru.po |  8 ++++----
 addons/mrp/i18n/hi.po        | 38 ++++++++++++++++++------------------
 addons/sale/i18n/ru.po       |  8 ++++----
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index fa64529594b..b43f11ed5d9 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-23 09:08+0000\n"
-"Last-Translator: grisha <Unknown>\n"
+"PO-Revision-Date: 2010-06-11 16:12+0000\n"
+"Last-Translator: Sios <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-06-12 03:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po
index 1543a8f1523..dc02c11683d 100644
--- a/addons/google_map/i18n/ru.po
+++ b/addons/google_map/i18n/ru.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-10-09 07:48+0000\n"
-"Last-Translator: Sardorbek Pulatov (pROCKrammer) <prockrammer@ya.ru>\n"
+"PO-Revision-Date: 2010-06-11 20:45+0000\n"
+"Last-Translator: Spector <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-06-12 03:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
 #: model:ir.actions.wizard,name:google_map.wizard_google_map
 msgid "Launch Google Map"
-msgstr ""
+msgstr "Запустить Google Map"
 
 #. module: google_map
 #: constraint:ir.ui.view:0
diff --git a/addons/mrp/i18n/hi.po b/addons/mrp/i18n/hi.po
index 7ac7081d791..2e356c5ca2a 100644
--- a/addons/mrp/i18n/hi.po
+++ b/addons/mrp/i18n/hi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-10 09:51+0000\n"
+"PO-Revision-Date: 2010-06-11 10:07+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-12 03:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -460,7 +460,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.bom.revision,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "लेखक"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduct0
@@ -491,7 +491,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.procurement,message:0
 msgid "Latest error"
-msgstr ""
+msgstr "नवीनतम त्रुटि"
 
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
@@ -511,7 +511,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Consumed Products"
-msgstr ""
+msgstr "खपत उत्पाद"
 
 #. module: mrp
 #: constraint:mrp.bom:0
@@ -538,12 +538,12 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.procurement,state:0
 msgid "Ready"
-msgstr ""
+msgstr "तैयार"
 
 #. module: mrp
 #: view:mrp.routing:0
 msgid "Workcenter Operations"
-msgstr ""
+msgstr "Workcenter संचालन"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2_gantt
@@ -564,7 +564,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production,date_finnished:0
 msgid "End Date"
-msgstr ""
+msgstr "समाप्ति तिथि"
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
@@ -576,7 +576,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "In Production"
-msgstr ""
+msgstr "उत्पादन में"
 
 #. module: mrp
 #: field:stock.warehouse.orderpoint,qty_multiple:0
@@ -600,12 +600,12 @@ msgstr ""
 #. module: mrp
 #: wizard_button:mrp.workcenter.load,init,report:0
 msgid "Print"
-msgstr ""
+msgstr "प्रिंट"
 
 #. module: mrp
 #: field:mrp.workcenter,type:0
 msgid "Type"
-msgstr ""
+msgstr "प्रकार"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
@@ -616,7 +616,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.workcenter.load,init,time_unit:0
 msgid "Per month"
-msgstr ""
+msgstr "प्रति माह"
 
 #. module: mrp
 #: field:mrp.procurement,product_uos_qty:0
@@ -626,18 +626,18 @@ msgstr ""
 #. module: mrp
 #: rml:bom.structure:0
 msgid "Product Name"
-msgstr ""
+msgstr "वस्तु का नाम"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Printing date"
-msgstr ""
+msgstr "मुद्रण तारीख"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_orderrfq0
 #: model:process.node,name:mrp.process_node_rfq0
 msgid "RFQ"
-msgstr ""
+msgstr "कोटेशन के लिए अनुरोध"
 
 #. module: mrp
 #: field:mrp.bom,revision_type:0
@@ -657,7 +657,7 @@ msgstr ""
 #. module: mrp
 #: field:stock.warehouse.orderpoint,product_min_qty:0
 msgid "Min Quantity"
-msgstr ""
+msgstr "न्यूनतम मात्रा"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -678,7 +678,7 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
 msgid "If Product type is service and procure method is Make to stock"
-msgstr ""
+msgstr "अगर उत्पाद प्रकार सेवा है और खरीद विधि है स्टॉक बनाने के लिए"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
@@ -689,7 +689,7 @@ msgstr ""
 #. module: mrp
 #: field:res.company,security_lead:0
 msgid "Security Days"
-msgstr ""
+msgstr "सुरक्षा दिवस"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -715,7 +715,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.procurement,state:0
 msgid "Exception"
-msgstr ""
+msgstr "अपवाद"
 
 #. module: mrp
 #: wizard_view:product.product.procurement,init:0
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index d6858cc9f75..ce9c8c51095 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-04 05:56+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-06-11 16:29+0000\n"
+"Last-Translator: Sios <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-06-12 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -117,7 +117,7 @@ msgstr ""
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_picking_policy
 msgid "sale.config.picking_policy"
-msgstr ""
+msgstr "sale.config.picking_policy"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0

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 06/37] [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

From ef9361f19d298217d92797dd1ba798b5b36f407c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 18:29:59 +0200
Subject: [PATCH 07/37] fix

bzr revid: fp@tinyerp.com-20100612162959-0v4p939h5loo8qxq
---
 addons/point_of_sale/pos.py                          | 12 ++++++------
 .../project_long_term/security/ir.model.access.csv   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 5d4df5a5f10..e0e2d9c5c5d 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -193,10 +193,10 @@ class pos_order(osv.osv):
                             res[order.id]['amount_tax'])
                 else:
                     res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
-                        tax_obj.compute(cr, uid, line.product_id.taxes_id,
+                        tax_obj.compute_all(cr, uid, line.product_id.taxes_id,
                             line.price_unit * \
-                            (1-(line.discount or 0.0)/100.0), line.qty),
-                            res[order.id]['amount_tax'])                                                    
+                            (1-(line.discount or 0.0)/100.0), line.qty)['taxes'],
+                            res[order.id]['amount_tax'])
         return res
         
 
@@ -789,8 +789,8 @@ class pos_order(osv.osv):
                 tax_amount = 0
                 taxes = [t for t in line.product_id.taxes_id]
                 if order.price_type=='tax_excluded':
-                    computed_taxes = account_tax_obj.compute(
-                        cr, uid, taxes, line.price_unit, line.qty)
+                    computed_taxes = account_tax_obj.compute_all(
+                        cr, uid, taxes, line.price_unit, line.qty)['taxes']
                 else:
                     computed_taxes = account_tax_obj.compute_inv(
                         cr, uid, taxes, line.price_unit, line.qty)
@@ -1058,7 +1058,7 @@ class pos_order_line(osv.osv):
         for line in self.browse(cr, uid, ids):
             tax_amount = 0.0
             taxes = [t for t in line.product_id.taxes_id]
-            computed_taxes = account_tax_obj.compute(cr, uid, taxes, line.price_unit, line.qty)
+            computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit, line.qty)['taxes']
             for tax in computed_taxes:
                 tax_amount += tax['amount']
             price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 62cd22a2109..b829675772e 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",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
+"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation",project.group_project_user,1,1,1,1

From b6325129e22c840d7837578e328d78ff8fb1cd49 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 18:33:16 +0200
Subject: [PATCH 08/37] [IMP] better icon fr point of sale paplication

bzr revid: fp@tinyerp.com-20100612163316-wbvh44149qsvg4x9
---
 addons/point_of_sale/pos_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 026b268eed0..e00589b3012 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+        <menuitem name="Point of Sale" id="menu_point_root" sequence="10"
+            icon="terp-partner"
+            groups="group_pos_manager,group_pos_user"/>
 
         <record model="ir.ui.view" id="view_pos_pos_form">
             <field name="name">pos.order</field>
@@ -169,8 +172,6 @@
             </field>
         </record>
 
-        <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" />

From c256aba48b71f3c002175fda429c18fadae3bd73 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 18:49:50 +0200
Subject: [PATCH 09/37] [IMP] better partner layout

bzr revid: fp@tinyerp.com-20100612164950-i6mxzp0izun55cek
---
 addons/stock/partner_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index be2ed4bfc55..b27264f7491 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -12,8 +12,8 @@
       <field name="inherit_id" ref="base.view_partner_form"/>
       <field name="arch" type="xml">
         <page string="Sales &amp; Purchases" position="inside">
-          <group colspan="4" col="4" groups="base.group_extended">
-            <separator string="Stock Properties" colspan="4"/>
+          <group colspan="2" col="2" groups="base.group_extended">
+            <separator string="Stock Properties" colspan="2"/>
             <field name="property_stock_customer" widget="selection" domain="[('usage','=','customer')]" groups="base.group_extended" />
             <field name="property_stock_supplier" widget="selection" domain="[('usage','=','supplier')]" groups="base.group_extended"/>
           </group>

From bb157ddf22ed7c7508d37a452fc3c074a5b7b921 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 18:50:46 +0200
Subject: [PATCH 10/37] [IMP] better partner layout

bzr revid: fp@tinyerp.com-20100612165046-nrjx547jbbip3hha
---
 addons/purchase/partner_view.xml | 4 ++--
 addons/stock/partner_view.xml    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 58594493643..06ba97079eb 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -9,8 +9,8 @@
             <field name="priority">36</field>
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
-                    <group colspan="4" col="2" groups="base.group_extended">
-                        <separator string="Purchases Properties" colspan="2"/>
+                    <group colspan="2" col="2" groups="base.group_extended">
+                        <separator string="Purchase Properties" colspan="2"/>
                         <field name="property_product_pricelist_purchase" />
                     </group>
                 </page>
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index b27264f7491..70968f73b9b 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -13,7 +13,7 @@
       <field name="arch" type="xml">
         <page string="Sales &amp; Purchases" position="inside">
           <group colspan="2" col="2" groups="base.group_extended">
-            <separator string="Stock Properties" colspan="2"/>
+            <separator string="Inventory Properties" colspan="2"/>
             <field name="property_stock_customer" widget="selection" domain="[('usage','=','customer')]" groups="base.group_extended" />
             <field name="property_stock_supplier" widget="selection" domain="[('usage','=','supplier')]" groups="base.group_extended"/>
           </group>

From cbc39b33b5d2f0b02b5a33164973cbd24271ae21 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 18:53:08 +0200
Subject: [PATCH 11/37] [IMP] better partner layout

bzr revid: fp@tinyerp.com-20100612165308-vnfks1qrw938nys3
---
 addons/account/account_invoice_view.xml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index aa4ccfc74ff..1f86fb07b90 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -487,20 +487,5 @@
 
         <act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="account.invoice"/>
 
-        <!--  Partners inherited form -->
-
-        <record id="view_invoice_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.invoice.info.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Account Info">
-                        <field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
-                    </page>
-                </notebook>
-            </field>
-        </record>
     </data>
 </openerp>

From 1f0860740c960d9b5be9fd0a84cb984efffe1108 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 19:09:29 +0200
Subject: [PATCH 12/37] [IMP] better view

bzr revid: fp@tinyerp.com-20100612170929-uc72lh2u8u24zxkn
---
 addons/sale_crm/sale_crm_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index bf5f1aaac52..69798fae644 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -9,8 +9,7 @@
         <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
         <field name="arch" type="xml">
             <field name="priority" position="after">
-                <button string="Create a Sale Order" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/>
-                <label colspan="2"  string=""/>
+                <button string="Convert to Sale" icon="gtk-go-forward" name="%(sale_crm_wizard)d" type="action"/>
             </field>
         </field>
     </record>

From e2487344d5fb4a9477b951a34ffb581f7eae5174 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 19:16:16 +0200
Subject: [PATCH 13/37] [FIX] opportunities

bzr revid: fp@tinyerp.com-20100612171616-1aul25xm928xb8ic
---
 addons/crm/crm_opportunity_menu.xml |  7 +++----
 addons/crm/crm_opportunity_view.xml | 15 ++++++---------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 0d81a3bc3ec..cb24990416f 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -25,11 +25,10 @@
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
           <field name="name">Opportunities</field>
           <field name="res_model">crm.lead</field>
-          <field name="view_mode">tree,form,graph</field>
-          <field name="domain">['|',('type','=','opportunity'),('state','=','draft')]</field>
-          <field name="context">{'search_default_user_id':uid,'search_default_current':1}</field>
+          <field name="view_mode">tree,form,graph,calendar</field>
+          <field name="domain">[('type','=','opportunity')]</field>
+          <field name="context">{'search_default_user_id':uid,'search_default_current':1, 'default_type': 'opportunity'}</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
-          <field name="context">{'search_default_current':1, 'default_type': 'opportunity'}</field>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
      </record>
 
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 95ab6a1d0df..9f1b7904448 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -32,7 +32,7 @@
             id="menu_crm_opportunity_stage_act" name="Stages"
             parent="menu_crm_config_opportunity" />
 
-		<!-- Opportunity Resource Type Form View -->
+        <!-- Opportunity Resource Type Form View -->
 
         <record id="crm_opportunity_resource_act" model="ir.actions.act_window">
             <field name="name">Opportunity Resource Type</field>
@@ -183,10 +183,10 @@
                                     icon="gtk-undo" type="action" />
                                 </form>
                                 <tree string="Communication history">
-		                            <field name="date"/>
-		                            <field name="email_from" />
-		                            <field name="email_to"/>
-		                            <field name="description"/>
+                                    <field name="date"/>
+                                    <field name="email_from" />
+                                    <field name="email_to"/>
+                                    <field name="description"/>
                                 </tree>
                             </field>
                             <button colspan="2" string="Send New Email"
@@ -246,8 +246,8 @@
                         <field name="create_date"/>
                         <field name="name" string="Opportunity"/>
                         <field name="partner_id"/>
+                        <field name="date_action"/>
                         <field name="stage_id"/>
-                        <field name="categ_id" invisible="1" groups="base.group_extended"/>
                         <button name="stage_previous" string="Previous"
                             states="open,pending" type="object" icon="gtk-go-back" />
                         <button name="stage_next" string="Next"
@@ -255,10 +255,7 @@
                             icon="gtk-go-forward" />
                         <field name="planned_revenue" sum="Total of Planned Revenue"/>
                         <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
-                        <field name="date_action"/>
-                        <field name="section_id" groups="base.group_extended"/>
                         <field name="user_id"/>
-                        <field name="priority"/>
                         <field name="state"/>
                         <button name="case_open" string="Open"
                             states="draft,pending" type="object"

From 85ba0d3d1d95f0ded4ff087a728ca41054580640 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 19:49:33 +0200
Subject: [PATCH 14/37] [IMP] improve views, reviewed widget=selection

bzr revid: fp@tinyerp.com-20100612174933-pr33o0l3ho2z4dai
---
 addons/account/account_installer.xml          |  38 +-
 addons/account/account_view.xml               |  22 +-
 addons/base_calendar/base_calendar_view.xml   |   4 +-
 addons/base_setup/base_setup_todo.xml         |  74 +-
 addons/crm/crm_lead_view.xml                  |   2 +-
 addons/crm/crm_meeting_view.xml               |  58 +-
 addons/crm/crm_opportunity_view.xml           |   2 +-
 addons/crm/crm_phonecall_view.xml             |   2 +-
 addons/document/document_view.xml             |  14 +-
 addons/hr/hr_department_view.xml              |   2 +-
 addons/hr/hr_view.xml                         |  22 +-
 addons/hr_contract/hr_contract_view.xml       |  16 +-
 addons/hr_evaluation/hr_evaluation_view.xml   |   6 +-
 addons/hr_expense/hr_expense_view.xml         |   4 +-
 addons/hr_holidays/hr_holidays_view.xml       |   2 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 112 +--
 .../hr_timesheet_invoice_view.xml             |  16 +-
 .../hr_timesheet_sheet_view.xml               |   2 +-
 addons/idea/idea_view.xml                     |  40 +-
 addons/mrp/mrp_view.xml                       |  58 +-
 addons/point_of_sale/pos_view.xml             |   4 +-
 addons/project/project_view.xml               |  15 +-
 addons/project_caldav/project_caldav_view.xml | 182 ++--
 addons/project_issue/project_issue_view.xml   |  52 +-
 .../project_long_term_view.xml                |  20 +-
 .../project_planning_view.xml                 |   8 +-
 addons/purchase/purchase_view.xml             |   4 +-
 .../purchase_requisition_view.xml             |  72 +-
 addons/resource/resource_view.xml             |   6 +-
 addons/sale/sale_view.xml                     |  20 +-
 addons/sale_journal/sale_journal_view.xml     | 794 +++++++++---------
 addons/scrum/scrum_view.xml                   |  16 +-
 addons/stock/partner_view.xml                 |   4 +-
 addons/stock/product_view.xml                 |  16 +-
 addons/stock_planning/stock_planning_view.xml |  14 +-
 addons/survey/survey_view.xml                 |   4 +-
 addons/wiki/wiki_view.xml                     |  19 +-
 37 files changed, 872 insertions(+), 874 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 4c6faae9e19..50e431935bc 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -19,26 +19,26 @@
                  position="attributes">
             <attribute name="string">You can enhance OpenERP's basic accounting support with a few additional OpenERP applications.</attribute>
           </xpath>
-		  <xpath expr="//button[@string='Install Modules']" position="attributes">
+          <xpath expr="//button[@string='Install Modules']" position="attributes">
                 <attribute name="string">Configure</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
               <attribute name='rowspan'>23</attribute>
               <attribute name='string'></attribute>
-	      </xpath>
-	      <group colspan="8">
-	      <group colspan="4" height="450" width="600">
+          </xpath>
+          <group colspan="8">
+          <group colspan="4" height="450" width="600">
             <field name="charts"/>
              <group colspan="4">
-            	<separator col="4" colspan="4" string="Configure Fiscal Year"/>
+                <separator col="4" colspan="4" string="Configure Fiscal Year"/>
                 <field name="date_start" on_change="on_change_start_date(date_start)"/>
                 <field name="date_stop"/>
                 <field name="period" colspan="4"/>
             </group>
              <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
-            	<separator col="4" colspan="4" string="Bank and Cost Account"/>
-            	 <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
-            	 	<form string="">
+                <separator col="4" colspan="4" string="Bank and Cost Account"/>
+                 <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
+                     <form string="">
                       <field name="acc_name"/>
                       <field name="account_type"/>
                       <field name="currency_id" widget="selection"/>
@@ -51,15 +51,15 @@
                   </field>
             </group>
             <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
-            	<field name="sale_tax" colspan="2" on_change="on_change_tax(sale_tax)"/>
-            	<field name="purchase_tax" colspan="2" />
+                <field name="sale_tax" colspan="2" on_change="on_change_tax(sale_tax)"/>
+                <field name="purchase_tax" colspan="2" />
             </group>
             <group colspan="4" groups="base.group_extended">
-            	<separator col="4" colspan="4" string="Install Extra Account Module"/>
-            	<field name="account_analytic_plans"/>
-            	<field name="account_payment"/>
-            	<field name="account_followup"/>
-            	<field name="account_asset"/>
+                <separator col="4" colspan="4" string="Install Extra Account Module"/>
+                <field name="account_analytic_plans"/>
+                <field name="account_payment"/>
+                <field name="account_followup"/>
+                <field name="account_asset"/>
             </group>
           </group>
           </group>
@@ -88,12 +88,12 @@
         <field name="name">account_installer_action_replace</field>
         <field name="type">tree</field>
         <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
-  		<field name="arch" type="xml">
-  		  <xpath expr="//button[@string='Launch']" position="replace">
-        	<button name="%(action_account_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+          <field name="arch" type="xml">
+            <xpath expr="//button[@string='Launch']" position="replace">
+            <button name="%(action_account_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
       </xpath>
         </field>
-	</record>
+    </record>
 
   </data>
 </openerp>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 2fdb2c5fd07..1b9e166ac81 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1496,7 +1496,7 @@
 
         <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
 
-		<act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All Account Entries" res_model="account.move.line" src_model="res.partner"/>
+        <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All Account Entries" res_model="account.move.line" src_model="res.partner"/>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Account Add wizard</field>
@@ -1752,17 +1752,17 @@
                   <attribute name="string">Generate Chart of Accounts from a Chart Template</attribute>
                 </form>
                 <separator string="title" position="attributes">
-            	<attribute name="string"
+                <attribute name="string"
                        >Generate Chart of Accounts from a Chart Template</attribute>
-          		</separator>
-          		<xpath expr="//label[@string='description']" position="attributes">
-            		<attribute name="string">This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template</attribute>
-            		<attribute name="width">150</attribute>
-          		</xpath>
-          		<xpath expr='//separator[@string="vsep"]' position='attributes'>
-              			<attribute name='rowspan'>15</attribute>
-              			<attribute name='string'></attribute>
-	      		</xpath>
+                  </separator>
+                  <xpath expr="//label[@string='description']" position="attributes">
+                    <attribute name="string">This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template</attribute>
+                    <attribute name="width">150</attribute>
+                  </xpath>
+                  <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                          <attribute name='rowspan'>15</attribute>
+                          <attribute name='string'></attribute>
+                  </xpath>
                 <group string="res_config_contents" position="replace">
                   <field name="company_id"  widget="selection"
                          />
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index a86a3e662d1..56e45c9ccf9 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -103,7 +103,7 @@
                        separator="1" help="Declined Invitations" />
                    <separator orientation="vertical"/>
                    <field name="email" select='1'/>
-                   <field name="sent_by_uid" select="1" widget="selection"/>
+                   <field name="sent_by_uid" select="1"/>
                    <separator orientation="vertical"/>
                    <field name="cutype" string="Invitation type" select="1"/>
                    <field name="event_date" select="1"/>
@@ -391,7 +391,7 @@
                            <field name="name" select="1" string="Summary"/>
                            <field name="location" select="1" string="Location"/>
                            <separator orientation="vertical"/>
-                           <field name="user_id" select="1" widget="selection"/>
+                           <field name="user_id" select="1"/>
                            <separator orientation="vertical"/>
                            <field name="show_as" select="1"/>
                            <field name="class" select="1"/>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 2d6b400d2c5..5ec9be53d76 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -10,45 +10,45 @@
           <form position="attributes">
             <attribute name="string">Main Company Setup</attribute>
           </form>
-		  <xpath expr="//label[@string='description']" position="attributes">
-	            <attribute name="string">Information of your company will be used to custiomise your documents like Invoices, Sale Orders,...</attribute>
-	      </xpath>
-	      <xpath expr='//separator[@string="title"]' position='attributes'>
-	          	  <attribute name='string'>Configure Your Company</attribute>
-	      </xpath>
-	      <xpath expr='//separator[@string="vsep"]' position='attributes'>
-	          	  <attribute name='rowspan'>25</attribute>
-	          	  <attribute name='string'></attribute>
-	      </xpath>
+          <xpath expr="//label[@string='description']" position="attributes">
+                <attribute name="string">Information of your company will be used to custiomise your documents like Invoices, Sale Orders,...</attribute>
+          </xpath>
+          <xpath expr='//separator[@string="title"]' position='attributes'>
+                    <attribute name='string'>Configure Your Company</attribute>
+          </xpath>
+          <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                    <attribute name='rowspan'>25</attribute>
+                    <attribute name='string'></attribute>
+          </xpath>
           <group string="res_config_contents" position="replace">
-          	<group colspan="5">
-          		<group colspan="2">
-	            	<field name="company_id" invisible="1"/>
-		            <field name="name" required="True"/><field name="account_no"/>
-		            <field name="currency" widget="selection"/><field name="street"/>
-		            <field name="zip"/>
-		            <field name="street2"/>
-		            <field name="country_id"/>
-		            <field name="state_id"/>
-		            <field name="city"/>
-		            <field name="email"/>
-		            <field name="phone"/>
-		            <field name="website"/>
-				</group>
-				<newline/>
-				<group colspan="2" groups="base.group_extended">
-		            <separator string="Report Information" colspan="4"/>
-		            <field name="rml_header1" colspan="5"/>
-		            <field name="rml_footer1" colspan="5"/>
-		            <field name="rml_footer2" colspan="5"/>
+              <group colspan="5">
+                  <group colspan="2">
+                    <field name="company_id" invisible="1"/>
+                    <field name="name" required="True"/><field name="account_no"/>
+                    <field name="currency" widget="selection"/><field name="street"/>
+                    <field name="zip"/>
+                    <field name="street2"/>
+                    <field name="country_id"/>
+                    <field name="state_id"/>
+                    <field name="city"/>
+                    <field name="email"/>
+                    <field name="phone"/>
+                    <field name="website"/>
+                </group>
+                <newline/>
+                <group colspan="2" groups="base.group_extended">
+                    <separator string="Report Information" colspan="4"/>
+                    <field name="rml_header1" colspan="5"/>
+                    <field name="rml_footer1" colspan="5"/>
+                    <field name="rml_footer2" colspan="5"/>
 
-		            <separator colspan="4"
-		                       string="Your Logo - Use a size of about 450x150 pixels."/>
-		            <field colspan="5" name="logo" widget="image"
-		                   nolabel="1"/>
-		          </group>
-	        </group>
-	       </group>
+                    <separator colspan="4"
+                               string="Your Logo - Use a size of about 450x150 pixels."/>
+                    <field colspan="5" name="logo" widget="image"
+                           nolabel="1"/>
+                  </group>
+            </group>
+           </group>
 
           <xpath expr='//button[@name="action_skip"]' position='replace'/>
         </data>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 7765ba8fbe8..c33339047d8 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -298,7 +298,7 @@
                 <separator orientation="vertical"/>
                 <field name="partner_name"/>
                 <field name="email_from"/>
-                <field name="user_id" widget="selection">
+                <field name="user_id">
                     <filter icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Leads" />
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index cd3b7866a89..34bdafe1c58 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-	<!-- CRM Meetings Categories Form View -->
+    <!-- CRM Meetings Categories Form View -->
 
     <record id="crm_meeting_categ_action" model="ir.actions.act_window">
         <field name="name">Meeting Categories</field>
@@ -16,7 +16,7 @@
      <menuitem action="crm_meeting_categ_action" name="Categories"
         id="menu_crm_case_meeting-act" parent="menu_crm_config_meeting" />
 
-	<!-- CRM Meetings Form View -->
+    <!-- CRM Meetings Form View -->
 
     <record model="ir.ui.view" id="crm_case_form_view_meet">
         <field name="name">CRM - Meetings Form</field>
@@ -26,7 +26,7 @@
             <form string="Meetings">
                 <group col="6" colspan="4">
                     <field name="name" select="1" string="Summary"
-                    	required="1" colspan="2" />
+                        required="1" colspan="2" />
                     <field name="categ_id" widget="selection"
                         string="Meeting Type"
                         groups="base.group_extended"
@@ -51,9 +51,9 @@
                                name="open_meeting" icon="gtk-edit"
                                type="object" />
                            <button string="ExRule"
-       		name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
-       		context="{'model' : 'crm.meeting'}"
-       		attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
+               name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
+               context="{'model' : 'crm.meeting'}"
+               attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
                     </group>
                 </group>
                 <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
@@ -133,7 +133,7 @@
                         <button name="case_close" string="Done"
                             states="open" type="object"
                             icon="gtk-jump-to" />
-						<button name="case_reset" string="Reset to Unconfirmed"
+                        <button name="case_reset" string="Reset to Unconfirmed"
                             states="open,done,cancel" type="object"
                             icon="gtk-convert" />
                         <button name="case_open" string="Confirm"
@@ -204,7 +204,7 @@
         </field>
     </record>
 
-	<!-- CRM Meeting Tree View  -->
+    <!-- CRM Meeting Tree View  -->
 
     <record model="ir.ui.view" id="crm_case_tree_view_meet">
         <field name="name">CRM - Meetings Tree</field>
@@ -222,7 +222,7 @@
         </field>
     </record>
 
-	<!-- CRM Meeting Calendar -->
+    <!-- CRM Meeting Calendar -->
 
     <record model="ir.ui.view" id="crm_case_calendar_view_meet">
         <field name="name">CRM - Meetings Calendar</field>
@@ -238,7 +238,7 @@
         </field>
     </record>
 
-	<!-- CRM Meeting Gantt  -->
+    <!-- CRM Meeting Gantt  -->
 
     <record id="crm_case_gantt_view_meet" model="ir.ui.view">
         <field name="name">CRM - Meetings Gantt</field>
@@ -254,7 +254,7 @@
         </field>
     </record>
 
-	<!-- CRM Meeting Search View  -->
+    <!-- CRM Meeting Search View  -->
 
     <record id="view_crm_case_meetings_filter" model="ir.ui.view">
         <field name="name">CRM - Meetings Search</field>
@@ -274,29 +274,29 @@
                                    domain="[('section_id','=',context.get('section_id',False))]"
                                    help="My Sale Team" />
                            </field>
-                           <field name="user_id" select="1" widget="selection"/>
+                           <field name="user_id" select="1"/>
                        </group>
                        <newline/>
-					   	<group expand="0" string="Group By...">
-							<filter string="Date" icon="terp-go-month"
-						        domain="[]" context="{'group_by':'date'}" />
-						    <filter string="Privacy" icon="terp-locked"
-						        domain="[]" context="{'group_by':'class'}" />
-						    <separator orientation="vertical" />
-						    <filter string="Responsible" icon="terp-personal" domain="[]"
-						        context="{'group_by':'user_id'}" />
-						    <filter string="Partner" icon="terp-personal" domain="[]"
-						        context="{'group_by':'partner_id'}" />
-						    <separator orientation="vertical" />
-						    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
-						        context="{'group_by':'state'}" />
-						    <separator orientation="vertical" />
-						</group>
+                           <group expand="0" string="Group By...">
+                            <filter string="Date" icon="terp-go-month"
+                                domain="[]" context="{'group_by':'date'}" />
+                            <filter string="Privacy" icon="terp-locked"
+                                domain="[]" context="{'group_by':'class'}" />
+                            <separator orientation="vertical" />
+                            <filter string="Responsible" icon="terp-personal" domain="[]"
+                                context="{'group_by':'user_id'}" />
+                            <filter string="Partner" icon="terp-personal" domain="[]"
+                                context="{'group_by':'partner_id'}" />
+                            <separator orientation="vertical" />
+                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
+                                context="{'group_by':'state'}" />
+                            <separator orientation="vertical" />
+                        </group>
                 </search>
             </field>
         </record>
 
-		<!-- Calendar Attendee Form View -->
+        <!-- Calendar Attendee Form View -->
 
         <record id="attendee_form_view_inherit" model="ir.ui.view">
                 <field name="name">calendar.attendee.form.inherit</field>
@@ -310,7 +310,7 @@
                 </field>
         </record>
 
-		<!-- Calendar Attendee Tree View -->
+        <!-- Calendar Attendee Tree View -->
 
         <record id="attendee_tree_view_inherit" model="ir.ui.view">
                 <field name="name">calendar.attendee.tree.inherit</field>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 9f1b7904448..4b618e352ce 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -317,7 +317,7 @@
                         />
                         <separator orientation="vertical"/>
                         <field name="name" string="Opportunity"/>
-                        <field name="user_id" widget="selection">
+                        <field name="user_id">
                             <filter icon="terp-personal-"
                                 domain="[('user_id','=', False)]"
                                 help="Unassigned Opportunities" />
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index db8adda789c..59b8013b167 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -261,7 +261,7 @@
                <separator orientation="vertical"/>
                <field name="name" string="Call Summary"/>
                <field name="partner_id"/>
-               <field name="user_id" widget="selection">
+               <field name="user_id">
                    <filter icon="terp-personal-"
                        domain="[('user_id','=',False)]"
                        help="Unassigned Phonecalls" />
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index aa37b4472ad..56d96d916ca 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -238,19 +238,19 @@
                     help="less 1 month modified/created attachments"
                     domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
                 />
-                    <separator orientation="vertical"/>
-                  <field name="user_id" widget="selection">
+                 <separator orientation="vertical"/>
+                 <field name="user_id">
                     <filter icon="terp-personal"
                         domain="[('user_id','=', False)]"
                         help="Filter on my Attachment" />
-                    </field>
-                    <field name="partner_id" widget="selection"/>
-                    <newline/>
-                 <group expand="0" string="Group By...">
+                 </field>
+                <field name="partner_id"/>
+                <newline/>
+                <group expand="0" string="Group By...">
                     <filter string="Partner" icon="terp-personal" domain="[]"
                        context="{'group_by':'partner_id'}" />
                     <filter string="Directory" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
-                 </group>
+                </group>
               </search>
              </field>
          </record>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 977cc22f005..b329fce97dc 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -51,7 +51,7 @@
                 <search string="Departments">
                     <group col='4' colspan='2'>
                         <field name="name" />
-                        <field name="manager_id" widget="selection"/>
+                        <field name="manager_id"/>
                     </group>
                 </search>
              </field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5e862781408..07612615086 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -30,18 +30,18 @@
             <field name="arch" type="xml">
                 <form string="Employee">
                     <group colspan="4" col="8">
-	                    <group colspan="6" col="6">
-	                        <field colspan="6" name="name" select="1"/>
-	                        <field name="user_id"/>
-	                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-	                        <field name="active" groups="base.group_extended"/>
-	                        <newline/>
+                        <group colspan="6" col="6">
+                            <field colspan="6" name="name" select="1"/>
+                            <field name="user_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="active" groups="base.group_extended"/>
+                            <newline/>
                             <field name="parent_id" />
                             <field name="coach_id" />
-	                    </group>
-	                    <group colspan="2" col="1">
-	                        <field name="photo" widget='image' nolabel="1"/>
-	                    </group>
+                        </group>
+                        <group colspan="2" col="1">
+                            <field name="photo" widget='image' nolabel="1"/>
+                        </group>
                     </group>
                     <notebook colspan="6">
                         <page string="Personal Information">
@@ -113,7 +113,7 @@
                     <field name="name"/>
                     <field name="department_id" widget="selection"/>
                     <field name="job_id" widget="selection"/>
-                    <field name="parent_id" widget="selection" />
+                    <field name="parent_id"/>
                     <newline />
                     <group expand="0" string="Group By...">
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 84cc82ebe8b..40cebb98ef2 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -133,17 +133,17 @@
             </field>
         </record>
 
-		<record id="hr_contract_view_search" model="ir.ui.view">
+        <record id="hr_contract_view_search" model="ir.ui.view">
             <field name="name">hr.contract.view.search</field>
             <field name="model">hr.contract</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group col='15' colspan='4'>
-                   		<field name="name"/>
-                      	<field name="employee_id"/>
-                       	<field name="date_start"/>
-                       	<field name="date_end"/>
+                           <field name="name"/>
+                          <field name="employee_id"/>
+                           <field name="date_start"/>
+                           <field name="date_end"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
@@ -217,7 +217,7 @@
             <field name="search_view_id" ref="hr_contract_view_search"/>
         </record>
 
-		<record id="hr_contract_type_view_form" model="ir.ui.view">
+        <record id="hr_contract_type_view_form" model="ir.ui.view">
             <field name="name">hr.contract.type.view.form</field>
             <field name="model">hr.contract.type</field>
             <field name="type">form</field>
@@ -228,7 +228,7 @@
             </field>
         </record>
 
-		 <record id="hr_contract_type_view_tree" model="ir.ui.view">
+         <record id="hr_contract_type_view_tree" model="ir.ui.view">
             <field name="name">hr.contract.type.view.tree</field>
             <field name="model">hr.contract.type</field>
             <field name="type">tree</field>
@@ -250,7 +250,7 @@
         <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_root" name="Contracts" sequence="4"/>
 
         <!-- Contracts Button on Employee Form -->
-		<act_window domain="[('employee_id', '=', active_id)]" id="act_hr_employee_2_hr_contract" name="Contracts" res_model="hr.contract" src_model="hr.employee"/>
+        <act_window domain="[('employee_id', '=', active_id)]" id="act_hr_employee_2_hr_contract" name="Contracts" res_model="hr.contract" src_model="hr.employee"/>
 
 
     </data>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index a3e4cac2a5f..cbb4c796c90 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -257,7 +257,7 @@
                         />
 
                         <separator orientation="vertical"/>
-                        <field name="employee_id" widget="selection" select="1"/>
+                        <field name="employee_id" select="1"/>
                         <field name="plan_id" widget="selection" select="1"/>
                         </group>
                         <newline/>
@@ -349,8 +349,8 @@
                         <separator orientation="vertical"/>
                         <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
-                        <field name="user_to_review_id" widget="selection"/>
-                        <field name="user_id" string="Interviewer" widget="selection"/>
+                        <field name="user_to_review_id"/>
+                        <field name="user_id" string="Interviewer"/>
                    </group>
                </search>
             </field>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 35ffc931831..1b73f7b3ebd 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -145,8 +145,8 @@
                       <separator orientation="vertical"/>
                       <field name="name" select='1'/>
                       <field name="date" select='1'/>
-                      <field name="user_id" select="1" widget="selection" string="User">
-                      		<filter icon="terp-personal+"
+                      <field name="user_id" select="1" string="User">
+                      <filter icon="terp-personal+"
                             domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
                       </field>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index fc9626d831d..1a310a55100 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -13,7 +13,7 @@
                         <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"
                             default="context.get('report', False)"/>
                         <separator orientation="vertical"/>
-                        <field name="user_id" widget="selection"/>
+                        <field name="user_id"/>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-personal+" help="My Department Holidays"
                                 domain="[('department_id.manager_id','=',uid)]"
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 99647cd2406..ef5fcd3387f 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -13,12 +13,12 @@
     # ------------------------------------------------------
 
     <record id="hr_job_categ_action" model="ir.actions.act_window">
-		<field name="name">Applicant Categories</field>
-		<field name="res_model">crm.case.categ</field>
-		<field name="view_type">form</field>
-		<field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-		<field name="domain">[('object_id.model', '=', 'hr.applicant')]</field>
-		<field name="context">{'object_id':'hr.applicant'}</field>
+        <field name="name">Applicant Categories</field>
+        <field name="res_model">crm.case.categ</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
+        <field name="domain">[('object_id.model', '=', 'hr.applicant')]</field>
+        <field name="context">{'object_id':'hr.applicant'}</field>
     </record>
     # ------------------------------------------------------
     # Stage
@@ -83,9 +83,9 @@
                     </group>
                     <newline/>
                     <group colspan="3" col="6">
-	                  	<field name="partner_name"/>
-	                   	<field name="job_id" on_change="onchange_job(job_id)"/>
-	                   	<button string="Schedule a Phone Call" name="%(action_hr_recruitment_phonecall)d" icon="gtk-redo" type="action"/>
+                          <field name="partner_name"/>
+                           <field name="job_id" on_change="onchange_job(job_id)"/>
+                           <button string="Schedule a Phone Call" name="%(action_hr_recruitment_phonecall)d" icon="gtk-redo" type="action"/>
                      </group>
                     <newline/>
                     <group colspan="3" col="6">
@@ -95,7 +95,7 @@
                     </group>
                     <button name="action_print_survey" string="Print Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
                     <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
-            	</group>
+                </group>
                 <notebook colspan="4">
                     <page string="Job Info">
                         <group col="2" colspan="2">
@@ -186,9 +186,9 @@
                                 </tree>
                             </field>
                            <button colspan="4" string="Send New Email"
-                           	name="%(crm.action_crm_send_mail)d"
-                           	context="{'mail':'new', 'model': 'hr.applicant'}"
-                           	icon="gtk-go-forward" type="action" />
+                               name="%(crm.action_crm_send_mail)d"
+                               context="{'mail':'new', 'model': 'hr.applicant'}"
+                               icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
             </form>
@@ -236,7 +236,7 @@
                <field name="partner_name"/>
                <field name="email_from"/>
                <field name="job_id" widget="selection"/>
-               <field name="user_id" widget="selection">
+               <field name="user_id">
                     <filter domain="[('user_id','=',False)]" help="Unassigned Recruitements" icon="terp-personal-" separator="1"/>
                </field>
                <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
@@ -281,56 +281,56 @@
 
 <!-- Stage Tree View -->
 
-	<record model="ir.ui.view" id="hr_recruitment_stage_tree">
-	    <field name="name">hr.recruitment.stage.tree</field>
-	    <field name="model">hr.recruitment.stage</field>
-	    <field name="type">tree</field>
-	    <field name="arch" type="xml">
-	        <tree string="Stages">
-	            <field name="sequence"/>
-	            <field name="name"/>
-	        </tree>
-	    </field>
-	</record>
+    <record model="ir.ui.view" id="hr_recruitment_stage_tree">
+        <field name="name">hr.recruitment.stage.tree</field>
+        <field name="model">hr.recruitment.stage</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Stages">
+                <field name="sequence"/>
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
 
 <!-- Stage Form View -->
 
-	<record model="ir.ui.view" id="hr_recruitment_stage_form">
-	    <field name="name">hr.recruitment.stage.form</field>
-	    <field name="model">hr.recruitment.stage</field>
-	    <field name="type">form</field>
-	    <field name="arch" type="xml">
-	        <form string="Stage">
-	            <separator string="Stage Definition" colspan="4"/>
-	            <field name="name" select="1"/>
-	            <field name="sequence"/>
-	            <separator string="Requirements" colspan="4"/>
-	            <field name="requirements" nolabel="1" colspan="4"/>
-	        </form>
-	    </field>
-	</record>
+    <record model="ir.ui.view" id="hr_recruitment_stage_form">
+        <field name="name">hr.recruitment.stage.form</field>
+        <field name="model">hr.recruitment.stage</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Stage">
+                <separator string="Stage Definition" colspan="4"/>
+                <field name="name" select="1"/>
+                <field name="sequence"/>
+                <separator string="Requirements" colspan="4"/>
+                <field name="requirements" nolabel="1" colspan="4"/>
+            </form>
+        </field>
+    </record>
 
 <!-- Stage Action -->
 
-	<record id="hr_recruitment_stage_act" model="ir.actions.act_window">
-	    <field name="name">Stages</field>
-	    <field name="res_model">hr.recruitment.stage</field>
-	    <field name="view_type">form</field>
-	    <field name="view_id" ref="hr_recruitment_stage_tree"/>
-	</record>
+    <record id="hr_recruitment_stage_act" model="ir.actions.act_window">
+        <field name="name">Stages</field>
+        <field name="res_model">hr.recruitment.stage</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="hr_recruitment_stage_tree"/>
+    </record>
 
-	<menuitem
-	    id="menu_hr_recruitment_recruitment"
-	    name="Recruitment"
-	    parent="hr.menu_hr_configuration"
-	    />
+    <menuitem
+        id="menu_hr_recruitment_recruitment"
+        name="Recruitment"
+        parent="hr.menu_hr_configuration"
+        />
 
-	<menuitem
-		id="menu_hr_recruitment_stage"
-		name="Stages"
-		parent="menu_hr_recruitment_recruitment"
-		action="hr_recruitment_stage_act"
-		sequence="1"/>
+    <menuitem
+        id="menu_hr_recruitment_stage"
+        name="Stages"
+        parent="menu_hr_recruitment_recruitment"
+        action="hr_recruitment_stage_act"
+        sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index a603cc3f24e..b56ecd75769 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -20,7 +20,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="view_account_analytic_account_form" model="ir.ui.view">
             <field name="name">account.analytic.account.form</field>
             <field name="model">account.analytic.account</field>
@@ -32,7 +32,7 @@
                 </field>
             </field>
         </record>
-            
+
         <record id="hr_timesheet_line_form" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.form</field>
             <field name="model">hr.analytic.timesheet</field>
@@ -117,9 +117,9 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('to_invoice','&lt;&gt;',False)]</field>
         </record>
-        <menuitem 
-            action="action_hr_analytic_timesheet_open_tree" 
-            id="menu_hr_analytic_timesheet_tree" 
+        <menuitem
+            action="action_hr_analytic_timesheet_open_tree"
+            id="menu_hr_analytic_timesheet_tree"
             parent="account.menu_finance_periodical_processing"/>
 
         <record id="action_hr_analytic_timesheet_tree_invoiced" model="ir.actions.act_window">
@@ -178,9 +178,9 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_hr_timesheet_invoice_factor_tree"/>
         </record>
-        <menuitem 
-            action="action_hr_timesheet_invoice_factor_form" 
-            id="hr_timesheet_invoice_factor_view" 
+        <menuitem
+            action="action_hr_timesheet_invoice_factor_form"
+            id="hr_timesheet_invoice_factor_view"
             parent="account.account_analytic_def_account"/>
 
     </data>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index f686daf575e..51edeea837b 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -195,7 +195,7 @@
                         <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
                         <filter icon="terp-gtk-go-back-rtl" string="To Validate" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
                         <separator orientation="vertical"/>
-                        <field name="user_id" select="1" widget="selection"/>
+                        <field name="user_id" select="1"/>
                         <field name="date_from"/>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-personal+"
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 90ee35d21e2..ca46b31ace8 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -68,8 +68,8 @@
         action="action_idea_category_tree"/>
 
     <menuitem name="Give Vote" parent="menu_ideas1"
-    	id="menu_give_vote"
-    	action="action_idea_select"/>
+        id="menu_give_vote"
+        action="action_idea_select"/>
 
 
     <!-- Open Ideas Action  -->
@@ -128,11 +128,11 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
         <form string="Votes">
-        	<group colspan="4">
-	            <field name="user_id" select="1" />
-	            <field name="date"/>
-	            <newline/>
-	            <field name="score"/>
+            <group colspan="4">
+                <field name="user_id" select="1" />
+                <field name="date"/>
+                <newline/>
+                <field name="score"/>
             </group>
             <separator string="Comments:" colspan="4"/>
             <field name="comment" colspan="4" nolabel="1"/>
@@ -147,18 +147,18 @@
         <field name="model">idea.vote</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-	        <search string="Ideas vote">
-	        	<group col="10" colspan="4">
-		            <field name="idea_id" widget="selection"/>
-		            <field name="user_id" widget="selection"/>
-				</group>
-				<newline/>
-	            <group expand="0" string="Group By..." colspan="14">
-	            	<filter string="Vote date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
-	                <filter string="Idea" icon="terp-idea" domain="[]" context="{'group_by':'idea_id'}"/>
-	                <filter string="User" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-	            </group>
-	        </search>
+            <search string="Ideas vote">
+                <group col="10" colspan="4">
+                    <field name="idea_id" widget="selection"/>
+                    <field name="user_id"/>
+                </group>
+                <newline/>
+                <group expand="0" string="Group By..." colspan="14">
+                    <filter string="Vote date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                    <filter string="Idea" icon="terp-idea" domain="[]" context="{'group_by':'idea_id'}"/>
+                    <filter string="User" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                </group>
+            </search>
         </field>
     </record>
 
@@ -270,7 +270,7 @@
                     <separator orientation="vertical"/>
                     <field name="title" select="1"/>
                     <field name="category_id" select="1"/>
-                    <field name="user_id" select="1" widget="selection"/>
+                    <field name="user_id" select="1"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Group By..." colspan="12" col="10">
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 293c8d58aa9..6aad379efcb 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -250,7 +250,7 @@
                         <newline/>
                         <field name="product_uom"/>
                         <field name="product_qty"/>
-                        <field name="routing_id" widget="selection" groups="base.group_extended"/>
+                        <field name="routing_id" groups="base.group_extended"/>
                         <newline/>
                         <field name="product_uos" groups="product.group_uos,base.group_extended" widget="selection"/>
                         <field name="product_uos_qty" groups="product.group_uos,base.group_extended" />
@@ -283,7 +283,7 @@
             </field>
         </record>
 
-		<record id="view_mrp_bom_filter" model="ir.ui.view">
+        <record id="view_mrp_bom_filter" model="ir.ui.view">
             <field name="name">mrp.bom.select</field>
             <field name="model">mrp.bom</field>
            <field name="type">search</field>
@@ -291,9 +291,9 @@
                 <search string="Search Bill Of Material">
                     <group col='4' colspan='4'>
                       <field name="name"/>
-	                    <field name="code" string="Reference"/>
-	                    <field name="product_id"/>
-	                    <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="code" string="Reference"/>
+                        <field name="product_id"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By" colspan="4" col="8" groups="base.group_extended">
@@ -402,26 +402,26 @@
             </field>
         </record>
 
-		<!--
+        <!--
         Procurement
         -->
 
-		<menuitem action="procurement.procurement_action" id="menu_mrp_procurement_action"
-        		  parent="mrp.menu_mrp_manufacturing" sequence="2" />
+        <menuitem action="procurement.procurement_action" id="menu_mrp_procurement_action"
+                  parent="mrp.menu_mrp_manufacturing" sequence="2" />
 <!--        <menuitem action="procurement.procurement_action5" id="menu_mrp_procurement_exception_action"-->
-<!--        		  parent="mrp.menu_mrp_control" sequence="1" />-->
+<!--                  parent="mrp.menu_mrp_control" sequence="1" />-->
 
-     	<menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
+         <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
         <menuitem action="procurement.action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/>
 
-		<!--
-		Order Point
-		-->
-		<menuitem action="procurement.action_orderpoint_form" id="menu_action_orderpoint_form" parent="mrp.menu_mrp_reordering"/>
+        <!--
+        Order Point
+        -->
+        <menuitem action="procurement.action_orderpoint_form" id="menu_action_orderpoint_form" parent="mrp.menu_mrp_reordering"/>
 
         <!--
-	    Production Management
-	    -->
+        Production Management
+        -->
 
         <record id="mrp_production_tree_view" model="ir.ui.view">
             <field name="name">mrp.production.tree</field>
@@ -515,9 +515,9 @@
                     <notebook colspan="4">
                         <page string="Consumed Products">
                             <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)" />
-                            <field name="routing_id" groups="base.group_extended" select="1" widget="selection"/>
-                            <field name="location_src_id" domain="[('usage','=','internal')]" widget="selection" on_change="location_id_change(location_src_id,location_dest_id)"/>
-                            <field name="location_dest_id" domain="[('usage','=','internal')]" widget="selection"/>
+                            <field name="routing_id" groups="base.group_extended" select="1"/>
+                            <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
+                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                             <separator string="" colspan="4"/>
 
                             <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
@@ -807,19 +807,19 @@
         </record>
 
         <!--
-        	Procurements
+            Procurements
         -->
 
         <record id="view_procurement_form_inherit" model="ir.ui.view">
-        	<field name="name">procurement.order.form.inherit</field>
-        	<field name="model">procurement.order</field>
-        	<field name="inherit_id" ref="procurement.procurement_form_view"/>
-        	<field name="type">form</field>
-        	<field name="arch" type="xml">
-        		<xpath expr="/form/notebook/page/field[@name='move_id']" position="before">
-        			<field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
-        		</xpath>
-        	</field>
+            <field name="name">procurement.order.form.inherit</field>
+            <field name="model">procurement.order</field>
+            <field name="inherit_id" ref="procurement.procurement_form_view"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='move_id']" position="before">
+                    <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
+                </xpath>
+            </field>
         </record>
 
         <act_window
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index e00589b3012..22e46933365 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -93,7 +93,7 @@
                             <group colspan="4">
                                 <separator string="Invoicing" colspan="4"/>
                                 <field name="sale_journal" domain="[('type','=','sale'),('company_id','=',company_id)]"/>
-                                <field name="pricelist_id" domain="[('type','=','sale')]" widget="selection"/>
+                                <field name="pricelist_id" domain="[('type','=','sale')]"/>
                                 <field name="invoice_id"/>
                                 <group colspan="2" col="3">
                                     <button name="invoice" string="Create _Invoice" states="paid"/>
@@ -159,7 +159,7 @@
                     <separator orientation="vertical"/>
                     <field name="name" select="1"/>
                     <field name="partner_id" select="1"/>
-                    <field name="user_id" select="1" widget="selection"/>
+                    <field name="user_id" select="1"/>
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
                     <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 1e2a0be260f..f7c5a834d1e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -242,7 +242,7 @@
                         <field name="project_id" required="1" select="1" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
                         <field name="total_hours" widget="float_time"/>
                         <field name="date_deadline"/>
-                        <field name="user_id" select="1" widget="selection"/>
+                        <field name="user_id" select="1"/>
                         <field name="progress" widget="progressbar"/>
                     </group>
                     <notebook colspan="4">
@@ -417,10 +417,10 @@
                         <filter string="Deadlines" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
-                        <field name="project_id" select="1" widget="selection">
+                        <field name="project_id" select="1">
                              <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/>
                         </field>
-                        <field name="user_id" select="1" widget="selection">
+                        <field name="user_id" select="1">
                             <filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
                         </field>
                     </group>
@@ -549,7 +549,7 @@
           <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 name="context_project_id" completion="1"/>
               </field>
           </field>
      </record>
@@ -562,7 +562,7 @@
          <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}"/>
+                <field name="context_project_id" completion="1" context="{'user_prefence':True}"/>
             </page>
        </field>
     </record>
@@ -611,9 +611,8 @@
                        <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>
+                       <field name="project_id" select="1"/>
+                       <field name="user_id" select="1"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
diff --git a/addons/project_caldav/project_caldav_view.xml b/addons/project_caldav/project_caldav_view.xml
index 541cc3c396e..885878cfcd8 100644
--- a/addons/project_caldav/project_caldav_view.xml
+++ b/addons/project_caldav/project_caldav_view.xml
@@ -2,100 +2,100 @@
 <openerp>
     <data>
 
-    	<record id="view_project_caldav_task_form" model="ir.ui.view">
-			<field name="name">project.task.caldav.form</field>
-			<field name="model">project.task</field>
-			<field name="inherit_id" ref="project.view_task_form2"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<notebook position="inside">
-					<page string="Assignees Detail">
-            			<button string="Assign Task"
-            				name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-            				icon="terp-partner" type="action"
-            				context="{'model' : 'project.task'}" colspan="2"/>
-            			<field name="attendee_ids" colspan="4"
-            				nolabel="1" widget="one2many" mode="tree,form">
-            				<tree string="Assignees details"
-            					editable="top">
-            					<field name="email" />
-            					<field name="role" select="1" />
-            					<field name="state" />
-            				</tree>
-            				<form string="Assignees details">
-            					<notebook colspan="4">
-            						<page string="Details">
-            							<field name="email" />
-            							<field name="rsvp" select="1" />
-            							<field name="cutype" select="1" />
-            							<field name="role" select="1" />
-            							<separator colspan="4"
-            								string="" />
-            							<field name="state" />
-            						</page>
-            						<page string="Other">
-            							<field name="user_id"
-            								select="1" />
-            							<field name="partner_address_id"
-            								select="1" />
-            							<newline />
-            						</page>
-            					</notebook>
-            				</form>
-            			</field>
-					</page>
-				</notebook>
-			</field>
-		</record>
+        <record id="view_project_caldav_task_form" model="ir.ui.view">
+            <field name="name">project.task.caldav.form</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Assignees Detail">
+                        <button string="Assign Task"
+                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                            icon="terp-partner" type="action"
+                            context="{'model' : 'project.task'}" colspan="2"/>
+                        <field name="attendee_ids" colspan="4"
+                            nolabel="1" widget="one2many" mode="tree,form">
+                            <tree string="Assignees details"
+                                editable="top">
+                                <field name="email" />
+                                <field name="role" select="1" />
+                                <field name="state" />
+                            </tree>
+                            <form string="Assignees details">
+                                <notebook colspan="4">
+                                    <page string="Details">
+                                        <field name="email" />
+                                        <field name="rsvp" select="1" />
+                                        <field name="cutype" select="1" />
+                                        <field name="role" select="1" />
+                                        <separator colspan="4"
+                                            string="" />
+                                        <field name="state" />
+                                    </page>
+                                    <page string="Other">
+                                        <field name="user_id"
+                                            select="1" />
+                                        <field name="partner_address_id"
+                                            select="1" />
+                                        <newline />
+                                    </page>
+                                </notebook>
+                            </form>
+                        </field>
+                    </page>
+                </notebook>
+            </field>
+        </record>
 
-		<record id="view_project_caldav_task_form1" model="ir.ui.view">
-			<field name="name">project.task.caldav.form1</field>
-			<field name="model">project.task</field>
-			<field name="inherit_id" ref="project.view_task_form2"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="sequence" position="after">
-					<field name="class" />
-				</field>
-			</field>
-		</record>
+        <record id="view_project_caldav_task_form1" model="ir.ui.view">
+            <field name="name">project.task.caldav.form1</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="sequence" position="after">
+                    <field name="class" />
+                </field>
+            </field>
+        </record>
 
-		<record id="view_project_caldav_task_form2" model="ir.ui.view">
-			<field name="name">project.task.caldav.form2</field>
-			<field name="model">project.task</field>
-			<field name="inherit_id" ref="project.view_task_form2" />
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="progress" position="after">
-					<group colspan="2" col="3">
-<!--						<field name="rrule_type" string="Recurrency"
-							on_change="onchange_rrule_type(rrule_type)" colspan="1" />
--->						<field name="rrule_type" string="Recurrency"
-							colspan="1" />
-						<button string="Custom" name="101"
-							icon="gtk-save-as" type="action"
-							context="{'model' : 'project.task'}"
-							attrs="{'readonly': [('rrule_type','!=','custom')]}" />
-					</group>
-				</field>
-			</field>
-		</record>
+        <record id="view_project_caldav_task_form2" model="ir.ui.view">
+            <field name="name">project.task.caldav.form2</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_form2" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="progress" position="after">
+                    <group colspan="2" col="3">
+<!--                        <field name="rrule_type" string="Recurrency"
+                            on_change="onchange_rrule_type(rrule_type)" colspan="1" />
+-->                        <field name="rrule_type" string="Recurrency"
+                            colspan="1" />
+                        <button string="Custom" name="101"
+                            icon="gtk-save-as" type="action"
+                            context="{'model' : 'project.task'}"
+                            attrs="{'readonly': [('rrule_type','!=','custom')]}" />
+                    </group>
+                </field>
+            </field>
+        </record>
 
-	<record id="view_project_caldav_task_form3" model="ir.ui.view">
-			<field name="name">project.task.caldav.form3</field>
-			<field name="model">project.task</field>
-			<field name="inherit_id" ref="project.view_task_form2" />
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="partner_id" position="after">
-					<field name="vtimezone" colspan="2" />
-					<field name="location" colspan="2" />
-					<field name="alarm_id" string="Reminder" widget="selection" />
-					<field name="base_calendar_url" widget="url" />
-					<field name="rrule" invisible="1"/>
-				</field>
-			</field>
-		</record>
+    <record id="view_project_caldav_task_form3" model="ir.ui.view">
+            <field name="name">project.task.caldav.form3</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_form2" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="after">
+                    <field name="vtimezone" colspan="2" />
+                    <field name="location" colspan="2" />
+                    <field name="alarm_id" string="Reminder" widget="selection" />
+                    <field name="base_calendar_url" widget="url" />
+                    <field name="rrule" invisible="1"/>
+                </field>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index a5009b7eb47..673f4239971 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -106,9 +106,9 @@
                                 </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
-                           	name="%(crm.action_crm_send_mail)d"
-                           	context="{'mail':'new', 'model': 'project.issue'}"
-                           	icon="gtk-go-forward" type="action" />
+                               name="%(crm.action_crm_send_mail)d"
+                               context="{'mail':'new', 'model': 'project.issue'}"
+                               icon="gtk-go-forward" type="action" />
                         </page>
                            <page string="History" groups="base.group_extended">
                             <group col="2" colspan="2">
@@ -187,10 +187,10 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group>
-						<filter string="Current" name="current" domain="[('state','in',('open','draft'))]" help="Draft and Open Issues" icon="terp-check" default="1"/>
+                        <filter string="Current" name="current" domain="[('state','in',('open','draft'))]" help="Draft and Open Issues" icon="terp-check" default="1"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Issues" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
-						<separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="   Today   "
                             separator="1"
                             domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
@@ -201,31 +201,31 @@
                             domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                             help="Bugs during last 7 days"
                             />
-                    	<separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                         <field name="name" string="Name"/>
-                        <field name="user_id" widget="selection"/>
-                        <field name="project_id" widget="selection" string="Project"/>
+                        <field name="user_id"/>
+                        <field name="project_id" string="Project"/>
                         <field name="state"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..."  groups="base.group_extended">
-	                    <filter string="Project"  icon="terp-folder-blue" domain="[]"
+                        <filter string="Project"  icon="terp-folder-blue" domain="[]"
                             context="{'group_by':'project_id'}" />
-	                    <filter string="Stage" icon="terp-stage" domain="[]"
-	                        context="{'group_by':'stage_id'}" />
-	                    <filter string="Priority" icon="terp-rating-rated" domain="[]"
-	                        context="{'group_by':'priority'}" />
-	                    <filter string="Version" icon="terp-gtk-jump-to-rtl"
-	                        domain="[]" context="{'group_by':'type_id'}" />
-	                    <separator orientation="vertical" />
-	                    <filter string="Partner" icon="terp-personal" domain="[]"
-	                        context="{'group_by':'partner_id'}" />
-	                    <filter string="Salesman" icon="terp-personal"
-	                        domain="[]" context="{'group_by':'user_id'}" />
-						<separator orientation="vertical" />
-						<filter string="Month" icon="terp-go-month"
-	                        domain="[]" context="{'group_by':'create_date'}" />
-                	</group>
+                        <filter string="Stage" icon="terp-stage" domain="[]"
+                            context="{'group_by':'stage_id'}" />
+                        <filter string="Priority" icon="terp-rating-rated" domain="[]"
+                            context="{'group_by':'priority'}" />
+                        <filter string="Version" icon="terp-gtk-jump-to-rtl"
+                            domain="[]" context="{'group_by':'type_id'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Partner" icon="terp-personal" domain="[]"
+                            context="{'group_by':'partner_id'}" />
+                        <filter string="Salesman" icon="terp-personal"
+                            domain="[]" context="{'group_by':'user_id'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Month" icon="terp-go-month"
+                            domain="[]" context="{'group_by':'create_date'}" />
+                    </group>
                 </search>
             </field>
         </record>
@@ -298,12 +298,12 @@
                     <separator orientation="vertical"/>
                     <group>
                         <field name="name" select='1' string="Feature description"/>
-                        <field name="user_id" select="1" widget="selection"/>
+                        <field name="user_id" select="1"/>
                         <field name="state" select="1">
                             <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                             <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
                         </field>
-                        <field name="project_id" select="1" widget="selection" string="Project"/>
+                        <field name="project_id" select="1" string="Project"/>
 
                     </group>
                 </search>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index cd76382b5d2..cafaefa9633 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-	<menuitem id="menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="1"/>
+    <menuitem id="menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="1"/>
 
     # ------------------------------------------------------
     # Project Resource Allocation
@@ -29,7 +29,7 @@
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Project Resource Allocation">
                     <field name="resource_id"/>
-					<field name="phase_id"/>
+                    <field name="phase_id"/>
                     <field name="useability"/>
                 </tree>
             </field>
@@ -42,8 +42,8 @@
             <field name="arch" type="xml">
                 <search string="Resource Allocations">
                     <group colspan="4" col="20">
-                        <field name="resource_id" widget="selection"/>
-                        <field name="phase_id" widget="selection"/>
+                        <field name="resource_id"/>
+                        <field name="phase_id"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="20">
@@ -59,7 +59,7 @@
             <field name="res_model">project.resource.allocation</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
- 			<field name="context">{'search_default_resource': 1} </field>
+             <field name="context">{'search_default_resource': 1} </field>
             <!--<field name="search_view_id" ref="view_project_phase_search"/>-->
         </record>
 
@@ -156,7 +156,7 @@
                                     </notebook>
                                   </form>
                              </field>
-                           	<button name="%(action_project_schedule_tasks)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
+                               <button name="%(action_project_schedule_tasks)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
                         </page>
                     </notebook>
                     <newline/>
@@ -222,10 +222,10 @@
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="project_id" widget="selection">
+                        <field name="project_id">
                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/>
                         </field>
-                        <field name="responsible_id" widget="selection"/>
+                        <field name="responsible_id"/>
                         <field name="date_start"/>
                     </group>
                     <newline/>
@@ -244,7 +244,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
- 			<field name="context">{'search_default_responsible_id':uid}</field>
+             <field name="context">{'search_default_responsible_id':uid}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 
@@ -294,7 +294,7 @@
             groups="base.group_extended"
             id="menu_project_phase" parent="menu_project_long_term" sequence="4"/>
 
-		<menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
+        <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
             name="Resource Allocations" parent="menu_project_long_term" />
 
         <!--<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>-->
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index fd9d586f21e..d7d2880714c 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -164,10 +164,10 @@
                     <group col="8" colspan="4">
                         <filter icon="terp-check" string="Current Plannings" domain="[('date_from','&lt;=',time.strftime('%%Y-%%m-%%d')),('date_to','&gt;=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
-                        <field name="user_id" widget="selection" select="1"/>
-                        <field name="state" select="1"/>
+                        <field name="name">
+                        <field name="code">
+                        <field name="user_id">
+                        <field name="state">
                     </group>
                 </search>
             </field>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 8d3402804a9..0327e2d017c 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -159,7 +159,7 @@
                     <field name="name" select="1" string="Reference"/>
                     <field name="partner_id" select="1"/>
                     <field name="product_id" select="1"/>
-                    <field name="create_uid" select="1" widget="selection"/>
+                    <field name="create_uid" select="1"/>
                 </group>
                 <newline/>
                   <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
@@ -289,7 +289,7 @@
                 <search string="Search Purchase Order">
                         <group>
                         <field name='order_id'/>
-                        <field name="product_id" widget="selection" />
+                        <field name="product_id"/>
                         </group>
                         <newline/>
                         <group expand="0" string="Group By...">
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 186815c9bc3..172be8c06e8 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -39,7 +39,7 @@
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <field name="origin"/>
-					<field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
 
                 <notebook colspan="4">
@@ -52,41 +52,41 @@
                             </tree>
                             <form string="Products" editable="bottom">
                                 <field name="product_id" />
-								<field name="product_qty"/>
+                                <field name="product_qty"/>
                                 <field name="product_uom_id" />
-								<field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             </form>
 
                         </field>
-					<separator colspan="4"/>
-	                <group col="8" colspan="4">
-	                    <field name="state" select="1" readonly ="1"/>
-						<button name="tender_in_progress" states="draft" string="Confirm" type="object" icon="gtk-apply" />
-	                    <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
-						<button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
-						<button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
-	                </group>
+                    <separator colspan="4"/>
+                    <group col="8" colspan="4">
+                        <field name="state" select="1" readonly ="1"/>
+                        <button name="tender_in_progress" states="draft" string="Confirm" type="object" icon="gtk-apply" />
+                        <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
+                        <button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
+                        <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
+                    </group>
                     </page>
                     <page string="Quotations">
-						<field colspan="4" name="purchase_ids" nolabel="1" mode="tree,form">
-							<tree string="Purchase Order">
-			                    <field name="name" string="Reference"/>
-			                    <field name="date_order" string="Order Date"/>
-			                    <field name="partner_id"/>
-			                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-			                    <field name="location_id"/>
-			                    <field name="minimum_planned_date"/>
-			                    <field name="origin"/>
-			                    <field name="state"/>
-			                    </tree>
-                     	</field>
-						<separator colspan="4" string=""/>
-                     	<group col="8" colspan="4">
-                     	 <label colspan="6"  string=""/>
-						<button name="%(action_purchase_requisition_partner)d" string="Requests for Quotation" type="action" icon="gtk-execute" />
-                    	</group>
+                        <field colspan="4" name="purchase_ids" nolabel="1" mode="tree,form">
+                            <tree string="Purchase Order">
+                                <field name="name" string="Reference"/>
+                                <field name="date_order" string="Order Date"/>
+                                <field name="partner_id"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="location_id"/>
+                                <field name="minimum_planned_date"/>
+                                <field name="origin"/>
+                                <field name="state"/>
+                                </tree>
+                         </field>
+                        <separator colspan="4" string=""/>
+                         <group col="8" colspan="4">
+                          <label colspan="6"  string=""/>
+                        <button name="%(action_purchase_requisition_partner)d" string="Requests for Quotation" type="action" icon="gtk-execute" />
+                        </group>
                    </page>
-					<page string="Notes">
+                    <page string="Notes">
                         <field name="description" colspan="4" nolabel="1"/>
                     </page>
                 </notebook>
@@ -110,7 +110,7 @@
         </field>
     </record>
 
-	<record id="view_purchase_requisition_filter" model="ir.ui.view">
+    <record id="view_purchase_requisition_filter" model="ir.ui.view">
             <field name="name">purchase.requisition.list.select</field>
             <field name="model">purchase.requisition</field>
             <field name="type">search</field>
@@ -118,22 +118,22 @@
                 <search string="Search Purchase Requisition">
                  <group col='10' colspan='4'>
                     <filter icon="terp-check" string="Current" domain="[('state','=','draft,in_progress')]" separator="1" help="Current Purchaes Requisition"/>
-					<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" separator="1" help="Current Purchaes Requisition"/>
+                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" separator="1" help="Current Purchaes Requisition"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1" string="Requisition Reference"/>
                     <field name="purchase_ids" select="1"/>
-                    <field name="user_id" select="1" widget="selection"/>
+                    <field name="user_id" select="1"/>
                     <field name="exclusive" select="1" />
                     <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <newline/>
                   <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-  					<separator orientation="vertical"/>
+                      <separator orientation="vertical"/>
                     <filter string="Date Start" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
                     <filter string="Date End" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'date_end'}"/>
                     <separator orientation="vertical"/>
-					<filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                    <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                 </group>
               </search>
             </field>
@@ -145,8 +145,8 @@
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">purchase.requisition</field>
         <field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="context">{"search_default_user_id":uid}</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="view_purchase_requisition_filter"/>
     </record>
 
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index df0974fd9ed..d00074cf54e 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -12,7 +12,7 @@
                 <search string="Search Resource">
                    <group col='15' colspan='4'>
                        <field name="name"/>
-                       <field name="user_id" string="User" widget="selection"/>
+                       <field name="user_id" string="User"/>
                        <field name="resource_type"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
@@ -35,7 +35,7 @@
                 <search string="Search Working Period">
                    <group col='15' colspan='4'>
                        <field name="name" string="Name"/>
-                       <field name="manager" widget="selection"/>
+                       <field name="manager"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                </search>
@@ -52,7 +52,7 @@
                        <field name="name" string="Name"/>
                        <field name="company_id" string="Company" widget="selection" />
                        <field name="calendar_id" string="Working Time" widget="selection"/>
-                       <field name="resource_id" string="Resource" widget="selection"/>
+                       <field name="resource_id" string="Resource"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 6d8b1b9b740..eb2674defc7 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -258,7 +258,7 @@
                     <separator orientation="vertical"/>
                     <field name="name" select="1"/>
                     <field name="partner_id" select="1"/>
-                    <field name="user_id" select="1" widget="selection"/>
+                    <field name="user_id" select="1"/>
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
                     <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
@@ -426,7 +426,7 @@
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
-                    <field name="salesman_id" widget="selection">
+                    <field name="salesman_id">
                         <filter icon="terp-dolar" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
                         <filter icon="terp-personal+" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
                     </field>
@@ -512,16 +512,16 @@
                   <attribute name="string">Sales Configuration</attribute>
                 </form>
                 <separator string="title" position="attributes">
-            	<attribute name="string"
+                <attribute name="string"
                        >Configure Sale Order Logistic</attribute>
-          		</separator>
-          		<xpath expr="//label[@string='description']" position="attributes">
-            		<attribute name="string">Setup your sales workflow and default values.</attribute>
-          		</xpath>
+                  </separator>
+                  <xpath expr="//label[@string='description']" position="attributes">
+                    <attribute name="string">Setup your sales workflow and default values.</attribute>
+                  </xpath>
                 <xpath expr='//separator[@string="vsep"]' position='attributes'>
-          			<attribute name='rowspan'>15</attribute>
-          			<attribute name='string'></attribute>
-	      		</xpath>
+                      <attribute name='rowspan'>15</attribute>
+                      <attribute name='string'></attribute>
+                  </xpath>
                 <group string="res_config_contents" position="replace">
                   <field name="picking_policy" groups="base.group_extended"/>
                   <newline/>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 7e4cc33b283..5b3d2de5652 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -3,467 +3,467 @@
 
    <!--  sale journal invoice Type's Form  view -->
 
-	    <record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
-	        <field name="name">sale_journal.invoice.type.form</field>
-	        <field name="model">sale_journal.invoice.type</field>
-	        <field name="type">form</field>
-	        <field name="arch" type="xml">
-	            <form string="Invoice Type">
-	                <field name="name" select="1"/>
-	                <field name="active" select="1"/>
-	                <field name="invoicing_method" select="1"/>
-	                <newline/>
-	                <field name="note" colspan="4"/>
-	            </form>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
+            <field name="name">sale_journal.invoice.type.form</field>
+            <field name="model">sale_journal.invoice.type</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Invoice Type">
+                    <field name="name" select="1"/>
+                    <field name="active" select="1"/>
+                    <field name="invoicing_method" select="1"/>
+                    <newline/>
+                    <field name="note" colspan="4"/>
+                </form>
+            </field>
+        </record>
 
-	  <!--  sale journal invoice Type's tree  view -->
+      <!--  sale journal invoice Type's tree  view -->
 
-	    <record model="ir.ui.view" id="view_sale_journal_invoice_type_tree">
-	        <field name="name">sale_journal.invoice.type.tree</field>
-	        <field name="model">sale_journal.invoice.type</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-	            <tree string="Invoice Type">
-	                <field name="name"/>
-	                <field name="invoicing_method"/>
-	            </tree>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_sale_journal_invoice_type_tree">
+            <field name="name">sale_journal.invoice.type.tree</field>
+            <field name="model">sale_journal.invoice.type</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Invoice Type">
+                    <field name="name"/>
+                    <field name="invoicing_method"/>
+                </tree>
+            </field>
+        </record>
 
-	  <!-- Action for sale journal invoice Type -->
+      <!-- Action for sale journal invoice Type -->
 
-	    <record model="ir.actions.act_window" id="action_definition_journal_invoice_type">
-	        <field name="res_model">sale_journal.invoice.type</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,form</field>
-	    </record>
+        <record model="ir.actions.act_window" id="action_definition_journal_invoice_type">
+            <field name="res_model">sale_journal.invoice.type</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
 
-	<!-- <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/> -->
+    <!-- <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/> -->
 
-	<!-- sale journal Form view  -->
+    <!-- sale journal Form view  -->
 
-	    <record model="ir.ui.view" id="view_sale_journal_form">
-	        <field name="name">sale_journal.sale.journal.form</field>
-	        <field name="model">sale_journal.sale.journal</field>
-	        <field name="type">form</field>
-	        <field name="arch" type="xml">
-	            <form string="Sales Journals">
-					<group colspan="4"	col="6">
-	                    <field name="name" select="1"/>
-	                    <field name="code" select="1"/>
-	                    <field name="user_id" select="1"/>
-	                    <field name="date" select="1"/>
-	                    <field name="date_created" select="1"/>
-	                    <field name="date_validation" select="1"/>
-	                </group>
-					<notebook colspan="4">
-		                <page string="Sales">
-		                    <field name="sale_stats_ids" colspan="4" nolabel="1">
-		                        <tree string="Sales">
-		                            <field name="name"/>
-		                            <field name="quantity"/>
-		                            <field name="price_total"/>
-		                            <field name="price_average"/>
-		                            <field name="count"/>
-		                            <field name="state"/>
-		                        </tree>
-		                    </field>
-		                </page>
-		                <page string="Notes">
-		                    <field name="note" colspan="4" nolabel="1"/>
-		                </page>
-	                </notebook>
-	                <field name="state"/>
-	                    <group col="6" colspan="2">
-	                        <button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
-	                        <button name="button_close" string="Close Journal" states="open" type="object" icon="gtk-close"/>
-	                        <button name="button_draft" string="Set to Draft" states="close,open" type="object" icon="gtk-convert"/>
-	                        <button string="Confirm Sales" name="button_sale_confirm" states="draft,open" type="object" icon="gtk-execute"/>
-	                    	<button string="Cancel Sales" name="button_sale_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
-	                    </group>
-	            </form>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_sale_journal_form">
+            <field name="name">sale_journal.sale.journal.form</field>
+            <field name="model">sale_journal.sale.journal</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales Journals">
+                    <group colspan="4"    col="6">
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="user_id" select="1"/>
+                        <field name="date" select="1"/>
+                        <field name="date_created" select="1"/>
+                        <field name="date_validation" select="1"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Sales">
+                            <field name="sale_stats_ids" colspan="4" nolabel="1">
+                                <tree string="Sales">
+                                    <field name="name"/>
+                                    <field name="quantity"/>
+                                    <field name="price_total"/>
+                                    <field name="price_average"/>
+                                    <field name="count"/>
+                                    <field name="state"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Notes">
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                    <field name="state"/>
+                        <group col="6" colspan="2">
+                            <button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
+                            <button name="button_close" string="Close Journal" states="open" type="object" icon="gtk-close"/>
+                            <button name="button_draft" string="Set to Draft" states="close,open" type="object" icon="gtk-convert"/>
+                            <button string="Confirm Sales" name="button_sale_confirm" states="draft,open" type="object" icon="gtk-execute"/>
+                            <button string="Cancel Sales" name="button_sale_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
+                        </group>
+                </form>
+            </field>
+        </record>
 
   <!-- Sale journal tree view -->
 
-	    <record model="ir.ui.view" id="view_sale_journal_tree">
-	        <field name="name">sale_journal.sale.journal.tree</field>
-	        <field name="model">sale_journal.sale.journal</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-	            <tree string="Sales Journals">
-	                <field name="name" select="1"/>
-	                <field name="code" select="1"/>
-	                <field name="user_id" select="1"/>
-	                <field name="date" select="1"/>
-	                <field name="state"/>
-	            </tree>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_sale_journal_tree">
+            <field name="name">sale_journal.sale.journal.tree</field>
+            <field name="model">sale_journal.sale.journal</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Sales Journals">
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
 
-	<!-- Sale journal search view -->
+    <!-- Sale journal search view -->
 
-	    <record model="ir.ui.view" id="view_sale_journal_search">
-	        <field name="name">sale_journal.sale.journal.search</field>
-	        <field name="model">sale_journal.sale.journal</field>
-	        <field name="type">search</field>
-	        <field name="arch" type="xml">
-	            <search string="Sales by Journal">
-	            	<group col="8" colspan="4">
-		            	<filter icon="terp-personal" string="My Sale Journals" domain="[('user_id','=',uid)]" help="My Sale Journals"/>
-		               	<filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Sale Journals"/>
-		               	<separator orientation="vertical"/>
-		                <field name="name" select="1"/>
-		                <field name="code" select="1"/>
-		                <field name="user_id" select="1"/>
-		                <field name="date" select="1"/>
-					</group>
-	            </search>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_sale_journal_search">
+            <field name="name">sale_journal.sale.journal.search</field>
+            <field name="model">sale_journal.sale.journal</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Sales by Journal">
+                    <group col="8" colspan="4">
+                        <filter icon="terp-personal" string="My Sale Journals" domain="[('user_id','=',uid)]" help="My Sale Journals"/>
+                           <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Sale Journals"/>
+                           <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="user_id" select="1"/>
+                        <field name="date" select="1"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
       <!-- Action for sale journal view -->
 
-	    <record model="ir.actions.act_window" id="action_definition_journal">
-	        <field name="res_model">sale_journal.sale.journal</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,form</field>
-	        <field name="search_view_id" ref="view_sale_journal_search"/>
-	    </record>
+        <record model="ir.actions.act_window" id="action_definition_journal">
+            <field name="res_model">sale_journal.sale.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_sale_journal_search"/>
+        </record>
 
-		<menuitem id="menu_definition_journal" name="Sales Journals" parent="base.menu_base_config"  action="action_definition_journal" sequence="60" />
+        <menuitem id="menu_definition_journal" name="Sales Journals" parent="base.menu_base_config"  action="action_definition_journal" sequence="60" />
 
-	<!-- Inherit sales order form view -->
+    <!-- Inherit sales order form view -->
 
-	    <record model="ir.ui.view" id="sale_journal_sale_order">
-	        <field name="name">sale.order.journal.view.form</field>
-	        <field name="type">form</field>
-	        <field name="model">sale.order</field>
-	        <field name="inherit_id" ref="sale.view_order_form" />
-	        <field name="arch" type="xml">
-	            <field name="user_id" position="after">
+        <record model="ir.ui.view" id="sale_journal_sale_order">
+            <field name="name">sale.order.journal.view.form</field>
+            <field name="type">form</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form" />
+            <field name="arch" type="xml">
+                <field name="user_id" position="after">
                     <separator string="Journal" colspan="4"/>
-	                <field name="journal_id" select="1" widget="selection"/>
-	                <field name="invoice_type_id" select="1" widget="selection"/>
-	            </field>
-	        </field>
-	    </record>
+                    <field name="journal_id" select="1" widget="selection"/>
+                    <field name="invoice_type_id" select="1" widget="selection"/>
+                </field>
+            </field>
+        </record>
 
-	    <!-- Inherit sales order tree view-->
+        <!-- Inherit sales order tree view-->
 
-	    <record model="ir.ui.view" id="sale_journal_sale_order_tree">
-	        <field name="name">sale.order.journal.view.tree</field>
-	        <field name="type">tree</field>
-	        <field name="model">sale.order</field>
-	        <field name="inherit_id" ref="sale.view_order_tree" />
-	        <field name="arch" type="xml">
-	            <field name="state" position="after">
-	                <field name="invoice_type_id"/>
-	                <field name="journal_id"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_sale_order_tree">
+            <field name="name">sale.order.journal.view.tree</field>
+            <field name="type">tree</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_tree" />
+            <field name="arch" type="xml">
+                <field name="state" position="after">
+                    <field name="invoice_type_id"/>
+                    <field name="journal_id"/>
+                </field>
+            </field>
+        </record>
 
 <!--  Inherit stock picking's form view  -->
 
-	    <record model="ir.ui.view" id="sale_journal_picking_order">
-	        <field name="name">stock.picking.journal.view.form</field>
-	        <field name="type">form</field>
-	        <field name="model">stock.picking</field>
-	        <field name="inherit_id" ref="stock.view_picking_form" />
-	        <field name="arch" type="xml">
-	            <field name="origin" position="after">
-	                <field name="journal_id" select="1"/>
-	                <field name="sale_journal_id" select="1"/>
-	                <field name="invoice_type_id" select="1"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_picking_order">
+            <field name="name">stock.picking.journal.view.form</field>
+            <field name="type">form</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_form" />
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="journal_id" select="1"/>
+                    <field name="sale_journal_id" select="1"/>
+                    <field name="invoice_type_id" select="1"/>
+                </field>
+            </field>
+        </record>
 
 <!--  Inherit stock picking's tree view  -->
 
-	    <record model="ir.ui.view" id="sale_journal_picking_order_tree">
-	        <field name="name">stock.picking.journal.view.tree</field>
-	        <field name="type">tree</field>
-	        <field name="model">stock.picking</field>
-	        <field name="inherit_id" ref="stock.vpicktree" />
-	        <field name="arch" type="xml">
-	            <field name="origin" position="after">
-	                <field name="journal_id" select="1"/>
-	                <field name="invoice_type_id" select="1"/>
-	                <field name="sale_journal_id" select="1"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_picking_order_tree">
+            <field name="name">stock.picking.journal.view.tree</field>
+            <field name="type">tree</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.vpicktree" />
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="journal_id" select="1"/>
+                    <field name="invoice_type_id" select="1"/>
+                    <field name="sale_journal_id" select="1"/>
+                </field>
+            </field>
+        </record>
 
-	<!--  Inherit stock picking delivery's form  view.-->
+    <!--  Inherit stock picking delivery's form  view.-->
 
-	    <record model="ir.ui.view" id="sale_journal_picking_order_del">
-	        <field name="name">stock.picking.journal.view.form</field>
-	        <field name="type">form</field>
-	        <field name="model">stock.picking</field>
-	        <field name="inherit_id" ref="stock.view_picking_delivery_form" />
-	        <field name="arch" type="xml">
-	            <field name="origin" position="after">
-	                <field name="journal_id" select="1"/>
-	                <field name="sale_journal_id" select="1"/>
-	                <field name="invoice_type_id" select="1"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_picking_order_del">
+            <field name="name">stock.picking.journal.view.form</field>
+            <field name="type">form</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_delivery_form" />
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="journal_id" select="1"/>
+                    <field name="sale_journal_id" select="1"/>
+                    <field name="invoice_type_id" select="1"/>
+                </field>
+            </field>
+        </record>
 
-	<!--  Inherit stock picking delivery's tree  view.-->
+    <!--  Inherit stock picking delivery's tree  view.-->
 
-	    <record model="ir.ui.view" id="sale_journal_picking_order_tree_del">
-	        <field name="name">stock.picking.journal.view.tree</field>
-	        <field name="type">tree</field>
-	        <field name="model">stock.picking</field>
-	        <field name="inherit_id" ref="stock.view_picking_delivery_tree" />
-	        <field name="arch" type="xml">
-	            <field name="origin" position="after">
-	                <field name="journal_id" select="1"/>
-	                <field name="invoice_type_id" select="1"/>
-	                <field name="sale_journal_id" select="1"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_picking_order_tree_del">
+            <field name="name">stock.picking.journal.view.tree</field>
+            <field name="type">tree</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_delivery_tree" />
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="journal_id" select="1"/>
+                    <field name="invoice_type_id" select="1"/>
+                    <field name="sale_journal_id" select="1"/>
+                </field>
+            </field>
+        </record>
 
-	    <record model="ir.ui.view" id="sale_journal_picking_order_in">
-	        <field name="name">stock.picking.journal.view.form</field>
-	        <field name="type">form</field>
-	        <field name="model">stock.picking</field>
-	        <field name="inherit_id" ref="stock.view_picking_in_form" />
-	        <field name="arch" type="xml">
-	            <field name="origin" position="after">
-	                <field name="journal_id" select="1"/>
-	                <field name="sale_journal_id" select="1"/>
-	                <field name="invoice_type_id" select="1"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_picking_order_in">
+            <field name="name">stock.picking.journal.view.form</field>
+            <field name="type">form</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_in_form" />
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="journal_id" select="1"/>
+                    <field name="sale_journal_id" select="1"/>
+                    <field name="invoice_type_id" select="1"/>
+                </field>
+            </field>
+        </record>
 
-	    <record model="ir.ui.view" id="sale_journal_picking_order_tree_in">
-	        <field name="name">stock.picking.journal.view.tree</field>
-	        <field name="type">tree</field>
-	        <field name="model">stock.picking</field>
-	        <field name="inherit_id" ref="stock.view_picking_in_tree" />
-	        <field name="arch" type="xml">
-	            <field name="origin" position="after">
-	                <field name="journal_id" select="1"/>
-	                <field name="invoice_type_id" select="1"/>
-	                <field name="sale_journal_id" select="1"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_picking_order_tree_in">
+            <field name="name">stock.picking.journal.view.tree</field>
+            <field name="type">tree</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_in_tree" />
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="journal_id" select="1"/>
+                    <field name="invoice_type_id" select="1"/>
+                    <field name="sale_journal_id" select="1"/>
+                </field>
+            </field>
+        </record>
 
-	    <record model="ir.ui.view" id="sale_journal_picking_order_out">
-	        <field name="name">stock.picking.journal.view.form</field>
-	        <field name="type">form</field>
-	        <field name="model">stock.picking</field>
-	        <field name="inherit_id" ref="stock.view_picking_out_form" />
-	        <field name="arch" type="xml">
-	            <field name="origin" position="after">
-	                <field name="journal_id" select="1"/>
-	                <field name="sale_journal_id" select="1"/>
-	                <field name="invoice_type_id" select="1"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_picking_order_out">
+            <field name="name">stock.picking.journal.view.form</field>
+            <field name="type">form</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_out_form" />
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="journal_id" select="1"/>
+                    <field name="sale_journal_id" select="1"/>
+                    <field name="invoice_type_id" select="1"/>
+                </field>
+            </field>
+        </record>
 
-	    <record model="ir.ui.view" id="sale_journal_picking_order_tree_out">
-	        <field name="name">stock.picking.journal.view.tree</field>
-	        <field name="type">tree</field>
-	        <field name="model">stock.picking</field>
-	        <field name="inherit_id" ref="stock.view_picking_out_tree" />
-	        <field name="arch" type="xml">
-	            <field name="origin" position="after">
-	                <field name="journal_id" select="1"/>
-	                <field name="invoice_type_id" select="1"/>
-	                <field name="sale_journal_id" select="1"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_picking_order_tree_out">
+            <field name="name">stock.picking.journal.view.tree</field>
+            <field name="type">tree</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_out_tree" />
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="journal_id" select="1"/>
+                    <field name="invoice_type_id" select="1"/>
+                    <field name="sale_journal_id" select="1"/>
+                </field>
+            </field>
+        </record>
 
-	    <!-- Action of sale journal report in sale journal  -->
+        <!-- Action of sale journal report in sale journal  -->
 
-	    <act_window name="Monthly sales"
-	        domain="[('journal_id', '=', active_id)]"
-	        res_model="sale.journal.report"
-	        src_model="sale_journal.sale.journal"
-	        id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
+        <act_window name="Monthly sales"
+            domain="[('journal_id', '=', active_id)]"
+            res_model="sale.journal.report"
+            src_model="sale_journal.sale.journal"
+            id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
 
-	   <!-- Action  of stock picking  in picking journal  -->
+       <!-- Action  of stock picking  in picking journal  -->
 
-	    <act_window name="Assigned picking"
-	        domain="[('journal_id', '=', active_id),('state', '=', 'assigned')]"
-	        res_model="stock.picking"
-	        src_model="sale_journal.picking.journal"
-	        id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
+        <act_window name="Assigned picking"
+            domain="[('journal_id', '=', active_id),('state', '=', 'assigned')]"
+            res_model="stock.picking"
+            src_model="sale_journal.picking.journal"
+            id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
 
-	  <!-- Action  of stock picking  in picking journal  -->
+      <!-- Action  of stock picking  in picking journal  -->
 
-	    <act_window name="Confirmed picking"
-	        domain="[('journal_id', '=', active_id),('state', '=', 'confirmed')]"
-	        res_model="stock.picking"
-	        src_model="sale_journal.picking.journal"
-	        id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
+        <act_window name="Confirmed picking"
+            domain="[('journal_id', '=', active_id),('state', '=', 'confirmed')]"
+            res_model="stock.picking"
+            src_model="sale_journal.picking.journal"
+            id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
 
-	 <!-- Action  of stock picking  in sale journal  -->
+     <!-- Action  of stock picking  in sale journal  -->
 
-	    <act_window name="Assigned picking"
-        	domain="[('sale_journal_id', '=', active_id),('state', '=', 'assigned')]"
-        	res_model="stock.picking"
-        	src_model="sale_journal.sale.journal"
-        	id="act_sale_journal_sale_journal_2_stock_picking_assigned"/>
+        <act_window name="Assigned picking"
+            domain="[('sale_journal_id', '=', active_id),('state', '=', 'assigned')]"
+            res_model="stock.picking"
+            src_model="sale_journal.sale.journal"
+            id="act_sale_journal_sale_journal_2_stock_picking_assigned"/>
 
     <!-- Action  of stock picking in sale journal -->
 
-	    <act_window name="Confirmed picking"
-	        domain="[('sale_journal_id', '=', active_id),('state', '=', 'confirmed')]"
-	        res_model="stock.picking"
-	        src_model="sale_journal.sale.journal"
-	        id="act_sale_journal_sale_journal_2_stock_picking_confirmed"/>
+        <act_window name="Confirmed picking"
+            domain="[('sale_journal_id', '=', active_id),('state', '=', 'confirmed')]"
+            res_model="stock.picking"
+            src_model="sale_journal.sale.journal"
+            id="act_sale_journal_sale_journal_2_stock_picking_confirmed"/>
 
-	<!-- Action of sale order in sale journal -->
+    <!-- Action of sale order in sale journal -->
 
-	    <act_window name="Draft sales"
-	        domain="[('journal_id', '=', active_id),('state', '=', 'draft')]"
-	        res_model="sale.order"
-	        src_model="sale_journal.sale.journal"
-	        id="act_sale_journal_sale_journal_2_sale_order_draft"/>
+        <act_window name="Draft sales"
+            domain="[('journal_id', '=', active_id),('state', '=', 'draft')]"
+            res_model="sale.order"
+            src_model="sale_journal.sale.journal"
+            id="act_sale_journal_sale_journal_2_sale_order_draft"/>
 
-	  <!-- Action  of sale order in sale journal -->
+      <!-- Action  of sale order in sale journal -->
 
-	    <act_window name="Approved sales"
-	        domain="[('journal_id', '=', active_id),('state', '=', 'approved')]"
-	        res_model="sale.order"
-	        src_model="sale_journal.sale.journal"
-	        id="act_sale_journal_sale_journal_2_sale_order_approved"/>
+        <act_window name="Approved sales"
+            domain="[('journal_id', '=', active_id),('state', '=', 'approved')]"
+            res_model="sale.order"
+            src_model="sale_journal.sale.journal"
+            id="act_sale_journal_sale_journal_2_sale_order_approved"/>
 
-	    <record id="view_partner_property_form" model="ir.ui.view">
-	        <field name="name">res.partner.journal.property.form.inherit</field>
-	        <field name="model">res.partner</field>
-	        <field name="type">form</field>
-	        <field name="inherit_id" ref="base.view_partner_form"/>
-	        <field name="arch" type="xml">
-	            <page string="Sales &amp; Purchases" position="inside">
-	                <field name="property_invoice_type"/>
-	            </page>
-	        </field>
-	    </record>
+        <record id="view_partner_property_form" model="ir.ui.view">
+            <field name="name">res.partner.journal.property.form.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <page string="Sales &amp; Purchases" position="inside">
+                    <field name="property_invoice_type"/>
+                </page>
+            </field>
+        </record>
 
-	<!--=====================================================-->
-	<!-- picking journal view-->
-	<!--=====================================================    -->
+    <!--=====================================================-->
+    <!-- picking journal view-->
+    <!--=====================================================    -->
 
-	    <record model="ir.ui.view" id="view_picking_journal_form">
-	        <field name="name">sale_journal.picking.journal.form</field>
-	        <field name="model">sale_journal.picking.journal</field>
-	        <field name="type">form</field>
-	        <field name="arch" type="xml">
-	            <form string="Picking Journal">
-					<group colspan="4" col="6">
-	                    <field name="name" select="1"/>
-	                    <field name="code" select="1"/>
-	                    <field name="user_id" select="1"/>
-	                    <newline/>
-	                    <field name="date" select="1"/>
-	                    <field name="date_created" select="1"/>
-	                    <field name="date_validation" select="1"/>
-	                </group>
-					<notebook colspan="4">
-		                <page string="Picking">
-		                    <field name="picking_stats_ids" colspan="4" nolabel="1"/>
-		                </page>
-		                <page string="Notes">
-		                    <field name="note" colspan="4" nolabel="1"/>
-		                </page>
-	                </notebook>
-	                <field name="state"/>
-	                    <group col="6" colspan="2">
-	                        <button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
-	                        <button name="button_close" string="Close Journal" states="open" type="object" icon="gtk-close"/>
-	                        <button name="button_draft" string="Set to Draft" states="close,open" type="object" icon="gtk-convert"/>
-	                        <button string="Cancel Picking" name="button_picking_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
-	                    </group>
-	            </form>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_picking_journal_form">
+            <field name="name">sale_journal.picking.journal.form</field>
+            <field name="model">sale_journal.picking.journal</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Picking Journal">
+                    <group colspan="4" col="6">
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="user_id" select="1"/>
+                        <newline/>
+                        <field name="date" select="1"/>
+                        <field name="date_created" select="1"/>
+                        <field name="date_validation" select="1"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Picking">
+                            <field name="picking_stats_ids" colspan="4" nolabel="1"/>
+                        </page>
+                        <page string="Notes">
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                    <field name="state"/>
+                        <group col="6" colspan="2">
+                            <button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
+                            <button name="button_close" string="Close Journal" states="open" type="object" icon="gtk-close"/>
+                            <button name="button_draft" string="Set to Draft" states="close,open" type="object" icon="gtk-convert"/>
+                            <button string="Cancel Picking" name="button_picking_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
+                        </group>
+                </form>
+            </field>
+        </record>
 
-	    <record model="ir.ui.view" id="view_picking_journal_tree">
-	        <field name="name">sale_journal.picking.journal.tree</field>
-	        <field name="model">sale_journal.picking.journal</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-	            <tree string="Picking Journal">
-	                <field name="name" select="1"/>
-	                <field name="code" select="1"/>
-	                <field name="user_id" select="1"/>
-	                <field name="date" select="1"/>
-	                <field name="state"/>
-	            </tree>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_picking_journal_tree">
+            <field name="name">sale_journal.picking.journal.tree</field>
+            <field name="model">sale_journal.picking.journal</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Picking Journal">
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
 
        <!-- Picking journal tree view  -->
 
-	    <record model="ir.ui.view" id="view_picking_journal_search">
-	        <field name="name">sale_journal.picking.journal.search</field>
-	        <field name="model">sale_journal.picking.journal</field>
-	        <field name="type">search</field>
-	        <field name="arch" type="xml">
-	            <search string="Picking Journals">
-	                <group col="8" colspan="4">
-	                    <filter icon="terp-personal" string="My Picking Journals" domain="[('user_id','=',uid)]" help="My Picking Journals"/>
-	                    <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="name" select="1"/>
-	                    <field name="code" select="1"/>
-	                    <field name="user_id" select="1" widget="selection"/>
-	                    <field name="date" select="1"/>
-	                </group>
-	            </search>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_picking_journal_search">
+            <field name="name">sale_journal.picking.journal.search</field>
+            <field name="model">sale_journal.picking.journal</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Picking Journals">
+                    <group col="8" colspan="4">
+                        <filter icon="terp-personal" string="My Picking Journals" domain="[('user_id','=',uid)]" help="My Picking Journals"/>
+                        <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="user_id" select="1"/>
+                        <field name="date" select="1"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
 <!-- Action of Picking journals -->
 
-	    <record model="ir.actions.act_window" id="action_definition_picking_journal">
-	        <field name="name">Picking Journals</field>
-	        <field name="res_model">sale_journal.picking.journal</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,form</field>
-	        <field name="search_view_id" ref="view_picking_journal_search"/>
-	    </record>
+        <record model="ir.actions.act_window" id="action_definition_picking_journal">
+            <field name="name">Picking Journals</field>
+            <field name="res_model">sale_journal.picking.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_picking_journal_search"/>
+        </record>
 
-	    <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
+        <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
 
-	    <record model="ir.actions.act_window" id="action_invoice_type_tree">
-	        <field name="name">Picking by invoice_method</field>
-	        <field name="res_model">sale_journal.invoice.type</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="view_type">tree</field>
-	    </record>
+        <record model="ir.actions.act_window" id="action_invoice_type_tree">
+            <field name="name">Picking by invoice_method</field>
+            <field name="res_model">sale_journal.invoice.type</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">tree</field>
+        </record>
 
-	    <record model="ir.actions.act_window" id="action_invoice_type_picking_open">
-	        <field name="name">Picking to invoice</field>
-	        <field name="res_model">stock.picking</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,form</field>
-	        <field name="domain">[('state','=','done'),('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
-	    </record>
+        <record model="ir.actions.act_window" id="action_invoice_type_picking_open">
+            <field name="name">Picking to invoice</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','done'),('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
+        </record>
 
-	    <record model="ir.values" id="ir_open_invoice_type">
-	        <field name="key2">tree_but_open</field>
-	        <field name="model">sale_journal.invoice.type</field>
-	        <field name="name">Picking to invoice</field>
-	        <field name="value" eval="'ir.actions.act_window,%d'%action_invoice_type_picking_open"/>
-	        <field name="object" eval="True"/>
-	    </record>
+        <record model="ir.values" id="ir_open_invoice_type">
+            <field name="key2">tree_but_open</field>
+            <field name="model">sale_journal.invoice.type</field>
+            <field name="name">Picking to invoice</field>
+            <field name="value" eval="'ir.actions.act_window,%d'%action_invoice_type_picking_open"/>
+            <field name="object" eval="True"/>
+        </record>
 
    </data>
 </openerp>
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index be16ecfa7e5..70c3e82ee56 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -137,8 +137,8 @@
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Backlogs"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="project_id" widget="selection"/>
-                        <field name="sprint_id" widget="selection" domain="[('state','in',('draft','open'))]">
+                        <field name="project_id"/>
+                        <field name="sprint_id" domain="[('state','in',('draft','open'))]">
                             <filter icon="terp-project"
                                 string="Sprints"
                                 domain="[('sprint_id.state','=','open')]"
@@ -148,7 +148,7 @@
                                 domain="[('sprint_id','=',False)]"
                                 help="Backlogs Not Assigned To Sprints."/>
                         </field>
-                        <field name="user_id" widget="selection"/>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
@@ -184,7 +184,7 @@
             <field name="model">scrum.sprint</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            	<tree colors="blue:state in ('pending');grey:state in ('cancel','done')" string="Scrum Sprint">
+                <tree colors="blue:state in ('pending');grey:state in ('cancel','done')" string="Scrum Sprint">
                     <field name="name"/>
                     <field name="project_id"/>
                     <field name="scrum_master_id"/>
@@ -266,8 +266,8 @@
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Sprints"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="project_id" widget="selection"/>
-                        <field name="scrum_master_id" widget="selection"/>
+                        <field name="project_id"/>
+                        <field name="scrum_master_id"/>
                         <field name="date_start"/>
                     </group>
                     <newline/>
@@ -352,10 +352,10 @@
                     <group col="10" colspan="4">
                         <filter name="scrum_daily" icon="terp-go-today" string="Daily" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Daily Meetings"/>
                         <separator orientation="vertical"/>
-                        <field name="sprint_id" widget="selection">
+                        <field name="sprint_id">
                             <filter icon="terp-check" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints" default="1"/>
                         </field>
-                        <field name="project_id" widget="selection"/>
+                        <field name="project_id"/>
                         <field name="date"/>
                     </group>
                     <newline/>
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index 70968f73b9b..9ba4073e2e2 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -14,8 +14,8 @@
         <page string="Sales &amp; Purchases" position="inside">
           <group colspan="2" col="2" groups="base.group_extended">
             <separator string="Inventory Properties" colspan="2"/>
-            <field name="property_stock_customer" widget="selection" domain="[('usage','=','customer')]" groups="base.group_extended" />
-            <field name="property_stock_supplier" widget="selection" domain="[('usage','=','supplier')]" groups="base.group_extended"/>
+            <field name="property_stock_customer" domain="[('usage','=','customer')]" groups="base.group_extended" />
+            <field name="property_stock_supplier" domain="[('usage','=','supplier')]" groups="base.group_extended"/>
           </group>
         </page>
       </field>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 4f6ede6c460..da9f0567ad1 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -8,8 +8,8 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="product.product_search_form_view"/>
             <field name="arch" type="xml">
-                   <field name="pricelist_id" widget="selection" position="before">
-                       <field name="location_id" widget="selection" context="{'location': self}" />
+                   <field name="pricelist_id" position="before">
+                       <field name="location_id" context="{'location': self}" />
                        <separator orientation="vertical"/>
                    </field>
             </field>
@@ -43,9 +43,9 @@
                  <page position="after" string="Information">
                     <page string="Properties">
                         <separator string="Counter-Part Locations Properties" colspan="4"/>
-                        <field name="property_stock_procurement"  widget="selection"/>
-                        <field name="property_stock_production"  widget="selection"/>
-                        <field name="property_stock_inventory"  widget="selection"/>
+                        <field name="property_stock_procurement" domain="[('usage','=','procurement')]"/>
+                        <field name="property_stock_production" domain="[('usage','=','production')]"/>
+                        <field name="property_stock_inventory" domain="[('usage','=','inventory')]"/>
                         <separator string="Accounting Entries" colspan="4"/>
                         <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
@@ -115,9 +115,9 @@
                 <group name="store" position="after">
                     <group col="2" colspan="2" name="store" groups="base.group_extended">
                         <separator string="Counter-Part Locations Properties" colspan="2"/>
-                        <field name="property_stock_procurement" widget="selection" domain="[('usage','=','procurement')]"/>
-                        <field name="property_stock_production" widget="selection"/>
-                        <field name="property_stock_inventory" widget="selection"/>
+                        <field name="property_stock_procurement" domain="[('usage','=','procurement')]"/>
+                        <field name="property_stock_production"  domain="[('usage','=','production')]"/>
+                        <field name="property_stock_inventory"  domain="[('usage','=','inventory')]"/>
                     </group>
                 </group>
             </field>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index e4861120270..7eb19f8863c 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -95,7 +95,7 @@
                 <form string="Stock and Sales Forecasts">
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <newline/>
-                    <field name="period_id1" widget="selection"/>
+                    <field name="period_id1"/>
                     <newline/>
                     <field name="warehouse_id1" domain = "[('company_id','=',company_id)] "/>
                     <newline/>
@@ -240,11 +240,11 @@
                 <search string="Search Stock and Sales Forecast">
                  <group col='10' colspan='4'>
                     <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" separator="1"/>
-                    <field name="company_id" select="1" widget="selection"/>
-                    <field name="warehouse_id" select="1" widget="selection"/>
-                    <field name="period_id" select="1" widget="selection"/>
-                    <field name="product_id" select="1" widget="selection"/>
-                    <field name="create_uid" select="1" widget="selection"/>
+                    <field name="company_id" widget="selection"/>
+                    <field name="warehouse_id" widget="selection"/>
+                    <field name="period_id" widget="selection"/>
+                    <field name="product_id"/>
+                    <field name="create_uid"/>
                 </group>
               </search>
             </field>
@@ -388,7 +388,7 @@
                     <field name="company_id" widget="selection"/>
                     <field name="warehouse_id" widget="selection"/>
                     <field name="period_id" widget="selection"/>
-                    <field name="product_id" widget="selection"/>
+                    <field name="product_id"/>
                  </group>
               </search>
             </field>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index a604b7c7c37..bd3f257c756 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -260,8 +260,8 @@
                         <separator orientation="vertical"/>
                         <field name="title" select="1"/>
                         <field name="type" select="1" widget="selection"/>
-                        <field name="responsible_id" select="1" widget="selection" default="1">
-                        <filter string="MY" icon="terp-partner" domain="[('responsible_id','=',uid)]"/>
+                        <field name="responsible_id" select="1" default="1">
+                            <filter string="MY" icon="terp-partner" domain="[('responsible_id','=',uid)]"/>
                         </field>
                    </group>
                </search>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index ca0eaccb449..8f07148fd52 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -160,16 +160,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Wiki">
-                        <filter icon="terp-check" string="Need Review" domain="[('review','=',True)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="section" select="1"/>
-                        <field name="name" select="1"/>
-                        <field name="group_id" select="1"/>
-                        <field name="write_uid" select="1"/>
-                        <field name="write_date" select="1"/>
-                        <field name="review" select="1"/>
-<!--                        <field name="create_uid" widget="selection" select="1"/>-->
-                        <newline/>
+                    <filter icon="terp-check" string="Need Review" domain="[('review','=',True)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="section" select="1"/>
+                    <field name="name" select="1"/>
+                    <field name="group_id" select="1"/>
+                    <field name="write_uid" select="1"/>
+                    <field name="write_date" select="1"/>
+                    <field name="review" select="1"/>
+                    <newline/>
                     <group expand="0" string="Group By..." colspan="8" col="6">
                         <filter icon="terp-check" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
                         <filter icon="terp-personal" string="Author" domain="[]" context="{'group_by':'create_uid'}"/>

From 10e5a60597567198d113ffd67218a196232b4faa Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 20:27:14 +0200
Subject: [PATCH 15/37] [IMP] crm view

bzr revid: fp@tinyerp.com-20100612182714-akr53zabjfo0bghr
---
 addons/crm/crm_opportunity_view.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 4b618e352ce..08530fcae27 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -255,6 +255,8 @@
                             icon="gtk-go-forward" />
                         <field name="planned_revenue" sum="Total of Planned Revenue"/>
                         <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
+                        <field name="section_id"
+                            invisible="context.get('invisible_section', True)" />
                         <field name="user_id"/>
                         <field name="state"/>
                         <button name="case_open" string="Open"
@@ -323,11 +325,17 @@
                                 help="Unassigned Opportunities" />
                         </field>
                         <field name="section_id"
-                            default="context.get('section_id', False)" select="1"
+                            default="context.get('section_id', False)"
+                            context="{'invisible_section': False}"
                             widget="selection">
                             <filter icon="terp-personal+"
-                                domain="[('section_id','=',context.get('section_id',False))]"
+                                domain="[('section_id.user_id','=',uid)]"
+                                context="{'invisible_section': False}"
                                 help="My Sale Team" />
+                            <filter icon="terp-personal+"
+                                context="{'invisible_section': False}"
+                                domain="[]"
+                                help="Show Sales Team"/>
                         </field>
                         <newline/>
                         <group expand="0" string="Group By..." colspan="16">

From bbbe5202d53512e2c2a7593f43ae3d7a1453927c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 20:29:53 +0200
Subject: [PATCH 16/37] [IMP] better view

bzr revid: fp@tinyerp.com-20100612182953-57sl9biub3q6pnnc
---
 addons/sale_crm/sale_crm_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 69798fae644..565fd687b4e 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -33,9 +33,9 @@
         <field name="inherit_id" ref="sale.view_sales_order_filter"/>
         <field name="arch" type="xml">
             <field name="date_order" position="after">
-            <field name="section_id" default="context.get('section_id', False)" widget="selection" string="Sale Team" groups="base.group_extended">
+                <field name="section_id" default="context.get('section_id', False)" widget="selection" string="Sale Team" groups="base.group_extended">
                     <filter icon="terp-personal+"
-                            domain="[('section_id','=',context.get('section_id',False))]"
+                            domain="[('section_id.user_id','=',uid)]"
                             groups="base.group_extended"
                             help="My Sales Team"/>
                 </field>

From 3e5e33a4460fcda0cf2500f3935cb359a22729c6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 20:32:16 +0200
Subject: [PATCH 17/37] [imp] remove translata=true on so and po

bzr revid: fp@tinyerp.com-20100612183216-49tgq67gzrbe51uk
---
 addons/purchase/purchase.py | 4 ++--
 addons/sale/sale.py         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 87f4c3031bb..99b116040d4 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -168,7 +168,7 @@ class purchase_order(osv.osv):
         'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Waiting Supplier Ack'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
         'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
         'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
-        'notes': fields.text('Notes', translate=True),
+        'notes': fields.text('Notes'),
         'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
         'picking_ids': fields.one2many('stock.picking', 'purchase_id', 'Picking List', readonly=True, help="This is the list of picking list that have been generated for this purchase"),
         'shipped':fields.boolean('Received', readonly=True, select=True),
@@ -591,7 +591,7 @@ class purchase_order_line(osv.osv):
         'move_dest_id': fields.many2one('stock.move', 'Reservation Destination', ondelete='set null'),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Purchase Price')),
         'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Purchase Price')),
-        'notes': fields.text('Notes', translate=True),
+        'notes': fields.text('Notes'),
         'order_id': fields.many2one('purchase.order', 'Order Reference', select=True, required=True, ondelete='cascade'),
         'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',),
         'company_id': fields.related('order_id','company_id',type='many2one',relation='res.company',string='Company'),
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 4b6c766b671..ec8e084ccc0 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -253,7 +253,7 @@ class sale_order(osv.osv):
         'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
         'invoiced': fields.function(_invoiced, method=True, string='Paid',
             fnct_search=_invoiced_search, type='boolean'),
-        'note': fields.text('Notes', translate=True),
+        'note': fields.text('Notes'),
 
         'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Untaxed Amount',
             store = {
@@ -822,7 +822,7 @@ class sale_order_line(osv.osv):
         'move_ids': fields.one2many('stock.move', 'sale_line_id', 'Inventory Moves', readonly=True),
         'discount': fields.float('Discount (%)', digits=(16, 2), readonly=True, states={'draft':[('readonly',False)]}),
         'number_packages': fields.function(_number_packages, method=True, type='integer', string='Number Packages'),
-        'notes': fields.text('Notes', translate=True),
+        'notes': fields.text('Notes'),
         'th_weight': fields.float('Weight'),
         'state': fields.selection([('draft', 'Draft'),('confirmed', 'Confirmed'),('done', 'Done'),('cancel', 'Cancelled'),('exception', 'Exception')], 'State', required=True, readonly=True,
                 help=' * The \'Draft\' state is set automatically when sale order in draft state. \

From 234351b9593fd7c31f33560f04fc977814fc32ae Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 20:36:08 +0200
Subject: [PATCH 18/37] [IMP] better view

bzr revid: fp@tinyerp.com-20100612183608-oyin04wkaspxtoc7
---
 addons/sale/sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index eb2674defc7..92176545cde 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -187,12 +187,12 @@
                                 </tree>
                             </field>
                             <newline/>
-                            <group col="8" colspan="10">
+                            <group col="13" colspan="10">
                                 <field name="amount_untaxed" sum="Untaxed amount"/>
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
-                                <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute"/>
+                                <button name="%(action_view_sale_advance_payment_inv)d" string="Deposit" type="action" icon="gtk-execute"/>
                             </group>
                             <group col="13" colspan="4">
                                 <field name="state"/>

From e5fa5ece2031b5e7e3312de00789150337987d46 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 20:37:57 +0200
Subject: [PATCH 19/37] [IMP] better view

bzr revid: fp@tinyerp.com-20100612183757-x0191p9c4lpjl2ly
---
 .../sale/wizard/sale_make_invoice_advance.xml | 57 ++++++++-----------
 1 file changed, 24 insertions(+), 33 deletions(-)

diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 5fc8b993921..a4f48554166 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -1,59 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_sale_advance_payment_inv" model="ir.ui.view">
-            <field name="name">Sale Advance Payment Invoive</field>
+        <record id="view_sale_advance_payment_inv" model="ir.ui.view">
+            <field name="name">Deposit Invoice</field>
             <field name="model">sale.advance.payment.inv</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-             <form string="Advance Payment">
-			    <field name="product_id"/>
-			    <newline />
-			    <field name="qtty"/>
-			    <field name="amount"/>
-			    <newline />
-             	<separator string="" colspan="4"/>
-             	<label string=""  colspan="2" />
-              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               	<button name="create_invoices" string="Create Advance Invoice" type="object" icon="gtk-ok"/>
+             <form string="Partial Invoice">
+                <field name="product_id"/>
+                <newline />
+                <field name="qtty"/>
+                <field name="amount"/>
+                <newline />
+                 <separator string="" colspan="4"/>
+                 <label string=""  colspan="2" />
+                  <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                   <button name="create_invoices" string="Create Partial Invoice" type="object" icon="gtk-ok"/>
              </form>
             </field>
-		</record>
+        </record>
 
 
-        <act_window name="Advance Invoice"		    
-		    res_model="sale.advance.payment.inv"
-		    src_model="sale.order"
-		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="action_view_sale_advance_payment_inv"/>	
-
-
-    	<record id="view_sale_open_invoice" model="ir.ui.view">
+        <record id="view_sale_open_invoice" model="ir.ui.view">
             <field name="name">Open Invoice</field>
             <field name="model">sale.open.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
              <form string="Invoices">
-             	<label string="You invoice has been successfully created!" />
-             	 <newline />
-             	<separator string="" colspan="4"/>
-             	<group colspan="4">
-              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               	<button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
-               	</group>
+                 <label string="You invoice has been successfully created!" />
+                  <newline />
+                 <separator string="" colspan="4"/>
+                 <group colspan="4">
+                  <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                   <button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
+                   </group>
              </form>
             </field>
-		</record>
+        </record>
 
-		<record id="action_view_sale_open_invoice" model="ir.actions.act_window">
+        <record id="action_view_sale_open_invoice" model="ir.actions.act_window">
             <field name="name">Open Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.open.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-    	</record>
+        </record>
     </data>
 </openerp>

From af09918a9bef8ad133d3473bd541cedf941c7ee4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 20:40:12 +0200
Subject: [PATCH 20/37] [IMP] better view

bzr revid: fp@tinyerp.com-20100612184012-yin25dzhcn16nlgd
---
 addons/product/product_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 5639315788e..5a5557dc14d 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -65,6 +65,7 @@
                 <form string="Product">
                    <group colspan="4" col="6">
                     <group colspan="4" col="2">
+                        <separator string="Name" colspan="2"/>
                         <field name="name"/>
                         <field groups="product.group_product_variant" name="variants" />
                     </group>
@@ -74,10 +75,9 @@
                         <field name="ean13" groups="base.group_extended"/>
                     </group>
                     <group colspan="1" col="2">
-                        <separator string="Product Characteristics" colspan="2"/>
+                        <separator string="Characteristics" colspan="2"/>
                         <field name="sale_ok"/>
                         <field name="purchase_ok"/>
-                        <field groups="base.group_extended" name="rental"/>
                     </group>
                    </group>
 

From 767f6301575dc8ea45ac203a06cab936295ae09d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 20:49:52 +0200
Subject: [PATCH 21/37] improve

bzr revid: fp@tinyerp.com-20100612184952-xw4b0q40205vte3m
---
 addons/hr/hr_department_view.xml        | 2 +-
 addons/hr/hr_view.xml                   | 6 +++++-
 addons/hr_contract/hr_contract_view.xml | 3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index b329fce97dc..70576149592 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -73,7 +73,7 @@
         </record>
 
        <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
-       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="menu_hr_root" sequence="5"/>
+       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="menu_hr_main" sequence="5"/>
 
         <record model="ir.ui.view" id="view_users_form_inherit">
             <field name="name">res.users.form</field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 07612615086..ce57f7441e7 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -6,6 +6,10 @@
             icon="terp-hr"
             name="Human Resources"
             sequence="6"/>
+        <menuitem
+            id="menu_hr_main"
+            name="Human Resources"
+            sequence="0"/>
         <menuitem
             id="menu_hr_configuration"
             name="Configuration"
@@ -156,7 +160,7 @@
             action="open_view_employee_list_my"
             id="menu_open_view_employee_list_my"
             sequence="3"
-            parent="menu_hr_root"/>
+            parent="menu_hr_main"/>
 
 
         <!--
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 40cebb98ef2..be13b0b05d2 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -246,8 +246,7 @@
         </record>
         <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56"/>
 
-        <!--<menuitem  id="hr_menu_contract_main" parent="hr.menu_hr_root" name="Contracts" sequence="3"/> -->
-        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_root" name="Contracts" sequence="4"/>
+        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4"/>
 
         <!-- Contracts Button on Employee Form -->
         <act_window domain="[('employee_id', '=', active_id)]" id="act_hr_employee_2_hr_contract" name="Contracts" res_model="hr.contract" src_model="hr.employee"/>

From b1a2d808af9959b328cc09e5c9c19da1dcb96c8e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 21:17:27 +0200
Subject: [PATCH 22/37] imp

bzr revid: fp@tinyerp.com-20100612191727-454a9d10zo5wq4c2
---
 addons/hr/hr_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index ce57f7441e7..f6a03030a6f 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -8,6 +8,7 @@
             sequence="6"/>
         <menuitem
             id="menu_hr_main"
+            parent="menu_hr_root"
             name="Human Resources"
             sequence="0"/>
         <menuitem

From 4d4484ca391be360b65388c3d343e84aaa937b09 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Jun 2010 21:41:09 +0200
Subject: [PATCH 23/37] bugfix

bzr revid: fp@tinyerp.com-20100612194109-b6qs30klrbe6pp8d
---
 addons/marketing_campaign/marketing_campaign.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 7b1a6b3e441..36754bea803 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -467,8 +467,8 @@ class marketing_campaign_workitem(osv.osv):
             else:
                 # manual states are not processed automatically
                 workitem_ids = []
-        if workitem_ids:
-            self.process(cr, uid, workitem_ids, context)
+            if workitem_ids:
+                self.process(cr, uid, workitem_ids, context)
 
 marketing_campaign_workitem()
 

From 65b70827c4f754082cc7d29f173c42488656a663 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Jun 2010 00:00:05 +0200
Subject: [PATCH 24/37] fix_and_better_access_rights

bzr revid: fp@tinyerp.com-20100612220005-4a33xqgs8bvvoa7x
---
 .../wizard/account_automatic_reconcile.py     |   3 +-
 .../wizard/account_budget_spread.py           |   7 +-
 addons/auction/report/auction_invoice.py      |   3 +-
 .../crm/report/crm_phonecall_report_view.xml  |   2 +-
 addons/hr/security/ir.model.access.csv        |   1 +
 addons/hr_attendance/report/bymonth.py        |   6 +-
 addons/hr_attendance/report/timesheet.py      | 135 +++++++++---------
 .../security/ir.model.access.csv              |   2 +
 .../wizard/hr_attendance_sign_in_out.py       |  41 +++---
 .../wizard/hr_attendance_sign_in_out_view.xml |  56 ++++----
 .../hr_contract/security/ir.model.access.csv  |   3 +
 addons/mrp/mrp_view.xml                       |   2 +-
 12 files changed, 127 insertions(+), 134 deletions(-)

diff --git a/addons/account/wizard/account_automatic_reconcile.py b/addons/account/wizard/account_automatic_reconcile.py
index 2370c6dbe13..a1798ae9cbf 100644
--- a/addons/account/wizard/account_automatic_reconcile.py
+++ b/addons/account/wizard/account_automatic_reconcile.py
@@ -134,7 +134,6 @@ class account_automatic_reconcile(osv.osv_memory):
         return (reconciled, len(credits)+len(debits))
 
     def reconcile(self, cr, uid, ids, context=None):
-        service = netsvc.LocalService("object_proxy")
         move_line_obj = self.pool.get('account.move.line')
         obj_model = self.pool.get('ir.model.data')
         if context is None:
@@ -240,4 +239,4 @@ class account_automatic_reconcile(osv.osv_memory):
 
 account_automatic_reconcile()
 
-# 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/account_budget/wizard/account_budget_spread.py b/addons/account_budget/wizard/account_budget_spread.py
index ab2eb3d0bf6..f8a627ce070 100644
--- a/addons/account_budget/wizard/account_budget_spread.py
+++ b/addons/account_budget/wizard/account_budget_spread.py
@@ -32,13 +32,12 @@ class account_budget_spread(osv.osv_memory):
         }
 
     def check_spread(self, cr, uid, ids, context=None):
-        service = netsvc.LocalService("object_proxy")
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids, [])[0]
-        res = service.execute(cr.dbname, uid, 'account.budget.post', 'spread', context['active_ids'], data['fiscalyear'], data['amount'])
+        data = self.browse(cr, uid, ids, context=context)[0]
+        res = self.pool.get('account.budget.post').spread(cr, uid, context['active_ids'], data.fiscalyear.id, data.amount)
         return {}
 
 account_budget_spread()
 
-# 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/auction/report/auction_invoice.py b/addons/auction/report/auction_invoice.py
index f367d8df88e..b8c508237a5 100644
--- a/addons/auction/report/auction_invoice.py
+++ b/addons/auction/report/auction_invoice.py
@@ -27,8 +27,7 @@ class auction_invoice(report_int):
         report_int.__init__(self, name)
 
     def create(self,cr, uid, ids, datas, context):
-        service = netsvc.LocalService("object_proxy")
-        lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', ids, ['ach_inv_id'])
+        lots = self.pool.get('auction.lots').read(cr,uid, ids, ['ach_inv_id'], context=context)
 
         invoices = {}
         for l in lots:
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 597d06faf7d..f1f5eb4a490 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -187,7 +187,7 @@
             <field name="act_window_id" ref="action_report_crm_phonecall"/>
         </record>
 
-        <menuitem name="Phone Calls"
+        <menuitem name="Phone Calls Analysis"
             action="action_report_crm_phonecall"
             id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" />
 
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 95fca268763..3d05e4d8f04 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,6 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_employee_category","hr.employee.category","model_hr_employee_category","hr.group_hr_user",1,0,0,0
 "access_hr_employee","hr.employee","model_hr_employee","hr.group_hr_user",1,1,1,1
+"access_hr_employee_resource","resource.resource","resource.model_resource_resource","hr.group_hr_user",1,1,1,1
 "access_hr_department","hr.department","model_hr_department","hr.group_hr_user",1,0,0,0
 "access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","hr.group_hr_manager",1,1,1,1
 "access_hr_department_manager","hr.department.manager","model_hr_department","hr.group_hr_manager",1,1,1,1
diff --git a/addons/hr_attendance/report/bymonth.py b/addons/hr_attendance/report/bymonth.py
index 8f9b0eae59e..e30d4107171 100644
--- a/addons/hr_attendance/report/bymonth.py
+++ b/addons/hr_attendance/report/bymonth.py
@@ -39,14 +39,10 @@ def hour2str(h):
 
 class report_custom(report_rml):
     def create_xml(self, cr, uid, ids, datas, context):
-        service = netsvc.LocalService('object_proxy')
-
         month = DateTime.DateTime(datas['form']['year'], datas['form']['month'], 1)
-        
         user_xml = ['<month>%s</month>' % month2name[month.month], '<year>%s</year>' % month.year]
-        
         for employee_id in ids:
-            emp = service.execute(cr.dbname, uid, 'hr.employee', 'read', [employee_id])[0]
+            emp = self.pool.get('hr.employee').read(cr, uid, 'read', [employee_id], ['name'])[0]
             stop, days_xml = False, []
             user_repr = '''
             <user>
diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index f5af46d8c43..9b428a6b54f 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -32,81 +32,80 @@ one_week = DateTime.RelativeDateTime(days=7)
 num2day = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
 
 def to_hour(h):
-	return int(h), int(round((h - int(h)) * 60, 0))
+    return int(h), int(round((h - int(h)) * 60, 0))
 
 class report_custom(report_rml):
-	def create_xml(self, cr, uid, ids, datas, context):
-		service = netsvc.LocalService('object_proxy')
+    def create_xml(self, cr, uid, ids, datas, context):
 
-		start_date = DateTime.strptime(datas['form']['init_date'], '%Y-%m-%d')
-		end_date = DateTime.strptime(datas['form']['end_date'], '%Y-%m-%d')
-		first_monday = start_date - DateTime.RelativeDateTime(days=start_date.day_of_week)
-		last_monday = end_date + DateTime.RelativeDateTime(days=7 - end_date.day_of_week)
+        start_date = DateTime.strptime(datas['form']['init_date'], '%Y-%m-%d')
+        end_date = DateTime.strptime(datas['form']['end_date'], '%Y-%m-%d')
+        first_monday = start_date - DateTime.RelativeDateTime(days=start_date.day_of_week)
+        last_monday = end_date + DateTime.RelativeDateTime(days=7 - end_date.day_of_week)
 
-		if last_monday < first_monday:
-			first_monday, last_monday = last_monday, first_monday
+        if last_monday < first_monday:
+            first_monday, last_monday = last_monday, first_monday
 
-		user_xml = []
+        user_xml = []
 
-		for employee_id in ids:
-			emp = service.execute(cr.dbname, uid, 'hr.employee', 'read', [employee_id], ['id', 'name'])[0]
-			monday, n_monday = first_monday, first_monday + one_week
-			stop, week_xml = False, []
-			user_repr = '''
-			<user>
-			  <name>%s</name>
-			  %%s
-			</user>
-			''' % toxml(emp['name'])
-			while monday != last_monday:
-				#### Work hour calculation
-				sql = '''
-				select action, att.name
-				from hr_employee as emp inner join hr_attendance as att
-				     on emp.id = att.employee_id
-				where att.name between %s and %s and emp.id = %s
-				order by att.name
-				'''
-				for idx in range(7):
-					cr.execute(sql, (monday.strftime('%Y-%m-%d %H:%M:%S'), (monday + DateTime.RelativeDateTime(days=idx+1)).strftime('%Y-%m-%d %H:%M:%S'), employee_id))
-					attendances = cr.dictfetchall()
-					week_wh = {}
-	                # Fake sign ins/outs at week ends, to take attendances across week ends into account
-	                # XXX this is wrong for the first sign-in ever and the last sign out to this date 
-					if attendances and attendances[0]['action'] == 'sign_out':
-						attendances.insert(0, {'name': monday.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_in'})
-					if attendances and attendances[-1]['action'] == 'sign_in':
-						attendances.append({'name' : n_monday.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_out'})
-					# sum up the attendances' durations
-					for att in attendances:
-						dt = DateTime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
-						if att['action'] == 'sign_out':
-							week_wh[ldt.day_of_week] = week_wh.get(ldt.day_of_week, 0) + (dt - ldt).hours
-						ldt = dt
+        for employee_id in ids:
+            emp = self.pool.get('hr.employee').read(cr, uid, [employee_id], ['id', 'name'])[0]
+            monday, n_monday = first_monday, first_monday + one_week
+            stop, week_xml = False, []
+            user_repr = '''
+            <user>
+              <name>%s</name>
+              %%s
+            </user>
+            ''' % toxml(emp['name'])
+            while monday != last_monday:
+                #### Work hour calculation
+                sql = '''
+                select action, att.name
+                from hr_employee as emp inner join hr_attendance as att
+                     on emp.id = att.employee_id
+                where att.name between %s and %s and emp.id = %s
+                order by att.name
+                '''
+                for idx in range(7):
+                    cr.execute(sql, (monday.strftime('%Y-%m-%d %H:%M:%S'), (monday + DateTime.RelativeDateTime(days=idx+1)).strftime('%Y-%m-%d %H:%M:%S'), employee_id))
+                    attendances = cr.dictfetchall()
+                    week_wh = {}
+                    # Fake sign ins/outs at week ends, to take attendances across week ends into account
+                    # XXX this is wrong for the first sign-in ever and the last sign out to this date 
+                    if attendances and attendances[0]['action'] == 'sign_out':
+                        attendances.insert(0, {'name': monday.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_in'})
+                    if attendances and attendances[-1]['action'] == 'sign_in':
+                        attendances.append({'name' : n_monday.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_out'})
+                    # sum up the attendances' durations
+                    for att in attendances:
+                        dt = DateTime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
+                        if att['action'] == 'sign_out':
+                            week_wh[ldt.day_of_week] = week_wh.get(ldt.day_of_week, 0) + (dt - ldt).hours
+                        ldt = dt
 
-				# Week xml representation
-				week_repr = ['<week>', '<weekstart>%s</weekstart>' % monday.strftime('%Y-%m-%d'), '<weekend>%s</weekend>' % n_monday.strftime('%Y-%m-%d')]
-				for idx in range(7):
-					week_repr.append('<%s>' % num2day[idx])
-					if idx in week_wh:
-						week_repr.append('<workhours>%sh%02d</workhours>' % to_hour(week_wh[idx]))
-					week_repr.append('</%s>' % num2day[idx])
-				week_repr.append('<total>')
-				week_repr.append('<worked>%sh%02d</worked>' % to_hour(reduce(lambda x,y:x+y, week_wh.values(), 0)))
-				week_repr.append('</total>')
-				week_repr.append('</week>')
-				if len(week_repr) > 21: # 21 = minimal length of week_repr
-					week_xml.append('\n'.join(week_repr))
-				
-				monday, n_monday = n_monday, n_monday + one_week
-			user_xml.append(user_repr % '\n'.join(week_xml))
-		
-		xml = '''<?xml version="1.0" encoding="UTF-8" ?>
-		<report>
-		%s
-		</report>
-		''' % '\n'.join(user_xml)
-		return self.post_process_xml_data(cr, uid, xml, context)
+                # Week xml representation
+                week_repr = ['<week>', '<weekstart>%s</weekstart>' % monday.strftime('%Y-%m-%d'), '<weekend>%s</weekend>' % n_monday.strftime('%Y-%m-%d')]
+                for idx in range(7):
+                    week_repr.append('<%s>' % num2day[idx])
+                    if idx in week_wh:
+                        week_repr.append('<workhours>%sh%02d</workhours>' % to_hour(week_wh[idx]))
+                    week_repr.append('</%s>' % num2day[idx])
+                week_repr.append('<total>')
+                week_repr.append('<worked>%sh%02d</worked>' % to_hour(reduce(lambda x,y:x+y, week_wh.values(), 0)))
+                week_repr.append('</total>')
+                week_repr.append('</week>')
+                if len(week_repr) > 21: # 21 = minimal length of week_repr
+                    week_xml.append('\n'.join(week_repr))
+                
+                monday, n_monday = n_monday, n_monday + one_week
+            user_xml.append(user_repr % '\n'.join(week_xml))
+        
+        xml = '''<?xml version="1.0" encoding="UTF-8" ?>
+        <report>
+        %s
+        </report>
+        ''' % '\n'.join(user_xml)
+        return self.post_process_xml_data(cr, uid, xml, context)
 
 report_custom('report.hr.attendance.allweeks', 'hr.employee', '', 'addons/hr_attendance/report/timesheet.xsl')
 # vim:noexpandtab:tw=0
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index 6150427e520..54a15a7cc6e 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -3,3 +3,5 @@
 "access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","hr.group_hr_manager",1,1,1,1
 "access_hr_attendance_employee","hr attendance employee","model_hr_attendance","hr_attendance.group_hr_attendance",1,1,1,1
 "access_hr_sign_in_out","hr attendance sign in out","model_hr_sign_in_out","hr_attendance.group_hr_attendance",1,1,1,1
+"access_hr_attendance_employee","hr employee attendance sign in out","hr.model_hr_employee","hr_attendance.group_hr_attendance",1,0,0,0
+"access_hr_attendance_resource","hr resource attendance sign in out","resource.model_resource_resource","hr_attendance.group_hr_attendance",1,0,0,0
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
index 9ad27298159..aaaefc088a6 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -33,16 +33,14 @@ class hr_si_so_ask(osv.osv_memory):
         'emp_id': fields.char('Empoyee ID', size=32, required=True, readonly=True),
                 }
     def _get_empname(self, cr, uid, context=None):
-        service = netsvc.LocalService('object_proxy')
-        emp_id = service.execute(cr.dbname, uid, 'hr.employee', 'search', [('user_id', '=', uid)])
+        emp_id = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
         if emp_id:
-            employee = service.execute(cr.dbname, uid, 'hr.employee', 'read', emp_id)[0]
+            employee = self.pool.get('hr.employee').browse(cr, uid, emp_id, context=context)[0].name
             return employee['name']
         return ''
 
     def _get_empid(self, cr, uid, context=None):
-        service = netsvc.LocalService('object_proxy')
-        emp_id = service.execute(cr.dbname, uid, 'hr.employee', 'search', [('user_id', '=', uid)])
+        emp_id = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
         if emp_id:
             return emp_id[0]
         return False
@@ -74,11 +72,10 @@ class hr_sign_in_out(osv.osv_memory):
                 }
 
     def _get_empid(self, cr, uid, context=None):
-        service = netsvc.LocalService('object_proxy')
-        emp_id = service.execute(cr.dbname, uid, 'hr.employee', 'search', [('user_id', '=', uid)])
+        emp_id = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
         if emp_id:
-            employee = service.execute(cr.dbname, uid, 'hr.employee', 'read', emp_id)[0]
-            return {'name': employee['name'], 'state': employee['state'], 'emp_id': emp_id[0]}
+            employee = self.pool.get('hr.employee').browse(cr, uid, emp_id, context=context)[0]
+            return {'name': employee.name, 'state': employee.state, 'emp_id': emp_id[0]}
         return {}
 
     def default_get(self, cr, uid, fields_list, context=None):
@@ -88,15 +85,15 @@ class hr_sign_in_out(osv.osv_memory):
         return res
 
     def si_check(self, cr, uid, ids, context=None):
-        service = netsvc.LocalService('object_proxy')
         obj_model = self.pool.get('ir.model.data')
+        att_obj = self.pool.get('hr.attendance')
         data = self.read(cr, uid, ids, [])[0]
         emp_id = data['emp_id']
-        att_id = service.execute(cr.dbname, uid, 'hr.attendance', 'search', [('employee_id', '=', emp_id)], limit=1, order='name desc')
-        last_att = service.execute(cr.dbname, uid, 'hr.attendance', 'read', att_id)
+        att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id)], limit=1, order='name desc')
+        last_att = att_obj.browse(cr, uid, att_id)
         if last_att:
             last_att = last_att[0]
-        cond = not last_att or last_att['action'] == 'sign_out'
+        cond = not last_att or last_att.action == 'sign_out'
         if cond:
             return self.sign_in(cr, uid, data, context)
         else:
@@ -113,12 +110,12 @@ class hr_sign_in_out(osv.osv_memory):
             }
 
     def so_check(self, cr, uid, ids, context=None):
-        service = netsvc.LocalService('object_proxy')
         obj_model = self.pool.get('ir.model.data')
         data = self.read(cr, uid, ids, [])[0]
+        att_obj = self.pool.get('hr.attendance')
         emp_id = data['emp_id']
-        att_id = service.execute(cr.dbname, uid, 'hr.attendance', 'search', [('employee_id', '=', emp_id),('action','!=','action')], limit=1, order='name desc')
-        last_att = service.execute(cr.dbname, uid, 'hr.attendance', 'read', att_id)
+        att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id),('action','!=','action')], limit=1, order='name desc')
+        last_att = att_obj.browse(cr, uid, att_id, context=context)
         if last_att:
             last_att = last_att[0]
         if not att_id and not last_att:
@@ -151,35 +148,33 @@ class hr_sign_in_out(osv.osv_memory):
             }
 
     def sign_in(self, cr, uid, data, context=None):
-        service = netsvc.LocalService('object_proxy')
         emp_id = data['emp_id']
         if 'last_time' in data:
             if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
                 raise osv.except_osv(_('UserError'), _('The sign-out date must be in the past'))
-            service.execute(cr.dbname, uid, 'hr.attendance', 'create', {
+            self.pool.get('hr.attendance').create(cr, uid, {
                 'name': data['last_time'],
                 'action': 'sign_out',
                 'employee_id': emp_id
             })
         try:
-            success = service.execute(cr.dbname, uid, 'hr.employee', 'attendance_action_change', [emp_id], 'sign_in')
+            success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_in')
         except:
             raise osv.except_osv(_('UserError'), _('A sign-in must be right after a sign-out !'))
         return {} # To do: Return Success message
 
     def sign_out(self, cr, uid, data, context=None):
-        service = netsvc.LocalService('object_proxy')
         emp_id = data['emp_id']
         if 'last_time' in data:
             if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
                 raise osv.except_osv(_('UserError'), _('The Sign-in date must be in the past'))
-            service.execute(cr.dbname, uid, 'hr.attendance', 'create', {'name':data['last_time'], 'action':'sign_in',  'employee_id':emp_id})
+            self.pool.get('hr.attendance').create(cr, uid, {'name':data['last_time'], 'action':'sign_in',  'employee_id':emp_id})
         try:
-            success = service.execute(cr.dbname, uid, 'hr.employee', 'attendance_action_change', [emp_id], 'sign_out')
+            success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_out')
         except:
             raise osv.except_osv(_('UserError'), _('A sign-out must be right after a sign-in !'))
         return {} # To do: Return Success message
 
 hr_sign_in_out()
 
-# 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/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index d5253dffa25..443983dffe7 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_hr_attendance_sigh_in_out" model="ir.ui.view">
+        <record id="view_hr_attendance_sigh_in_out" model="ir.ui.view">
             <field name="name">hr.sign.in.out.form</field>
             <field name="model">hr.sign.in.out</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign in / Sign out">
-                	<group colspan="4" >
-	                	<separator string="You are now ready to sign in or out of the attendance follow up" colspan="4" />
-	                	<field name="name" />
-	                	<field name="state" />
-                	</group>
+                    <group colspan="4" >
+                        <separator string="You are now ready to sign in or out of the attendance follow up" colspan="4" />
+                        <field name="name" />
+                        <field name="state" />
+                    </group>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-go-back" string="Sign in" name="si_check" type="object"/>
-                    	<button icon="gtk-go-forward" string="Sign out" name="so_check" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-go-back" string="Sign in" name="si_check" type="object"/>
+                        <button icon="gtk-go-forward" string="Sign out" name="so_check" type="object"/>
                    </group>
                </form>
             </field>
@@ -27,15 +27,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign in / Sign out">
-                	<label string="Sign-Out Entry must follow Sign-In." colspan="4" />
+                    <label string="Sign-Out Entry must follow Sign-In." colspan="4" />
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Ok"/>
+                        <button icon="gtk-cancel" special="cancel" string="Ok"/>
                    </group>
                </form>
             </field>
         </record>
 
-		<record id="action_hr_attendance_sigh_in_out" model="ir.actions.act_window">
+        <record id="action_hr_attendance_sigh_in_out" model="ir.actions.act_window">
             <field name="name">Sign in / Sign out</field>
             <field name="res_model">hr.sign.in.out</field>
             <field name="view_type">form</field>
@@ -45,8 +45,8 @@
         </record>
 
         <menuitem action="action_hr_attendance_sigh_in_out"
-        	id="menu_hr_attendance_sigh_in_out"
-        	parent="menu_hr_time_tracking" groups="base.group_extended" />
+            id="menu_hr_attendance_sigh_in_out"
+            parent="menu_hr_time_tracking"/>
 
        <record id="view_hr_attendance_so_ask" model="ir.ui.view">
             <field name="name">hr.sign.in.out.ask.form</field>
@@ -54,14 +54,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="hr.sign.out.ask">
-                	<group colspan="4" >
-	                	<separator string="You did not sign out the last time. Please enter the date and time you signed out." colspan="4" />
-	                	<field name="name" />
-	                	<field name="last_time" string="Your last sign out" />
-                	</group>
+                    <group colspan="4" >
+                        <separator string="You did not sign out the last time. Please enter the date and time you signed out." colspan="4" />
+                        <field name="name" />
+                        <field name="last_time" string="Your last sign out" />
+                    </group>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-go-back" string="Sign in" name="sign_in" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-go-back" string="Sign in" name="sign_in" type="object"/>
                    </group>
                </form>
             </field>
@@ -73,14 +73,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="hr.sign.in.out.ask">
-                	<group colspan="4" >
-	                	<separator string="You did not sign in the last time. Please enter the date and time you signed in." colspan="4" />
-	                	<field name="name" />
-	                	<field name="last_time" string="Your last sign in" />
-                	</group>
+                    <group colspan="4" >
+                        <separator string="You did not sign in the last time. Please enter the date and time you signed in." colspan="4" />
+                        <field name="name" />
+                        <field name="last_time" string="Your last sign in" />
+                    </group>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-go-back" string="Sign out" name="sign_out" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-go-back" string="Sign out" name="sign_out" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
index ab6179c530f..5237b6c01d4 100644
--- a/addons/hr_contract/security/ir.model.access.csv
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -8,5 +8,8 @@
 "access_hr_contract_user","hr.contract user","model_hr_contract","hr.group_hr_user",1,0,0,0
 "access_hr_contract","hr.contract","model_hr_contract","group_hr_contract",1,1,1,1
 "access_hr_employee_contract","hr.employee contract","hr.model_hr_employee","group_hr_contract",1,0,0,0
+"access_hr_resource_contract","hr.employee.resource contract","resource.model_resource_resource","group_hr_contract",1,0,0,0
+"access_hr_resource_calendar_contract","hr.employee.resource.calendar contract","resource.model_resource_calendar","group_hr_contract",1,0,0,0
+"access_hr_job_contract","hr.employee.job contract","hr.model_hr_job","group_hr_contract",1,0,0,0
 "access_hr_contract_type_user","hr.contract.type user","model_hr_contract_type","hr.group_hr_user",1,0,0,0
 "access_hr_contract_type","hr.contract.type","model_hr_contract_type","group_hr_contract",1,1,1,1
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 6aad379efcb..936a207caa3 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -41,7 +41,7 @@
             id="menu_mrp_configuration"
             name="Configuration"
             parent="base.menu_mrp_root"
-            groups="base.group_extended"
+            groups="group_mrp_manager"
             sequence="50" />
 
         <record id="mrp_property_tree_view" model="ir.ui.view">

From 5eb7a02e0721032b2b097291e8e58adfb2d034b4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Jun 2010 00:33:23 +0200
Subject: [PATCH 25/37] [FIX] removed action by mistake

bzr revid: fp@tinyerp.com-20100612223323-2gtw8kn6w0gfpz30
---
 addons/hr_contract/hr_contract.py       |  4 +-
 addons/hr_contract/hr_contract_view.xml | 54 +++----------------------
 addons/sale/sale_view.xml               |  9 +++++
 3 files changed, 17 insertions(+), 50 deletions(-)

diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index ddc29bd26a1..90889b6343e 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -27,11 +27,11 @@ class hr_employee(osv.osv):
     _description = "Employee"
     _inherit = "hr.employee"
     _columns = {
-        'manager': fields.boolean('Manager'),
+        'manager': fields.boolean('Is a Manager'),
         'medic_exam': fields.date('Medical Examination Date'),
         'place_of_birth': fields.char('Place of Birth', size=30),
         'children': fields.integer('Number of Children'),
-        'vehicle': fields.integer('Company Vehicle'),
+        'vehicle': fields.char('Company Vehicle', size=64),
         'vehicle_distance': fields.integer('Home-Work Distance', help="In kilometers"),
         'contract_ids': fields.one2many('hr.contract', 'employee_id', 'Contracts'),
     }
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index be13b0b05d2..0b92bcc986a 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -69,47 +69,6 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Contracts">
-                        <field colspan="4" mode="form,tree" name="contract_ids" nolabel="1">
-                            <tree string="Contracts">
-                                <field name="name"/>
-                                <field name="job_id"/>
-                                <field name="date_start"/>
-                                <field name="date_end"/>
-                                <field name="working_hours"/>
-                                <field name="wage_type_id"/>
-                                <field name="wage"/>
-                            </tree>
-                            <form string="Contract">
-                                <group colspan="3" col="6">
-                                    <field name="name" select="1"/>
-                                    <field name="job_id"/>
-                                    <newline/>
-                                    <field name="wage"/>
-                                    <field name="wage_type_id" widget="selection"/>
-                                    <field name="type_id" widget="selection"/>
-                                </group>
-                                <notebook>
-                                <page string="Main Data">
-                                    <group col="2" colspan="2">
-                                        <separator colspan="2" string="Duration"/>
-                                        <field name="date_start" select="1"/>
-                                        <field name="date_end" select="1"/>
-                                        <field name="working_hours"/>
-                                    </group>
-                                    <group col="2" colspan="2">
-                                        <separator colspan="2" string="Advantages"/>
-                                        <field name="advantages_net"/>
-                                        <field name="advantages_gross"/>
-                                        <field name="advantages" nolabel="1" colspan="2"/>
-                                    </group>
-                                    <separator colspan="4" string="Notes"/>
-                                    <field colspan="4" name="notes" nolabel="1"/>
-                                </page>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
                     <page string="Miscelleanous">
                         <group colspan="2" col="2">
                             <separator string="Personal Info" colspan="2"/>
@@ -122,7 +81,6 @@
                             <field name="manager" select="1"/>
                             <field name="vehicle" select="1"/>
                             <field name="vehicle_distance" select="1"/>
-                            <field name="medic_exam" select="1"/>
                         </group>
                         <group colspan="2" col="2">
                             <separator string="Others Info" colspan="2"/>
@@ -140,15 +98,15 @@
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group col='15' colspan='4'>
-                           <field name="name"/>
-                          <field name="employee_id"/>
-                           <field name="date_start"/>
-                           <field name="date_end"/>
+                       <field name="name"/>
+                       <field name="employee_id"/>
+                       <field name="date_start"/>
+                       <field name="date_end"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
-                        <filter string="Wage Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'wage_type_id'}"/>
-                    </group>
+                       <filter string="Wage Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'wage_type_id'}"/>
+                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 92176545cde..088daf40fe8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -91,6 +91,15 @@
             </field>
         </record>
 
+        <act_window name="Partial Invoice"
+           res_model="sale.advance.payment.inv"
+           src_model="sale.order"
+           view_mode="form"
+           target="new"
+           key2="client_action_multi"
+           id="action_view_sale_advance_payment_inv"/> 
+
+
         <record id="view_order_form" model="ir.ui.view">
             <field name="name">sale.order.form</field>
             <field name="model">sale.order</field>

From d501da038dec3d7e48eefceaeb311fe09d1c58c9 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Jun 2010 00:40:26 +0200
Subject: [PATCH 26/37] fix

bzr revid: fp@tinyerp.com-20100612224026-775nilt6wh0w5gij
---
 addons/hr_expense/hr_expense_view.xml | 2 +-
 addons/product/product_view.xml       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 1b73f7b3ebd..cafe42fcffa 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -183,7 +183,7 @@
          <field name="inherit_id" ref="product.product_normal_form_view"/>
          <field name="type">form</field>
          <field name="arch" type="xml">
-            <field groups="base.group_extended" name="rental" position="after">
+            <field name="purchase_ok" position="after">
                <field name="hr_expense_ok"/>
             </field>
          </field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 5a5557dc14d..21255b0c8c8 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -520,7 +520,6 @@
                         <separator string="Product Type" colspan="2"/>
                         <field name="sale_ok"/>
                         <field name="purchase_ok"/>
-                        <field groups="base.group_extended" name="rental"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Information">

From 8dfe66803b5d77156e76672674a251162c4650c5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Jun 2010 01:01:10 +0200
Subject: [PATCH 27/37] fix

bzr revid: fp@tinyerp.com-20100612230110-e6ef6ol2vu2u3spf
---
 addons/product/product_view.xml | 4 ++--
 addons/stock/product.py         | 9 +++++----
 addons/stock/product_view.xml   | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 21255b0c8c8..edd5e9e3499 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -12,8 +12,8 @@
                    <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
                    <filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
                    <separator orientation="vertical"/>
-                   <filter string="Can be sold" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
-                   <filter string="Can be Purchased" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
+                   <filter string="To Sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
+                   <filter string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
                    <separator orientation="vertical"/>
                    <field name="default_code"/>
                    <field name="name"/>
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 16db5f4e1f2..9a19d3e84c3 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -24,8 +24,7 @@ from tools.translate import _
 
 
 class product_product(osv.osv):
-    _inherit = "product.product"    
-    
+    _inherit = "product.product"
 
     def get_product_accounts(self, cr, uid, product_id, context=None):
         """ To get the stock input account, stock output account and stock journal related to product.
@@ -71,8 +70,8 @@ class product_product(osv.osv):
         product_obj=self.browse(cr,uid,ids)[0]
         account_variation = product_obj.categ_id.property_stock_variation
         move_ids = []        
+        loc_ids = location_obj.search(cr, uid,[('usage','=','internal')])
         for rec_id in ids:
-            loc_ids = location_obj.search(cr, uid,[('usage','=','internal')])
             for location in location_obj.browse(cr, uid, loc_ids):
                 c = context.copy()
                 c.update({
@@ -202,6 +201,8 @@ class product_product(osv.osv):
         if context.get('location', False):
             if type(context['location']) == type(1):
                 location_ids = [context['location']]
+            elif type(context['location']) in (type(''), type(u'')):
+                location_ids = self.pool.get('stock.location').search(cr, uid, [('name','ilike',context['location'])], context=context)
             else:
                 location_ids = context['location']
         else:
@@ -312,7 +313,7 @@ class product_product(osv.osv):
         'track_production': fields.boolean('Track Production Lots' , help="Forces to use a Production Lot during production order"),
         'track_incoming': fields.boolean('Track Incoming Lots', help="Forces to use a tracking lot during receptions"),
         'track_outgoing': fields.boolean('Track Outgoing Lots', help="Forces to use a tracking lot during deliveries"),
-        'location_id': fields.dummy(string='Location', relation='stock.location', type='many2one', domain=[('usage','=','internal')]),
+        'location_id': fields.dummy(string='Location', relation='stock.location', type='many2one'),
         'valuation':fields.selection([('manual_periodic', 'Periodic (manual)'),
                                         ('real_time','Real Time (automatized)'),], 'Stock Valuation', help="Decide if the system must automatically creates account moves based on stock moves", required=True),
     }
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index da9f0567ad1..36ba20b3b05 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -9,7 +9,7 @@
             <field name="inherit_id" ref="product.product_search_form_view"/>
             <field name="arch" type="xml">
                    <field name="pricelist_id" position="before">
-                       <field name="location_id" context="{'location': self}" />
+                       <field name="location_id" context="{'location': self}" domain="[]"/>
                        <separator orientation="vertical"/>
                    </field>
             </field>

From 1ff14e9cebf4ec3244374c99ac8a8f58e3e379c3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Jun 2010 11:01:34 +0200
Subject: [PATCH 28/37] [FIX] purchase report

bzr revid: fp@tinyerp.com-20100613090134-4hs79c7709pmhltr
---
 addons/board_purchase/board_purchase_view.xml |  10 +-
 addons/purchase/purchase.py                   |   7 +-
 addons/purchase/report/purchase_report.py     | 102 ++---------
 .../purchase/report/purchase_report_view.xml  | 166 ++++++------------
 4 files changed, 76 insertions(+), 209 deletions(-)

diff --git a/addons/board_purchase/board_purchase_view.xml b/addons/board_purchase/board_purchase_view.xml
index 5548b3f2838..8e08ee7134d 100644
--- a/addons/board_purchase/board_purchase_view.xml
+++ b/addons/board_purchase/board_purchase_view.xml
@@ -2,13 +2,13 @@
 <openerp>
     <data>
 
-    	<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
             id="menu_purchase_deshboard"
             name="Purchase"
             parent="base.dashboard"/>
 
-		<record id="purchase_draft" model="ir.actions.act_window">
+        <record id="purchase_draft" model="ir.actions.act_window">
             <field name="name">Draft Purchases</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
@@ -17,7 +17,7 @@
             <field name="domain">[('date_order','&gt;',time.strftime('%Y-01-01 00:00:00')),('date_order','&lt;',time.strftime('%Y-12-31 23:59:59')), ('state','=','draft')]</field> 
             <field name="search_view_id" ref="purchase.purchase_order_tree"/>
         </record>
-		<record id="purchase_waiting" model="ir.actions.act_window">
+        <record id="purchase_waiting" model="ir.actions.act_window">
             <field name="name">Quotation Request</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
@@ -47,7 +47,7 @@
             </field>
         </record>
 
-		<record id="open_board_purchase" model="ir.actions.act_window">
+        <record id="open_board_purchase" model="ir.actions.act_window">
             <field name="name">Purchase Dashboard</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
@@ -55,7 +55,7 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_purchase_form"/>
         </record>
-		<menuitem
+        <menuitem
             action="open_board_purchase"
             icon="terp-graph"
             id="menu_board_purchase"
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 99b116040d4..289db4d3401 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -65,7 +65,6 @@ class purchase_order(osv.osv):
             res[order.id]['amount_tax']=cur_obj.round(cr, uid, cur, val)
             res[order.id]['amount_untaxed']=cur_obj.round(cr, uid, cur, val1)
             res[order.id]['amount_total']=res[order.id]['amount_untaxed'] + res[order.id]['amount_tax']
-            print res
         return res
 
     def _set_minimum_planned_date(self, cr, uid, ids, name, value, arg, context):
@@ -172,9 +171,11 @@ class purchase_order(osv.osv):
         'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
         'picking_ids': fields.one2many('stock.picking', 'purchase_id', 'Picking List', readonly=True, help="This is the list of picking list that have been generated for this purchase"),
         'shipped':fields.boolean('Received', readonly=True, select=True),
-        'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float'),
+        'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float',
+            store=True), # Improve the store=True or remove from report
         'invoiced': fields.function(_invoiced, method=True, string='Invoiced & Paid', type='boolean'),
-        'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
+        'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float',
+            store=True), # Improve the store=True or remove from report
         'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Picking')], 'Invoicing Control', required=True,
             help="From Order: a draft invoice will be pre-generated based on the purchase order. The accountant " \
                 "will just have to validate this invoice for control.\n" \
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index ff3d4bdcee8..a9fe223b89f 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -31,7 +31,7 @@ class purchase_report(osv.osv):
     _description = "Purchases Orders"
     _auto = False
     _columns = {
-        'date': fields.date('Date order', readonly=True),
+        'date': fields.date('Order Date', readonly=True),
         'name': fields.char('Year',size=64,required=False, readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'state': fields.selection([
@@ -44,32 +44,26 @@ class purchase_report(osv.osv):
             ('done','Done'),
             ('cancel','Cancel')
         ], 'Order State', readonly=True),
-        'invoice_method': fields.selection([
-            ('manual','Manual'),
-            ('order','From Order'),
-            ('picking','From Picking')
-        ],'Invoicing Control', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', readonly=True),
         'location_id': fields.many2one('stock.location', 'Destination', readonly=True),
-        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position',readonly=True),
         'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
         'partner_address_id':fields.many2one('res.partner.address', 'Address Contact Name', readonly=True),
         'dest_address_id':fields.many2one('res.partner.address', 'Dest. Address Contact Name',readonly=True),
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', readonly=True),
         'date_approve':fields.date('Date Approved', readonly=True),
         'expected_date':fields.date('Expected Date', readonly=True),
-        'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
+        'validator' : fields.many2one('res.users', 'Validated By', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
-        'shipped_qty':fields.integer('Received Qty', readonly=True),
-        'invoiced_qty':fields.integer('Invoiced Qty', readonly=True),
         'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
-        'delay':fields.float('Days to Close', digits=(16,2), readonly=True),
-        'delay_pass':fields.float('Overpassed expected', digits=(16,2), readonly=True),
+        'shipped_qty':fields.float('Received', digits=(16,2), readonly=True, group_operator='avg'),
+        'invoiced_qty':fields.float('Invoiced', digits=(16,2), readonly=True, group_operator='avg'),
+        'delay':fields.float('Days to Validate', digits=(16,2), readonly=True, group_operator="avg"),
+        'delay_pass':fields.float('Days to Deliver', digits=(16,2), readonly=True, group_operator="avg"),
         'quantity': fields.float('# of Products', readonly=True),
         'price_total': fields.float('Total Price', readonly=True),
-        'price_average': fields.float('Average Price', readonly=True),
-        'nbr': fields.integer('# of Ordered Lines', readonly=True),
+        'price_average': fields.float('Unit Price', readonly=True, group_operator="avg"),
+        'nbr': fields.integer('# of PO Lines', readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                           ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
 
@@ -94,17 +88,15 @@ class purchase_report(osv.osv):
                     s.validator,
                     s.warehouse_id as warehouse_id,
                     s.partner_id as partner_id,
-                    s.fiscal_position,
                     s.create_uid as user_id,
                     s.company_id as company_id,
-                    s.invoice_method,
-                    s.shipped::integer as shipped_qty,
-                    l.invoiced::integer as invoiced_qty,
+                    avg(s.shipped_rate) as shipped_qty,
+                    avg(s.invoiced_rate) as invoiced_qty,
                     l.product_id,
                     s.location_id as location_id,
                     sum(l.product_qty*u.factor) as quantity,
                     extract(epoch from age(s.date_approve,s.date_order))/(24*60*60)::decimal(16,2) as delay,
-                    extract(epoch from age(s.minimum_planned_date,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass,
+                    extract(epoch from age(l.date_planned,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass,
                     count(*) as nbr,
                     l.price_unit*l.product_qty*u.factor as price_total,
                     (sum(l.product_qty*l.price_unit)/sum(l.product_qty*u.factor))::decimal(16,2) as price_average
@@ -115,15 +107,13 @@ class purchase_report(osv.osv):
                 group by
                     s.company_id,
                     s.create_uid,
-                    s.shipped,
-                    l.invoiced,
                     s.partner_id,
                     l.product_qty,
                     u.factor,
                     s.location_id,
                     l.price_unit,
                     s.date_approve,
-                    s.minimum_planned_date,
+                    l.date_planned,
                     date_trunc('day',s.minimum_planned_date),
                     s.partner_address_id,
                     s.pricelist_id,
@@ -135,74 +125,8 @@ class purchase_report(osv.osv):
                     to_char(s.date_order, 'MM'),
                     to_char(s.date_order, 'YYYY-MM-DD'),
                     s.state,
-                    s.warehouse_id,
-                    s.fiscal_position,
-                    s.invoice_method
+                    s.warehouse_id
             )
         """)
 purchase_report()
 
-class purchase_order_qty_amount(osv.osv):
-    _name = "purchase.order.qty.amount"
-    _description = "Quantity and amount per month"
-    _auto = False
-    _columns = {
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
-                          ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
-        'total_qty' : fields.float('Total Qty'),
-        'total_amount' : fields.float('Total Amount'),
-
-        }
-    def init(self, cr):
-        tools.sql.drop_view_if_exists(cr, 'purchase_order_qty_amount')
-        cr.execute("""
-            create or replace view purchase_order_qty_amount as (
-                select
-                    min(id) as id,
-                    to_char(create_date, 'MM') as month,
-                    sum(product_qty) as total_qty,
-                    sum(price_unit*product_qty) as total_amount
-                from
-                    purchase_order_line
-                where
-                    to_char(create_date,'YYYY') =  to_char(current_date,'YYYY')
-                group by
-                    to_char(create_date, 'MM')
-
-            )
-        """)
-purchase_order_qty_amount()
-
-class purchase_order_by_user(osv.osv):
-    _name = "purchase.order.by.user"
-    _description = "Purchase Order by user per month"
-    _auto = False
-    _columns = {
-        'name' : fields.char('User',size=64,required=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
-                          ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
-        'nbr' : fields.integer('Total Orders'),
-
-        }
-    _order = 'name desc'
-    def init(self, cr):
-        tools.sql.drop_view_if_exists(cr, 'purchase_order_by_user')
-        cr.execute("""
-            create or replace view purchase_order_by_user as (
-                select
-                    min(po.id) as id,
-                    rs.name as name,
-                    count(po.id) as nbr,
-                    to_char(po.date_order, 'MM') as month
-                from
-                    purchase_order as po,res_users as rs
-                where
-                    po.create_uid = rs.id
-                group by
-                    rs.name,po.date_order
-
-            )
-        """)
-purchase_order_by_user()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index db6cc6273de..61f2942db8f 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -8,7 +8,6 @@
             <field name="arch" type="xml">
                 <graph string="Purchase Orders Statistics" type="bar">
                     <field name="product_id"/>
-                    <field name="quantity" operator="+"/>
                     <field name="price_total" operator="+"/>
                 </graph>
             </field>
@@ -20,13 +19,13 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Purchase Orders Statistics">
-                	<field name="date" invisible="1"/>
-                	<field name="date_approve" invisible="1"/>
-                	<field name="expected_date" invisible="1"/>
-                	<field name="user_id" invisible="1"/>
-                	<field name="partner_id" invisible="1"/>
+                    <field name="date" invisible="1"/>
+                    <field name="date_approve" invisible="1"/>
+                    <field name="expected_date" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="partner_id" invisible="1"/>
                     <field name="product_id" invisible="1"/>
-                	<field name="day" invisible="1"/>
+                    <field name="day" invisible="1"/>
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="warehouse_id" invisible="1"/>
@@ -34,14 +33,14 @@
                     <field name="company_id" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="location_id" invisible="1"/>
-                    <field name="nbr" sum="# of Lines"/>
-                    <field name="shipped_qty" sum="# of received"/>
-                    <field name="invoiced_qty" sum="# of invoiced"/>
-                    <field name="quantity" sum="# Qty"/>
+                    <field name="nbr"/>
+                    <field name="shipped_qty" widget="progressbar"/>
+                    <field name="invoiced_qty" widget="progressbar"/>
+                    <field name="quantity" sum="# of Products"/>
                     <field name="price_average" avg="Average Price"/>
-                	<field name="price_total" sum="Total Price"/>
-                    <field name="delay" sum="# Days to close"/>
-                	<field name="delay_pass" sum="Total Price"/>
+                    <field name="price_total" sum="Total Price"/>
+                    <field name="delay"/>
+                    <field name="delay_pass"/>
                 </tree>
             </field>
         </record>
@@ -53,65 +52,56 @@
         <field name="arch" type="xml">
             <search string="Purchase Orders">
             <group colspan="10" col="12">
-            	<filter icon="terp-purchase" string="This Year"
-	                    	    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-	                    	    help="Tasks performed in this year"/>
+                <filter icon="terp-purchase" string="This Year"
+                                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+                                help="Tasks performed in this year"/>
                 <filter icon="terp-purchase" string="This Month"
-                		name="month"
-                		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                		help="Tasks performed in this month"/>
+                        name="month"
+                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                        help="Tasks performed in this month"/>
                 <filter icon="gtk-media-rewind"
-                        string="    7 Days    "
+                        string="7 Days"
                         separator="1"
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                         help="Tasks during last 7 days"/>
                 <separator orientation="vertical"/>
                 <filter icon="terp-purchase"
-                    	string="Quotations"
-                    	domain="[('state','=','draft')]"/>
+                        string="Quotations"
+                        name="quotes"
+                        domain="[('state','=','draft')]"/>
                 <filter icon="terp-purchase"
-                		string="Waiting Schedule"
-                		domain="[('state','=','waiting_date')]"/>
-                <filter icon="terp-purchase"
-                		string="Manual in progress"
-                		domain="[('state','=','manual')]"/>
-                <filter icon="terp-purchase" string="Done" domain="[('state','=','done')]"/>
-
+                        string="Orders"
+                        name="orders"
+                        domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
                 <separator orientation="vertical"/>
-                <field name="partner_id" string="Supplier"/>
+                <field name="partner_id"/>
                 <field name="product_id"/>
-                <field name="user_id" widget="selection">
-                    <filter icon="terp-purchase"
-                    		string="Purchase Non User"
-                    		help="Purchase Non User"
-                    		domain="[('user_id','=',False)]"/>
-                </field>
-				</group>
-				<newline/>
+                <field name="user_id"/>
+                <field name="company_id" groups="base.group_multi_company"/>
+                </group>
+                <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="Supplier" name="group_partner_id" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
+                    <filter string="Product" name="group_product_id" icon="terp-purchase" context="{'group_by':'product_id'}"/>
+                    <separator orientation="vertical"/>
                     <filter string="Responsible" name="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
-                    <filter string="Supplier" name="partner_id" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
                     <filter string="Validated by" icon="terp-purchase" context="{'group_by':'validator'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
+                    <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
                     <filter string="Destination" icon="terp-purchase" context="{'group_by':'location_id'}"/>
-                    <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
+                    <filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
                     <filter string="Day" icon="terp-purchase" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-purchase" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-purchase" context="{'group_by':'name'}"/>
                 </group>
-				<newline/>
+                <newline/>
                 <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
                     <field name="date"/>
                     <field name="date_approve"/>
                     <field name="expected_date"/>
                     <newline/>
-                    <field name="invoice_method"/>
                     <field name="warehouse_id" widget="selection"/>
                     <field name="validator" widget="selection"/>
                     <separator orientation="vertical"/>
@@ -127,77 +117,29 @@
         <field name="res_model">purchase.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="search_view_id" ref="view_purchase_order_search"/>
-        <field name="context">{'search_default_month':1,'search_default_Responsible':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'search_default_group_partner_id':1,'search_default_group_product_id': 1, 'search_default_orders': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
     </record>
 
     <menuitem id="base.next_id_73" name="Reporting" parent="base.menu_purchase_root" sequence="8"/>
     <menuitem action="action_purchase_order_report_all" id="menu_action_purchase_order_report_all" parent="base.next_id_73" sequence="3"/>
 
-	<record model="ir.ui.view" id="view_purchase_order_qty_amount_graph">
-            <field name="name">purchase.order.qty.amount.graph</field>
-            <field name="model">purchase.order.qty.amount</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Total Qty and Amount by month" type="bar">
-                    <field name="month"/>
-                    <field name="total_qty" operator="+"/>
-                    <field name="total_amount" operator="+"/>
-                </graph>
-            </field>
-        </record>
+    <record id="action_purchase_order_qty_amount_all" model="ir.actions.act_window">
+        <field name="name">Purchase Orders by Month</field>
+        <field name="res_model">purchase.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,tree</field>
+        <field name="context">{'group_by_no_leaf': 1, 'group_by': ['month']}</field>
+        <field name="domain">[('date','>=',time.strftime('%Y-01-01'))]</field>
+    </record>
 
-        <record model="ir.ui.view" id="view_purchase_order_qty_amount_tree">
-            <field name="name">purchase.order.qty.amount.tree</field>
-            <field name="model">purchase.order.qty.amount</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Total Qty and Amount by month" >
-                    <field name="month"/>
-                    <field name="total_qty" />
-                    <field name="total_amount"/>
-                </tree>
-            </field>
-        </record>
+    <record id="action_purchase_order_by_user_all" model="ir.actions.act_window">
+        <field name="name">Purchase Orders by Supplier</field>
+        <field name="res_model">purchase.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,tree</field>
+        <field name="context">{'group_by_no_leaf': 1, 'group_by': ['partner_id']}</field>
+        <field name="domain">[('date','>=',time.strftime('%Y-01-01'))]</field>
+    </record>
 
-	    <record id="action_purchase_order_qty_amount_all" model="ir.actions.act_window">
-	        <field name="name">Total Qty and Amount by month</field>
-	        <field name="res_model">purchase.order.qty.amount</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-	    </record>
-
-	    <record model="ir.ui.view" id="view_purchase_order_by_user_graph">
-            <field name="name">purchase.order.by.user.graph</field>
-            <field name="model">purchase.order.by.user</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Total Orders by User per month" type="bar">
-                    <field name="name" />
-                    <field name="month" group="True" />
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_purchase_order_by_user_tree">
-            <field name="name">purchase.order.by.user.tree</field>
-            <field name="model">purchase.order.by.user</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Total Orders by User per month" >
-                	<field name="name"/>
-                    <field name="month"/>
-                    <field name="nbr" />
-                </tree>
-            </field>
-        </record>
-
-	    <record id="action_purchase_order_by_user_all" model="ir.actions.act_window">
-	        <field name="name">Total Orders by User per month</field>
-	        <field name="res_model">purchase.order.by.user</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-	    </record>
     </data>
 </openerp>

From 5239c166395378176215d80811c158c204bd63d3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Jun 2010 17:53:05 +0200
Subject: [PATCH 29/37] [IMP] reports on stock and purchases

bzr revid: fp@tinyerp.com-20100613155305-z4glzp5h7cq8rzw9
---
 addons/purchase/purchase.py                   |   7 +-
 addons/purchase/report/purchase_report.py     |  12 +-
 .../purchase/report/purchase_report_view.xml  |  24 +--
 addons/stock/__openerp__.py                   |   2 -
 addons/stock/report/__init__.py               |   4 -
 addons/stock/report/report_stock_move.py      | 102 ++++++++--
 .../stock/report/report_stock_move_view.xml   | 192 +++++++++++++-----
 addons/stock/report/report_stock_picking.py   | 110 ----------
 .../report/report_stock_picking_view.xml      | 136 -------------
 addons/stock/report/report_stock_view.xml     | 127 ------------
 10 files changed, 254 insertions(+), 462 deletions(-)
 delete mode 100644 addons/stock/report/report_stock_picking.py
 delete mode 100644 addons/stock/report/report_stock_picking_view.xml

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 289db4d3401..4dd0c4a73fb 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -171,11 +171,9 @@ class purchase_order(osv.osv):
         'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
         'picking_ids': fields.one2many('stock.picking', 'purchase_id', 'Picking List', readonly=True, help="This is the list of picking list that have been generated for this purchase"),
         'shipped':fields.boolean('Received', readonly=True, select=True),
-        'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float',
-            store=True), # Improve the store=True or remove from report
+        'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float'),
         'invoiced': fields.function(_invoiced, method=True, string='Invoiced & Paid', type='boolean'),
-        'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float',
-            store=True), # Improve the store=True or remove from report
+        'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
         'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Picking')], 'Invoicing Control', required=True,
             help="From Order: a draft invoice will be pre-generated based on the purchase order. The accountant " \
                 "will just have to validate this invoice for control.\n" \
@@ -429,6 +427,7 @@ class purchase_order(osv.osv):
                         'product_uom': order_line.product_uom.id,
                         'product_uos': order_line.product_uom.id,
                         'date_planned': order_line.date_planned,
+                        'date_expected': order_line.date_planned,
                         'location_id': loc_id,
                         'location_dest_id': dest,
                         'picking_id': picking_id,
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index a9fe223b89f..d5688e5bd22 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -56,13 +56,13 @@ class purchase_report(osv.osv):
         'validator' : fields.many2one('res.users', 'Validated By', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
-        'shipped_qty':fields.float('Received', digits=(16,2), readonly=True, group_operator='avg'),
-        'invoiced_qty':fields.float('Invoiced', digits=(16,2), readonly=True, group_operator='avg'),
         'delay':fields.float('Days to Validate', digits=(16,2), readonly=True, group_operator="avg"),
         'delay_pass':fields.float('Days to Deliver', digits=(16,2), readonly=True, group_operator="avg"),
         'quantity': fields.float('# of Products', readonly=True),
         'price_total': fields.float('Total Price', readonly=True),
         'price_average': fields.float('Unit Price', readonly=True, group_operator="avg"),
+        'negociation': fields.float('Purchase-Standard Price', readonly=True, group_operator="avg"),
+        'price_standard': fields.float('Products Value', readonly=True, group_operator="sum"),
         'nbr': fields.integer('# of PO Lines', readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                           ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
@@ -90,18 +90,20 @@ class purchase_report(osv.osv):
                     s.partner_id as partner_id,
                     s.create_uid as user_id,
                     s.company_id as company_id,
-                    avg(s.shipped_rate) as shipped_qty,
-                    avg(s.invoiced_rate) as invoiced_qty,
                     l.product_id,
                     s.location_id as location_id,
                     sum(l.product_qty*u.factor) as quantity,
                     extract(epoch from age(s.date_approve,s.date_order))/(24*60*60)::decimal(16,2) as delay,
                     extract(epoch from age(l.date_planned,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass,
                     count(*) as nbr,
-                    l.price_unit*l.product_qty*u.factor as price_total,
+                    (l.price_unit*l.product_qty*u.factor)::decimal(16,2) as price_total,
+                    avg(100.0 * (l.price_unit*l.product_qty*u.factor) / (t.standard_price*l.product_qty*u.factor))::decimal(16,2) as negociation,
+                    sum(t.standard_price*l.product_qty*u.factor)::decimal(16,2) as price_standard,
                     (sum(l.product_qty*l.price_unit)/sum(l.product_qty*u.factor))::decimal(16,2) as price_average
                 from purchase_order s
                     left join purchase_order_line l on (s.id=l.order_id)
+                        left join product_product p on (l.product_id=p.id)
+                            left join product_template t on (p.product_tmpl_id=t.id)
                     left join product_uom u on (u.id=l.product_uom)
                 where l.product_id is not null
                 group by
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 61f2942db8f..b2bdf840c3d 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -34,11 +34,11 @@
                     <field name="state" invisible="1"/>
                     <field name="location_id" invisible="1"/>
                     <field name="nbr"/>
-                    <field name="shipped_qty" widget="progressbar"/>
-                    <field name="invoiced_qty" widget="progressbar"/>
                     <field name="quantity" sum="# of Products"/>
                     <field name="price_average" avg="Average Price"/>
                     <field name="price_total" sum="Total Price"/>
+                    <field name="price_standard" sum="Products Costs"/>
+                    <field name="negociation" widget="progressbar"/>
                     <field name="delay"/>
                     <field name="delay_pass"/>
                 </tree>
@@ -123,23 +123,15 @@
     <menuitem id="base.next_id_73" name="Reporting" parent="base.menu_purchase_root" sequence="8"/>
     <menuitem action="action_purchase_order_report_all" id="menu_action_purchase_order_report_all" parent="base.next_id_73" sequence="3"/>
 
-    <record id="action_purchase_order_qty_amount_all" model="ir.actions.act_window">
-        <field name="name">Purchase Orders by Month</field>
-        <field name="res_model">purchase.report</field>
+    <record id="action_stock_move_report_po" model="ir.actions.act_window">
+        <field name="name">Receptions Analysis</field>
+        <field name="res_model">report.stock.move</field>
         <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>
-        <field name="context">{'group_by_no_leaf': 1, 'group_by': ['month']}</field>
-        <field name="domain">[('date','>=',time.strftime('%Y-01-01'))]</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="context">{'search_default_month':1, 'search_default_group_product':1, 'search_default_group_partner':1, 'search_default_done':1, 'search_default_in': 1, 'group_by':[], 'group_by_no_leaf':1}</field>
     </record>
+    <menuitem action="action_stock_move_report_po" id="menu_action_stock_move_report_po" parent="base.next_id_73" sequence="8"/>
 
-    <record id="action_purchase_order_by_user_all" model="ir.actions.act_window">
-        <field name="name">Purchase Orders by Supplier</field>
-        <field name="res_model">purchase.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>
-        <field name="context">{'group_by_no_leaf': 1, 'group_by': ['partner_id']}</field>
-        <field name="domain">[('date','>=',time.strftime('%Y-01-01'))]</field>
-    </record>
 
     </data>
 </openerp>
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index ec7ce1c6cee..32adb5e84d2 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -64,7 +64,6 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "partner_view.xml",
         "report/report_stock_move_view.xml",
         "report/report_stock_view.xml",
-        "report/report_stock_picking_view.xml",
         "security/stock_security.xml",
         "security/ir.model.access.csv",
     ],
@@ -73,4 +72,3 @@ Thanks to the double entry management, the inventory controlling is powerful and
     'active': False,
     'certificate': '0055421559965',
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py
index a0a4bcb8ea5..381644fcd32 100644
--- a/addons/stock/report/__init__.py
+++ b/addons/stock/report/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-#import lot_overview
 import product_stock
 import lot_location
 import ups
@@ -28,7 +27,4 @@ import lot_overview
 import lot_overview_all
 import report_stock
 import report_stock_move
-import report_stock_picking
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 8d905a4c4d7..c26f0c13006 100755
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -34,19 +34,20 @@ class report_stock_move(osv.osv):
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
-        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
+        'partner_id':fields.many2one('res.partner.address', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
+        'company_id':fields.many2one('res.company', 'Company', readonly=True),
+        'picking_id':fields.many2one('stock.picking', 'Packing', readonly=True),
+        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
         'location_id': fields.many2one('stock.location', 'Source Location', readonly=True, select=True, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', readonly=True, select=True, help="Location where the system will stock the finished products."),
+        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True),
         'product_qty':fields.integer('Qty',readonly=True),
         'value' : fields.float('Total Value', required=True),
-        'product_uom': fields.many2one('product.uom', 'Product UOM', readonly=True),
-        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
-                                  help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the picking it done the state is \'Done\'.\
-                                  \nThe state is \'Waiting\' if the move is waiting for another one.'),
-        'day_diff':fields.integer('Expected Performance',readonly=True),
+        'day_diff2':fields.float('Delay (Days)',readonly=True, digits=(16,2), group_operator="avg"),
+        'day_diff1':fields.float('Planned (Days)',readonly=True, digits=(16,2), group_operator="avg"),
+        'day_diff':fields.float('Real (Days)',readonly=True, digits=(16,2), group_operator="avg"),
     }
-    
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'report_stock_move')
         cr.execute("""
@@ -56,8 +57,13 @@ class report_stock_move(osv.osv):
                     to_char(date_trunc('day',m.date_planned), 'YYYY') as year,
                     to_char(date_trunc('day',m.date_planned), 'MM') as month,
                     to_char(date_trunc('day',m.date_planned), 'YYYY-MM-DD') as day,
-                    (date(m.date_planned)-date(m.date_expected)) as day_diff,
+                    avg(date(m.date_planned)-date(m.create_date)) as day_diff,
+                    avg(date(m.date_expected)-date(m.create_date)) as day_diff1,
+                    avg(date(m.date_planned)-date(m.date_expected)) as day_diff2,
                     m.address_id as partner_id,
+                    m.picking_id as picking_id,
+                    m.company_id as company_id,
+                    p.type as type,
                     m.location_id as location_id,
                     m.location_dest_id as location_dest_id,
                     m.product_id as product_id,
@@ -65,11 +71,83 @@ class report_stock_move(osv.osv):
                     m.product_uom as product_uom,
                     sum(m.product_qty) as product_qty,
                     pt.standard_price * sum(m.product_qty) as value
-               from stock_move m ,product_product pp,product_template pt
-               where 
-                    m.product_id=pp.id and pp.product_tmpl_id=pt.id
+               from
+                    stock_move m
+                    left join stock_picking p on (m.picking_id=p.id)
+                    left join product_product pp on (m.product_id=pp.id)
+                    left join product_template pt on (pp.product_tmpl_id=pt.id)
                group by 
                     m.id, m.product_id,m.address_id, m.location_id, m.location_dest_id,
-                    m.date_planned, m.state, m.product_uom,pt.standard_price,m.date_expected     )      
+                    m.date_planned, m.state, m.product_uom,pt.standard_price,
+                    m.picking_id, p.type, m.company_id
+               )
         """)
 report_stock_move()
+
+
+class report_stock_inventory(osv.osv):
+    _name = "report.stock.inventory"
+    _description = "Stock Statistics"
+    _auto = False
+    _columns = {
+        'date_planned': fields.datetime('Date', readonly=True),
+        'partner_id':fields.many2one('res.partner.address', 'Partner', readonly=True),
+        'product_id':fields.many2one('product.product', 'Product', readonly=True),
+        'location_id': fields.many2one('stock.location', 'Location', readonly=True),
+        'prodlot_id': fields.many2one('stock.production.lot', 'Lot', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'product_qty':fields.float('Qty', digits=(16,2), readonly=True),
+        'value' : fields.float('Total Value', digits=(16,2), required=True),
+        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
+              help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the picking it done the state is \'Done\'.\
+              \nThe state is \'Waiting\' if the move is waiting for another one.'),
+        'location_type': fields.selection([('supplier', 'Supplier Location'), ('view', 'View'), ('internal', 'Internal Location'), ('customer', 'Customer Location'), ('inventory', 'Inventory'), ('procurement', 'Procurement'), ('production', 'Production'), ('transit', 'Transit Location for Inter-Companies Transfers')], 'Location Type', required=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_stock_inventory')
+        cr.execute("""
+create or replace view report_stock_inventory as (
+    (select
+        min(m.id) as id, m.date_planned as date_planned,
+        m.address_id as partner_id, m.location_id as location_id,
+        m.product_id as product_id, l.usage as location_type,
+        m.company_id,
+        m.state as state, m.prodlot_id as prodlot_id,
+        sum(-m.product_qty*u.factor)::decimal(16,2) as product_qty,
+        sum(-pt.standard_price * m.product_qty * u.factor)::decimal(16,2) as value
+    from
+        stock_move m
+            left join stock_picking p on (m.picking_id=p.id)
+                left join product_product pp on (m.product_id=pp.id)
+                    left join product_template pt on (pp.product_tmpl_id=pt.id)
+            left join product_uom u on (m.product_uom=u.id)
+                left join stock_location l on (m.location_id=l.id)
+    group by
+        m.id, m.product_id, m.address_id, m.location_id, m.prodlot_id,
+        m.date_planned, m.state, l.usage, m.company_id
+) union all (
+    select
+        -m.id as id, m.date_planned as date_planned,
+        m.address_id as partner_id, m.location_dest_id as location_id,
+        m.product_id as product_id, l.usage as location_type,
+        m.company_id,
+        m.state as state, m.prodlot_id as prodlot_id,
+        sum(m.product_qty*u.factor)::decimal(16,2) as product_qty,
+        sum(pt.standard_price * m.product_qty * u.factor)::decimal(16,2) as value
+    from
+        stock_move m
+            left join stock_picking p on (m.picking_id=p.id)
+                left join product_product pp on (m.product_id=pp.id)
+                    left join product_template pt on (pp.product_tmpl_id=pt.id)
+            left join product_uom u on (m.product_uom=u.id)
+                left join stock_location l on (m.location_dest_id=l.id)
+    group by
+        m.id, m.product_id, m.address_id, m.location_id, m.location_dest_id,
+        m.prodlot_id, m.date_planned, m.state, l.usage, m.company_id
+    )
+);
+        """)
+report_stock_inventory()
+
+
+
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 458fc250091..5adc3407b0f 100755
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -1,25 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
+
+    <menuitem
+        id="stock.next_id_61"
+        name="Reporting"
+        parent="stock.menu_stock_root"/>
+
     <record id="view_stock_tree" model="ir.ui.view">
         <field name="name">report.stock.move.tree</field>
         <field name="model">report.stock.move</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Stock Orders Statistics">
-                <field name="date_planned"/>
-                <field name="day_diff"/>
+            <tree string="Moves Analysis">
+                <field name="date_planned" invisible="1"/>
                 <field name="year" invisible="1" />
-                <field name="state" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
+                <field name="type" invisible="1"/>
+                <field name="company_id" invisible="1"/>
+                <field name="partner_id" invisible="1" context="{'contact_display':'partner'}" />
+                <field name="picking_id" invisible="1"/>
                 <field name="location_id" invisible="1"/>
                 <field name="location_dest_id" invisible="1"/>
-                <field name="product_id"/>
-                <field name="partner_id"/>
+                <field name="product_id" invisible="1"/>
+                <field name="state" invisible="1"/>
                 <field name="product_qty"/>
-                <field name="product_uom"/>
                 <field name="value"/>
+                <field name="day_diff"/>
+                <field name="day_diff1"/>
+                <field name="day_diff2"/>
            </tree>
         </field>
     </record>
@@ -29,9 +39,9 @@
          <field name="model">report.stock.move</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Stock Moves Statistics" type="bar">
+             <graph string="Moves Analysis" type="bar">
                  <field name="product_id"/>
-                 <field name="product_qty"/>
+                 <field name="day_diff2" operator="avg"/>
              </graph>
          </field>
     </record>
@@ -41,50 +51,50 @@
         <field name="model">report.stock.move</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Stock Move">
+            <search string="Moves Analysis">
                 <group>
-                <filter icon="terp-go-year"
-                    string="This Year"
-                    domain="[('year','=',time.strftime('%%Y'))]"
-                    help="Stock Moves of the year"/>
                 <filter icon="terp-go-month"
-                 	name="month"
+                    name="month"
                     string="This Month"
                     domain="[('month','=',time.strftime('%%m'))]"
                     help="Stock Moves of this month"/>
-	            <filter icon="terp-go-today"
+                <filter icon="terp-go-today"
                     string="Today"
                     separator="1"
-                    domain="[('date_planned','&gt;=', time.strftime('%%Y-%%m-%%d')), ('date_planned','&lt;',(datetime.date.today()-datetime.timedelta(days=1)).strftime('%%Y-%%m-%%d'))]"
+                    domain="[('date_planned','=', time.strftime('%%Y-%%m-%%d'))]"
                     help="Stock Moves of today"/>
                 <separator orientation="vertical"/>
 
-                <filter string="Future"
-                    	icon="terp-camera_test"
-                    	domain="[('state','in',('assigned','done','waiting','confirmed'))]"
-                    	help = "Future Stock-Moves"/>
-
                 <filter string="Done"
-                		name="done"
-                    	icon="terp-dialog-close"
-                    	domain="[('state','=','done')]"
-                    	help = "Completed Stock-Moves"/>
-
+                    name="done"
+                    icon="terp-dialog-close"
+                    domain="[('state','=','done')]"
+                    help = "Completed Stock-Moves"/>
+                <filter string="Todo"
+                    icon="terp-camera_test"
+                    domain="[('state','in',('assigned','waiting','confirmed'))]"
+                    help = "Future Stock-Moves"/>
 
                 <separator orientation="vertical"/>
-                <filter icon="terp-go-home" string="Internal" domain="[('location_id.usage','=','internal')]"/>
-                <filter icon="terp-go-home" string="Scrap" domain="[('location_id.scrap_location','=',1)]"/>
+                <filter icon="terp-go-home" name="in" string="Receptions" domain="[('type','=','in')]"/>
+                <filter icon="terp-go-home" name="internal" string="Internals" domain="[('type','=','internal')]"/>
+                <filter icon="terp-go-home" name="out" string="Packings" domain="[('type','=','out')]"/>
+                <filter icon="terp-go-home" name="delivery" string="Deliveries" domain="[('type','=','delivery')]"/>
                 <separator orientation="vertical"/>
                 <field name="product_id"/>
+                <field name="partner_id" context="{'contact_display':'partner'}"/>
+                <field name="date_planned"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." >
-                    <filter string="Partner" name="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <filter name="product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                <group expand="1" string="Group By...">
+                    <filter name="group_partner" string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <filter name="group_picking" string="Packing" icon="terp-accessories-archiver" context="{'group_by':'picking_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter name="src_location" string="Source Location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_id'}"/>
-                    <filter string="Dest. Location" icon="terp-gtk-jump-to-ltr"  context="{'group_by':'location_dest_id'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Type" name="group_type" icon="terp-gtk-jump-to-rtl" context="{'group_by':'type'}"/>
+                    <filter string="Source Location" name="src_location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_id'}"/>
+                    <filter string="Dest. Location" name="dest_location" icon="terp-gtk-jump-to-ltr"  context="{'group_by':'location_dest_id'}"/>
+                    <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'date_planned'}"/>
@@ -92,9 +102,9 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..."  groups="base.group_extended">
-                <field name="location_id" widget = "selection"/>
-                <field name="location_dest_id"  widget = "selection"/>
-                <field name="date_planned"/>
+                    <field name="location_id" widget = "selection"/>
+                    <field name="location_dest_id"  widget = "selection"/>
+                    <field name="state"/>
                 </group>
 
             </search>
@@ -102,20 +112,110 @@
     </record>
 
     <record id="action_stock_move_report" model="ir.actions.act_window">
-        <field name="name">Stock Moves</field>
+        <field name="name">Moves Analysis</field>
         <field name="res_model">report.stock.move</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
- 		<field name="search_view_id"  ref="view_stock_search"/>
- 		<field name="context">{'search_default_product':1, 'search_default_src_location':1,'search_default_done':1,'group_by':[], 'group_by_no_leaf':1}</field>
+        <field name="search_view_id"  ref="view_stock_search"/>
+        <field name="context">{'contact_display': 'partner', 'search_default_month':1, 'search_default_group_product':1,'search_default_done':1,'group_by':[], 'group_by_no_leaf':1}</field>
+    </record>
+    <menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="5"/>
+
+    <!-- Inventory Control -->
+
+    <record id="view_stock_inventory_tree" model="ir.ui.view">
+        <field name="name">report.stock.inventory.tree</field>
+        <field name="model">report.stock.inventory</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Inventory Analysis">
+                <field name="date_planned" invisible="1"/>
+                <field name="company_id" invisible="1"/>
+                <field name="location_type" invisible="1"/>
+                <field name="location_id" invisible="1"/>
+                <field name="partner_id" invisible="1" context="{'contact_display':'partner'}"/>
+                <field name="product_id" invisible="1"/>
+                <field name="prodlot_id" invisible="1"/>
+                <field name="state" invisible="1"/>
+                <field name="product_qty"/>
+                <field name="value"/>
+           </tree>
+        </field>
     </record>
 
-	<menuitem
-        id="stock.next_id_61"
-        name="Reporting"
-        parent="stock.menu_stock_root" groups="base.group_user"/>
+    <record id="view_stock_inventory_graph" model="ir.ui.view">
+         <field name="name">report.stock.inventory.graph</field>
+         <field name="model">report.stock.inventory</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Inventory Analysis" type="bar">
+                 <field name="product_id"/>
+                 <field name="product_qty"/>
+             </graph>
+         </field>
+    </record>
+
+    <record id="view_stock_inventory_search" model="ir.ui.view">
+        <field name="name">report.stock.inventory.search</field>
+        <field name="model">report.stock.inventory</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Inventory Analysis">
+                <group col="16">
+                    <filter string="Real"
+                        name="real"
+                        icon="terp-dialog-close"
+                        domain="[('state','=','done')]"
+                        help="Analysis on real stock."/>
+
+                    <filter string="Virtual"
+                        icon="terp-camera_test"
+                        domain="[('state','in',('assigned','done','waiting','confirmed'))]"
+                        help = "Analysis including future operations."/>
+
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
+                    <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('location_type','=','scrap')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="date_planned"/>
+                    <field name="product_id"/>
+                    <field name="location_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                </group>
+
+                <newline/>
+                <group expand="1" string="Group By..." >
+                    <filter string="Partner" name="group_partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter name="group_company" string="Company" context="{'group_by':'company_id'}"/>
+                    <filter name="group_location" string="Location" context="{'group_by':'location_id'}"/>
+                    <filter name="group_lot" string="Lot" context="{'group_by':'prodlot_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Date" icon="terp-go-month" context="{'group_by':'date_planned'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                </group>
+                <newline/>
+                <group expand="0" string="Extended options..."  groups="base.group_extended">
+                    <field name="partner_id" context="{'contact_display':'partner'}"/>
+                    <field name="prodlot_id"/>
+                    <field name="state"/>
+                    <field name="location_type"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_stock_inventory_report" model="ir.actions.act_window">
+        <field name="name">Inventory Analysis</field>
+        <field name="res_model">report.stock.inventory</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="search_view_id"  eval="False"/>
+        <field name="context">{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'search_default_group_location':1,'group_by':[], 'group_by_no_leaf':1}</field>
+    </record>
+    <menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="5"/>
 
-	<menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="5"/>
 
 </data>
 </openerp>
diff --git a/addons/stock/report/report_stock_picking.py b/addons/stock/report/report_stock_picking.py
deleted file mode 100644
index b6e2a3d3373..00000000000
--- a/addons/stock/report/report_stock_picking.py
+++ /dev/null
@@ -1,110 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields,osv
-import tools
-
-class report_stock_picking(osv.osv):
-    _name = "report.stock.picking"
-    _description = "Stock Picking Report"
-    _auto = False
-    _columns = {
-        'year': fields.char('Year',size=64,required=False, readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
-                                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
-        'day': fields.char('Day', size=128, readonly=True),
-        'nbr': fields.integer('# of Lines', readonly=True),
-        'nbp': fields.integer('# of Picking', readonly=True),
-        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
-        'product_qty': fields.float('# of Products', readonly=True),
-        'product_uos_qty': fields.float('# of Products', readonly=True),
-        'product_id': fields.many2one('product.product', 'Product', readonly=True),
-        'date': fields.date('Date', readonly=True),
-        'avg_days_to_deliver': fields.float('Avg Days to Deliver', digits=(16,2), readonly=True, group_operator="avg",
-                                       help="Number of  Avg Days to deliver"),
-        'state': fields.selection([('draft', 'Draft'),('auto', 'Waiting'),('confirmed', 'Confirmed'),('assigned', 'Available'),('done', 'Done'),('cancel', 'Cancelled')], 'State'),
-        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True),
-        'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'invoice_state': fields.selection([
-            ("invoiced", "Invoiced"),
-            ("2binvoiced", "To Be Invoiced"),
-            ("none", "Not from Picking")], "Invoice Status",readonly=True),
-        'min_date': fields.date('Expected Date',help="Expected date for Picking. Default it takes current date"),
-        'order_date': fields.date('Order Date', help="Date of Order"),
-        'date_done': fields.date('Date Done', help="Date of completion"),
-        'location_id': fields.many2one('stock.location', 'Source Location', help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
-        'location_dest_id': fields.many2one('stock.location', 'Dest. Location', help="Location where the system will stock the finished products."),
-        'max_date': fields.date('Max.Expected Date'),
-        'product_uos': fields.many2one('product.uom', 'Product UOS'),
-        'product_uom': fields.many2one('product.uom', 'Product UOM'),
-    }
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_stock_picking')
-        cr.execute("""
-            create or replace view report_stock_picking as (
-                select
-                    min(sm.id) as id,
-                    date_trunc('day',sp.min_date) as min_date,
-                    date_trunc('day',sp.date) as order_date,
-                    date_trunc('day',sp.date_done) as date_done,
-                    date_trunc('day',sp.max_date) as max_date,
-                    to_char(sp.create_date, 'YYYY') as year,
-                    to_char(sp.create_date, 'MM') as month,
-                    to_char(sp.create_date, 'YYYY-MM-DD') as day,
-                    sp.address_id as partner_id,
-                    to_date(to_char(sp.create_date, 'MM-dd-YYYY'),'MM-dd-YYYY') as date,
-                    count(sm.id) as nbr,
-                    count(distinct sp.id) as nbp,
-                    sum(sm.product_qty) as product_qty,
-                    sum(sm.product_uos_qty) as product_uos_qty,
-                    sm.product_id as product_id,
-                    sm.location_dest_id as location_dest_id,
-                    sm.location_id as location_id,
-                    sp.type,
-                    sm.product_uos,
-                    sm.product_uom,
-                    sp.invoice_state,
-                    sp.company_id as company_id,
-                    avg(extract('epoch' from (sp.date_done-sp.create_date)))/(3600*24) as  avg_days_to_deliver,
-                    sp.state
-                from stock_move as sm
-                left join stock_picking as sp ON (sm.picking_id=sp.id)
-                group by sp.type,
-                         sp.create_date,
-                         sp.address_id,
-                         sm.product_id,
-                         to_char(sp.create_date, 'YYYY'),
-                         sm.location_dest_id,
-                         sm.location_id,
-                         to_char(sp.create_date, 'MM'),
-                         to_char(sp.create_date, 'YYYY-MM-DD'),
-                         sm.product_uos,
-                         sm.product_uom,
-                         date_trunc('day',sp.min_date),
-                         date_trunc('day',sp.date),
-                         date_trunc('day',sp.date_done),
-                         date_trunc('day',sp.max_date),
-                         sp.invoice_state,
-                         sp.company_id,
-                         sp.state
-
-            )""")
-report_stock_picking()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
deleted file mode 100644
index a14298ff771..00000000000
--- a/addons/stock/report/report_stock_picking_view.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-	<!--
-	Stock Picking Report
-	-->
-
-        <record id="view_report_report_stock_picking_tree" model="ir.ui.view">
-            <field name="name">report.stock.picking.tree</field>
-            <field name="model">report.stock.picking</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-               <tree string="Picking">
-               		<field name="year" invisible="1"/>
-               		<field name="month" invisible="1"/>
-               		<field name="day" invisible="1"/>
-               		<field name="date" invisible="1"/>
-					<field name="company_id" invisible="1"/>
-					<field name="partner_id" invisible="1"/>
-					<field name="product_id" invisible="1"/>
-					<field name="min_date" invisible="1"/>
-					<field name="order_date" invisible="1"/>
-					<field name="date_done" invisible="1"/>
-					<field name="max_date" invisible="1"/>
-					<field name="type" invisible="1"/>
-					<field name="invoice_state" invisible="1"/>
-					<field name="state" invisible="1"/>
-					<field name="product_qty" sum="# of Products" />
-					<field name="nbp" sum="# of Pickings" />
-					<field name="nbr" sum="# of Lines" />
-			        <field name="avg_days_to_deliver" avg='Avg Days to Deliver'/>
-				</tree>
-            </field>
-        </record>
-
-        <record id="view_report_report_stock_picking_graph" model="ir.ui.view">
-            <field name="name">report.stock.picking.graph</field>
-            <field name="model">report.stock.picking</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Picking" type="bar">
-                    <field name="partner_id"/>
-                    <field name="nbr" operator="+"/>
-                    <field name="product_qty" operator="+"/>
-                    <field name="nbp" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-		<record id="view_report_report_stock_picking_filter" model="ir.ui.view">
-            <field name="name">report.stock.picking.select</field>
-            <field name="model">report.stock.picking</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search">
-                  <group col="16" colspan="6">
-                   		<filter icon="terp-go-year" string="  365 Days  "
-	                    	    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-	                    	    help="Picking in last 365 days"/>
-	                	<filter icon="terp-go-month" string="   30 Days   "
-	                			name="month"
-	                			domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                			help="Picking in last 30 days"/>
-	                	<filter icon="terp-go-week"
-                                string="    7 Days    "
-                                separator="1"
-                                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                                help="Picking during last 7 days"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Todo" icon="terp-gtk-go-back-rtl" domain="[('state','in',('draft','auto','confirmed','assigned'))]"/>
-                        <filter string="Done" icon="terp-dialog-close" domain="[('state','=','done')]"/>
-						<separator orientation="vertical"/>
-						<field name="partner_id"/>
-						<field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                   </group>
-                   <newline/>
-                   <group expand="0" string="Group By...">
-                        <filter string="Partner" name="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <filter string="Shipping Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Invoice Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'invoice_state'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-month" domain="[]" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
-                    </group>
-                    <newline/>
-                	<group expand="0" string="Extended options..." groups="base.group_extended">
-                		<field name="type"/>
-                		<separator orientation="vertical"/>
-                		<field name="min_date"/>
-                		<separator orientation="vertical"/>
-                		<field name="max_date"/>
-	                    <newline/>
-	                    <field name="invoice_state"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="order_date"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="date_done"/>
-                	</group>
-
-               </search>
-            </field>
-        </record>
-        <record id="action_report_report_stock_picking" model="ir.actions.act_window">
-            <field name="name">Picking</field>
-            <field name="res_model">report.stock.picking</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="view_id" ref="view_report_report_stock_picking_tree"/>
-            <field name="search_view_id" ref="view_report_report_stock_picking_filter"/>
-            <field name="context">{'search_default_Partner':1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]}</field>
-        </record>
-
-       	<record model="ir.actions.act_window.view" id="action_report_report_stock_picking_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_report_stock_picking_tree"/>
-	        <field name="act_window_id" ref="action_report_report_stock_picking"/>
-	    </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_report_stock_picking_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_report_stock_picking_graph"/>
-	        <field name="act_window_id" ref="action_report_report_stock_picking"/>
-	    </record>
-
-        <menuitem name="Picking" action="action_report_report_stock_picking" id="menu_report_report_stock_pickings_tree" parent="next_id_61"/>
-
-  </data>
-</openerp>
-
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 34121d0c9ed..5732513e07a 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -2,104 +2,6 @@
 <openerp>
     <data>
 
-         <record id="view_stock_report_prodlots_filter" model="ir.ui.view">
-            <field name="name">stock.report.prodlots.filter</field>
-            <field name="model">stock.report.prodlots</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Location">
-                    <group col="10" colspan="4">
-                        <filter icon="terp-go-home" name="internal_locations" string="Internal Locations" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations"/>
-                        <filter icon="terp-go-home" string="Customer Locations" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
-                        <filter icon="terp-go-home" string="Supplier Locations" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
-                        <separator orientation="vertical"/>
-                        <field name="location_id"/>
-                        <field name="product_id"/>
-                    </group>
-                    <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="10">
-                        <filter string="Location" icon="terp-go-home" domain="[]"  context="{'group_by':'location_id'}"/>
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-
-        <record id="stock_report_prodlots_form" model="ir.ui.view">
-            <field name="name">stock.report.prodlots.view</field>
-            <field name="model">stock.report.prodlots</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Stock by Lots">
-                    <field name="location_id"/>
-                    <field name="product_id"/>
-                    <field name="prodlot_id" groups="base.group_extended"/>
-                    <field name="name"/>
-                </form>
-            </field>
-        </record>
-
-        <record id="stock_report_prodlots_tree" model="ir.ui.view">
-            <field name="name">stock.report.prodlots.view</field>
-            <field name="model">stock.report.prodlots</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Stock by Lots">
-                    <field name="location_id"/>
-                    <field name="product_id"/>
-                    <field name="prodlot_id" groups="base.group_extended"/>
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="stock_report_prodlots_graph" model="ir.ui.view">
-            <field name="name">stock.report.prodlots.view</field>
-            <field name="model">stock.report.prodlots</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Stock by Lots" type="bar">
-                    <field name="product_id"/>
-                    <field name="name"/>
-                </graph>
-            </field>
-        </record>
-
-
-        <record id="action_stock_report_prodlots_form" model="ir.actions.act_window">
-            <field name="name">Inventory by Location</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">stock.report.prodlots</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'full':'1','search_default_internal_locations':1}</field>
-            <field name="search_view_id" ref="view_stock_report_prodlots_filter" />
-        </record>
-        <record id="stock_report_tracklots_tree" model="ir.ui.view">
-            <field name="name">stock.report.tracklots.view</field>
-            <field name="model">stock.report.tracklots</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Stock by Lots">
-                    <field name="location_id"/>
-                    <field name="product_id"/>
-                    <field name="tracking_id"/>
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-
-        <menuitem
-            id="next_id_61"
-            name="Reporting"
-            parent="stock.menu_stock_root" sequence="5"/>
-
-<!--        <menuitem-->
-<!--            id="next_id_62"-->
-<!--            name="Traceability"-->
-<!--            parent="next_id_61"/>-->
-
         <act_window
             context="{'product_id': active_id}"
             id="act_stock_product_location_open"
@@ -108,28 +10,6 @@
             src_model="product.product"
             groups="base.group_extended"/>
 
-        <act_window
-            domain="[('location_id', 'child_of', [active_id])]"
-            id="act_stock_location_2_stock_report_prodlots"
-            name="Stock by Lots"
-            res_model="stock.report.prodlots"
-            src_model="stock.location"
-            />
-
-        <act_window
-            domain="[('product_id','=',active_id)]"
-            id="act_product_product_2_stock_report_prodlots"
-            name="Stock by Lots"
-            res_model="stock.report.prodlots"
-            src_model="product.product"
-            groups="base.group_extended"/>
-
-        <act_window
-            domain="[('prodlot_id', '=', active_id)]"
-            id="act_stock_production_lot_2_stock_report_prodlots"
-            name="Stock" res_model="stock.report.prodlots"
-            src_model="stock.production.lot"/>
-
 		<act_window
             domain="[('tracking_id', '=', active_id)]"
             id="act_stock_tracking_lot_2_stock_report_tracklots"
@@ -228,12 +108,5 @@
         </record>
         <menuitem action="action_location_tree_3" id="menu_action_location_tree_3" parent="next_id_61" sequence="1"/>
 
-        <menuitem
-            action="action_stock_report_prodlots_form"
-            id="menu_stock_report_prodlots"
-            parent="next_id_61" sequence="10"/>
-
-
-
     </data>
 </openerp>

From d2d74c56935318300da92af794ea6ece7f5f494c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Jun 2010 19:08:03 +0200
Subject: [PATCH 30/37] imp

bzr revid: fp@tinyerp.com-20100613170803-7i9v2x78v5hrvwqm
---
 addons/sale/report/sale_report_view.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index f6090638891..9b8ed32ede4 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -128,6 +128,16 @@
     <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
     <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="3"/>
 
+    <record id="action_stock_move_report_so" model="ir.actions.act_window">
+        <field name="name">Shipments Analysis</field>
+        <field name="res_model">report.stock.move</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="context">{'search_default_month':1, 'search_default_group_product':1, 'search_default_group_partner':1, 'search_default_done':1, 'search_default_out': 1, 'group_by':[], 'group_by_no_leaf':1}</field>
+    </record>
+    <menuitem action="action_stock_move_report_so" id="menu_action_stock_move_report_so" parent="base.next_id_64" sequence="8"/>
+
+
     <!--This views used in board_sale module -->
     <record id="view_sale_order_by_clients_tree" model="ir.ui.view">
         <field name="name">sale.order.by.clients.tree</field>

From 9606c04a7556c81dcb961d532ed95e6abbc358f6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Jun 2010 19:32:49 +0200
Subject: [PATCH 31/37] fix

bzr revid: fp@tinyerp.com-20100613173249-q9iy86k4yv3ie295
---
 addons/sale/sale.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index ec8e084ccc0..07cb7e34b50 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -642,6 +642,7 @@ class sale_order(osv.osv):
                         'picking_id': picking_id,
                         'product_id': line.product_id.id,
                         'date_planned': date_planned,
+                        'date_expected': date_planned,
                         'product_qty': line.product_uom_qty,
                         'product_uom': line.product_uom.id,
                         'product_uos_qty': line.product_uos_qty,

From d093b7df1afbd15c1461847ed77f69973aa80891 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Jun 2010 23:16:36 +0200
Subject: [PATCH 32/37] [IMP] bugfixes and better views

bzr revid: fp@tinyerp.com-20100613211636-qd4qub5xnpv13daa
---
 addons/account/partner.py                     |  2 +-
 addons/account/security/account_security.xml  | 24 +++++++--------
 addons/delivery/delivery_view.xml             | 30 ++-----------------
 addons/project/project_view.xml               |  4 +--
 addons/purchase/purchase.py                   |  9 +++---
 addons/purchase/purchase_view.xml             |  2 +-
 addons/sale/sale_view.xml                     |  2 +-
 addons/sale/security/ir.model.access.csv      |  1 +
 addons/stock/security/stock_security.xml      |  2 +-
 addons/stock/stock.py                         |  2 +-
 addons/stock/stock_view.xml                   | 30 +++++++++----------
 addons/stock_location/mrp_pull.py             |  0
 addons/stock_location/mrp_pull_workflow.xml   |  0
 .../security/ir.model.access.csv              |  3 ++
 addons/stock_location/stock.py                |  2 +-
 15 files changed, 46 insertions(+), 67 deletions(-)
 mode change 100755 => 100644 addons/stock_location/mrp_pull.py
 mode change 100755 => 100644 addons/stock_location/mrp_pull_workflow.xml

diff --git a/addons/account/partner.py b/addons/account/partner.py
index 215c4286315..2497aaa447c 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -89,7 +89,7 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
     _description = 'Partner'
     def _credit_debit_get(self, cr, uid, ids, field_names, arg, context):
-        query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
+        query = self.pool.get('account.move.line')._query_get(cr, 1, context=context)
         cr.execute("""select
                 l.partner_id, a.type, sum(l.debit-l.credit)
             from
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index beb3e4e8ebb..a572f6ca425 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -44,77 +44,77 @@
     </record>
 
     <record id="account_move_line_comp_rule" model="ir.rule">
-    	 <field name="name">Entry lines</field>
+         <field name="name">Entry lines</field>
         <field model="ir.model" name="model_id" ref="model_account_move_line"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="journal_period_comp_rule" model="ir.rule">
-    	<field name="name">Journal Period</field>
+        <field name="name">Journal Period</field>
         <field model="ir.model" name="model_id" ref="model_account_journal_period"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="journal_comp_rule" model="ir.rule">
-    	<field name="name">Journal multi-company</field>
+        <field name="name">Journal multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_journal"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="analytic_journal_comp_rule" model="ir.rule">
-    	<field name="name">Analytic journal multi-company</field>
+        <field name="name">Analytic journal multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="analytic_journal_comp_rule_false" model="ir.rule">
-    	<field name="name">Analytic journal multi-company</field>
+        <field name="name">Analytic journal multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="period_comp_rule" model="ir.rule">
-    	<field name="name">Period multi-company</field>
+        <field name="name">Period multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_period"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="fiscal_year_comp_rule" model="ir.rule">
-    	<field name="name">Fiscal year multi-company</field>
+        <field name="name">Fiscal year multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_fiscalyear"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_comp_rule" model="ir.rule">
-		<field name="name">Account multi-company</field>
+        <field name="name">Account multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_account"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="tax_comp_rule" model="ir.rule">
-    	 <field name="name">Tax multi-company</field>
+         <field name="name">Tax multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_tax"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="tax_code_comp_rule" model="ir.rule">
-    	<field name="name">Tax code multi-company</field>
+        <field name="name">Tax code multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_tax_code"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="invoice_comp_rule" model="ir.rule">
-    	<field name="name">Invoice multi-company</field>
+        <field name="name">Invoice multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_invoice"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 427f5bfd6f2..e367148213d 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -67,7 +67,7 @@
                             <field colspan="4" name="line_ids" nolabel="1" select="1"/>
                         </page>
                         <page string="Destination">
-                        	<separator colspan="4" string="Countries"/>
+                            <separator colspan="4" string="Countries"/>
                             <field colspan="4" name="country_ids" nolabel="1"/>
                             <separator colspan="4" string="States"/>
                             <field colspan="4" name="state_ids" nolabel="1"/>
@@ -243,18 +243,6 @@
             </field>
         </record>
 
-        <record id="view_move_withweight_tree" model="ir.ui.view">
-            <field name="name">stock.move.tree.weight</field>
-            <field name="type">tree</field>
-            <field name="model">stock.move</field>
-            <field name="inherit_id" ref="stock.view_move_tree"/>
-            <field name="arch" type="xml">
-                <field name="product_uom" position="after">
-                    <field name="weight"/>
-                </field>
-            </field>
-        </record>
-
         <record id="view_move_withweight_form" model="ir.ui.view">
             <field name="name">stock.move.form.weight</field>
             <field name="type">form</field>
@@ -267,18 +255,6 @@
             </field>
         </record>
 
-        <record id="view_move_reception_picking_withweight_tree" model="ir.ui.view">
-            <field name="name">stock.move.reception.packing.tree.weight</field>
-            <field name="type">tree</field>
-            <field name="model">stock.move</field>
-            <field name="inherit_id" ref="stock.view_move_tree_reception_picking"/>
-            <field name="arch" type="xml">
-                <field name="product_uom" position="after">
-                    <field name="weight"/>
-                </field>
-            </field>
-        </record>
-
         <record id="view_move_reception_picking_withweight_form" model="ir.ui.view">
             <field name="name">stock.move.reception.packing.form.weight</field>
             <field name="type">form</field>
@@ -297,8 +273,8 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                     <xpath expr="/form/notebook/page[@string='Sale Order']/group[1]/button[@name='button_dummy']" position="after">
- 			        	<button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-execute" context="{'order_id':id}"/>                    
- 			        </xpath>
+                         <button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-execute" context="{'order_id':id}"/>                    
+                    </xpath>
             </field>
         </record>
 
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f7c5a834d1e..004ed9ba429 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -549,7 +549,7 @@
           <field eval="18" name="priority"/>
           <field name="arch" type="xml">
               <field name="password" position="after">
-               <field name="context_project_id" completion="1"/>
+                   <field name="context_project_id"/>
               </field>
           </field>
      </record>
@@ -562,7 +562,7 @@
          <field eval="18" name="priority"/>
          <field name="arch" type="xml">
             <page string="Current Activity" position="inside">
-                <field name="context_project_id" completion="1" context="{'user_prefence':True}"/>
+                <field name="context_project_id" completion="1" context="{'user_prefence':True}" widget="selection"/>
             </page>
        </field>
     </record>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 4dd0c4a73fb..af00075a6d3 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -726,17 +726,16 @@ class procurement_order(osv.osv):
         po_obj = self.pool.get('purchase.order')
         for procurement in self.browse(cr, uid, ids):
             res_id = procurement.move_id.id
-            partner_list = sorted([(partner_id.sequence, partner_id) for partner_id in  procurement.product_id.seller_ids if partner_id])
-            partner_rec = partner_list and partner_list[0] and partner_list[0][1] or False
-            partner = partner_rec.name or False
-            partner_id = partner_rec.id or False
+            partner = procurement.product_id.seller_ids[0].name
+            partner_id = partner.id
+            partner_rec = procurement.product_id.seller_ids[0]
             address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
             pricelist_id = partner.property_product_pricelist_purchase.id
 
             uom_id = procurement.product_id.uom_po_id.id
 
             qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
-            if partner_rec.qty:
+            if procurement.product_id.seller_ids[0].qty:
                 qty = max(qty,partner_rec.qty)
 
             price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, False, {'uom': uom_id})[pricelist_id]
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 0327e2d017c..8086a169d9d 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -21,7 +21,7 @@
             parent="base.menu_purchase_root" sequence="4"/>
       <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory"
               name="Incoming Shipments" sequence="9"/>
-      <menuitem action="stock.action_picking_tree_out" id="menu_action_picking_treeout" parent="menu_procurement_management_inventory" sequence="11"/>
+      <menuitem action="stock.action_reception_picking_move" id="menu_action_picking_tree_in_move" parent="menu_procurement_management_inventory" sequence="11"/>
 
      <!--Invoice control-->
       <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 088daf40fe8..9b879d4c136 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -120,7 +120,7 @@
                             <field domain="[('partner_id','=',partner_id)]" name="partner_order_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
-                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended" widget="selection"/>
+                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended"/>
                             <field name="project_id"
                                 context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"
                                 groups="base.group_extended"/>
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index f2f3b36f1f4..7328793e2f3 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -24,3 +24,4 @@
 "access_sale_open_invoice","sale.open.invoice","model_sale_open_invoice","group_sale_user",1,1,1,0
 "access_sale_open_invoice_manager","sale.open.invoice","model_sale_open_invoice","group_sale_manager",1,1,1,1
 "access_product_product_sale_user","product.product.sale.user","model_product_product","group_sale_user",1,0,0,0
+"access_sale_account_journal","account.journal sale order.user","account.model_account_journal","group_sale_user",1,0,0,0
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 07f67119244..099e32a889b 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -23,7 +23,7 @@
         <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>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="stock_warehouse_comp_rule">
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f63fe5b0f68..13e45b149e5 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1361,7 +1361,7 @@ class stock_move(osv.osv):
         'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'),
 
         'date': fields.datetime('Created Date'),
-        'date_planned': fields.datetime('Date Planned', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
+        'date_planned': fields.datetime('Date', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
         'date_expected': fields.datetime('Date Expected', readonly=True,required=True, help="Scheduled date for the movement of the products"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5e011b9fb5b..8aae80453d3 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -907,7 +907,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree_delivery"/>
         </record>
-        <menuitem action="action_picking_tree_delivery" groups="base.group_extended" id="menu_action_picking_tree_delivery" parent="menu_stock_warehouse_mgmt" sequence="20"/>
+        <menuitem action="action_picking_tree_delivery" id="menu_action_picking_tree_delivery" parent="menu_stock_warehouse_mgmt" sequence="20"/>
 
         #
         # Sending Products
@@ -1307,7 +1307,7 @@
             <field name="context">{'contact_display': 'partner',"search_default_confirmed":1}</field>
             <field name="search_view_id" ref="view_picking_internal_search"/>
         </record>
-        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" groups="base.group_extended" sequence="2"/>
+        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>
 
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">stock.move.tree</field>
@@ -1454,10 +1454,9 @@
                     <field name="partner_id" string="Supplier"/>
                     <field name="product_id"/>
                     <field name="product_qty" />
-                    <field name="product_uom" string="Unit Of Measure"/>
-                    <field name="prodlot_id" string="Lot" groups="base.group_extended"/>
+                    <field name="product_uom" string="UoM"/>
+                    <field name="prodlot_id" groups="base.group_extended"/>
                     <field name="date_planned"/>
-                    <field name="date_expected"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="state"/>
                     <button name="%(action_partial_move)d" string="Partial" type="action" states="assigned" icon="gtk-justify-fill"/>
@@ -1529,37 +1528,38 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="8" colspan="4">
+                        <filter icon="terp-go-today" string="Today" domain="[('date_planned','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date_planned','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
+                        <filter icon="terp-gtk-done" name="receive" string="Received" domain="[('state','=','done'))]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
-                        <filter icon="terp-go-today" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
                         <field name="origin"/>
                         <field name="partner_id" string="Supplier"/>
                         <field name="product_id"/>
                     </group>
                     <newline/>
-                    <group col='8' colspan='14' expand="1" string="Tracking Lots">
-                       <field name="tracking_id" context="{'tracking_lot': self}" />
-                    </group>
-                    <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Supplier" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Order" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'origin'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
-                        <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_expected'}" />
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}" />
                     </group>
                 </search>
             </field>
         </record>
 
         <record id="action_reception_picking_move" model="ir.actions.act_window">
-            <field name="name">Incoming Packings</field>
+            <field name="name">Incoming Products</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('picking_id','!=',False),('picking_id.type','=','in')]</field>
+            <field name="domain">[('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context">{"search_default_receive":1}</field>
             <field name="search_view_id" ref="view_move_search_reception_picking"/>
@@ -1738,7 +1738,7 @@
         </record>
 
         <record id="action_picking_tree_out" model="ir.actions.act_window">
-            <field name="name">Outcoming Shipments</field>
+            <field name="name">Outgoing Products</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/mrp_pull.py
old mode 100755
new mode 100644
diff --git a/addons/stock_location/mrp_pull_workflow.xml b/addons/stock_location/mrp_pull_workflow.xml
old mode 100755
new mode 100644
diff --git a/addons/stock_location/security/ir.model.access.csv b/addons/stock_location/security/ir.model.access.csv
index e87f65004bb..188218b6e26 100644
--- a/addons/stock_location/security/ir.model.access.csv
+++ b/addons/stock_location/security/ir.model.access.csv
@@ -1,4 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_product_pulled_flow_user","product_pulled_flow user","model_product_pulled_flow","stock.group_stock_user",1,0,0,0
+"access_product_pulled_flow_manager","product_pulled_flow manager","model_product_pulled_flow","stock.group_stock_manager",1,1,1,1
+"access_product_pulled_flow_partner_manager","product_pulled_flow partner manager","model_product_pulled_flow","product.group_product_manager",1,1,1,1
 "access_stock_location_path_user","stock location path user","model_stock_location_path","stock.group_stock_user",1,0,0,0
 "access_stock_location_path_manager","stock location path manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1
 "access_stock_location_path_partner_manager","stock.location.path partner manager","model_stock_location_path","product.group_product_manager",1,1,1,1
diff --git a/addons/stock_location/stock.py b/addons/stock_location/stock.py
index 8611b8dba6b..4aa4a1999ed 100644
--- a/addons/stock_location/stock.py
+++ b/addons/stock_location/stock.py
@@ -58,7 +58,7 @@ stock_location_path()
 
 class product_pulled_flow(osv.osv):
     _name = 'product.pulled.flow'
-    _description = "Pulled Flows."
+    _description = "Pulled Flows"
     _columns = {
         'name': fields.char('Name', size=64, required=True, help="This field will fill the packing Origin and the name of its moves"),
         'cancel_cascade': fields.boolean('Cancel Cascade', help="Allow you to cancel moves related to the product pull flow"),

From 8334a5e885176ea3aed98c06096417cc79e3e6a5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Jun 2010 23:25:21 +0200
Subject: [PATCH 33/37] removed_stock.delivery

bzr revid: fp@tinyerp.com-20100613212521-yyb5h6pxofkyn07s
---
 addons/stock/security/ir.model.access.csv |  5 ++--
 addons/stock/stock.py                     | 33 -----------------------
 addons/stock/stock_view.xml               |  2 +-
 3 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 4ce32167a21..601ca486012 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -36,13 +36,12 @@
 "access_stock_invoice_onshipping","stock.invoice.onshipping","model_stock_invoice_onshipping","stock.group_stock_user",1,0,0,0
 "access_stock_location_product","stock.location.product","model_stock_location_product","stock.group_stock_user",1,0,0,0
 "access_report_stock_picking","report.stock.picking","model_report_stock_picking","stock.group_stock_user",1,0,0,0
-"access_stock_delivery","stock.delivery","model_stock_delivery","stock.group_stock_user",1,0,0,0
 "access_stock_traceability_upstream","stock.traceability.upstream","model_stock_traceability_upstream","stock.group_stock_user",1,0,0,0
 "access_stock_traceability_downstream","stock.traceability.downstream","model_stock_traceability_downstream","stock.group_stock_user",1,0,0,0
 "access_stock_traceability_lot_upstream","stock.traceability.lot.upstream","model_stock_traceability_lot_upstream","stock.group_stock_user",1,0,0,0
 "access_stock_traceability_lot_downstream","stock.traceability.lot.downstream","model_stock_traceability_lot_downstream","stock.group_stock_user",1,0,0,0
-"access_stock_partial_picking",stock.partial.picking","model_stock_partial_picking","stock.group_stock_user",1,0,0,0
-"access_stock_partial_move","stock.partial.move","model_stock_partial_move","stock.group_stock_user",1,0,0,0
+"access_stock_partial_picking",stock.partial.picking","model_stock_partial_picking",,1,1,1,1
+"access_stock_partial_move","stock.partial.move","model_stock_partial_move",,1,1,1,1
 "access_stock_inventory_merge","stock.inventory.merge","model_stock_inventory_merge","stock.group_stock_user",1,0,0,0
 "access_stock_change_standard_price","stock.change.standard.price","model_stock_change_standard_price","stock.group_stock_user",1,0,0,0
 "access_action_traceability","action.traceability","model_action_traceability","stock.group_stock_user",1,0,0,0
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 13e45b149e5..d3cba22dfe8 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -582,7 +582,6 @@ class stock_picking(osv.osv):
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  method=True, store=True, type='datetime', string='Max. Expected Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Internal Moves', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
-        'delivery_line':fields.one2many('stock.delivery', 'picking_id', 'Delivery lines', readonly=True),
         'auto_picking': fields.boolean('Auto-Picking'),
         'address_id': fields.many2one('res.partner.address', 'Partner', help="Address of partner"),
         'invoice_state': fields.selection([
@@ -1048,7 +1047,6 @@ class stock_picking(osv.osv):
         res = {}
         
         move_obj = self.pool.get('stock.move')
-        delivery_obj = self.pool.get('stock.delivery')
         product_obj = self.pool.get('product.product')
         currency_obj = self.pool.get('res.currency')
         users_obj = self.pool.get('res.users')
@@ -1291,23 +1289,6 @@ class stock_production_lot_revision(osv.osv):
 
 stock_production_lot_revision()
 
-class stock_delivery(osv.osv):
-
-    """ Traceability of partial deliveries """
-
-    _name = "stock.delivery"
-    _description = "Delivery"
-    
-    _columns = {
-        'name': fields.char('Name', size=60, required=True),
-        'date': fields.datetime('Date', required=True),
-        'partner_id': fields.many2one('res.partner', 'Partner', required=True),
-        'address_id': fields.many2one('res.partner.address', 'Address', required=True),
-        'move_delivered':fields.one2many('stock.move', 'delivered_id', 'Move Delivered'),
-        'picking_id': fields.many2one('stock.picking', 'Picking list'),
-
-    }
-stock_delivery()
 # ----------------------------------------------------
 # Move
 # ----------------------------------------------------
@@ -1398,7 +1379,6 @@ class stock_move(osv.osv):
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Orders"),
         'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
         'move_stock_return_history': fields.many2many('stock.move', 'stock_move_return_history', 'move_id', 'return_move_id', 'Move Return History',readonly=True),
-        'delivered_id': fields.many2one('stock.delivery', 'Product delivered'),
         'scraped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scraped'),
     }
     _constraints = [
@@ -2076,7 +2056,6 @@ class stock_move(osv.osv):
         """
         res = {}
         picking_obj = self.pool.get('stock.picking')
-        delivery_obj = self.pool.get('stock.delivery')
         product_obj = self.pool.get('product.product')
         currency_obj = self.pool.get('res.currency')
         users_obj = self.pool.get('res.users')
@@ -2189,18 +2168,6 @@ class stock_move(osv.osv):
         done_move_ids = []
         for move in complete:
             done_move_ids.append(move.id)
-            if move.picking_id.id not in ref:
-                delivery_id = delivery_obj.create(cr, uid, {
-                    'partner_id': partner_id,
-                    'address_id': address_id,
-                    'date': delivery_date,
-                    'name' : move.picking_id.name,
-                    'picking_id':  move.picking_id.id
-                }, context=context)
-                ref[move.picking_id.id] = delivery_id
-            delivery_obj.write(cr, uid, ref[move.picking_id.id], {
-                'move_delivered' : [(4,move.id)]
-            })
         return done_move_ids
 
 stock_move()
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8aae80453d3..20d169534f8 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1531,7 +1531,7 @@
                         <filter icon="terp-go-today" string="Today" domain="[('date_planned','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date_planned','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
-                        <filter icon="terp-gtk-done" name="receive" string="Received" domain="[('state','=','done'))]"/>
+                        <filter icon="terp-check" name="received" string="Received" domain="[('state','=','done'))]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
                         <separator orientation="vertical"/>

From 37763730aa1a13e7ab4b54a4dd35c37b9a96b8a7 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Jun 2010 23:28:35 +0200
Subject: [PATCH 34/37] removed bad stuff in stock

bzr revid: fp@tinyerp.com-20100613212835-rcu5dvhcscbpgjyk
---
 addons/stock/stock.py       | 12 ------------
 addons/stock/stock_view.xml | 20 +-------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d3cba22dfe8..0914f34dcfd 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1172,14 +1172,6 @@ class stock_picking(osv.osv):
                 delivered_pack_id = pick.id
 
             delivered_pack = self.browse(cr, uid, delivered_pack_id, context=context)
-            delivery_id = delivery_obj.create(cr, uid, {
-                'name':  delivered_pack.name or move.name,
-                'partner_id': partner_id,
-                'address_id': address_id,
-                'date': delivery_date,
-                'picking_id' :  pick.id,
-                'move_delivered' : [(6,0, map(lambda x:x.id, delivered_pack.move_lines))]
-            }, context=context)
             res[pick.id] = {'delivered_picking': delivered_pack.id or False}
         return res
 
@@ -1378,7 +1370,6 @@ class stock_move(osv.osv):
         'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner"),
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Orders"),
         'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
-        'move_stock_return_history': fields.many2many('stock.move', 'stock_move_return_history', 'move_id', 'return_move_id', 'Move Return History',readonly=True),
         'scraped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scraped'),
     }
     _constraints = [
@@ -1434,12 +1425,9 @@ class stock_move(osv.osv):
         if default is None:
             default = {}
         default = default.copy()
-        default['move_stock_return_history'] = []
         return super(stock_move, self).copy(cr, uid, id, default, context)
 
     def create(self, cr, user, vals, context=None):
-        if vals.get('move_stock_return_history',False):
-            vals['move_stock_return_history'] = []
         # Check that the stock.move is in draft state at creation to force
         # passing through button_confirm
         if vals.get('state','draft') not in ('draft','done','waiting'):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 20d169534f8..8b0031a6446 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -674,9 +674,6 @@
                                                 <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                             </group>
                                         </page>
-                                        <page string="Return Picking History" groups="base.group_extended">
-                                            <field name="move_stock_return_history" nolabel="1"/>
-                                        </page>
                                     </notebook>
                                 </form>
                             </field>
@@ -822,9 +819,6 @@
                                                 <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                             </group>
                                         </page>
-                                        <page string="Return Picking History">
-                                            <field name="move_stock_return_history" nolabel="1"/>
-                                        </page>
                                     </notebook>
                                 </form>
                             </field>
@@ -1005,9 +999,6 @@
                                                 <button name="action_cancel" states="assigned" string="Cancel" type="object"  icon="gtk-cancel"/>
                                             </group>
                                         </page>
-                                        <page string="Return Picking History">
-                                            <field name="move_stock_return_history" nolabel="1"/>
-                                        </page>
                                     </notebook>
                                 </form>
                             </field>
@@ -1184,10 +1175,7 @@
                                                 <button name="action_cancel" states="assigned" string="Cancel" type="object" icon=""/>
                                             </group>
                                         </page>
-                                        <page string="Return Picking History">
-                                                    <field name="move_stock_return_history" nolabel="1"/>
-                                                </page>
-                                            </notebook>
+                                    </notebook>
                                 </form>
                             </field>
                             <group col="7" colspan="4">
@@ -1377,9 +1365,6 @@
                                 <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill" colspan="2" />
                             </group>
                         </page>
-                        <page string="Return Picking History">
-                            <field name="move_stock_return_history" nolabel="1"/>
-                        </page>
                     </notebook>
                     <group col="6" colspan="4">
                         <field name="state"/>
@@ -1512,9 +1497,6 @@
                                 <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
                             </group>
                         </page>
-                    <!--    <page string="Return Picking History">
-                            <field name="move_stock_return_history" nolabel="1"/>
-                         </page-->
                     </notebook>
                 </form>
             </field>

From cd511aa7a09ea54a7f7841a24f113450aacdb5c4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Jun 2010 23:32:39 +0200
Subject: [PATCH 35/37] improved access rights stock

bzr revid: fp@tinyerp.com-20100613213239-uagkel4z2im91nmj
---
 addons/stock/security/ir.model.access.csv | 30 +++++++++--------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 601ca486012..4358e8ec9ab 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_stock_incoterms_all","stock.incoterms all","model_stock_incoterms",,1,0,0,0
+"access_stock_incoterms_manager","stock.incoterms manager","model_stock_incoterms",stock.group_stock_manager,1,1,1,1
 "access_stock_warehouse_manager","stock.warehouse.manager","model_stock_warehouse","stock.group_stock_manager",1,1,1,1
 "access_stock_warehouse_user","stock.warehouse.user","model_stock_warehouse","base.group_user",1,0,0,0
 "access_stock_location_manager","stock.location.manager","model_stock_location","stock.group_stock_manager",1,1,1,1
@@ -16,24 +17,17 @@
 "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",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
-"access_stock_move_track","stock.move.track","model_stock_move_track","stock.group_stock_user",1,0,0,0
-"access_stock_move_consume","stock.move.consume","model_stock_move_consume","stock.group_stock_user",1,0,0,0
-"access_stock_move_scrap","stock.move.scrap","model_stock_move_scrap","stock.group_stock_user",1,0,0,0
-"access_stock_move_split","stock.move.split","model_stock_move_split","stock.group_stock_user",1,0,0,0
-"access_stock_move_split_lines","stock.move.split.lines","model_stock_move_split_lines","stock.group_stock_user",1,0,0,0
-"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
-"access_stock_move_track","stock.move.track","model_stock_move_track","stock.group_stock_user",1,0,0,0
-"access_stock_move_consume","stock.move.consume","model_stock_move_consume","stock.group_stock_user",1,0,0,0
-"access_stock_move_scrap","stock.move.scrap","model_stock_move_scrap","stock.group_stock_user",1,0,0,0
-"access_stock_move_split","stock.move.split","model_stock_move_split","stock.group_stock_user",1,0,0,0
-"access_stock_move_split_lines","stock.move.split.lines","model_stock_move_split_lines","stock.group_stock_user",1,0,0,0
-"access_stock_inventory_set_stock_zero","stock.inventory.set.stock.zero","model_stock_inventory_set_stock_zero","stock.group_stock_user",1,0,0,0
-"access_stock_fill_inventory","stock.fill.inventory","model_stock_fill_inventory","stock.group_stock_user",1,0,0,0
-"access_stock_inventory_line_split","stock.inventory.line.split","model_stock_inventory_line_split","stock.group_stock_user",1,0,0,0
-"access_stock_invoice_onshipping","stock.invoice.onshipping","model_stock_invoice_onshipping","stock.group_stock_user",1,0,0,0
+"access_report_products_to_received_planned","report.products.to.received.planned","model_report_products_to_received_planned","stock.group_stock_user",1,1,1,1
+"access_report_delivery_products_planned","report.delivery.products.planned","model_report_delivery_products_planned","stock.group_stock_user",1,1,1,1
+"access_stock_move_track","stock.move.track","model_stock_move_track","stock.group_stock_user",1,1,1,1
+"access_stock_move_consume","stock.move.consume","model_stock_move_consume","stock.group_stock_user",1,1,1,1
+"access_stock_move_scrap","stock.move.scrap","model_stock_move_scrap","stock.group_stock_user",1,1,1,1
+"access_stock_move_split","stock.move.split","model_stock_move_split","stock.group_stock_user",1,1,1,1
+"access_stock_move_split_lines","stock.move.split.lines","model_stock_move_split_lines","stock.group_stock_user",1,1,1,1
+"access_stock_inventory_set_stock_zero","stock.inventory.set.stock.zero","model_stock_inventory_set_stock_zero","stock.group_stock_user",1,1,1,1
+"access_stock_fill_inventory","stock.fill.inventory","model_stock_fill_inventory","stock.group_stock_user",1,1,1,1
+"access_stock_inventory_line_split","stock.inventory.line.split","model_stock_inventory_line_split","stock.group_stock_user",1,1,1,1
+"access_stock_invoice_onshipping","stock.invoice.onshipping","model_stock_invoice_onshipping","stock.group_stock_user",1,1,1,1
 "access_stock_location_product","stock.location.product","model_stock_location_product","stock.group_stock_user",1,0,0,0
 "access_report_stock_picking","report.stock.picking","model_report_stock_picking","stock.group_stock_user",1,0,0,0
 "access_stock_traceability_upstream","stock.traceability.upstream","model_stock_traceability_upstream","stock.group_stock_user",1,0,0,0

From f5b4319b04bde17269a7445c7d6cf08b8544055f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 14 Jun 2010 00:35:25 +0200
Subject: [PATCH 36/37] [FIX] improvements in stock management

bzr revid: fp@tinyerp.com-20100613223525-qmtypsjrhio58rcy
---
 addons/stock/stock.py                         |   3 +-
 addons/stock/stock_view.xml                   |  50 ++++--
 addons/stock/wizard/stock_move.py             | 167 +++++++++---------
 addons/stock/wizard/stock_partial_move.py     | 113 ++++++------
 .../stock/wizard/stock_partial_move_view.xml  |  27 +--
 addons/stock/wizard/stock_partial_picking.py  | 119 +++++--------
 .../wizard/stock_partial_picking_view.xml     |  12 +-
 7 files changed, 233 insertions(+), 258 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 0914f34dcfd..8873d3f42a2 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1296,6 +1296,7 @@ class stock_move(osv.osv):
         return (res and res[0]) or False
     _name = "stock.move"
     _description = "Stock Move"
+    _order = 'date_planned desc'
     _log_create = False
 
     def name_get(self, cr, uid, ids, context={}):
@@ -1368,7 +1369,7 @@ class stock_move(osv.osv):
             digits_compute= dp.get_precision('Account')),
         'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
         'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner"),
-        'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Orders"),
+        'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order"),
         'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
         'scraped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scraped'),
     }
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8b0031a6446..120af5d78f5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -713,7 +713,7 @@
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-accessories-archiver-minus" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order"  />
+                        <filter icon="terp-accessories-archiver-minus" string="Back Order" domain="[('backorder_id', '&lt;&gt;', False)]" help="Has Back Order"  />
                         <separator orientation="vertical"/>
                         <field name="location_id"/>
                         <field name="location_dest_id"/>
@@ -915,10 +915,10 @@
                 <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
                     <field name="address_id"/>
-                    <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
+                    <field name="backorder_id" groups="base.group_extended"/>
                     <field name="invoice_state"/>
                     <field name="state"/>
                     <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Picking"/>
@@ -1035,14 +1035,15 @@
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <group col="8" colspan="4">
-                        <filter icon="terp-check" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Orders"/>
-                        <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Orders"/>
+                        <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Orders"/>
+                        <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Orders"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '&lt;&gt;', False)]" help="Has Back Order"  />
                         <separator orientation="vertical"/>
-
                         <field name="name"/>
                         <field name="address_id" />
-<!--                        <field name="company_id" widget="selection"/>-->
-
+                        <field name="origin"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
@@ -1308,7 +1309,15 @@
                     <field name="product_id"/>
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                     <field name="product_uom" string="Unit Of Measure"/>
+                    <button name="%(stock.move_scrap)d"
+                        string="Scrap Products" type="action"
+                        icon="gtk-convert" context="{'scrap': True}"
+                        states="draft,waiting,confirmed,assigned" />
                     <field name="prodlot_id" groups="base.group_extended"/>
+                    <button name="%(track_line)d" string="Split" type="action" 
+                        icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
+                        states="assigned,confirmed"
+                        groups="base.group_extended"/>
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
                     <field name="date_planned"/>
@@ -1335,7 +1344,8 @@
                                 <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id)"/>
                                 <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                 <field name="product_uom" string="Unit Of Measure" widget="selection"/>
-                                <field name="product_uos" groups="base.group_extended" />
+                                <field name="product_uos_qty" groups="product.product_uos" />
+                                <field name="product_uos" groups="product.product_uos" />
                             </group>
 
                             <group colspan="2" col="2">
@@ -1440,13 +1450,20 @@
                     <field name="product_id"/>
                     <field name="product_qty" />
                     <field name="product_uom" string="UoM"/>
+                    <button name="%(stock.move_scrap)d"
+                        string="Scrap Products" type="action"
+                        icon="gtk-convert" context="{'scrap': True}"
+                        states="draft,waiting,confirmed,assigned" />
                     <field name="prodlot_id" groups="base.group_extended"/>
+                    <button name="%(track_line)d" string="Split" type="action" 
+                        icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
+                        states="assigned,confirmed,done"
+                        groups="base.group_extended"/>
                     <field name="date_planned"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="state"/>
                     <button name="%(action_partial_move)d" string="Partial" type="action" states="assigned" icon="gtk-justify-fill"/>
                     <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
-                    <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
                 </tree>
             </field>
         </record>
@@ -1466,7 +1483,8 @@
                             <field colspan="4" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)"/>
                             <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                             <field name="product_uom" widget="selection"/>
-                            <field name="product_uos" widget="selection" groups="base.group_extended"/>
+                            <field name="product_uos_qty" groups="product.product_uos"/>
+                            <field name="product_uos" widget="selection" groups="product.product_uos"/>
                             <field colspan="4" name="name"/>
                             <field name="date"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -1512,13 +1530,13 @@
                     <group col="8" colspan="4">
                         <filter icon="terp-go-today" string="Today" domain="[('date_planned','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date_planned','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
-                        <filter icon="terp-check" name="received" string="Received" domain="[('state','=','done'))]"/>
+                        <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
+                        <filter icon="terp-check" name="received" string="Done" domain="[('state','=','done'))]"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
+                        <filter icon="terp-accessories-archiver-minus" string="Back Order" domain="[('backorder_id','!=',False)]" help="Back Order"/>
                         <separator orientation="vertical"/>
                         <field name="origin"/>
-                        <field name="partner_id" string="Supplier"/>
+                        <field name="partner_id" string="Partner"/>
                         <field name="product_id"/>
                     </group>
                     <newline/>
@@ -1720,7 +1738,7 @@
         </record>
 
         <record id="action_picking_tree_out" model="ir.actions.act_window">
-            <field name="name">Outgoing Products</field>
+            <field name="name">Customers Packings</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1748,7 +1766,7 @@
         </record>
 
         <record id="action_out_picking_move" model="ir.actions.act_window">
-            <field name="name">Outcoming Packings</field>
+            <field name="name">Outgoing Products</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index bce550e74ff..0e670ee3e5d 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,25 +25,25 @@ from tools.translate import _
 class stock_move_track(osv.osv_memory):
     _name = "stock.move.track"
     _description = "Track moves"
-    
+
     _columns = {
-        'tracking_prefix': fields.char('Tracking prefix', size=64), 
+        'tracking_prefix': fields.char('Tracking prefix', size=64),
         'quantity': fields.float("Quantity per lot")
     }
 
     _defaults = {
         'quantity': lambda *x: 1
     }
-    
+
     def track_lines(self, cr, uid, ids, context={}):
         """ To track stock moves lines
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param ids: An ID or list of IDs if we want more than one 
-        @param context: A standard dictionary 
-        @return: 
-        """                
+        @param ids: An ID or list of IDs if we want more than one
+        @param context: A standard dictionary
+        @return:
+        """
         datas = self.read(cr, uid, ids)[0]
         move_obj = self.pool.get('stock.move')
         move_obj._track_lines(cr, uid, context['active_id'], datas, context=context)
@@ -54,11 +54,11 @@ stock_move_track()
 class stock_move_consume(osv.osv_memory):
     _name = "stock.move.consume"
     _description = "Consume Products"
-    
+
     _columns = {
-        'product_id': fields.many2one('product.product', 'Product', required=True, select=True), 
-        'product_qty': fields.float('Quantity', required=True), 
-        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True), 
+        'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
+        'product_qty': fields.float('Quantity', required=True),
+        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
         'location_id': fields.many2one('stock.location', 'Location', required=True)
     }
 
@@ -67,37 +67,37 @@ class stock_move_consume(osv.osv_memory):
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param fields: List of fields for default value 
-        @param context: A standard dictionary 
+        @param fields: List of fields for default value
+        @param context: A standard dictionary
         @return: default values of fields
         """
-        res = super(stock_move_consume, self).default_get(cr, uid, fields, context=context)        
+        res = super(stock_move_consume, self).default_get(cr, uid, fields, context=context)
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
         if 'product_id' in fields:
-            res.update({'product_id': move.product_id.id})     
+            res.update({'product_id': move.product_id.id})
         if 'product_uom' in fields:
-            res.update({'product_uom': move.product_uom.id})    
+            res.update({'product_uom': move.product_uom.id})
         if 'product_qty' in fields:
             res.update({'product_qty': move.product_qty})
         if 'location_id' in fields:
             res.update({'location_id': move.location_id.id})
-        
-        return res   
-            
+
+        return res
+
     def do_move_consume(self, cr, uid, ids, context={}):
         """ To move consumed products
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param ids: the ID or list of IDs if we want more than one 
-        @param context: A standard dictionary 
-        @return: 
-        """              
+        @param ids: the ID or list of IDs if we want more than one
+        @param context: A standard dictionary
+        @return:
+        """
         move_obj = self.pool.get('stock.move')
         move_ids = context['active_ids']
-        for data in self.read(cr, uid, ids):            
-            move_obj.action_consume(cr, uid, move_ids, 
-                             data['product_qty'], data['location_id'], 
+        for data in self.read(cr, uid, ids):
+            move_obj.action_consume(cr, uid, move_ids,
+                             data['product_qty'], data['location_id'],
                              context=context)
         return {}
 
@@ -108,7 +108,7 @@ class stock_move_scrap(osv.osv_memory):
     _name = "stock.move.scrap"
     _description = "Scrap Products"
     _inherit = "stock.move.consume"
-    
+
     _defaults = {
         'location_id': lambda *x: False
     }
@@ -118,19 +118,19 @@ class stock_move_scrap(osv.osv_memory):
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param fields: List of fields for default value 
-        @param context: A standard dictionary 
+        @param fields: List of fields for default value
+        @param context: A standard dictionary
         @return: default values of fields
         """
-        res = super(stock_move_consume, self).default_get(cr, uid, fields, context=context)        
+        res = super(stock_move_consume, self).default_get(cr, uid, fields, context=context)
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
         location_obj = self.pool.get('stock.location')
         scrpaed_location_ids = location_obj.search(cr, uid, [('scrap_location','=',True)])
-        
+
         if 'product_id' in fields:
-            res.update({'product_id': move.product_id.id})     
+            res.update({'product_id': move.product_id.id})
         if 'product_uom' in fields:
-            res.update({'product_uom': move.product_uom.id})    
+            res.update({'product_uom': move.product_uom.id})
         if 'product_qty' in fields:
             res.update({'product_qty': move.product_qty})
         if 'location_id' in fields:
@@ -138,23 +138,23 @@ class stock_move_scrap(osv.osv_memory):
                 res.update({'location_id': scrpaed_location_ids[0]})
             else:
                 res.update({'location_id': False})
-        
+
         return res
-        
+
     def move_scrap(self, cr, uid, ids, context={}):
         """ To move scraped products
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param ids: the ID or list of IDs if we want more than one 
-        @param context: A standard dictionary 
-        @return: 
-        """              
-        move_obj = self.pool.get('stock.move')        
+        @param ids: the ID or list of IDs if we want more than one
+        @param context: A standard dictionary
+        @return:
+        """
+        move_obj = self.pool.get('stock.move')
         move_ids = context['active_ids']
         for data in self.read(cr, uid, ids):
-            move_obj.action_scrap(cr, uid, move_ids, 
-                             data['product_qty'], data['location_id'], 
+            move_obj.action_scrap(cr, uid, move_ids,
+                             data['product_qty'], data['location_id'],
                              context=context)
         return {}
 
@@ -164,42 +164,42 @@ stock_move_scrap()
 class split_in_production_lot(osv.osv_memory):
     _name = "stock.move.split"
     _description = "Split in Production lots"
-    
+
     def default_get(self, cr, uid, fields, context=None):
         """ Get default values
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param fields: List of fields for default value 
-        @param context: A standard dictionary 
+        @param fields: List of fields for default value
+        @param context: A standard dictionary
         @return: Default values of fields
         """
-        
-        res = super(split_in_production_lot, self).default_get(cr, uid, fields, context=context)        
-        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)  
+
+        res = super(split_in_production_lot, self).default_get(cr, uid, fields, context=context)
+        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
         if 'product_id' in fields:
-            res.update({'product_id': move.product_id.id})  
+            res.update({'product_id': move.product_id.id})
         if 'qty' in fields:
-            res.update({'qty': move.product_qty})  
+            res.update({'qty': move.product_qty})
         return res
-    
+
     _columns = {
-        'qty': fields.integer('Quantity'), 
+        'qty': fields.integer('Quantity'),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
         'line_ids': fields.one2many('stock.move.split.lines', 'lot_id', 'Lots Number'),
         'line_exist_ids': fields.one2many('stock.move.split.lines.exist', 'lot_id', 'Lots Existing Numbers'),
         'use_exist' : fields.boolean('Use Exist'),
      }
-    
+
     def split_lot(self, cr, uid, ids, context=None):
         """ To split a lot
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param ids: An ID or list of IDs if we want more than one 
-        @param context: A standard dictionary 
-        @return: 
-        """                    
+        @param ids: An ID or list of IDs if we want more than one
+        @param context: A standard dictionary
+        @return:
+        """
         self.split(cr, uid, ids, context.get('active_ids'), context=context)
         return {}
 
@@ -208,21 +208,21 @@ class split_in_production_lot(osv.osv_memory):
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param ids: the ID or list of IDs if we want more than one 
+        @param ids: the ID or list of IDs if we want more than one
         @param move_ids: the ID or list of IDs of stock move we want to split
-        @param context: A standard dictionary 
-        @return: 
-        """                    
+        @param context: A standard dictionary
+        @return:
+        """
         prodlot_obj = self.pool.get('stock.production.lot')
         ir_sequence_obj = self.pool.get('ir.sequence')
         move_obj = self.pool.get('stock.move')
-        new_move = []        
+        new_move = []
         for data in self.browse(cr, uid, ids):
             for move in move_obj.browse(cr, uid, move_ids):
                 move_qty = move.product_qty
                 quantity_rest = move.product_qty
                 uos_qty_rest = move.product_uos_qty
-                new_move = []                            
+                new_move = []
                 if data.use_exist:
                     lines = [l for l in data.line_exist_ids if l]
                 else:
@@ -238,12 +238,17 @@ class split_in_production_lot(osv.osv_memory):
                         quantity_rest = quantity
                         break
                     default_val = {
-                        'product_qty': quantity, 
-                        'product_uos_qty': uos_qty, 
-                        'state': move.state
+                        'product_qty': quantity,
+                        'product_uos_qty': uos_qty,
+                        'state': 'draft'
                     }
                     if quantity_rest > 0:
                         current_move = move_obj.copy(cr, uid, move.id, default_val)
+                        move_obj.action_confirm(cr, uid, [current_move])
+                        if move.state=='assigned':
+                            move_obj.force_assign(cr, uid, [current_move])
+                        elif move.state<>'confirmed':
+                            move_obj.write(cr, uid, [current_move], {'state': move.state})
                         new_move.append(current_move)
                     if quantity_rest == 0:
                         current_move = move.id
@@ -255,19 +260,19 @@ class split_in_production_lot(osv.osv_memory):
                     if not prodlot_id:
                       #  sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
                         prodlot_id = prodlot_obj.create(cr, uid, {'name': line.name},
-                        # 'prefix' : line.name}, 
-                                                 {'product_id': move.product_id.id})                    
+                        # 'prefix' : line.name},
+                                                 {'product_id': move.product_id.id})
                     move_obj.write(cr, uid, [current_move], {'prodlot_id': prodlot_id})
-                    prodlot = prodlot_obj.browse(cr, uid, prodlot_id) 
+                    prodlot = prodlot_obj.browse(cr, uid, prodlot_id)
                  #   ref = '%d' % (move.id)
                  #   if prodlot.ref:
-                 #       ref = '%s, %s' % (prodlot.ref, ref) 
+                 #       ref = '%s, %s' % (prodlot.ref, ref)
                  #   prodlot_obj.write(cr, uid, [prodlot_id], {'ref': ref})
-                    
+
                     update_val = {}
-                    if quantity_rest > 0:                        
+                    if quantity_rest > 0:
                         update_val['product_qty'] = quantity_rest
-                        update_val['product_uos_qty'] = uos_qty_rest                          
+                        update_val['product_uos_qty'] = uos_qty_rest
                         move_obj.write(cr, uid, [move.id], update_val)
         return new_move
 split_in_production_lot()
@@ -276,8 +281,8 @@ class stock_move_split_lines_exist(osv.osv_memory):
     _name = "stock.move.split.lines.exist"
     _description = "Exist Split lines"
     _columns = {
-        'name': fields.char('Tracking serial', size=64), 
-        'quantity': fields.integer('Quantity'), 
+        'name': fields.char('Tracking serial', size=64),
+        'quantity': fields.integer('Quantity'),
         'lot_id': fields.many2one('stock.move.split', 'Lot'),
         'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot'),
     }
@@ -291,16 +296,14 @@ class stock_move_split_lines(osv.osv_memory):
     _name = "stock.move.split.lines"
     _description = "Split lines"
     _columns = {
-        'name': fields.char('Tracking serial', size=64), 
-        'quantity': fields.integer('Quantity'), 
+        'name': fields.char('Tracking serial', size=64),
+        'quantity': fields.integer('Quantity'),
         'use_exist' : fields.boolean('Use Exist'),
         'lot_id': fields.many2one('stock.move.split', 'Lot'),
         'action': fields.selection([('split','Split'),('keepinone','Keep in one lot')],'Action'),
     }
-    
     _defaults = {
         'quantity': lambda *x: 1,
-        'action' : lambda *x: 'split', 
+        'action' : lambda *x: 'split',
     }
-
 stock_move_split_lines()
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 0f538748a98..b8efdc4ed77 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -27,21 +27,19 @@ import pooler
 import time
 
 class stock_partial_move(osv.osv_memory):
-    _name = "stock.partial.move"    
-    _description = "Partial Move"    
+    _name = "stock.partial.move"
+    _description = "Partial Move"
     _columns = {
         'date': fields.datetime('Date', required=True),
-        'partner_id': fields.many2one('res.partner',string="Partner", required=True),
-        'address_id': fields.many2one('res.partner.address', 'Delivery Address', help="Address where goods are to be delivered", required=True),
      }
 
     def view_init(self, cr, uid, fields_list, context=None):
         res = super(stock_partial_move, self).view_init(cr, uid, fields_list, context=context)
-        move_obj = self.pool.get('stock.move')        
+        move_obj = self.pool.get('stock.move')
         if not context:
             context={}
         moveids = []
-        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):            
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
             if m.state in ('done', 'cancel'):
                 continue
             if 'move%s_product_id'%(m.id) not in self._columns:
@@ -56,55 +54,53 @@ class stock_partial_move(osv.osv_memory):
                     self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
                 if 'move%s_product_currency'%(m.id) not in self._columns:
                     self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency")
-        return res   
+        return res
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
-        result = super(stock_partial_move, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)        
+        result = super(stock_partial_move, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
         move_obj = self.pool.get('stock.move')
-        move_ids = context.get('active_ids', False)                
+        move_ids = context.get('active_ids', False)
         move_ids = move_obj.search(cr, uid, [('id','in',move_ids)])
         _moves_arch_lst = """<form string="Deliver Products">
                         <separator colspan="4" string="Delivery Information"/>
                     	<field name="date" colspan="4" />
-                    	<field name="partner_id"/>
-                    	<field name="address_id"/>
                     	<newline/>
                         <separator colspan="4" string="Move Detail"/>
                     	"""
         _moves_fields = result['fields']
-        if move_ids and view_type in ['form']:            
-            for m in move_obj.browse(cr, uid, move_ids, context):                
+        if move_ids and view_type in ['form']:
+            for m in move_obj.browse(cr, uid, move_ids, context):
                 if m.state in ('done', 'cancel'):
                     continue
                 _moves_fields.update({
                     'move%s_product_id'%(m.id)  : {
                                 'string': _('Product'),
-                                'type' : 'many2one', 
-                                'relation': 'product.product', 
-                                'required' : True, 
-                                'readonly' : True,                                    
+                                'type' : 'many2one',
+                                'relation': 'product.product',
+                                'required' : True,
+                                'readonly' : True,
                                 },
                     'move%s_product_qty'%(m.id) : {
                                 'string': _('Quantity'),
                                 'type' : 'float',
-                                'required': True,                                    
+                                'required': True,
                                 },
                     'move%s_product_uom'%(m.id) : {
                                 'string': _('Product UOM'),
-                                'type' : 'many2one', 
-                                'relation': 'product.uom', 
-                                'required' : True, 
-                                'readonly' : True,                                    
+                                'type' : 'many2one',
+                                'relation': 'product.uom',
+                                'required' : True,
+                                'readonly' : True,
                                 }
-                })                
-                
+                })
+
                 _moves_arch_lst += """
                     <group colspan="4" col="10">
                     <field name="move%s_product_id" nolabel="1"/>
                     <field name="move%s_product_qty" string="Qty" />
                     <field name="move%s_product_uom" nolabel="1" />
                 """%(m.id, m.id, m.id)
-                if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):                        
+                if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
                     _moves_fields.update({
                         'move%s_product_price'%(m.id) : {
                                 'string': _('Price'),
@@ -112,9 +108,9 @@ class stock_partial_move(osv.osv_memory):
                                 },
                         'move%s_product_currency'%(m.id): {
                                 'string': _('Currency'),
-                                'type' : 'float',      
-                                'type' : 'many2one', 
-                                'relation': 'res.currency',                                    
+                                'type' : 'float',
+                                'type' : 'many2one',
+                                'relation': 'res.currency',
                                 }
                     })
                     _moves_arch_lst += """
@@ -135,7 +131,7 @@ class stock_partial_move(osv.osv_memory):
         	</group>                	
         </form>"""
         result['arch'] = _moves_arch_lst
-        result['fields'] = _moves_fields           
+        result['fields'] = _moves_fields
         return result
 
     def default_get(self, cr, uid, fields, context=None):
@@ -143,13 +139,13 @@ class stock_partial_move(osv.osv_memory):
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param fields: List of fields for which we want default values 
-        @param context: A standard dictionary 
-        @return: A dictionary which of fields with values. 
-        """ 
+        @param fields: List of fields for which we want default values
+        @param context: A standard dictionary
+        @return: A dictionary which of fields with values.
+        """
 
         res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
-        move_obj = self.pool.get('stock.move')        
+        move_obj = self.pool.get('stock.move')
         if not context:
             context={}
         moveids = []
@@ -157,17 +153,9 @@ class stock_partial_move(osv.osv_memory):
             res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         move_ids = context.get('active_ids', [])
         move_ids = move_obj.search(cr, uid, [('id','in',move_ids)])
-        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):            
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
             if m.state in ('done', 'cancel'):
                 continue
-            address_ids = list(set([(pick.address_id and pick.address_id.id, pick.address_id and pick.address_id.partner_id and  pick.address_id.partner_id.id) for pick in move_obj.browse(cr, uid, move_ids)]))
-            if len(address_ids) == 1:
-                address_id = address_ids[0][0]
-                partner_id = address_ids[0][1]
-                res['address_id'] = address_ids[0][0]
-                res['partner_id'] = address_ids[0][1]
-            else:
-                address_id = partner_id = False
             if 'move%s_product_id'%(m.id) in fields:
                 res['move%s_product_id'%(m.id)] = m.product_id.id
             if 'move%s_product_qty'%(m.id) in fields:
@@ -183,7 +171,7 @@ class stock_partial_move(osv.osv_memory):
                 currency = False
                 if hasattr(m.picking_id, 'sale_id') and m.picking_id.sale_id:
                     currency = m.picking_id.sale_id.pricelist_id.currency_id.id
-    
+
                 if 'move%s_product_price'%(m.id) in fields:
                     res['move%s_product_price'%(m.id)] = price
                 if 'move%s_product_currency'%(m.id) in fields:
@@ -197,38 +185,37 @@ class stock_partial_move(osv.osv_memory):
                 currency = False
                 if hasattr(m.picking_id, 'purchase_id') and m.picking_id.purchase_id:
                     currency = m.picking_id.purchase_id.pricelist_id.currency_id.id
-    
+
                 if 'move%s_product_price'%(m.id) in fields:
                     res['move%s_product_price'%(m.id)] = price
                 if 'move%s_product_currency'%(m.id) in fields:
                     res['move%s_product_currency'%(m.id)] = currency
-        return res   
+        print res
+        return res
 
     def do_partial(self, cr, uid, ids, context):
         """ Makes partial moves and pickings done.
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param fields: List of fields for which we want default values 
-        @param context: A standard dictionary 
-        @return: A dictionary which of fields with values. 
-        """ 
-            
+        @param fields: List of fields for which we want default values
+        @param context: A standard dictionary
+        @return: A dictionary which of fields with values.
+        """
+
         rec_id = context and context.get('active_id', False)
         tracking_lot = context.get('tracking_lot', False)
         if tracking_lot:
             tracking = self.pool.get('stock.tracking')
-            tracking_lot = tracking.get_create_tracking_lot(cr, uid,[rec_id], tracking_lot)        
-            context ['tracking_lot'] = tracking_lot 
-        move_obj = self.pool.get('stock.move')    
+            tracking_lot = tracking.get_create_tracking_lot(cr, uid,[rec_id], tracking_lot)
+            context ['tracking_lot'] = tracking_lot
+        move_obj = self.pool.get('stock.move')
         move_ids = context.get('active_ids', False)
         partial = self.browse(cr, uid, ids[0], context)
         partial_datas = {
-            'partner_id' : partial.partner_id and partial.partner_id.id or False,
-            'address_id' : partial.address_id and partial.address_id.id or False,
-            'delivery_date' : partial.date         
+            'delivery_date' : partial.date
         }
-        for m in move_obj.browse(cr, uid, move_ids):            
+        for m in move_obj.browse(cr, uid, move_ids):
             if m.state in ('done', 'cancel'):
                 continue
             partial_datas['move%s'%(m.id)] = {
@@ -237,15 +224,15 @@ class stock_partial_move(osv.osv_memory):
                 'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id
             }
 
-            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):   
-                partial_datas['move%s'%(m.id)].update({             
+            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+                partial_datas['move%s'%(m.id)].update({
                     'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
                     'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id
-                })  
+                })
         res = move_obj.do_partial(cr, uid, move_ids, partial_datas, context=context)
         return {}
- 
-stock_partial_move()    
+
+stock_partial_move()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index 30b7f3fca0e..a7b4271a5b2 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -1,25 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>	
+    <data>
 
-        <record id="view_stock_partial_move" model="ir.ui.view">
-            <field name="name">Delivery Product</field>
-            <field name="model">stock.partial.move</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-              <form string="Delivery Product">
-             		
-             </form>
-            </field>
-		</record>
-
-        <act_window name="Delivery Product"		    
-		    res_model="stock.partial.move"
-		    src_model="stock.move"
-		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="action_partial_move"/>		    	  		
+        <act_window name="Delivery Product"
+            res_model="stock.partial.move"
+            src_model="stock.move"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            id="action_partial_move"/>
 
     </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 0feac97010b..595215c2a49 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -30,17 +30,15 @@ class stock_partial_picking(osv.osv_memory):
     _description = "Partial Picking"
     _columns = {
             'date': fields.datetime('Date', required=True),
-            'partner_id': fields.many2one('res.partner',string="Partner", required=True),
-            'address_id': fields.many2one('res.partner.address', 'Delivery Address', help="Address where goods are to be delivered", required=True),
      }
 
     def view_init(self, cr, uid, fields_list, context=None):
         res = super(stock_partial_picking, self).view_init(cr, uid, fields_list, context=context)
-        pick_obj = self.pool.get('stock.picking')        
+        pick_obj = self.pool.get('stock.picking')
         if not context:
             context={}
         moveids = []
-        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):            
+        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
             for m in pick.move_lines:
                 if m.state in ('done', 'cancel'):
                     continue
@@ -56,20 +54,18 @@ class stock_partial_picking(osv.osv_memory):
                         self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
                     if 'move%s_product_currency'%(m.id) not in self._columns:
                         self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency")
-        return res   
+        return res
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
-        result = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)        
+        result = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
         pick_obj = self.pool.get('stock.picking')
-        picking_ids = context.get('active_ids', False) 
-        _moves_arch_lst = """<form string="Deliver Products">
-                        <separator colspan="4" string="Delivery Information"/>
-                    	<field name="date" colspan="4" />
-                    	<field name="partner_id"/>
-                    	<field name="address_id"/>
-                    	<newline/>
+        picking_ids = context.get('active_ids', False)
+        _moves_arch_lst = """<form string="Process Packing">
+                        <separator colspan="4" string="Product Information"/>
+                        <field name="date" colspan="4" />
+                        <newline/>
                         <separator colspan="4" string="Move Detail"/>
-                    	"""
+                        """
         _moves_fields = result['fields']
         if picking_ids and view_type in ['form']:
             for pick in pick_obj.browse(cr, uid, picking_ids, context):
@@ -79,32 +75,32 @@ class stock_partial_picking(osv.osv_memory):
                     _moves_fields.update({
                         'move%s_product_id'%(m.id)  : {
                                     'string': _('Product'),
-                                    'type' : 'many2one', 
-                                    'relation': 'product.product', 
-                                    'required' : True, 
-                                    'readonly' : True,                                    
+                                    'type' : 'many2one',
+                                    'relation': 'product.product',
+                                    'required' : True,
+                                    'readonly' : True,
                                     },
                         'move%s_product_qty'%(m.id) : {
                                     'string': _('Quantity'),
                                     'type' : 'float',
-                                    'required': True,                                    
+                                    'required': True,
                                     },
                         'move%s_product_uom'%(m.id) : {
                                     'string': _('Product UOM'),
-                                    'type' : 'many2one', 
-                                    'relation': 'product.uom', 
-                                    'required' : True, 
-                                    'readonly' : True,                                    
+                                    'type' : 'many2one',
+                                    'relation': 'product.uom',
+                                    'required' : True,
+                                    'readonly' : True,
                                     }
-                    })                
-                    
+                    })
+
                     _moves_arch_lst += """
                         <group colspan="4" col="10">
                         <field name="move%s_product_id" nolabel="1"/>
                         <field name="move%s_product_qty" string="Qty" />
                         <field name="move%s_product_uom" nolabel="1" />
                     """%(m.id, m.id, m.id)
-                    if (m.product_id.cost_method == 'average'):                        
+                    if (m.product_id.cost_method == 'average'):
                         _moves_fields.update({
                             'move%s_product_price'%(m.id) : {
                                     'string': _('Price'),
@@ -112,9 +108,9 @@ class stock_partial_picking(osv.osv_memory):
                                     },
                             'move%s_product_currency'%(m.id): {
                                     'string': _('Currency'),
-                                    'type' : 'float',      
-                                    'type' : 'many2one', 
-                                    'relation': 'res.currency',                                    
+                                    'type' : 'float',
+                                    'type' : 'many2one',
+                                    'relation': 'res.currency',
                                     }
                         })
                         _moves_arch_lst += """
@@ -128,14 +124,14 @@ class stock_partial_picking(osv.osv_memory):
                 <separator string="" colspan="4" />
                 <label string="" colspan="2"/>
                 <group col="2" colspan="2">
-        		<button icon='gtk-cancel' special="cancel"
-        			string="_Cancel" />
-        		<button name="do_partial" string="_Deliver"
-        			colspan="1" type="object" icon="gtk-apply" />
-        	</group>                	
+                <button icon='gtk-cancel' special="cancel"
+                    string="_Cancel" />
+                <button name="do_partial" string="_Process"
+                    colspan="1" type="object" icon="gtk-apply" />
+            </group>
         </form>"""
         result['arch'] = _moves_arch_lst
-        result['fields'] = _moves_fields           
+        result['fields'] = _moves_fields
         return result
 
     def default_get(self, cr, uid, fields, context=None):
@@ -143,23 +139,19 @@ class stock_partial_picking(osv.osv_memory):
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param fields: List of fields for which we want default values 
-        @param context: A standard dictionary 
-        @return: A dictionary which of fields with values. 
-        """ 
+        @param fields: List of fields for which we want default values
+        @param context: A standard dictionary
+        @return: A dictionary which of fields with values.
+        """
 
         res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
-        pick_obj = self.pool.get('stock.picking')        
+        pick_obj = self.pool.get('stock.picking')
         if not context:
             context={}
         moveids = []
         if 'date' in fields:
             res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
-            if 'partner_id' in fields:
-                res.update({'partner_id': pick.address_id.partner_id and pick.address_id.partner_id.id or False })                
-            if 'address_id' in fields:
-                res.update({'address_id': pick.address_id.id})            
             for m in pick.move_lines:
                 if m.state in ('done', 'cancel'):
                     continue
@@ -187,24 +179,22 @@ class stock_partial_picking(osv.osv_memory):
                         res['move%s_product_price'%(m.id)] = price
                     if 'move%s_product_currency'%(m.id) in fields:
                         res['move%s_product_currency'%(m.id)] = currency
-        return res   
+        return res
 
-    def do_partial(self, cr, uid, ids, context): 
+    def do_partial(self, cr, uid, ids, context):
         """ Makes partial moves and pickings done.
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param fields: List of fields for which we want default values 
-        @param context: A standard dictionary 
-        @return: A dictionary which of fields with values. 
-        """    
-        pick_obj = self.pool.get('stock.picking')    
+        @param fields: List of fields for which we want default values
+        @param context: A standard dictionary
+        @return: A dictionary which of fields with values.
+        """
+        pick_obj = self.pool.get('stock.picking')
         picking_ids = context.get('active_ids', False)
         partial = self.browse(cr, uid, ids[0], context)
         partial_datas = {
-            'partner_id' : partial.partner_id and partial.partner_id.id or False,
-            'address_id' : partial.address_id and partial.address_id.id or False,
-            'delivery_date' : partial.date         
+            'delivery_date' : partial.date
         }
         for pick in pick_obj.browse(cr, uid, picking_ids):
             for m in pick.move_lines:
@@ -216,26 +206,13 @@ class stock_partial_picking(osv.osv_memory):
                     'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id
                 }
 
-                if (m.product_id.cost_method == 'average'):   
-                    partial_datas['move%s'%(m.id)].update({             
+                if (m.product_id.cost_method == 'average'):
+                    partial_datas['move%s'%(m.id)].update({
                         'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
                         'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id
-                    })          
+                    })
         res = pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
         return {}
- 
-stock_partial_picking()    
 
-
-
-#_moves_arch_end = '''<?xml version="1.0"?>
-#<form string="Picking result">
-#    <label string="The picking has been successfully made !" colspan="4"/>
-#    <field name="back_order_notification" colspan="4" nolabel="1"/>
-#</form>'''
-
-#_moves_fields_end = {
-#    'back_order_notification': {'string':'Back Order' ,'type':'text', 'readonly':True}
-#                     }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+stock_partial_picking()
 
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 2f901b9884d..b399576c83d 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>		    	
-  		<record id="action_partial_picking" model="ir.actions.act_window">
+    <data>
+        <record id="action_partial_picking" model="ir.actions.act_window">
             <field name="name">Making Picking</field>
-  			<field name="res_model">stock.partial.picking</field>                        
-            <field name="view_type">form</field>            
-           	<field name="view_mode">form</field>            
+            <field name="res_model">stock.partial.picking</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
             <field name="target">new</field>
-        </record>	
+        </record>
 
     </data>
 </openerp>

From 30b9d3269c2c316311b52ec837bb6f58278e1d26 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Mon, 14 Jun 2010 04:43:01 +0100
Subject: [PATCH 37/37] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100614034301-bcpvifo3ktczyfgh
---
 addons/google_map/i18n/ru.po |  9 ++++++---
 addons/product/i18n/vi.po    | 10 +++++-----
 addons/stock/i18n/pl.po      | 22 +++++++++++-----------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po
index dc02c11683d..6e3e44985e5 100644
--- a/addons/google_map/i18n/ru.po
+++ b/addons/google_map/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-11 20:45+0000\n"
-"Last-Translator: Spector <Unknown>\n"
+"PO-Revision-Date: 2010-06-13 13:02+0000\n"
+"Last-Translator: Alex L. <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-12 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-06-14 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
@@ -39,6 +39,9 @@ msgid ""
 "so that we can directly open google map from the\n"
 "url widget."
 msgstr ""
+"Модуль добавляет поле с Google картой в адрес партнера\n"
+"поэтому мы можем открыть карту Google непосредственно из\n"
+"адреса виджета."
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index c6b06e8b29d..a2c65299744 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:40+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-06-13 07:00+0000\n"
+"Last-Translator: Vu Duc Tiep <ductiepdt@yahoo.com>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-06-14 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -163,7 +163,7 @@ msgstr "Công ty"
 #. module: product
 #: field:product.template,rental:0
 msgid "Rentable Product"
-msgstr ""
+msgstr "Sản phẩm có thể cho thuê"
 
 #. module: product
 #: field:product.product,lst_price:0
@@ -244,7 +244,7 @@ msgstr ""
 #. module: product
 #: model:process.transition,note:product.process_transition_supplierofproduct0
 msgid "You can see the list of suppliers for that product."
-msgstr ""
+msgstr "Bạn có thể thấy danh sách các nhà cung cấp sản phầm này"
 
 #. module: product
 #: help:product.packaging,rows:0
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index a4406384e8e..117d90e683a 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-21 08:22+0000\n"
+"PO-Revision-Date: 2010-06-13 15:17+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-06-14 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -120,7 +120,7 @@ msgstr "Otrzymane produkty"
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4
 msgid "Incoming Products"
-msgstr "Przyjmowanie produktów"
+msgstr "Przyjęcia zewnętrzne"
 
 #. module: stock
 #: field:stock.picking,name:0
@@ -592,7 +592,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_picking_form
 #: model:ir.ui.menu,name:stock.menu_action_picking_form
 msgid "New Reception Packing"
-msgstr "Nowy odbiór listy przesunięć"
+msgstr "Nowe przyjęcia zewnętrzne"
 
 #. module: stock
 #: wizard_field:stock.move.track,init,quantity:0
@@ -837,7 +837,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_picking_tree9
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree9
 msgid "New Internal Packing"
-msgstr "Nowa lista przesunięć wewnętrznych"
+msgstr "Nowe przesunięcie wewnętrzne"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1330,7 +1330,7 @@ msgstr "Cel przesunięcia"
 #: model:ir.actions.act_window,name:stock.action_inventory_form_new
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form_new
 msgid "New Periodical Inventory"
-msgstr "Nowa inentaryzacja okresowa"
+msgstr "Nowa inwentaryzacja okresowa"
 
 #. module: stock
 #: field:stock.production.lot,revisions:0
@@ -1346,7 +1346,7 @@ msgstr "FIFO"
 #: model:ir.actions.act_window,name:stock.action_picking_tree2_delivery
 #: model:ir.ui.menu,name:stock.menu_picking_waiting_delivery
 msgid "Delivery Orders to Process"
-msgstr "Zamówienia dostawy do przetworzenia"
+msgstr "Wydania zewnętrzne do obsługi"
 
 #. module: stock
 #: field:stock.move,priority:0
@@ -1493,7 +1493,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_picking_tree3_delivery
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3_delivery
 msgid "Future Delivery Orders"
-msgstr "Przyszłe zamówienia dostawy"
+msgstr "Przyszłe wydania zewnętrzne"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1990,7 +1990,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_picking_tree_delivery
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree_delivery
 msgid "Delivery Orders"
-msgstr "Zamówienia dostawy"
+msgstr "Wydania zewnętrzne"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2197,7 +2197,7 @@ msgstr "Czy chcesz ustawić zapasy na 0 ?"
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Direct Delivery"
-msgstr "Dostawa bezpośrednia"
+msgstr "Dostawa częściowa"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2345,7 +2345,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.picking,type:0
 msgid "Delivery"
-msgstr "Dostawa"
+msgstr "Wydanie zewnętrzne"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action5