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

[gpa(OpenERP)]

changes in sales_shop_stock_availablity

=== modified file 'sales_shop_stock_availability/sales_shop_stock_availability.py'
--- sales_shop_stock_availability/sales_shop_stock_availability.py	2010-06-10 10:03:25 +0000
+++ sales_shop_stock_availability/sales_shop_stock_availability.py	2010-06-16 14:59:21 +0000
@@ -31,18 +31,36 @@
         res = {}
         product_obj = self.pool.get('product.product')
         shop = context.get('shop', False)
-        fields_name = ['qty_available']
+        fields_name = ['qty_available','virtual_available']
+        
         stock2 = product_obj._product_available(cr, uid, ids ,fields_name,context={})
+
         context.update({'shop':shop})
         stock1 = product_obj._product_available(cr, uid, ids ,fields_name,context=context)
+        
+        real_res = {}
         for key,value in stock2.items():
-            res[key] = stock2[key]['qty_available'] - stock1[key]['qty_available']
+            real_res[key] = stock2[key]['qty_available'] - stock1[key]['qty_available']
+
+        virtual_res = {}    
+        for key,value in stock2.items():    
+            virtual_res[key] = stock2[key]['virtual_available'] - stock1[key]['virtual_available']
+            
+        for id in ids:
+            res[id] = {}
+            if 'qty_available_other_shop' in name:
+                res[id].update({'qty_available_other_shop': real_res[id]})
+            if 'virtual_qty_available_other_shop' in name:
+                res[id].update({'virtual_qty_available_other_shop' : virtual_res[id]})
         return res
-
+    
     _columns = {
-        'qty_available_other_shop': fields.function(_product_available_other_shop, method=True, type='float', string='Other Shops', help="Current quantities of products in other stock location except selected shop in sale order."),
+        'qty_available_other_shop': fields.function(_product_available_other_shop, method=True, type='float', string='Real Other Stock', help="Current quantities of products in other stock location except selected shop in sale order.", multi='qty_available_other_shop'),
+
+        'virtual_qty_available_other_shop': fields.function(_product_available_other_shop, method=True, type='float', string='Virtual Other Stock', help="Current virtual quantities of products in other stock location except selected shop in sale order.", multi='virtual_qty_available_other_shop'),
     }
 
+
 product_product()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'sales_shop_stock_availability/sales_shop_stock_availability_view.xml'
--- sales_shop_stock_availability/sales_shop_stock_availability_view.xml	2010-06-10 10:03:25 +0000
+++ sales_shop_stock_availability/sales_shop_stock_availability_view.xml	2010-06-16 14:59:21 +0000
@@ -16,6 +16,7 @@
                     <field name="qty_available"/>
                     <field name="virtual_available"/>
                     <field name="qty_available_other_shop"/>
+                    <field name="virtual_qty_available_other_shop"/>
                     <field invisible="'partner_id' not in context" name="price"/>
                     <field name="lst_price"/>
                     <field name="standard_price"/>