diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index 20cc896a11d..03e78ef30b6 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/i18n/de.po
@@ -1551,7 +1551,7 @@ msgstr "Verkäufe je Verkäufer"
 #. module: sale
 #: view:sale.order:0
 
-msgid "Logistic"
+msgid "Logistics"
 msgstr "Logistik"
 
 #. module: sale
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index c020389ba19..622c4917d7d 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -70,7 +70,7 @@ class stock_picking(osv.osv):
     def _get_price_unit_invoice(self, cursor, user, move_line, type):
         if move_line.sale_line_id and move_line.sale_line_id.product_id.id == move_line.product_id.id:
             from_uom_id = move_line.product_id.uom_id.id
-            to_uom_id = move_line.product_id.uos_id.id
+            to_uom_id = move_line.product_id.uos_id and move_line.product_id.uos_id.id or False
             price = move_line.sale_line_id.price_unit
             coeff = move_line.product_id.uos_coeff
             if from_uom_id != to_uom_id  and coeff != 0: