pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]: Merge with lp:~openerp-commiter/openobject-addons/trunk-addons-aag

Browse Source 
bzr revid: rpa@tinyerp.com-20101122135153-0hu11k06zk4xm5a3
This commit is contained in:
rpa (Open ERP)
2010-11-22 19:21:53 +05:30
parent 32c6c5229b 864423b1f4
commit 93d742392f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale/i18n/de.po
+1 -1
View File
@@ -1551,7 +1551,7 @@ msgstr "Verkäufe je Verkäufer"
#. module: sale
#: view:sale.order:0
msgid "Logistic"
msgid "Logistics"
msgstr "Logistik"
#. module: sale
addons/sale/stock.py
+1 -1
View File
@@ -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: