[MERGE] From Joel GrandGuillaume (Camp2Camp)

bzr revid: stephane@openerp.com-20100325133524-bopyjvq6dr6xq0xr

diff --cc addons/account/account_analytic_line.py
Simple merge

diff --cc addons/hr_expense/hr_expense.py
index bb6a4d3,62988a9..3c99276
--- 1/addons/hr_expense/hr_expense.py
--- 2/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@@ -217,12 -215,13 +217,13 @@@ class hr_expense_line(osv.osv)
          if product_id:
              product=self.pool.get('product.product').browse(cr,uid,product_id, context=context)
              v['name']=product.name
 -            
 +
              # Compute based on pricetype of employee company
              pricetype_id = self.pool.get('hr.employee').browse(cr,uid,employee_id).user_id.company_id.property_valuation_price_type.id
+             context['currency_id']=self.pool.get('hr.employee').browse(cr,uid,employee_id).user_id.company_id.currency_id.id
              pricetype=self.pool.get('product.price.type').browse(cr,uid,pricetype_id)
              amount_unit=product.price_get(pricetype.field, context)[product.id]
 -            
 +
              v['unit_amount']=amount_unit
              if not uom_id:
                  v['uom_id']=product.uom_id.id

diff --cc addons/product/product.py
Simple merge

diff --cc addons/stock/stock.py
Simple merge

diff --cc addons/stock/wizard/wizard_partial_picking.py
Simple merge