diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 17ebfe1f744..26e18271dc2 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -189,7 +189,7 @@
                     </group>
                     <notebook>
                         <page string="Invoice">
-                            <field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
+                            <field context="{'partner_id': partner_id, 'price_type': context.get('price_type') or False, 'type': type}" name="invoice_line">
                                 <tree string="Invoice lines" editable="bottom">
                                     <field name="product_id"
                                         on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1fbda80a0fe..1c40bebba52 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1549,10 +1549,7 @@
             <field name="view_mode">account_reconciliation_list</field>
             <field name="help" type="html">
                 <p>
-                    Good job!
-                </p><p>
-                    There is nothing to reconcile. All invoices and payments
-                    have been reconciled, your partner balance is clean.
+                    No journal items found.
                 </p>
             </field>
         </record>
diff --git a/addons/account/static/src/xml/account_move_reconciliation.xml b/addons/account/static/src/xml/account_move_reconciliation.xml
index c266e819198..d7b5301238d 100644
--- a/addons/account/static/src/xml/account_move_reconciliation.xml
+++ b/addons/account/static/src/xml/account_move_reconciliation.xml
@@ -3,10 +3,17 @@
 <templates id="template" xml:space="preserve">
     
     <t t-name="AccountReconciliation">
+        <t t-if="widget.current_partner === null">
+            <div class="oe_view_nocontent">
+                <p>
+                    Good job!
+                </p><p>
+                    There is nothing to reconcile. All invoices and payments
+                    have been reconciled, your partner balance is clean.
+                </p>
+            </div>
+        </t>
         <div class="oe_account_reconciliation">
-            <t t-if="widget.current_partner === null">
-                There is no pending reconciliation.
-            </t>
             <t t-if="widget.current_partner !== null">
                 <div>
                     <div>
diff --git a/addons/auth_oauth/__openerp__.py b/addons/auth_oauth/__openerp__.py
index c8da9c65d4a..1c29ca8c093 100644
--- a/addons/auth_oauth/__openerp__.py
+++ b/addons/auth_oauth/__openerp__.py
@@ -34,6 +34,7 @@ Allow users to login through Google OAuth2.
     'depends': ['base', 'web', 'base_setup'],
     'data': [
         'auth_oauth_data.xml',
+        'auth_oauth_data.yml',
         'auth_oauth_view.xml',
         'security/ir.model.access.csv'
     ],
diff --git a/addons/auth_oauth/auth_oauth_data.yml b/addons/auth_oauth/auth_oauth_data.yml
new file mode 100644
index 00000000000..af43811a560
--- /dev/null
+++ b/addons/auth_oauth/auth_oauth_data.yml
@@ -0,0 +1,6 @@
+-
+  Use database uuid as client_id for OpenERP oauth provider
+-
+  !python {model: ir.config_parameter}: |
+    oauth = self.pool.get('auth.oauth.provider')
+    oauth.write(cr, uid, [ref('provider_openerp')], {'client_id': self.get_param(cr, uid, 'database.uuid')})
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 3baf3ff9023..fbadf76f2fb 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -121,7 +121,7 @@ class mail_compose_message(osv.TransientModel):
         'partner_ids': lambda self, cr, uid, ctx={}: [],
     }
 
-    def notify(self, cr, uid, newid, context=None):
+    def _notify(self, cr, uid, newid, context=None):
         """ Override specific notify method of mail.message, because we do
             not want that feature in the wizard. """
         return
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 19eff9bc250..2f85e832b7d 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -78,6 +78,7 @@
                   <!-- title -->
                   <field name="name"/>
                 </div>
+                <div class="oe_clear"></div>
                 <field name="tag_ids"/>
                 <div class="oe_right">
                   <t t-foreach="record.message_follower_ids.raw_value" t-as="follower">
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 0d519190e86..8e5280d036a 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -40,7 +40,7 @@
        <record id="product_uom_dozen" model="product.uom">
             <field name="category_id" ref="product.product_uom_categ_unit"/>
             <field name="name">Dozen</field>
-            <field name="factor" eval="0.083"/>
+            <field name="factor_inv" eval="12"/>
             <field name="uom_type">bigger</field>
         </record>
         <record id="product_uom_kgm" model="product.uom">
@@ -70,7 +70,7 @@
             <!-- 'tonne' is the most common spelling in english-speaking countries,
                  the alternative is 'metric ton' in the US, abbreviated as 'mt' -->
             <field name="name">t</field>
-            <field name="factor" eval="0.001"/>
+            <field name="factor_inv" eval="1000"/>
             <field name="uom_type">bigger</field>
         </record>
         <record id="product_uom_meter" model="product.uom">
@@ -81,7 +81,7 @@
         <record id="product_uom_km" model="product.uom">
             <field name="category_id" ref="uom_categ_length"/>
             <field name="name">km</field>
-            <field name="factor" eval="0.001"/>
+            <field name="factor_inv" eval="1000"/>
             <field name="uom_type">bigger</field>
         </record>
         <record id="product_uom_cm" model="product.uom">
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 9cfe3dccd2f..560c1c3552a 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -72,7 +72,7 @@
         </record>
         <record id="project_tt_deployment" model="project.task.type">
             <field name="sequence">7</field>
-            <field name="name">Deployment</field>
+            <field name="name">Done</field>
             <field name="state">done</field>
             <field name="case_default" eval="True"/>
         </record>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index f72ce8e9b2d..2004e1310f0 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -279,7 +279,7 @@ class project_issue(base_stage, osv.osv):
         'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
-         }
+    }
 
     _group_by_full = {
         'stage_id': _read_group_stage_ids
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 4036217b886..12fac7802c6 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -28,6 +28,7 @@ from tools.translate import _
 
 class project_project(osv.osv):
     _inherit = 'project.project'
+
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
         res = super(project_project, self).onchange_partner_id(cr, uid, ids, part, context)
         if part and res and ('value' in res):
@@ -68,6 +69,7 @@ class project_project(osv.osv):
             'nodestroy': True,
             'help': help
         }
+
 project_project()
 
 class project_work(osv.osv):
@@ -81,7 +83,7 @@ class project_work(osv.osv):
             user_name = self.pool.get('res.users').read(cr, uid, [user_id], ['name'])[0]['name']
             raise osv.except_osv(_('Bad Configuration !'),
                  _('Please define employee for user "%s". You must create one.')% (user_name,))
-        emp = self.pool.get('hr.employee').browse(cr, uid, emp_id[0])
+        emp = emp_obj.browse(cr, uid, emp_id[0])
         if not emp.product_id:
             raise osv.except_osv(_('Bad Configuration !'),
                  _('Please define product on the related employee.\nFill in the timesheet tab of the employee form.'))
@@ -90,44 +92,44 @@ class project_work(osv.osv):
             raise osv.except_osv(_('Bad Configuration !'),
                  _('Please define journal on the related employee.\nFill in the timesheet tab of the employee form.'))
 
-        a = emp.product_id.product_tmpl_id.property_account_expense.id
-        if not a:
-            a = emp.product_id.categ_id.property_account_expense_categ.id
-            if not a:
+        acc_id = emp.product_id.product_tmpl_id.property_account_expense.id
+        if not acc_id:
+            acc_id = emp.product_id.categ_id.property_account_expense_categ.id
+            if not acc_id:
                 raise osv.except_osv(_('Bad Configuration !'),
                         _('Please define product and product category property account on the related employee.\nFill in the timesheet tab of the employee form.'))
+
         res['product_id'] = emp.product_id.id
         res['journal_id'] = emp.journal_id.id
-        res['general_account_id'] = a
+        res['general_account_id'] = acc_id
         res['product_uom_id'] = emp.product_id.uom_id.id
         return res
 
     def create(self, cr, uid, vals, *args, **kwargs):
-        obj_timesheet = self.pool.get('hr.analytic.timesheet')
-        project_obj = self.pool.get('project.project')
+        timesheet_obj = self.pool.get('hr.analytic.timesheet')
         task_obj = self.pool.get('project.task')
         uom_obj = self.pool.get('product.uom')
 
         vals_line = {}
         context = kwargs.get('context', {})
         if not context.get('no_analytic_entry',False):
-            obj_task = task_obj.browse(cr, uid, vals['task_id'])
+            task_obj = task_obj.browse(cr, uid, vals['task_id'])
             result = self.get_user_related_details(cr, uid, vals.get('user_id', uid))
-            vals_line['name'] = '%s: %s' % (tools.ustr(obj_task.name), tools.ustr(vals['name']) or '/')
+            vals_line['name'] = '%s: %s' % (tools.ustr(task_obj.name), tools.ustr(vals['name']) or '/')
             vals_line['user_id'] = vals['user_id']
             vals_line['product_id'] = result['product_id']
             vals_line['date'] = vals['date'][:10]
 
-            #calculate quantity based on employee's product's uom
+            # Calculate quantity based on employee's product's uom
             vals_line['unit_amount'] = vals['hours']
 
             default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
             if result['product_uom_id'] != default_uom:
                 vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])
-            acc_id = obj_task.project_id and obj_task.project_id.analytic_account_id.id or False
+            acc_id = task_obj.project_id and task_obj.project_id.analytic_account_id.id or False
             if acc_id:
                 vals_line['account_id'] = acc_id
-                res = obj_timesheet.on_change_account_id(cr, uid, False, acc_id)
+                res = timesheet_obj.on_change_account_id(cr, uid, False, acc_id)
                 if res.get('value'):
                     vals_line.update(res['value'])
                 vals_line['general_account_id'] = result['general_account_id']
@@ -137,27 +139,29 @@ class project_work(osv.osv):
                 amount = vals_line['unit_amount']
                 prod_id = vals_line['product_id']
                 unit = False
-                timeline_id = obj_timesheet.create(cr, uid, vals=vals_line, context=context)
+                timeline_id = timesheet_obj.create(cr, uid, vals=vals_line, context=context)
 
                 # Compute based on pricetype
-                amount_unit = obj_timesheet.on_change_unit_amount(cr, uid, timeline_id,
+                amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, timeline_id,
                     prod_id, amount, False, unit, vals_line['journal_id'], context=context)
                 if amount_unit and 'amount' in amount_unit.get('value',{}):
                     updv = { 'amount': amount_unit['value']['amount'] }
-                    obj_timesheet.write(cr, uid, [timeline_id], updv, context=context)
+                    timesheet_obj.write(cr, uid, [timeline_id], updv, context=context)
                 vals['hr_analytic_timesheet_id'] = timeline_id
         return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
 
     def write(self, cr, uid, ids, vals, context=None):
+        """
+        When a project task work gets updated, handle its hr analytic timesheet.
+        """
         if context is None:
             context = {}
         timesheet_obj = self.pool.get('hr.analytic.timesheet')
-        project_obj = self.pool.get('project.project')
         uom_obj = self.pool.get('product.uom')
         result = {}
 
         if isinstance(ids, (long, int)):
-            ids = [ids,]
+            ids = [ids]
 
         for task in self.browse(cr, uid, ids, context=context):
             line_id = task.hr_analytic_timesheet_id
@@ -165,25 +169,28 @@ class project_work(osv.osv):
                 # if a record is deleted from timesheet, the line_id will become
                 # null because of the foreign key on-delete=set null
                 continue
+
             vals_line = {}
             if 'name' in vals:
                 vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name']) or '/')
             if 'user_id' in vals:
                 vals_line['user_id'] = vals['user_id']
-                result = self.get_user_related_details(cr, uid, vals.get('user_id', task.user_id.id))
-                for fld in ('product_id', 'general_account_id', 'journal_id', 'product_uom_id'):
-                    if result.get(fld, False):
-                        vals_line[fld] = result[fld]
-
             if 'date' in vals:
                 vals_line['date'] = vals['date'][:10]
             if 'hours' in vals:
-                default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
                 vals_line['unit_amount'] = vals['hours']
                 prod_id = vals_line.get('product_id', line_id.product_id.id) # False may be set
 
-                if result.get('product_uom_id',False) and (not result['product_uom_id'] == default_uom):
-                    vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])
+                # Put user related details in analytic timesheet values
+                details = self.get_user_related_details(cr, uid, vals.get('user_id', task.user_id.id))
+                for field in ('product_id', 'general_account_id', 'journal_id', 'product_uom_id'):
+                    if details.get(field, False):
+                        vals_line[field] = details[field]
+
+                # Check if user's default UOM differs from product's UOM
+                user_default_uom_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
+                if details.get('product_uom_id', False) and details['product_uom_id'] != user_default_uom_id:
+                    vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, user_default_uom_id, vals['hours'], details['product_uom_id'])
 
                 # Compute based on pricetype
                 amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, line_id.id,
@@ -203,7 +210,7 @@ class project_work(osv.osv):
         for task in self.browse(cr, uid, ids):
             if task.hr_analytic_timesheet_id:
                 hat_ids.append(task.hr_analytic_timesheet_id.id)
-#            delete entry from timesheet too while deleting entry to task.
+        # Delete entry from timesheet too while deleting entry to task.
         if hat_ids:
             hat_obj.unlink(cr, uid, hat_ids, *args, **kwargs)
         return super(project_work,self).unlink(cr, uid, ids, *args, **kwargs)
@@ -231,12 +238,11 @@ class task(osv.osv):
         if vals.get('project_id',False) or vals.get('name',False):
             vals_line = {}
             hr_anlytic_timesheet = self.pool.get('hr.analytic.timesheet')
-            task_obj_l = self.browse(cr, uid, ids, context=context)
             if vals.get('project_id',False):
                 project_obj = self.pool.get('project.project').browse(cr, uid, vals['project_id'], context=context)
                 acc_id = project_obj.analytic_account_id.id
 
-            for task_obj in task_obj_l:
+            for task_obj in self.browse(cr, uid, ids, context=context):
                 if len(task_obj.work_ids):
                     for task_work in task_obj.work_ids:
                         if not task_work.hr_analytic_timesheet_id:
@@ -253,16 +259,19 @@ task()
 
 class res_partner(osv.osv):
     _inherit = 'res.partner'
+
     def unlink(self, cursor, user, ids, context=None):
         parnter_id=self.pool.get('project.project').search(cursor, user, [('partner_id', 'in', ids)])
         if parnter_id:
             raise osv.except_osv(_('Invalid Action!'), _('You cannot delete a partner which is assigned to project, but you can uncheck the active box.'))
         return super(res_partner,self).unlink(cursor, user, ids,
                 context=context)
+
 res_partner()
 
 class account_analytic_line(osv.osv):
    _inherit = "account.analytic.line"
+
    def on_change_account_id(self, cr, uid, ids, account_id):
        res = {}
        if not account_id:
@@ -274,5 +283,7 @@ class account_analytic_line(osv.osv):
        if acc.state == 'close' or acc.state == 'cancelled':
            raise osv.except_osv(_('Invalid Analytic Account !'), _('You cannot select a Analytic Account which is in Close or Cancelled state.'))
        return res
+
 account_analytic_line()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: