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

[Atik Agewan(OpenERP)]

Functional field are added in product tab.....

=== modified file 'product_price_information/product_price_info.py'
--- product_price_information/product_price_info.py	2010-05-26 14:22:22 +0000
+++ product_price_information/product_price_info.py	2010-06-22 14:09:30 +0000
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -21,20 +21,20 @@
 ##############################################################################
 from osv import fields, osv
 from tools import config
-    
+
 class sale_order_line(osv.osv):
     _inherit = "sale.order.line"
 
     _columns = {
         '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')
-        
+
         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)
         if product:
@@ -43,19 +43,19 @@
             result['value']['sale_price_unit_tax'] = product_obj.product_tmpl_id.price_unit_tax
 
         return result
-    
+
 sale_order_line()
 
 class sale_order(osv.osv):
     _name = "sale.order"
     _inherit = "sale.order"
-    
+
     def onchange_shop_id(self, cr, uid, ids, shop_id):
         res = super(sale_order, self).onchange_shop_id(cr, uid, id, shop_id)
         if 'value' in res and shop_id:
             res['value']['price_type'] = self.pool.get('sale.shop').browse(cr, uid , shop_id).price_type
         return res
-    
+
 sale_order()
 
 
@@ -86,7 +86,7 @@
     _defaults = {
         'price_type': lambda *a: 'tax_included',
     }
-    
+
     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')
@@ -97,8 +97,8 @@
                 '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',
@@ -107,5 +107,128 @@
                 'type': 'ir.actions.act_window',
                 'target':'new',
         }
-        
-sale_shop_price_method_policy()
 \ No newline at end of file
+
+sale_shop_price_method_policy()
+
+
+class product_product(osv.osv):
+    _name = "product.product"
+    _inherit = "product.product"
+    _description = "Product"
+
+    def _get_all_values(self, cr, uid, ids, name, arg, context={}):
+        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')
+        for line in product_obj.browse(cr, uid, product, context=context):
+            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
+                    list_price = product_obj.browse(cr, uid, line.id).standard_price
+                    list_price1 = list_price * qty1
+                    list_price2 = list_price * qty2
+                    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_list_prices2'in name:
+                             res[id]['pi_list_prices2']= list_price2
+                        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_list_prices2'in name:
+                            res[id]['pi_list_prices2']= 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
+        return res
+
+    _columns = {
+        'pi_quantity1': fields.float('Quantity1'),
+        'pi_quantity2': fields.float('Quantity2'),
+        'pi_pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
+        'pi_partner_id': fields.many2one('res.partner', 'Customer'),
+        'pi_customer_prices1': fields.function(_get_all_values, method=True, type='float', string='Costomer Prices',multi='pi_customer_prices1'),
+        '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'),
+        'pi_list_prices2': fields.function(_get_all_values, method=True, type='float', string='List Prices',multi='pi_list_prices2'),
+        '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'),
+        }
+    _defaults = {
+        'pi_quantity1': lambda *a: 1.0,
+        'pi_quantity2': lambda *a: 5.0,
+         }
+product_product()
+
 
=== modified file 'product_price_information/product_price_info_view.xml'
--- product_price_information/product_price_info_view.xml	2010-05-20 14:03:55 +0000
+++ product_price_information/product_price_info_view.xml	2010-06-22 14:09:30 +0000
@@ -1,9 +1,7 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-
-<!-- Adding shop price field on sale order line form below Unit Price -->
-
+    <data>
+    <!-- Adding shop price field on sale order line form below Unit Price -->
      	<record model="ir.ui.view" id="view_sale_order_line_tree_direct_delivery">
 			<field name="name">sale.order.form2</field>
 			<field name="model">sale.order</field>
@@ -15,7 +13,7 @@
 				</xpath>
 			</field>
 		</record>
-		
+
 		<record model="ir.ui.view" id="product_tax_include_tree">
             <field name="name">product.tax.include.tree</field>
             <field name="model">product.product</field>
@@ -27,19 +25,58 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="view_partner_property_form" model="ir.ui.view">
             <field name="name">sale.shop.property.form.inherit</field>
             <field name="model">sale.shop</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="sale.view_shop_form"/>
             <field name="arch" type="xml">
-            <field name="project_id" position="after">
+                <field name="project_id" position="after">
                     <field name="price_type"/>
                 </field>
             </field>
         </record>
-        
+
+        <!--product.product inherit view -->
+		<record id="product_product_price_information_inherit" model="ir.ui.view">
+            <field name="name">product.product.price.information.inherit</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <notebook colspan="4" position="inside">
+				    <page string='Price Information'>
+                        <field name="pi_partner_id"/>
+                        <field name="pi_pricelist_id"/>
+                        <field name="pi_quantity1"/>
+                        <field name="pi_quantity2"/>
+                        <newline/>
+                        <group col="6" colspan="4">
+                             <group col="4" colspan="3">
+			                        <separator string="Prices of Product" colspan="2"/>
+			                        <newline/>
+			                        <field name="pi_customer_prices1"/>
+			                        <field name="pi_customer_prices2" nolabel="1"/>
+			                        <field name="pi_list_prices1"/>
+			                        <field name="pi_list_prices2" nolabel="1"/>
+			                        <field name="pi_next_better_price_qty"/>
+			                        <newline/>
+			                        <field name="pi_best_price_on_qty"/>
+		                       </group>
+		                       <group col="3" colspan="3">
+				                    <separator string="Price on Last Sale" colspan="2"/>
+				            		<newline/>
+                                    <field name="pi_last_customer_prices"/>
+				                    <field name="pi_last_list_prices"/>
+				                    <field name="pi_qty_buyed"/>
+		                       </group>
+	                    </group>
+				    </page>
+			    </notebook>
+            </field>
+        </record>
+
         <record id="view_config_price_policy" model="ir.ui.view">
             <field name="name">Price Method for Sale Order Shop</field>
             <field name="model">sale.shop.price.method</field>
@@ -55,7 +92,7 @@
                 </form>
             </field>
        </record>
-       
+
        <record id="action_config_price_policy" model="ir.actions.act_window">
             <field name="name">Price Method for Sale Order Shop</field>
             <field name="type">ir.actions.act_window</field>
@@ -64,12 +101,12 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
        </record>
-       
+
        <record id="config_wizard_step_shop_price_policy" model="ir.actions.todo">
             <field name="name">Shop Price</field>
             <field name="note">This Configuration step use to set default price type for shop.</field>
             <field name="action_id" ref="action_config_price_policy"/>
        </record>
-   				
+
 	</data>
 </openerp>
 
=== modified file 'product_price_information/wizard/sale_prize_information_view.xml'
--- product_price_information/wizard/sale_prize_information_view.xml	2010-06-09 10:37:58 +0000
+++ product_price_information/wizard/sale_prize_information_view.xml	2010-06-22 14:09:30 +0000
@@ -6,46 +6,46 @@
             <field name="model">sale.prize.information</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Sale Prize Information">
-			 <group col="6" colspan="4">
-				   <group col="2" colspan="3">
-					     <field name="partner_id"/>
-						 <field name="product_id"/>
-						 <separator string="Prices of Product"/>
-						 <newline/>
-						 <group col="4" colspan="2">
-							 <field name="customer_prices1"/>
-							 <field name="customer_prices2" string=""/>
-							 <field name="list_prices1"/>
-							 <field name="list_prices2" string=""/>
+                <form string="Sale Prize Information">
+                    <group col="6" colspan="4">
+                        <group col="2" colspan="3">
+                            <field name="partner_id"/>
+                            <field name="product_id"/>
+                            <separator string="Prices of Product"/>
+                            <newline/>
+                            <group col="4" colspan="2">
+                                <field name="customer_prices1"/>
+                                <field name="customer_prices2" nolabel="1"/>
+                                <field name="list_prices1"/>
+                                <field name="list_prices2" nolabel="1"/>
+                            </group>
+                                <field name="next_better_price_qty"/>
+                                <field name="best_price_on_qty"/>
+                                <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>
-							 <field name="next_better_price_qty"/>
-							 <field name="best_price_on_qty"/>
-						 <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>
+					 <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">
-            <field name="name">Sale Prize Information</field>
+            <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>