diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index 6d8d5a17bd1..5a5d0528cf3 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -55,7 +55,7 @@ class stock_picking(osv.osv):
         'weight': fields.function(_cal_weight, method=True, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'),
                   store={
                  'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
-                 'stock.move': (_get_picking_line, ['product_id','product_uos_qty'], 20),
+                 'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
                  }),
         }
 
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index a48c86b49ce..890abe49bb1 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -436,7 +436,7 @@ class sale_order(osv.osv):
             'currency_id': order.pricelist_id.currency_id.id,
             'comment': order.note,
             'payment_term': pay_term,
-            'fiscal_position': order.partner_id.property_account_position.id or order.fiscal_position.id,
+            'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,
             'date_invoice' : context.get('date_invoice',False),
             'company_id' : order.company_id.id,
         }
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index bb22000f8e1..d26631a5bfb 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -82,7 +82,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
                 'currency_id' : order.pricelist_id.currency_id.id,
                 'comment': order.note,
                 'payment_term': pay_term,
-                'fiscal_position': order.partner_id.property_account_position.id or order.fiscal_position.id
+                'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,
             }
             inv_id = self.pool.get('account.invoice').create(cr, uid, inv)
             return inv_id
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index a78f548617b..ce06519f123 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -95,7 +95,7 @@ class sale_advance_payment_inv(osv.osv_memory):
                     'currency_id' :sale.pricelist_id.currency_id.id,
                     'comment': '',
                     'payment_term':sale.payment_term.id,
-                    'fiscal_position': sale.partner_id.property_account_position.id or sale.fiscal_position.id
+                    'fiscal_position': sale.fiscal_position.id or sale.partner_id.property_account_position.id
                     }
                 
                 inv_id = inv_obj.create(cr, uid, inv)