diff --git a/addons/product/product.py b/addons/product/product.py
index cbdb99ccef2..ca23d86b0f1 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -84,7 +84,7 @@ class product_uom(osv.osv):
         'factor': fields.float('Rate', digits=(12, 6), required=True,
             help='The coefficient for the formula:\n' \
                     '1 (base unit) = coeff (this unit). Rate = 1 / Factor.'),
-        'factor_inv': fields.function(_factor, fnct_inv=_factor_inv, digits=(12, 6),
+        'factor_inv': fields.function(_factor, digits=(12, 6),
             method=True, string='Factor',
             help='The coefficient for the formula:\n' \
                     'coeff (base unit) = 1 (this unit). Factor = 1 / Rate.'),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index e7296005122..ecc1ae7cc01 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -246,8 +246,8 @@
                 <tree string="Units of Measure">
                     <field name="name"/>
                     <field name="category_id"/>
-                    <field name="factor_inv" on_change="onchange_factor_inv(factor_inv)"/>
-                    <field name="factor" on_change="onchange_factor(factor)"/>
+                    <field name="factor"/>
+                    <field name="factor_inv"/>
                     <field name="rounding"/>
                 </tree>
             </field>
@@ -261,8 +261,8 @@
                 <form string="Units of Measure">
                     <field name="name" select="1"/>
                     <field name="category_id" select="1"/>
-                    <field name="factor_inv" select="1"/>
                     <field name="factor" select="1"/>
+                    <field name="factor_inv" select="1"/>
                     <field name="rounding"/>
                     <field name="active"/>
                 </form>
diff --git a/addons/project/report/_date_compute.py b/addons/project/report/_date_compute.py
index beca7e5a621..85458ee0175 100644
--- a/addons/project/report/_date_compute.py
+++ b/addons/project/report/_date_compute.py
@@ -59,7 +59,7 @@ def _compute_tasks(cr, uid, task_list, date_begin):
 
             # Compute the closing date of the task
             tasks[task.id] = []
-            res = pooler.get_pool(cr.dbname).get('hr.timesheet.group').interval_get(cr, uid, task.project_id.timesheet_id.id, date_start, task.planned_hours)
+            res = pooler.get_pool(cr.dbname).get('hr.timesheet.group').interval_get(cr, uid, task.project_id.timesheet_id.id, date_start, task.remaining_hours)
             for (d1,d2) in res:
                 tasks[task.id].append((d1, d2, task.name, task.user_id.login))
             date_close = tasks[task.id][-1][1]
diff --git a/addons/project/report/gantt.py b/addons/project/report/gantt.py
index 1caa71b423f..ab4d947caa0 100644
--- a/addons/project/report/gantt.py
+++ b/addons/project/report/gantt.py
@@ -51,6 +51,7 @@ class GanttCanvas(object):
                 self._min = x[0]
             if x[1]>self._max or not self._max:
                 self._max = x[1]
+            print name, self._conv[1](x[1])
             self._datas[user].append( (name, x))
             self._names.setdefault(name, x[0])
 
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index bcf1a4592ee..aa2717e58aa 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -163,7 +163,7 @@ class stock_picking(osv.osv):
                     account_analytic_id = self._get_account_analytic_invoice(cursor,
                             user, picking, sale_line)
 
-                    account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, picking.sale_id.partner_id, account_id)
+                    account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, picking.sale_id.partner_id.property_account_position, account_id)
                     invoice = invoices[result[picking.id]]
                     invoice_line_id = invoice_line_obj.create(cursor, user, {
                         'name': name,
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index ab384a5ef08..d9e50d2b5ba 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -135,9 +135,9 @@
         </td>
         <td>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
-          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]] </para>
-          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.zip) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.city) or '' ]] [[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or '' ]] </para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.title) or '' ]] [[ (picking.address_id and picking.address_id.name) or '' ]] </para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street) or '' ]] </para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.zip) or '' ]] [[ (picking.address_id and picking.address_id.city) or '' ]] [[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or '' ]] </para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
         </td>
       </tr>
@@ -176,7 +176,7 @@
           <para style="terp_tblheader_General_Centre">Expected Shipping Date </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">weight</para>
+          <para style="terp_tblheader_General_Centre"></para>
         </td>
       </tr>
     </blockTable>
@@ -186,13 +186,13 @@
           <para style="terp_default_Centre_8">[[ picking.origin ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
+          <para style="terp_default_Centre_8">[[ (picking.address_id and picking.address_id.title) or '' ]] [[ (picking.address_id and picking.address_id.name) or '' ]] </para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ picking.weight or '']] </para>
+          <para style="terp_default_Centre_8"></para>
         </td>
       </tr>
     </blockTable>