[MERGE]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20101125053205-1ttc6aqfdmw3543y

diff --cc addons/mrp/i18n/es.po
Simple merge

diff --cc addons/procurement/i18n/mn.po
Simple merge

diff --cc addons/sale/i18n/es.po
Simple merge

diff --cc addons/sale/i18n/pl.po
Simple merge

diff --cc addons/sale/i18n/sv.po
Simple merge

diff --cc addons/sale/i18n/vi.po
Simple merge

diff --cc addons/sale/sale_view.xml
index c83f1cd,82ec4d6..adafd19
--- 1/addons/sale/sale_view.xml
--- 2/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@@ -138,7 -138,7 +138,7 @@@
                                                  <field groups="product.group_uos" name="product_uos_qty"/>
                                                  <field groups="product.group_uos" name="product_uos"/>
                                              <field name="product_uom"
--                                                on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
++                                                on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)" domain="[('category_id','=', product_id.uom_id.category_id.id)]"/>
                                              <field
                                                  name="product_packaging"
                                                  context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"