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

[Atik Agewan(OpenERP)]

Modify wizard of product_price_information......

Unmerged revisions

16. By aag(OpenERP) on 2010-06-16

modify wizard of product_price_information

=== modified file 'product_price_information/wizard/sale_prize_information.py'
--- product_price_information/wizard/sale_prize_information.py	2010-06-09 10:37:58 +0000
+++ product_price_information/wizard/sale_prize_information.py	2010-06-16 06:35:39 +0000
@@ -49,6 +49,7 @@
     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')
             form = self.read(cr, uid, ids, [])[0]
             partner = form['partner_id']
             pricelist = form['pricelist_id']
@@ -66,11 +67,33 @@
             for line in obj2.browse(cr, uid,item_line, context=context):
                 if product == line.product_id.id:
                         list.append(line.min_quantity)
-            m_qty = max(list)
+            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
-            self.write(cr , uid, ids,{'customer_prices1':c_price1,'customer_prices2':c_price2,'next_better_price_qty':m_qty,'best_price_on_qty':c_price3},context=context)
+            list_price = self.pool.get("product.product").browse(cr, uid, product).standard_price
+            list_price1 = list_price * qty1
+            list_price2 = list_price * qty2
+            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)
             value = {
 
                     'name': 'Sale Prize Information',
 
=== modified file 'sales_shop_stock_availability/wizard/stock_shop_availability.py'
--- sales_shop_stock_availability/wizard/stock_shop_availability.py	2010-06-15 09:10:12 +0000
+++ sales_shop_stock_availability/wizard/stock_shop_availability.py	2010-06-16 06:35:39 +0000
@@ -46,10 +46,19 @@
         fields_name = ['qty_available','virtual_available']
         
         stock2 = product_obj._product_available(cr, uid, [product_id] ,fields_name,context={})
+<<<<<<< TREE
         
         context.update({'shop':shop_id,'product_id':product_id})
+=======
+        print "stock2:::::::::::::::",stock2
+        context.update({'shop_id':shop_id,'product_id':product_id})
+>>>>>>> MERGE-SOURCE
         stock1 = product_obj._product_available(cr, uid, [product_id] ,fields_name,context=context)
+<<<<<<< TREE
         
+=======
+        print "stock1:::::::::::",stock1
+>>>>>>> MERGE-SOURCE
         for key,value in stock1.items():
             real_val1 = value['qty_available']
             virt_val1 = value['virtual_available']