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

[Atik Agewan(OpenERP)]

Common product field is added...

=== modified file 'sales_shop_stock_availability/sales_shop_stock_availability.py'
--- sales_shop_stock_availability/sales_shop_stock_availability.py	2010-06-29 06:24:04 +0000
+++ sales_shop_stock_availability/sales_shop_stock_availability.py	2010-06-29 13:03:26 +0000
@@ -26,19 +26,35 @@
 class product_product(osv.osv):
     _inherit = "product.product"
 
+    def _product_available(self, cr, uid, ids, field_names=None, arg=False, context={}):
+        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={})
+        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={}):
         res = {}
         product_obj = self.pool.get('product.product')
+        common_id = product_obj.search(cr,uid,[('common_product','=',True),('id','in',ids)])
+        simple_id = product_obj.search(cr,uid,[('common_product','=',False),('id','in',ids)])
         shop = context.get('shop', False)
         fields_name = ['qty_available','virtual_available']
-        stock2 = product_obj._product_available(cr, uid, ids ,fields_name,context={})
+        real_res = {}
+        virtual_res = {}
+        if common_id:
+            stock_common = product_obj._product_available(cr, uid, common_id ,fields_name, context={})
+            for key,value in stock_common.items():
+                real_res[key] = stock_common[key]['qty_available']
+                virtual_res[key] = stock_common[key]['virtual_available']
+        stock2 = product_obj._product_available(cr, uid, simple_id ,fields_name,context={})
         context.update({'shop':shop})
-        stock1 = product_obj._product_available(cr, uid, ids ,fields_name,context=context)
-        real_res = {}
+        stock1 = product_obj._product_available(cr, uid, simple_id ,fields_name,context=context)
         for key,value in stock2.items():
             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] = {}
@@ -51,6 +67,12 @@
     _columns = {
         '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'),
+        'common_product' : fields.boolean('Common Product'),
+        'qty_available': fields.function(_product_available, method=True, type='float', string='Real Stock', help="Current quantities of products in selected locations or all internal if none have been selected.", multi='qty_available'),
+        '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/sales_shop_stock_availability_view.xml'
--- sales_shop_stock_availability/sales_shop_stock_availability_view.xml	2010-06-29 06:24:04 +0000
+++ sales_shop_stock_availability/sales_shop_stock_availability_view.xml	2010-06-29 13:03:26 +0000
@@ -2,6 +2,19 @@
 <openerp>
 	<data>
 
+	   <record id="product_normal_form_view1" model="ir.ui.view">
+            <field name="name">product.normal.form</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field eval="7" name="priority"/>
+            <field name="arch" type="xml">
+               <field name="variants" position="after">
+                    <field name="common_product"/>
+               </field>
+            </field>
+        </record>
+
 		<record id="product_stock_tree_view1" model="ir.ui.view">
             <field name="name">stock.product.tree</field>
             <field name="model">product.product</field>
 
=== modified file 'sales_shop_stock_availability/wizard/stock_shop_availability.py'
--- sales_shop_stock_availability/wizard/stock_shop_availability.py	2010-06-29 06:24:04 +0000
+++ sales_shop_stock_availability/wizard/stock_shop_availability.py	2010-06-29 13:03:26 +0000
@@ -38,18 +38,27 @@
         product_id = form['product_id']
         shop_id = form['shop_id']
         product_obj = self.pool.get('product.product')
+        common_id = product_obj.browse(cr, uid, product_id ,context=context).common_product
         fields_name = ['qty_available','virtual_available']
-        stock2 = product_obj._product_available(cr, uid, [product_id] ,fields_name,context={})
-        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']
-        other_real_val = real_val2 - real_val1
-        other_virt_val = virt_val2 - virt_val1
+        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']
+        else:
+            stock2 = product_obj._product_available(cr, uid, [product_id] ,fields_name,context={})
+            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']
+            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,