Merge lp:~openbig/bigconsulting/product_price_information_patch into lp:bigconsulting

[gpa(OpenERP)]

Apply the changes of patch on the sales_shop_stock_availability and product_price_informations

=== modified file 'product_price_information/product_price_info.py'
--- product_price_information/product_price_info.py	2010-06-29 06:24:04 +0000
+++ product_price_information/product_price_info.py	2010-07-19 15:15:54 +0000
@@ -20,7 +20,6 @@
 #
 ##############################################################################
 from osv import fields, osv
-from tools import config
 
 class sale_order_line(osv.osv):
     _inherit = "sale.order.line"
@@ -28,11 +27,13 @@
         'sale_price_unit_tax': fields.float('Sale price W/O taxes'),
     }
     def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
-            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
-            lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False):
-        tax_obj = self.pool.get('account.tax')
+                          uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+                          lang=False, update_tax=True, date_order=False, packaging=False,
+                          fiscal_position=False, flag=False):
+
         result = super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty,
-            uom, qty_uos, uos, name, partner_id, lang, update_tax, date_order, packaging, fiscal_position, flag)
+                                                                uom, qty_uos, uos, name, partner_id, lang,
+                                                                update_tax, date_order, packaging, fiscal_position, flag)
         if product:
             context = {'lang': lang, 'partner_id': partner_id, 'qty': qty}
             product_obj = self.pool.get('product.product').browse(cr, uid, product, context=context)
@@ -82,24 +83,25 @@
     }
 
     def set_default(self, cr, uid, ids, context=None):
-        for o in self.browse(cr, uid, ids, context=context):
-            ir_values_obj = self.pool.get('ir.values')
-            ir_values_obj.set(cr, uid, 'default', False, 'price_type', ['sale.shop'], o.price_type)
+        ir_values_obj = self.pool.get('ir.values')
+        for obj in self.browse(cr, uid, ids, context=context):
+            ir_values_obj.set(cr, uid, 'default', False, 'price_type', ['sale.shop'], obj.price_type)
+
         return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-         }
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'ir.actions.configuration.wizard',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+        }
 
     def action_cancel(self,cr,uid,ids,conect=None):
         return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'ir.actions.configuration.wizard',
+            'type': 'ir.actions.act_window',
+            'target':'new',
         }
 
 sale_shop_price_method_policy()
@@ -110,100 +112,54 @@
     _inherit = "product.product"
     _description = "Product"
 
-    def _get_all_values(self, cr, uid, ids, name, arg, context={}):
+    def _get_all_values(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        product = ids
         product_obj = self.pool.get('product.product')
-        obj2 = self.pool.get('product.pricelist.item')
-        obj = self.pool.get('product.pricelist')
-        obj3 = self.pool.get('sale.order.line')
+        pricelist_proxy = self.pool.get('product.pricelist')
+        sol_proxy = self.pool.get('sale.order.line')
         res_partner_obj = self.pool.get("res.partner")
-        for line in product_obj.browse(cr, uid, product, context=context):
+        for line in product_obj.browse(cr, uid, ids, context=context):
+            c_price1, c_price2, list_price1, last_price, qty_last = 0.0, 0.0, 0.0, 0.0, 0.0
+
             partner = line.pi_partner_id.id
             pricelist = line.pi_pricelist_id.id
             qty1 = line.pi_quantity1
             qty2 = line.pi_quantity2
             if pricelist != False:
-                val1 = obj.price_get(cr, uid, [pricelist], line.id, qty1, partner)
-                for key,values  in val1.items():
-                    c_price1 = values
-                val2 = obj.price_get(cr, uid, [pricelist], line.id, qty2, partner)
-                for key,values  in val2.items():
-                    c_price2 = values
-#                item_line = obj2.search(cr,uid,[])
-#                list = []
-#                for line2 in obj2.browse(cr, uid, item_line, context=context):
-#                    if line.id == line2.product_id.id:
-#                        list.append(line.min_quantity)
-#                    if list == []:
-#                        m_qty = 1.0
-#                    else:
-#                        m_qty = max(list)
-#                    val3 = obj.price_get(cr, uid, [pricelist], line.id, m_qty, partner)
-#                    for key,values  in val3.items():
-#                        c_price3 = values
-                    sale_price_list = res_partner_obj.browse(cr, uid, partner).property_product_pricelist.id
-                    val_sale = obj.price_get(cr, uid, [sale_price_list], line.id, qty1, partner)
-                    for key,values  in val_sale.items():
-                        list_price1 = values
-                    read_id = obj3.search(cr,uid,[('product_id','=',line.id)])
-                    if read_id == []:
-                        last_price = 0.0
-                        qty_last = 0.0
-                        last_list_price = 0.0
-                    else:
-                        last_id = max(read_id)
-                        last_brw = obj3.browse(cr,uid,[last_id],context=context)
-                        for rec in last_brw:
-                            product2 = rec.product_id.id
-                            if line.id == product2:
-                                last_price = rec.price_unit
-                                qty_last = rec.product_uom_qty
-#                                val_last = obj.price_get(cr, uid,[pricelist], line.id, qty_last)
-#                                for key,values  in val_last.items():
-#                                    last_list_price = values
-
-                    for id in ids:
-                        res[id] = {}
-                        if 'pi_customer_prices1' in name:
-                             res[id]['pi_customer_prices1'] = c_price1
-                        if 'pi_customer_prices2' in name:
-                             res[id]['pi_customer_prices2'] = c_price2
-                        if 'pi_list_prices1' in name:
-                             res[id]['pi_list_prices1'] = list_price1
-#                        if 'pi_next_better_price_qty'in name:
-#                             res[id]['pi_next_better_price_qty']= m_qty
-#                        if 'pi_best_price_on_qty'in name:
-#                             res[id]['pi_best_price_on_qty']= c_price3
-                        if 'pi_last_customer_prices'in name:
-                             res[id]['pi_last_customer_prices']= last_price
-#                        if 'pi_last_list_prices'in name:
-#                             res[id]['pi_last_list_prices']= last_list_price
-                        if 'pi_qty_buyed'in name:
-                             res[id]['pi_qty_buyed']= qty_last
-
-            else:
-                 for id in ids:
-                        res[id] = {}
-                        if 'pi_customer_prices1' in name:
-                             res[id]['pi_customer_prices1'] = 0.0
-                        if 'pi_customer_prices2' in name:
-                            res[id]['pi_customer_prices2'] = 0.0
-                        if 'pi_list_prices1' in name:
-                            res[id]['pi_list_prices1'] = 0.0
-#                        if 'pi_next_better_price_qty'in name:
-#                            res[id]['pi_next_better_price_qty']= 0.0
-#                        if 'pi_best_price_on_qty'in name:
-#                            res[id]['pi_best_price_on_qty']= 0.0
-                        if 'pi_last_customer_prices'in name:
-                            res[id]['pi_last_customer_prices']= 0.0
-#                        if 'pi_last_list_prices'in name:
-#                            res[id]['pi_last_list_prices']= 0.0
-                        if 'pi_qty_buyed'in name:
-                            res[id]['pi_qty_buyed']= 0.0
+                values = pricelist_proxy.price_get(cr, uid, [pricelist], line.id, qty1, partner)
+                c_price1 = values[pricelist]
+
+                values = pricelist_proxy.price_get(cr, uid, [pricelist], line.id, qty2, partner)
+                c_price2 = values[pricelist]
+
+                sale_price_list = res_partner_obj.browse(cr, uid, partner).property_product_pricelist.id
+                values = pricelist_proxy.price_get(cr, uid, [sale_price_list], line.id, qty1, partner)
+                list_price1 = values[sale_price_list]
+
+                read_ids = sol_proxy.search(cr,uid,[('product_id','=',line.id)])
+                last_price, qty_last = 0.0, 0.0
+                if read_ids:
+                    last_id = max(read_ids)
+                    last_brw = sol_proxy.browse(cr,uid,[last_id],context=context)
+                    if line.id == last_brw[0].product_id.id:
+                        last_price = last_brw[0].price_unit
+                        qty_last = last_brw[0].product_uom_qty
+            res[line.id] = {}
+
+            if 'pi_customer_prices1' in name:
+                 res[line.id]['pi_customer_prices1'] = c_price1 or 0.0
+            if 'pi_customer_prices2' in name:
+                 res[line.id]['pi_customer_prices2'] = c_price2 or 0.0
+            if 'pi_list_prices1' in name:
+                 res[line.id]['pi_list_prices1'] = list_price1 or 0.0
+            if 'pi_last_customer_prices'in name:
+                 res[line.id]['pi_last_customer_prices']= last_price or 0.0
+            if 'pi_qty_buyed'in name:
+                 res[line.id]['pi_qty_buyed']= qty_last or 0.0
+
         return res
 
-    def button_dummy(self, cr, uid, ids, context={}):
+    def button_dummy(self, cr, uid, ids, context=None):
         return True
 
     _columns = {
@@ -214,15 +170,12 @@
         'pi_customer_prices1': fields.function(_get_all_values, method=True, type='float', string='Costomer Prices',multi='pi_customer_prices1',help='Costomer Price For Quantity1 & Quantity2'),
         'pi_customer_prices2': fields.function(_get_all_values, method=True, type='float', string='Costomer Prices',multi='pi_customer_prices2'),
         'pi_list_prices1': fields.function(_get_all_values, method=True, type='float', string='List Prices',multi='pi_list_prices1',help= 'Price Of Public Pricelist'),
-#        'pi_next_better_price_qty': fields.function(_get_all_values, method=True, type='float', string='Next Better Price Qty',multi='pi_next_better_price_qty'),
-#        'pi_best_price_on_qty': fields.function(_get_all_values, method=True, type='float', string='Best Price On Quantity',multi='pi_best_price_on_qty'),
         'pi_last_customer_prices': fields.function(_get_all_values, method=True, type='float', string='Last Costomer Prices',multi='pi_last_customer_prices'),
-#        'pi_last_list_prices': fields.function(_get_all_values, method=True, type='float', string='Last List Prices',multi='pi_last_list_prices'),
         'pi_qty_buyed': fields.function(_get_all_values, method=True, type='float', string='Quantity Buyed',multi='pi_qty_buyed',help='Last Costomer Buyed Quantity'),
-        }
+    }
     _defaults = {
         'pi_quantity1': lambda *a: 1.0,
         'pi_quantity2': lambda *a: 5.0,
-         }
+    }
 product_product()
 

=== modified file 'product_price_information/wizard/sale_prize_information.py'
--- product_price_information/wizard/sale_prize_information.py	2010-06-29 06:24:04 +0000
+++ product_price_information/wizard/sale_prize_information.py	2010-07-19 15:15:54 +0000
@@ -34,76 +34,55 @@
         'customer_prices2':fields.float('Costomer Prices'),
         'last_customer_prices':fields.float('Last Costomer Prices'),
         'list_prices1':fields.float('List Prices',help= 'Price Of Public Pricelist'),
-#        'last_list_prices':fields.float('Last List Prices'),
-#        'next_better_price_qty':fields.float('Next Better Price Qty'),
-#        'best_price_on_qty':fields.float('Best Price On Quantity'),
         'qty_buyed':fields.float('Quantity Buyed',help='Last Costomer Buyed Quantity'),
-                }
+    }
+
     _defaults = {
         'quantity1': lambda *a: 1.0,
         'quantity2': lambda *a: 5.0,
-         }
+    }
 
     def set_default(self, cr, uid, ids, context=None):
-            obj = self.pool.get('product.pricelist')
-            obj2 = self.pool.get('product.pricelist.item')
-            obj3 = self.pool.get('sale.order.line')
-            obj_product = self.pool.get("product.product")
-            res_partner_obj = self.pool.get("res.partner")
-            form = self.read(cr, uid, ids, [])[0]
-            partner = form['partner_id']
-            pricelist = form['pricelist_id']
-            product = form['product_id']
-            qty1 = form['quantity1']
-            qty2 = form['quantity2']
-            val1 = obj.price_get(cr, uid, [pricelist], product, qty1, partner)
-            for key,values  in val1.items():
-                c_price1 = values
-            val2 = obj.price_get(cr, uid, [pricelist], product, qty2, partner)
-            for key,values  in val2.items():
-                c_price2 = values
-#            item_line = obj2.search(cr,uid,[])
-#            list = []
-#            for line in obj2.browse(cr, uid,item_line, context=context):
-#                if product == line.product_id.id:
-#                        list.append(line.min_quantity)
-#            if list == []:
-#                m_qty = 1.0
-#            else:
-#                m_qty = max(list)
-#            val3 = obj.price_get(cr, uid, ids, product, m_qty, partner)
-#            for key,values  in val3.items():
-#                c_price3 = values
-            sale_price_list = res_partner_obj.browse(cr, uid, partner).property_product_pricelist.id
-            val_sale = obj.price_get(cr, uid, [sale_price_list], product, qty1, partner)
-            for key,values  in val_sale.items():
-                list_price1 = values
-            read_id = obj3.search(cr,uid,[('product_id','=',product)])
-            if read_id == []:
-                last_price = 0.0
-                qty_last = 0.0
-                last_list_price = 0.0
-            else:
-                last_id = max(read_id)
-                last_brw = obj3.browse(cr,uid,[last_id],context=context)
-                for rec in last_brw:
-                     product2 = rec.product_id.id
-                     if product == product2:
-                         last_price = rec.price_unit
-                         qty_last = rec.product_uom_qty
-#                         val_last = obj.price_get(cr, uid,ids, product2, qty_last)
-#                         for key,values  in val_last.items():
-#                             last_list_price = values
-#            self.write(cr , uid, ids,{'customer_prices1':c_price1,'customer_prices2':c_price2,'list_prices1':list_price1,'list_prices2':list_price2,'next_better_price_qty':m_qty,'best_price_on_qty':c_price3,'last_customer_prices':last_price,'qty_buyed':qty_last,'last_list_prices':last_list_price},context=context)
-            self.write(cr , uid, ids,{'customer_prices1':c_price1,'customer_prices2':c_price2,'list_prices1':list_price1,'last_customer_prices':last_price,'qty_buyed':qty_last},context=context)
-            value = {
-                    'name': 'Sale Prize Information',
-                    'view_type': 'form',
-                    'view_mode': 'tree,form',
-                    'res_model': 'sale.prize.information',
-                    'type': 'ir.actions.act_window',
-                    }
+        pricelist_proxy = self.pool.get('product.pricelist')
+        sol_proxy = self.pool.get('sale.order.line')
+        res_partner_proxy = self.pool.get("res.partner")
+        form = self.read(cr, uid, ids, [])[0]
+        partner = form['partner_id']
+        pricelist = form['pricelist_id']
+        product = form['product_id']
+        qty1 = form['quantity1']
+        qty2 = form['quantity2']
+
+        # Get the prices of the product
+        values = pricelist_proxy.price_get(cr, uid, [pricelist], product, qty1, partner)
+        c_price1 = values[pricelist]
+
+        values = pricelist_proxy.price_get(cr, uid, [pricelist], product, qty2, partner)
+        c_price2 = values[pricelist]
+
+        sale_price_list = res_partner_proxy.browse(cr, uid, partner).property_product_pricelist.id
+        values = pricelist_proxy.price_get(cr, uid, [sale_price_list], product, qty1, partner)
+        list_price1 = values[sale_price_list]
+
+        read_ids = sol_proxy.search(cr,uid,[('product_id','=',product)])
+        last_price, qty_last = 0.0, 0.0
+        if read_ids:
+            last_id = max(read_ids)
+            last_brw = sol_proxy.browse(cr,uid,[last_id],context=context)
+
+            if product == last_brw[0].product_id.id:
+                last_price = last_brw[0].price_unit
+                qty_last = last_brw[0].product_uom_qty
+
+        values = {
+            'customer_prices1':c_price1,
+            'customer_prices2':c_price2,
+            'list_prices1':list_price1,
+            'last_customer_prices':last_price,
+            'qty_buyed':qty_last
+        }
+        self.write(cr , uid, ids, values, context=context)
 
 sale_prize_information()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'product_price_information/wizard/sale_prize_information_view.xml'
--- product_price_information/wizard/sale_prize_information_view.xml	2010-06-25 10:12:24 +0000
+++ product_price_information/wizard/sale_prize_information_view.xml	2010-07-19 15:15:54 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-		<record id="view_sale_prize_information" model="ir.ui.view">
+        <record id="view_sale_prize_information" model="ir.ui.view">
             <field name="name">Sale Prize Information</field>
             <field name="model">sale.prize.information</field>
             <field name="type">form</field>
@@ -18,44 +18,41 @@
                                 <field name="customer_prices2" nolabel="1"/>
                                 <field name="list_prices1"/>
                             </group>
-<!--                                <field name="next_better_price_qty"/>-->
-<!--                                <field name="best_price_on_qty"/>-->
-                                <newline/>
+                            <newline/>
                         </group>
                         <group col="2" colspan="3">
                             <field name="pricelist_id"/>
-                                <group col="4" colspan="2">
-								    <field name="quantity1"/>
-									<field name="quantity2"/>
-								</group>
-								<separator string="Price on Last Sale"/>
-								<newline/>
-								<field name="last_customer_prices"/>
-<!--								<field name="last_list_prices"/>-->
-								<field name="qty_buyed"/>
-						</group>
-					</group>
-					 <group col="2" colspan="4">
-					     <button icon="gtk-cancel" special="cancel" string="Cancel" />
-					     <button icon="gtk-ok" string="Calculate" name="set_default" type="object"/>
-					 </group>
-				 </form>
+                            <group col="4" colspan="2">
+                                <field name="quantity1"/>
+                                <field name="quantity2"/>
+                            </group>
+                            <separator string="Price on Last Sale"/>
+                            <newline/>
+                            <field name="last_customer_prices"/>
+                            <field name="qty_buyed"/>
+                        </group>
+                    </group>
+                    <group col="2" colspan="4">
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="gtk-ok" string="Calculate" name="set_default" type="object"/>
+                    </group>
+                </form>
             </field>
         </record>
 
-         <record id="action_sale_prize_information" model="ir.actions.act_window">
+        <record id="action_sale_prize_information" model="ir.actions.act_window">
             <field name="name">Sale Price Information</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.prize.information</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
-           <field name="view_id" ref="view_sale_prize_information"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="view_sale_prize_information"/>
+            <field name="target">new</field>
         </record>
 
-	        <menuitem action="action_sale_prize_information"
-                id="menu_sale_prize_information"
-                 parent="sale.menu_sale_root"/>
+        <menuitem action="action_sale_prize_information"
+            id="menu_sale_prize_information"
+            parent="sale.menu_sale_root"/>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>

=== modified file 'sales_shop_stock_availability/sales_shop_stock_availability.py'
--- sales_shop_stock_availability/sales_shop_stock_availability.py	2010-06-29 13:31:14 +0000
+++ sales_shop_stock_availability/sales_shop_stock_availability.py	2010-07-19 15:15:54 +0000
@@ -26,17 +26,19 @@
 class product_product(osv.osv):
     _inherit = "product.product"
 
-    def _product_available(self, cr, uid, ids, field_names=None, arg=False, context={}):
+    def _product_available(self, cr, uid, ids, field_names=None, arg=False, context=None):
         res = {}
         product_obj = self.pool.get('product.product')
         common_ids = product_obj.search(cr,uid,[('common_product','=',True),('id','in',ids)])
         simple_ids = product_obj.search(cr,uid,[('common_product','=',False),('id','in',ids)])
-        res = super(product_product,self)._product_available(cr, uid, common_ids, field_names, arg, context={})
+        res = super(product_product,self)._product_available(cr, uid, common_ids, field_names, arg, context=context)
         res2 = super(product_product,self)._product_available(cr, uid, simple_ids, field_names, arg, context=context)
         res.update(res2)
         return res
 
-    def _product_available_other_shop(self, cr, uid, ids, name, arg, context={}):
+    def _product_available_other_shop(self, cr, uid, ids, name, arg, context=None):
+        if context is None:
+            context = {}
         res = {}
         product_obj = self.pool.get('product.product')
         common_id = product_obj.search(cr,uid,[('common_product','=',True),('id','in',ids)])
@@ -46,7 +48,7 @@
         real_res = {}
         virtual_res = {}
         if common_id:
-            stock_common = product_obj._product_available(cr, uid, common_id ,fields_name, context={})
+            stock_common = product_obj._product_available(cr, uid, common_id ,fields_name, context=context)
             for key,value in stock_common.items():
                 real_res[key] = stock_common[key]['qty_available']
                 virtual_res[key] = stock_common[key]['virtual_available']
@@ -72,8 +74,7 @@
         'virtual_available': fields.function(_product_available, method=True, type='float', string='Virtual Stock', help="Futur stock for this product according to the selected location or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available'),
         'incoming_qty': fields.function(_product_available, method=True, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected.", multi='qty_available'),
         'outgoing_qty': fields.function(_product_available, method=True, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected.", multi='qty_available'),
-
-        }
+    }
 
 product_product()
 

=== modified file 'sales_shop_stock_availability/wizard/stock_shop_availability.py'
--- sales_shop_stock_availability/wizard/stock_shop_availability.py	2010-06-29 12:57:57 +0000
+++ sales_shop_stock_availability/wizard/stock_shop_availability.py	2010-07-19 15:15:54 +0000
@@ -31,7 +31,7 @@
         'virtual_stock': fields.float('Virtual Stock',help="Current virtual quantities of products selected shop in sale order."),
         'other_shop_real_stock': fields.float('Other Shop Real Stock',help="Current quantities of products in other stock location except selected shop in sale order."),
         'other_shop_virtual_stock': fields.float('Other Shop Virtual Stock',help="Current virtual quantities of products in other stock location except selected shop in sale order."),
-              }
+    }
 
     def product_available_other_shop(self, cr, uid, ids, context=None):
         form = self.read(cr, uid, ids, [])[0]
@@ -41,32 +41,30 @@
         common_id = product_obj.browse(cr, uid, product_id ,context=context).common_product
         fields_name = ['qty_available','virtual_available']
         if common_id:
-            stock_common = product_obj._product_available(cr, uid, [product_id] ,fields_name,context={})
-            for key,value in stock_common.items():
-                real_val1 = value['qty_available']
-                virt_val1 = value['virtual_available']
-                other_real_val = value['qty_available']
-                other_virt_val = value['virtual_available']
+            stock_common = product_obj._product_available(cr, uid, [product_id] ,fields_name,context=context)
+
+            real_val1 = stock_common[product_id]['qty_available']
+            virt_val1 = stock_common[product_id]['virtual_available']
+            other_real_val = stock_common[product_id]['qty_available']
+            other_virt_val = stock_common[product_id]['virtual_available']
         else:
-            stock2 = product_obj._product_available(cr, uid, [product_id] ,fields_name,context={})
+            stock2 = product_obj._product_available(cr, uid, [product_id] ,fields_name,context=context)
+            real_val2 = stock2[product_id]['qty_available']
+            virt_val2 = stock2[product_id]['virtual_available']
+
             context.update({'shop':shop_id,'product_id':product_id})
             stock1 = product_obj._product_available(cr, uid, [product_id] ,fields_name,context=context)
-            for key,value in stock1.items():
-                real_val1 = value['qty_available']
-                virt_val1 = value['virtual_available']
-            for key,value in stock2.items():
-                real_val2 = value['qty_available']
-                virt_val2 = value['virtual_available']
+            real_val1 = stock1[product_id]['qty_available']
+            virt_val1 = stock1[product_id]['virtual_available']
+
             other_real_val = real_val2 - real_val1
             other_virt_val = virt_val2 - virt_val1
-        for id in ids:
-            self.write(cr, uid, [id],{
-                                     'real_stock':real_val1,
-                                     'virtual_stock':virt_val1,
-                                     'other_shop_real_stock':other_real_val,
-                                     'other_shop_virtual_stock':other_virt_val,
 
-                                     })
+        self.write(cr, uid, ids, {'real_stock':real_val1,
+                                  'virtual_stock':virt_val1,
+                                  'other_shop_real_stock':other_real_val,
+                                  'other_shop_virtual_stock':other_virt_val,
+                                 })
         return True
 
 stock_shop_availability()