From 864423b1f469586ca8747fc16b98ecd7240e0981 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 22 Nov 2010 18:38:29 +0530 Subject: [PATCH] [IMP] inmprovement in sale for Logistics and in sale/stock.py bzr revid: aag@tinyerp.co.in-20101122130829-y2vwtrtndgy1s4ne --- addons/sale/i18n/de.po | 2 +- addons/sale/stock.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po index e725e5fac59..fece92aa489 100644 --- a/addons/sale/i18n/de.po +++ b/addons/sale/i18n/de.po @@ -1512,7 +1512,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: