From ca1079cb074aabadc3754304dbfa8c8a70681ffc Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 1 Aug 2012 17:59:52 +0530
Subject: [PATCH 01/18] [IMP]: added "e.g." before example related placeholder

bzr revid: cha@tinyerp.com-20120801122952-dhw9q7zt8hk2bnlx
---
 openerp/addons/base/module/wizard/base_import_language_view.xml | 2 +-
 openerp/addons/base/res/res_company_view.xml                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/module/wizard/base_import_language_view.xml b/openerp/addons/base/module/wizard/base_import_language_view.xml
index 1d62c74b781..f6466479bff 100644
--- a/openerp/addons/base/module/wizard/base_import_language_view.xml
+++ b/openerp/addons/base/module/wizard/base_import_language_view.xml
@@ -10,7 +10,7 @@
                 <form string="Import Translation" version="7.0">
                     <group>
                         <field name="name"/>
-                        <field name="code" string="Code" placeholder="en_US"/>
+                        <field name="code" string="Code" placeholder="e.g. en_US"/>
                         <field name="data"/>
                         <field name="overwrite"/>
                     </group>
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 8637da10f4c..c3e2501ccbb 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -34,7 +34,7 @@
                         </h1>
                         <label for="rml_header1" class="oe_edit_only"/>
                         <div>
-                            <field name="rml_header1" placeholder="Global Business Solutions"/>
+                            <field name="rml_header1" placeholder="e.g. Global Business Solutions"/>
                         </div>
                     </div>
                     <group col="4">

From e178275b98899078fe95e462ef1b6e5a51c106ac Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Fri, 3 Aug 2012 17:23:23 +0530
Subject: [PATCH 02/18] [IMP] account: Removed Or and Skip from configuration
 view

bzr revid: pso@tinyerp.com-20120803115323-uq78whuliv3ivgvp
---
 addons/account/account_installer.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 8e2526c3f97..9f0b69e1f6b 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -9,9 +9,9 @@
                 <form position="attributes" version="7.0">
                     <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
-                <button name="action_next" position="attributes">
-                    <attribute name="string">Continue</attribute>
-                </button>
+                <footer position="replace">
+                    <button name="action_next" type="object" string="Continue" class="oe_highlight"/>
+                </footer>
                 <separator string="title" position="replace">
                     <group>
                         <field name="charts"/>

From e9eb895c6a76be5e590777e691815c36e5521774 Mon Sep 17 00:00:00 2001
From: "Saurang Suthar(OpenERP)" <>
Date: Fri, 3 Aug 2012 17:53:54 +0530
Subject: [PATCH 03/18] [IMP] stock: Added default vals of location and hidden
 by location group

bzr revid: pso@tinyerp.com-20120803122354-3y3ge823cgo9edlk
---
 addons/stock/stock.py       | 20 ++++++++++++++++++++
 addons/stock/stock_view.xml | 14 +++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9752f0c78f4..39de341bfe7 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2801,6 +2801,14 @@ class stock_inventory_line(osv.osv):
         'state': fields.related('inventory_id','state',type='char',string='Status',readonly=True),
     }
 
+    def _default_stock_location(self, cr, uid, context=None):
+        stock_location = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock')
+        return stock_location.id
+
+    _defaults = {
+        'location_id': _default_stock_location
+    }
+
     def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False, to_date=False):
         """ Changes UoM and name if product_id changes.
         @param location_id: Location id
@@ -2832,8 +2840,20 @@ class stock_warehouse(osv.osv):
         'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True, domain=[('usage','=','internal')]),
         'lot_output_id': fields.many2one('stock.location', 'Location Output', required=True, domain=[('usage','<>','view')]),
     }
+
+    def _default_lot_input_stock_id(self, cr, uid, context=None):
+        lot_input_stock = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock')
+        return lot_input_stock.id
+
+    def _default_lot_output_id(self, cr, uid, context=None):
+        lot_output = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_output')
+        return lot_output.id
+
     _defaults = {
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c),
+        'lot_input_id': _default_lot_input_stock_id,
+        'lot_stock_id': _default_lot_input_stock_id,
+        'lot_output_id': _default_lot_output_id,
     }
 
 stock_warehouse()
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3c08c1eaff0..c0cfec7f881 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -626,9 +626,9 @@
                     <h1><field name="name"/></h1>
                     <group>
                         <group>
-                            <field name="lot_input_id"/>
-                            <field name="lot_stock_id"/>
-                            <field name="lot_output_id"/>
+                            <field name="lot_input_id" groups="stock.group_locations"/>
+                            <field name="lot_stock_id" groups="stock.group_locations"/>
+                            <field name="lot_output_id" groups="stock.group_locations"/>
                         </group>
                         <group>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -645,9 +645,9 @@
             <field name="arch" type="xml">
                 <tree string="Warehouse">
                     <field name="name"/>
-                    <field name="lot_input_id"/>
-                    <field name="lot_stock_id"/>
-                    <field name="lot_output_id"/>
+                    <field name="lot_input_id" groups="stock.group_locations"/>
+                    <field name="lot_stock_id" groups="stock.group_locations"/>
+                    <field name="lot_output_id" groups="stock.group_locations"/>
                     <field name="partner_id"/>
                 </tree>
             </field>
@@ -734,7 +734,7 @@
                     <group>
                         <group>
                             <field name="backorder_id" readonly="1"/>
-                            <field name="invoice_state" string="Invoice Control" groups="account.group_account_invoice"/>
+                            <field name="invoice_state" string="Invoice Control" groups="account.group_account_invoice" attrs="{'invisible':[('invoice_state', '=', 'none')]}"/>
                             <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
                         </group>
                         <group>

From a34333914930ee26dd8b77a4cac9b7603dc6e7f2 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi(OpenERP)" <>
Date: Mon, 6 Aug 2012 11:06:15 +0530
Subject: [PATCH 04/18] [IMP] project: Improved task view

bzr revid: pso@tinyerp.com-20120806053615-0nv0ent4qr8wdakw
---
 addons/project/project_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index ae86f9712a3..d7354f77618 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -415,7 +415,7 @@
                     </h1>
                     <group>
                         <group>
-                            <field name="project_id"  on_change="onchange_project(project_id)"/>
+                            <field name="project_id"  on_change="onchange_project(project_id)" context="{'default_use_tasks':1}"/>
                             <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
@@ -538,15 +538,15 @@
                                     <i><field name="date_deadline"/></i>
                                 </div>
                                 <div class="oe_kanban_bottom_right">
-                                    <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="" name="set_kanban_state_done" class="oe_kanban_status"> </a>
-                                    <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
+                                    <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="Ready to Pull" name="set_kanban_state_done" class="oe_kanban_status"> </a>
+                                    <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready to Pull" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
                                     <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a>
-                                    <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a>
-                                    <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
+                                    <a t-if="record.priority.raw_value == 1" type="object" string="Priority" name="set_normal_priority" class="oe_e oe_star_on">7</a>
+                                    <a t-if="record.priority.raw_value != 1" type="object" string="Priority" name="set_high_priority" class="oe_e oe_star_off">7</a>
                                     <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
                                 </div>
                                 <div class="oe_kanban_footer_left">
-                                    <span>
+                                    <span groups="project.group_time_work_estimation_tasks">
                                         <span class="oe_e">N</span>
                                         <t t-esc="Math.round(record.remaining_hours.raw_value)"/>
                                     </span>

From d6f1cdbe5c433b7660ffe6706bd9504d1743e5cc Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (Open ERP)" <>
Date: Mon, 6 Aug 2012 11:22:13 +0530
Subject: [PATCH 05/18] [IMP] crm: Added default true in schedule call object

bzr revid: pso@tinyerp.com-20120806055213-s2aa2mvntbzdazc8
---
 addons/crm/crm_phonecall.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index e73089bfff8..b3043ce09b8 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -81,6 +81,7 @@ class crm_phonecall(base_state, osv.osv):
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
         'state':  _get_default_state,
         'user_id': lambda self,cr,uid,ctx: uid,
+        'active': 1
     }
 
     def create(self, cr, uid, vals, context=None):

From b8e21e9799715636db325a3b7a11cc3147641897 Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <>
Date: Mon, 6 Aug 2012 12:01:02 +0530
Subject: [PATCH 06/18] [IMP] base_calendar: Improved meeting view

bzr revid: pso@tinyerp.com-20120806063102-vt359ei5ez33djmc
---
 addons/base_calendar/crm_meeting.py       |  2 +-
 addons/base_calendar/crm_meeting_view.xml | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 239ab8d0f28..cb96ff2a4d0 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -63,7 +63,7 @@ class crm_meeting(base_state, osv.Model):
                             'event_id', 'attendee_id', 'Attendees', states={'done': [('readonly', True)]}),
     }
     _defaults = {
-        'state': 'draft',
+        'state': 'open',
     }
 
     # ----------------------------------------
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index d3371ad602a..a70bca5ec09 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -72,15 +72,7 @@
         <field name="arch" type="xml">
             <form string="Meetings" version="7.0">
                 <header>
-                    <button name="case_open" string="Confirm" type="object"
-                            states="draft"/>
-                    <button name="case_close" string="Done" type="object"
-                            states="open"/>
-                    <button name="case_reset" string="Reset to Unconfirmed" type="object" 
-                            states="cancel,done"/>
-                    <button name="case_cancel" string="Cancel" type="object"
-                            states="draft,open"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
+                    <field name="state"/>
                 </header>
                 <sheet>
                     <div class="oe_title">

From 4c2a3f49698f74804fc240bd13956d49a4831a0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 6 Aug 2012 12:24:31 +0200
Subject: [PATCH 07/18] [FIX] purchase_requisition: fixed mail.message
 inheritance, where behavior specific to this module was executed for every
 composed message.

bzr revid: tde@openerp.com-20120806102431-2vw87hw656kss0q0
---
 .../purchase_requisition.py                   | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 1b0c36b114b..85ce92ad7ac 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -201,17 +201,18 @@ class mail_message(osv.osv):
                              email_bcc=None, reply_to=False, attachments=None, message_id=False, references=False,
                              res_id=False, subtype='plain', headers=None, mail_server_id=False, auto_delete=False,
                              context=None):
-        purchase_order_obj = self.pool.get('purchase.order')
-        requisition_id = purchase_order_obj.browse(cr, uid, res_id, context=context).requisition_id.id
         result = super(mail_message, self).schedule_with_attach(cr, uid, email_from, email_to, subject, body, model=model, email_cc=email_cc,
-                     email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
-                     res_id=res_id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
-                     context=context)
-        if requisition_id:
-            result = self.schedule_with_attach(cr, uid, email_from, email_to, subject, body, 'purchase.requisition', email_cc=email_cc,
-                             email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
-                             res_id=requisition_id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
-                             context=context)
+            email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
+            res_id=res_id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
+            context=context)
+        # check model is purchase.order
+        if model and model == 'purchase.order' and res_id:
+            requisition_id = self.pool.get('purchase.order').browse(cr, uid, res_id, context=context).requisition_id
+            if requisition_id:
+                result = self.schedule_with_attach(cr, uid, email_from, email_to, subject, body, 'purchase.requisition', email_cc=email_cc,
+                    email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
+                    res_id=requisition_id.id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
+                    context=context)
         return result
 
 class purchase_requisition_line(osv.osv):

From b0d95be9685fe774c06602dea87f3929e937d73f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 6 Aug 2012 12:51:38 +0200
Subject: [PATCH 08/18] [FIX] subtype -> content_subtype.

bzr revid: tde@openerp.com-20120806105138-ipcsz8yscof5eg0f
---
 addons/purchase_requisition/purchase_requisition.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 85ce92ad7ac..8ba12657405 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -199,19 +199,19 @@ class mail_message(osv.osv):
     
     def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, email_cc=None,
                              email_bcc=None, reply_to=False, attachments=None, message_id=False, references=False,
-                             res_id=False, subtype='plain', headers=None, mail_server_id=False, auto_delete=False,
+                             res_id=False, content_subtype='plain', headers=None, mail_server_id=False, auto_delete=False,
                              context=None):
         result = super(mail_message, self).schedule_with_attach(cr, uid, email_from, email_to, subject, body, model=model, email_cc=email_cc,
             email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
-            res_id=res_id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
+            res_id=res_id, content_subtype=content_subtype, headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
             context=context)
         # check model is purchase.order
         if model and model == 'purchase.order' and res_id:
             requisition_id = self.pool.get('purchase.order').browse(cr, uid, res_id, context=context).requisition_id
             if requisition_id:
-                result = self.schedule_with_attach(cr, uid, email_from, email_to, subject, body, 'purchase.requisition', email_cc=email_cc,
+                result = self.schedule_with_attach(cr, uid, email_from, email_to, subject, body, model='purchase.requisition', email_cc=email_cc,
                     email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
-                    res_id=requisition_id.id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
+                    res_id=requisition_id.id, content_subtype=content_subtype, headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
                     context=context)
         return result
 

From 3aab9f4f56e1b152f2e4be221b5feee976e6af39 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Mon, 6 Aug 2012 17:47:22 +0530
Subject: [PATCH 09/18] [IMP]accounting-option-wizard

bzr revid: pna@tinyerp.com-20120806121722-w2r8givb32dl0mn3
---
 addons/account/installer.py     | 9 +++++++++
 addons/project/project_view.xml | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/account/installer.py b/addons/account/installer.py
index 5a2b0b346c4..4fc4754ea3f 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -119,6 +119,15 @@ class account_installer(osv.osv_memory):
         self.execute_simple(cr, uid, ids, context)
         super(account_installer, self).execute(cr, uid, ids, context=context)
 
+    def action_next(self, cr, uid, ids, context=None):
+        next = self.execute(cr, uid, ids, context=context)
+        for installer in self.browse(cr, uid, ids, context=context):
+            if installer.charts == 'l10n_be':
+                return {'type': 'ir.actions.act_window_close'}
+            else :
+                if next : return next
+                return self.next(cr, uid, ids, context=context)
+
     def execute_simple(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index ae86f9712a3..79593109593 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -546,7 +546,7 @@
                                     <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
                                 </div>
                                 <div class="oe_kanban_footer_left">
-                                    <span>
+                                    <span groups="project.group_time_work_estimation_tasks" title="Remaining hours">
                                         <span class="oe_e">N</span>
                                         <t t-esc="Math.round(record.remaining_hours.raw_value)"/>
                                     </span>

From 6b8c1d2828d7309b83b3b6f623df4dc6ba726930 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 6 Aug 2012 15:53:12 +0200
Subject: [PATCH 10/18] [FIX] Fixed openerp classname in jQuery Tipsy

The classname should be present before tipsy computes it's width/height !

bzr revid: fme@openerp.com-20120806135312-b3xlvbba0m0rzr1a
---
 addons/web/static/lib/jquery.tipsy/jquery.tipsy.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/lib/jquery.tipsy/jquery.tipsy.js b/addons/web/static/lib/jquery.tipsy/jquery.tipsy.js
index f36c9bdb43a..5929d591261 100644
--- a/addons/web/static/lib/jquery.tipsy/jquery.tipsy.js
+++ b/addons/web/static/lib/jquery.tipsy/jquery.tipsy.js
@@ -27,7 +27,7 @@
                 var $tip = this.tip();
                 
                 $tip.find('.tipsy-inner')[this.options.html ? 'html' : 'text'](title);
-                $tip[0].className = 'tipsy'; // reset classname in case of dynamic gravity
+                $tip[0].className = 'tipsy openerp oe_tooltip '; // reset classname in case of dynamic gravity
                 $tip.remove().css({top: 0, left: 0, visibility: 'hidden', display: 'block'}).prependTo(document.body);
                 
                 var pos = $.extend({}, this.$element.offset(), {
@@ -63,7 +63,7 @@
                     }
                 }
                 
-                $tip.css(tp).addClass('openerp oe_tooltip tipsy-' + gravity);
+                $tip.css(tp).addClass('tipsy-' + gravity);
                 $tip.find('.tipsy-arrow')[0].className = 'tipsy-arrow tipsy-arrow-' + gravity.charAt(0);
                 if (this.options.className) {
                     $tip.addClass(maybeCall(this.options.className, this.$element[0]));

From 0cecacd43e14c920da4c4d961c87223ab8330b96 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 6 Aug 2012 16:00:44 +0200
Subject: [PATCH 11/18] [IMP] Improved m2o tooltip

bzr revid: fme@openerp.com-20120806140044-mgo3git8zi9xrqbh
---
 addons/web/static/src/css/base.css    | 13 +++++++++++++
 addons/web/static/src/css/base.sass   | 10 ++++++++++
 addons/web/static/src/js/chrome.js    |  1 +
 addons/web/static/src/js/view_form.js | 14 ++++++++++++--
 addons/web/static/src/xml/base.xml    |  7 +++++++
 5 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 8f35c81de2d..029b3ef4f10 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -602,6 +602,19 @@
 .openerp.oe_tooltip .oe_tooltip_technical_title {
   font-weight: bold;
 }
+.openerp.oe_tooltip .oe_tooltip_close {
+  margin: -5px 0 0 2px;
+  cursor: default;
+  float: right;
+  color: white;
+}
+.openerp.oe_tooltip .oe_tooltip_close:hover {
+  color: #999999;
+  cursor: pointer;
+}
+.openerp.oe_tooltip .oe_tooltip_message {
+  max-width: 310px;
+}
 .openerp .oe_notebook {
   margin: 8px 0;
   padding: 0 16px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 688c306169b..449d76b882b 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -469,6 +469,16 @@ $sheet-max-width: 860px
                 list-style: circle
         .oe_tooltip_technical_title
             font-weight: bold
+        .oe_tooltip_close
+            margin: -5px 0 0 2px
+            cursor: default
+            float: right
+            color: white
+            &:hover
+                color: #999
+                cursor: pointer
+        .oe_tooltip_message
+            max-width: 310px
     // }}}
     // Notebook {{{
     .oe_notebook
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 694ffc3b722..503cb337103 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -979,6 +979,7 @@ instance.web.Client = instance.web.Widget.extend({
             }, 0);
         });
         instance.web.bus.on('click', this, function(ev) {
+            $.fn.tipsy.clear();
             if (!$(ev.target).is('input[type=file]')) {
                 self.$element.find('.oe_dropdown_menu.oe_opened').removeClass('oe_opened');
             }
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c4e13dabae2..f69bf39f824 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2711,10 +2711,20 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
 
         self.$input.tipsy({
             title: function() {
-                return "No element was selected, you should create or select one from the dropdown list.";
+                return QWeb.render('Tipsy.alert', {
+                    message: "No element was selected, you should create or select one from the dropdown list."
+                });
             },
             trigger:'manual',
             fade: true,
+            gravity: 's',
+            html: true,
+            opacity: 1,
+            offset: 4,
+        });
+
+        self.$input.on('focus', function() {
+            self.$input.tipsy("hide");
         });
 
         this.$drop_down = this.$element.find(".oe_m2o_drop_down_button");
@@ -2768,7 +2778,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         var tip_def = $.Deferred();
         var untip_def = $.Deferred();
         var tip_delay = 200;
-        var tip_duration = 3000;
+        var tip_duration = 15000;
         var anyoneLoosesFocus = function() {
             var used = false;
             if (self.floating) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c45b2d7f226..601fe165f81 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -25,6 +25,13 @@
         </div>
     </div>
 </t>
+<t t-name="Tipsy.alert">
+    <a class="oe_tooltip_close oe_e">[</a>
+    <span style="float:left; margin:2px 5px 0 0;" class="ui-icon ui-icon-alert ui-state-error"></span>
+    <div class="oe_tooltip_message">
+        <t t-esc="message"/>
+    </div>
+</t>
 
 <t t-name="CrashManager.warning">
     <table cellspacing="0" cellpadding="0" border="0" class="oe_dialog_warning">

From c7f04c43c7c29bf226c13287d09c9b24a78dd7a2 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 6 Aug 2012 17:02:48 +0200
Subject: [PATCH 12/18] [FIX] Stuck in login when creating a new database

bzr revid: fme@openerp.com-20120806150248-am7gql5pr1bfyunl
---
 addons/web/static/src/js/chrome.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 503cb337103..45cbaf46bfb 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -400,6 +400,9 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
                     'db': form_obj['db_name'],
                     'login': 'admin',
                     'password': form_obj['create_admin_pwd'],
+                    'login_successful': function() {
+                        instance.webclient.show_application();
+                    },
                 },
             };
             self.do_action(client_action);

From c10136071d47e4e12d622f16279fb0db0202453d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 6 Aug 2012 17:32:08 +0200
Subject: [PATCH 13/18] [REV] Reverted Revision: 2636
 revid:nicolas.vanhoren@openerp.com-20120627153131-uxp6d2l4ri8xjoz5

bzr revid: fme@openerp.com-20120806153208-fbet6xbs365ir6lm
---
 addons/web_kanban/static/src/js/kanban.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index a17f77be1e8..29c26bbca29 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -320,7 +320,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
     },
     open_record: function(id, editable) {
         if (this.dataset.select_id(id)) {
-            this.do_switch_view('form', null);
+            this.do_switch_view('form', null, { editable: editable });
         } else {
             this.do_warn("Kanban: could not find id#" + id);
         }

From 20ae82a823e6f4cc8ed39d556b57c1071ae787f0 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 6 Aug 2012 17:54:05 +0200
Subject: [PATCH 14/18] [REV] Revert Revision: 2677
 revid:fp@tinyerp.com-20120705123259-okklz6m7nfziqaqf

bzr revid: fme@openerp.com-20120806155405-vw1qgz5btqd6hzvp
---
 addons/web_kanban/static/src/js/kanban.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 29c26bbca29..4477b4dc01f 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -256,7 +256,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
                 scroll: false
             });
         } else {
-            this.$element.find('.oe_kanban_draghandle').removeClass('oe_kanban_draghandle').removeClass('oe_kanban_card');
+            this.$element.find('.oe_kanban_draghandle').removeClass('oe_kanban_draghandle');
         }
     },
     on_record_moved : function(record, old_group, old_index, new_group, new_index) {
@@ -606,7 +606,7 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
 
         // If no draghandle is found, make the whole card as draghandle
         if (!this.$element.find('.oe_kanban_draghandle').length) {
-            this.$element.children(':first').addClass('oe_kanban_draghandle').addClass('oe_kanban_card');
+            this.$element.children(':first').addClass('oe_kanban_draghandle');
         }
 
         this.$element.find('.oe_kanban_action').click(function() {

From 4e641e9f2c0b5dba1ba8bc937d54c7108c1241ab Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 6 Aug 2012 18:09:22 +0200
Subject: [PATCH 15/18] [IMP] Don't display the many2one icon if it's value is
 empty.

bzr revid: fme@openerp.com-20120806160922-d4b59jzsu2nx2yl7
---
 addons/web/static/src/js/view_form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index f69bf39f824..56d8e3379e4 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2698,6 +2698,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         this.on("change:value", this, function() {
             this.floating = false;
             this.render_value();
+            this.$('.oe_m2o_cm_button').css({'visibility': this.is_false() ? 'hidden' : 'visible'});
         });
     },
     initialize_content: function() {

From f53e1450baffb42c45c45f6db5077719fe682d03 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 6 Aug 2012 18:43:20 +0200
Subject: [PATCH 16/18] [IMP] cleaning views, reduced summary and module name
 fields (to avoid crap in apps.openerp.com)

bzr revid: fp@tinyerp.com-20120806164320-x3mc637dw809life
---
 openerp/addons/base/module/module.py         |  4 ++--
 openerp/addons/base/res/res_partner_view.xml | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 49a65acebca..4717ea63a84 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -177,8 +177,8 @@ class module(osv.osv):
     _columns = {
         'name': fields.char("Technical Name", size=128, readonly=True, required=True, select=True),
         'category_id': fields.many2one('ir.module.category', 'Category', readonly=True, select=True),
-        'shortdesc': fields.char('Module Name', size=256, readonly=True, translate=True),
-        'summary': fields.char('Summary', size=256, readonly=True, translate=True),
+        'shortdesc': fields.char('Module Name', size=64, readonly=True, translate=True),
+        'summary': fields.char('Summary', size=64, readonly=True, translate=True),
         'description': fields.text("Description", readonly=True, translate=True),
         'author': fields.char("Author", size=128, readonly=True),
         'maintainer': fields.char('Maintainer', size=128, readonly=True),
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 9ea9658403a..58f0c281804 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -101,18 +101,19 @@
                 <sheet>
                     <field name="photo" widget='image' class="oe_avatar oe_left"/>
                     <div class="oe_title">
+                        <div class="oe_edit_only">
+                            <label for="name"/> (
+                            <field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/> <label for="is_company" string="Is a Company?"/>)
+                        </div>
                         <h1>
                             <field name="name" default_focus="1" placeholder="Name" />
                         </h1>
                         <field name="parent_id"
-                            string="Work for Company"
+                            placeholder="Company"
                             domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
                             attrs="{'invisible': [('is_company','=', True)]}"
                             on_change="onchange_address(use_parent_address, parent_id)"/>
-                        <div class="oe_edit_only">
-                            <field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/> <label for="is_company" string="Company?"/>
-                            <field name="category_id" widget="many2many_tags" placeholder="Select Tags"/>
-                        </div>
+                        <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                     </div>
                     <div class="oe_right oe_button_box" name="buttons"> </div>
 
@@ -133,10 +134,10 @@
                                 <field name="street2"/>
                                 <div class="address_format">
                                     <field name="city" placeholder="City" style="width: 40%%"/>
-                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
+                                    <field name="state_id" options='{"no_open": true}' placeholder="State" style="width: 24%%"/>
                                     <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                 </div>
-                                <field name="country_id" placeholder="Country" class="oe_no_button"/>
+                                <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
                             </div>
                             <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
                         </group>
@@ -148,6 +149,7 @@
                             <field name="fax"/>
                             <field name="email" widget="email"/>
                             <field name="title" domain="[('domain', '=', 'contact')]"
+                                groups="base.group_no_one"
                                 options='{"no_open": true}' attrs="{'invisible': [('is_company','=', True)]}" />
                         </group>
                     </group>
@@ -215,7 +217,7 @@
                                 </group>
                                 <group>
                                     <field name="customer"/>
-                                    <field name="supplier" invisible="1"/>
+                                    <field name="supplier" invisible="not context.get('default_supplier')"/>
                                 </group>
                                 <group>
                                     <field name="ref"/>

From cf9e609ad0e9e2ec07791f8f6e0661368b022c9b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 6 Aug 2012 18:44:04 +0200
Subject: [PATCH 17/18] [IMP] better views

bzr revid: fp@tinyerp.com-20120806164404-nweyqbh3635e0ntv
---
 addons/crm/crm_lead_view.xml     | 4 ++--
 addons/crm/res_partner_view.xml  | 2 +-
 addons/purchase/partner_view.xml | 7 +++----
 addons/sale/sale_view.xml        | 6 +++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index dd2ef7bd9e8..a1c400671c6 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -526,7 +526,7 @@
                                     <field name="street2"/>
                                     <div class="address_format">
                                         <field name="city" placeholder="City" style="width: 40%%"/>
-                                        <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
+                                        <field name="state_id" options='{"no_open": true}' placeholder="State" style="width: 24%%"/>
                                         <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                     </div>
                                     <field name="country_id" placeholder="Country"/>
@@ -537,7 +537,7 @@
                                 <label for="contact_name" />
                                 <div>
                                     <field name="contact_name" class="oe_inline"/>
-                                    <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline oe_no_button"/>
+                                    <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": true}' class="oe_inline"/>
                                 </div>
                                 <field name="function" />
                                 <field name="mobile"/>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 31040a33376..4461dd63c4c 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -141,7 +141,7 @@
                     <button type="action" string="Schedule a Call" 
                         name="%(crm.crm_case_categ_phone_create_partner)d" 
                         context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
-                    <button type="action" string="Opportunities"
+                    <button type="action" string="Opportunities" attrs="{'invisible': [('customer', '=', False)]}"
                         name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': active_id}"/>
                 </xpath>
             </field>
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 81eaac92827..7cd0a790e17 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -11,9 +11,6 @@
                 <field name="property_product_pricelist" position="after">
                     <field name="property_product_pricelist_purchase" />
                 </field>
-                <field name="supplier" position="replace">
-                    <field name="supplier"/>
-                </field>
             </field>
         </record>
         
@@ -76,9 +73,11 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button name="%(purchase.act_res_partner_2_purchase_order)d" type="action"
-                        string="RFQs and Purchases"
+                        string="Purchase Orders"
+                        attrs="{'invisible': [('supplier', '=', False)]}"
                         groups="purchase.group_purchase_user"/>
                     <button name="%(purchase.act_res_partner_2_supplier_invoices)d" type="action"
+                        attrs="{'invisible': [('supplier', '=', False)]}"
                         string="Supplier Invoices"/>
                 </xpath>
             </field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index a14841541a0..dda3e8c9622 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -224,13 +224,13 @@
                                                     context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                                                     name="product_uom_qty" class="oe_inline"
                                                     on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
-                                                <field name="product_uom" groups="product.group_uom" class="oe_inline oe_no_button"
+                                                <field name="product_uom" groups="product.group_uom" options='{"no_open": true}' class="oe_inline"
                                                     on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
                                             </div>
                                             <label for="product_uos_qty" groups="product.group_uos"/>
                                             <div groups="product.group_uos">
                                                 <field name="product_uos_qty" class="oe_inline"/>
-                                                <field name="product_uos" class="oe_inline oe_no_button"/>
+                                                <field name="product_uos" options='{"no_open": true}' class="oe_inline"/>
                                             </div>
                                             <field name="price_unit"/>
                                             <label for="discount" groups="sale.group_discount_per_so_line"/>
@@ -284,7 +284,7 @@
                                         on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, False, parent.fiscal_position, True, context)"/>
                                     <field name="product_uom"
                                         on_change="product_uom_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, context)"
-                                        groups="product.group_uom" class="oe_no_button"/>
+                                        groups="product.group_uom" options='{"no_open": true}'/>
                                     <field name="product_uos_qty" groups="product.group_uos"/>
                                     <field name="product_uos" string="UoS" groups="product.group_uos"/>
                                     <field name="discount" groups="sale.group_discount_per_so_line"/>

From c69dd2028384a576137fb015aacc62ed6f132f2b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 6 Aug 2012 18:47:32 +0200
Subject: [PATCH 18/18] [IMP] simplification of list views

bzr revid: fp@tinyerp.com-20120806164732-tyeljfvy1ayhwjuz
---
 addons/purchase/purchase_view.xml | 2 --
 addons/sale/sale_view.xml         | 2 --
 2 files changed, 4 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 3ee2bc653e4..47216a11cac 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -337,8 +337,6 @@
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field name="minimum_planned_date" invisible="context.get('quotation_only', False)"/>
                     <field name="origin"/>
-                    <field name="invoiced_rate" widget="progressbar" invisible="context.get('quotation_only', False)"/>
-                    <field name="shipped_rate" widget="progressbar" invisible="context.get('quotation_only', False)"/>
                     <field name="amount_untaxed" sum="Total Untaxed amount"/>
                     <field name="amount_total" sum="Total amount"/>
                     <field name="state"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index dda3e8c9622..34e759307b6 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -144,8 +144,6 @@
                     <field name="date_order"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
-                    <field name="picked_rate" widget="progressbar"/>
-                    <field name="invoiced_rate" widget="progressbar"/>
                     <field name="amount_total" sum="Total Tax Included"/>
                     <field name="state"/>
                 </tree>