← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/rpa-dev-addons2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons2

 

rpa (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/rpa-dev-addons2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons2.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #511193 unit factor is limited to 5 zeros
  https://bugs.launchpad.net/bugs/511193
  #535401 Production orders ignore chained location at destination
  https://bugs.launchpad.net/bugs/535401
  #641110 Cannot record outgoing stock move with prodlot for consumable products
  https://bugs.launchpad.net/bugs/641110
  #663662 [6.0rc1] bug in 'request a quotation' from PR
  https://bugs.launchpad.net/bugs/663662
  #663999 [6.0RC1] delivery - usability issues
  https://bugs.launchpad.net/bugs/663999
  #664344 Unclear help texts in product_expiry
  https://bugs.launchpad.net/bugs/664344
  #666781 useless list comprehension and browse in split_moves
  https://bugs.launchpad.net/bugs/666781
  #667327 [v6 RC1] Consume products in Production order not working in GTK client
  https://bugs.launchpad.net/bugs/667327
  #667558 product_visible_discount uses discount in changing UoM in sale order of OpenERP v6.0 rc1
  https://bugs.launchpad.net/bugs/667558
  #683718 [v6 RC1] stock addon: _product_value badly implemented
  https://bugs.launchpad.net/bugs/683718
  #690034 no translation in pricelist report
  https://bugs.launchpad.net/bugs/690034

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/rpa-dev-addons2/+merge/45028

fixes in purchase, product
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/rpa-dev-addons2/+merge/45028
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/rpa-dev-addons2.
=== modified file 'product/report/product_pricelist.py'
--- product/report/product_pricelist.py	2010-10-01 14:14:50 +0000
+++ product/report/product_pricelist.py	2011-01-03 12:59:15 +0000
@@ -62,18 +62,18 @@
 
     def _get_pricelist(self, pricelist_id):
         pool = pooler.get_pool(self.cr.dbname)
-        pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['name'])[0]
+        pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['name'], context=self.localcontext)[0]
         return pricelist['name']
 
     def _get_currency(self, pricelist_id):
         pool = pooler.get_pool(self.cr.dbname)
-        pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'])[0]
+        pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'], context=self.localcontext)[0]
         return pricelist['currency_id'][1]
 
     def _get_currency_symbol(self, pricelist_id):
         pool = pooler.get_pool(self.cr.dbname)
-        pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'])[0]
-        symbol = pool.get('res.currency').read(self.cr, self.uid, [pricelist['currency_id'][0]], ['symbol'])[0]
+        pricelist = pool.get('product.pricelist').read(self.cr, self.uid, [pricelist_id], ['currency_id'], context=self.localcontext)[0]
+        symbol = pool.get('res.currency').read(self.cr, self.uid, [pricelist['currency_id'][0]], ['symbol'], context=self.localcontext)[0]
         return symbol['symbol'] or ''
 
     def _get_categories(self, products,form):
@@ -88,13 +88,13 @@
             if product.categ_id.id not in cat_ids:
                 cat_ids.append(product.categ_id.id)
 
-        cats = pool.get('product.category').name_get(self.cr, self.uid, cat_ids)
+        cats = pool.get('product.category').name_get(self.cr, self.uid, cat_ids, context=self.localcontext)
         if not cats:
             return res
         for cat in cats:
-            product_ids=pool.get('product.product').search(self.cr, self.uid, [('id','in',pro_ids),('categ_id','=',cat[0])])
+            product_ids=pool.get('product.product').search(self.cr, self.uid, [('id', 'in', pro_ids), ('categ_id', '=', cat[0])], context=self.localcontext)
             products = []
-            for product in pool.get('product.product').read(self.cr, self.uid, product_ids, ['name','code']):
+            for product in pool.get('product.product').read(self.cr, self.uid, product_ids, ['name', 'code'], context=self.localcontext):
                 val = {
                      'id':product['id'],
                      'name':product['name'],
@@ -114,7 +114,7 @@
     def _get_price(self,pricelist_id, product_id,qty):
         sale_price_digits = self.get_digits(dp='Sale Price')
         pool = pooler.get_pool(self.cr.dbname)
-        price_dict = pool.get('product.pricelist').price_get(self.cr, self.uid, [pricelist_id], product_id,qty)
+        price_dict = pool.get('product.pricelist').price_get(self.cr, self.uid, [pricelist_id], product_id, qty, context=self.localcontext)
         if price_dict[pricelist_id]:
             price = self.formatLang(price_dict[pricelist_id], digits=sale_price_digits)
         else:

=== modified file 'purchase/i18n/purchase.pot'
--- purchase/i18n/purchase.pot	2010-12-21 19:47:51 +0000
+++ purchase/i18n/purchase.pot	2011-01-03 12:59:15 +0000
@@ -539,7 +539,7 @@
 
 #. module: purchase
 #: view:purchase.order:0
-msgid "To be Invoiced"
+msgid "No Invoice"
 msgstr ""
 
 #. module: purchase

=== modified file 'purchase/purchase_demo.xml'
--- purchase/purchase_demo.xml	2010-12-02 11:51:53 +0000
+++ purchase/purchase_demo.xml	2011-01-03 12:59:15 +0000
@@ -48,7 +48,7 @@
             <field name="order_id" ref="order_purchase2"/>
             <field name="date_planned">2010/09/15</field>
             <field name="name">[PC3] Medium PC</field>
-            <field name="product_id" ref="product.product_product_pc1"/>
+            <field name="product_id" ref="product.product_product_pc3"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">900</field>
             <field name="product_qty">1</field>


Follow ups