openerp-openbig

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

  1. get_value_list_price1
  2. Merge into addons
Proposed by Atik Agewan(OpenERP)
Status: Merged
Merged at revision: 33
Proposed branch: lp:~openbig/bigconsulting/get_value_list_price1
Merge into: lp:bigconsulting
Diff against target: 131 lines (+14/-17)
4 files modified
product_price_information/product_price_info.py (+5/-8)
product_price_information/product_price_info_view.xml (+0/-1)
product_price_information/wizard/sale_prize_information.py (+9/-7)
product_price_information/wizard/sale_prize_information_view.xml (+0/-1)
To merge this branch: bzr merge lp:~openbig/bigconsulting/get_value_list_price1
Reviewer Review Type Date Requested Status
openbig Pending
Review via email: mp+28490@code.launchpad.net

Description of the change

GET VALUE OF LISTPRICE1 AND REMOVE FIELD LIST PRICE 2

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'product_price_information/product_price_info.py'
2--- product_price_information/product_price_info.py 2010-06-24 13:20:05 +0000
3+++ product_price_information/product_price_info.py 2010-06-25 10:45:38 +0000
4@@ -123,6 +123,7 @@
5 obj2 = self.pool.get('product.pricelist.item')
6 obj = self.pool.get('product.pricelist')
7 obj3 = self.pool.get('sale.order.line')
8+ res_partner_obj = self.pool.get("res.partner")
9 for line in product_obj.browse(cr, uid, product, context=context):
10 partner = line.pi_partner_id.id
11 pricelist = line.pi_pricelist_id.id
12@@ -147,9 +148,10 @@
13 # val3 = obj.price_get(cr, uid, [pricelist], line.id, m_qty, partner)
14 # for key,values in val3.items():
15 # c_price3 = values
16- list_price = product_obj.browse(cr, uid, line.id).standard_price
17- list_price1 = list_price * qty1
18- list_price2 = list_price * qty2
19+ sale_price_list = res_partner_obj.browse(cr, uid, partner).property_product_pricelist.id
20+ val_sale = obj.price_get(cr, uid, [sale_price_list], line.id, qty1, partner)
21+ for key,values in val_sale.items():
22+ list_price1 = values
23 read_id = obj3.search(cr,uid,[('product_id','=',line.id)])
24 if read_id == []:
25 last_price = 0.0
26@@ -175,8 +177,6 @@
27 res[id]['pi_customer_prices2'] = c_price2
28 if 'pi_list_prices1' in name:
29 res[id]['pi_list_prices1'] = list_price1
30- if 'pi_list_prices2'in name:
31- res[id]['pi_list_prices2']= list_price2
32 # if 'pi_next_better_price_qty'in name:
33 # res[id]['pi_next_better_price_qty']= m_qty
34 # if 'pi_best_price_on_qty'in name:
35@@ -197,8 +197,6 @@
36 res[id]['pi_customer_prices2'] = 0.0
37 if 'pi_list_prices1' in name:
38 res[id]['pi_list_prices1'] = 0.0
39- if 'pi_list_prices2'in name:
40- res[id]['pi_list_prices2']= 0.0
41 # if 'pi_next_better_price_qty'in name:
42 # res[id]['pi_next_better_price_qty']= 0.0
43 # if 'pi_best_price_on_qty'in name:
44@@ -223,7 +221,6 @@
45 'pi_customer_prices1': fields.function(_get_all_values, method=True, type='float', string='Costomer Prices',multi='pi_customer_prices1'),
46 'pi_customer_prices2': fields.function(_get_all_values, method=True, type='float', string='Costomer Prices',multi='pi_customer_prices2'),
47 'pi_list_prices1': fields.function(_get_all_values, method=True, type='float', string='List Prices',multi='pi_list_prices1'),
48- 'pi_list_prices2': fields.function(_get_all_values, method=True, type='float', string='List Prices',multi='pi_list_prices2'),
49 # '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'),
50 # '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'),
51 'pi_last_customer_prices': fields.function(_get_all_values, method=True, type='float', string='Last Costomer Prices',multi='pi_last_customer_prices'),
52
53=== modified file 'product_price_information/product_price_info_view.xml'
54--- product_price_information/product_price_info_view.xml 2010-06-24 13:20:05 +0000
55+++ product_price_information/product_price_info_view.xml 2010-06-25 10:45:38 +0000
56@@ -59,7 +59,6 @@
57 <field name="pi_customer_prices1"/>
58 <field name="pi_customer_prices2" nolabel="1"/>
59 <field name="pi_list_prices1"/>
60- <field name="pi_list_prices2" nolabel="1"/>
61 <!-- <field name="pi_next_better_price_qty"/>-->
62 <!-- <newline/>-->
63 <!-- <field name="pi_best_price_on_qty"/>-->
64
65=== modified file 'product_price_information/wizard/sale_prize_information.py'
66--- product_price_information/wizard/sale_prize_information.py 2010-06-24 13:20:05 +0000
67+++ product_price_information/wizard/sale_prize_information.py 2010-06-25 10:45:38 +0000
68@@ -34,7 +34,6 @@
69 'customer_prices2':fields.float('Costomer Prices'),
70 'last_customer_prices':fields.float('Last Costomer Prices'),
71 'list_prices1':fields.float('List Prices'),
72- 'list_prices2':fields.float('List Prices'),
73 # 'last_list_prices':fields.float('Last List Prices'),
74 # 'next_better_price_qty':fields.float('Next Better Price Qty'),
75 # 'best_price_on_qty':fields.float('Best Price On Quantity'),
76@@ -50,16 +49,18 @@
77 obj = self.pool.get('product.pricelist')
78 obj2 = self.pool.get('product.pricelist.item')
79 obj3 = self.pool.get('sale.order.line')
80+ obj_product = self.pool.get("product.product")
81+ res_partner_obj = self.pool.get("res.partner")
82 form = self.read(cr, uid, ids, [])[0]
83 partner = form['partner_id']
84 pricelist = form['pricelist_id']
85 product = form['product_id']
86 qty1 = form['quantity1']
87 qty2 = form['quantity2']
88- val1 = obj.price_get(cr, uid, ids, product, qty1, partner)
89+ val1 = obj.price_get(cr, uid, [pricelist], product, qty1, partner)
90 for key,values in val1.items():
91 c_price1 = values
92- val2 = obj.price_get(cr, uid, ids, product, qty2, partner)
93+ val2 = obj.price_get(cr, uid, [pricelist], product, qty2, partner)
94 for key,values in val2.items():
95 c_price2 = values
96 # item_line = obj2.search(cr,uid,[])
97@@ -74,9 +75,10 @@
98 # val3 = obj.price_get(cr, uid, ids, product, m_qty, partner)
99 # for key,values in val3.items():
100 # c_price3 = values
101- list_price = self.pool.get("product.product").browse(cr, uid, product).standard_price
102- list_price1 = list_price * qty1
103- list_price2 = list_price * qty2
104+ sale_price_list = res_partner_obj.browse(cr, uid, partner).property_product_pricelist.id
105+ val_sale = obj.price_get(cr, uid, [sale_price_list], product, qty1, partner)
106+ for key,values in val_sale.items():
107+ list_price1 = values
108 read_id = obj3.search(cr,uid,[('product_id','=',product)])
109 if read_id == []:
110 last_price = 0.0
111@@ -94,7 +96,7 @@
112 # for key,values in val_last.items():
113 # last_list_price = values
114 # 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)
115- self.write(cr , uid, ids,{'customer_prices1':c_price1,'customer_prices2':c_price2,'list_prices1':list_price1,'list_prices2':list_price2,'last_customer_prices':last_price,'qty_buyed':qty_last},context=context)
116+ 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)
117 value = {
118
119 'name': 'Sale Prize Information',
120
121=== modified file 'product_price_information/wizard/sale_prize_information_view.xml'
122--- product_price_information/wizard/sale_prize_information_view.xml 2010-06-24 13:20:05 +0000
123+++ product_price_information/wizard/sale_prize_information_view.xml 2010-06-25 10:45:38 +0000
124@@ -17,7 +17,6 @@
125 <field name="customer_prices1"/>
126 <field name="customer_prices2" nolabel="1"/>
127 <field name="list_prices1"/>
128- <field name="list_prices2" nolabel="1"/>
129 </group>
130 <!-- <field name="next_better_price_qty"/>-->
131 <!-- <field name="best_price_on_qty"/>-->

Subscribers

People subscribed via source and target branches