Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-770392-ron into lp:openobject-addons

  1. trunk-bug-770392-ron
  2. Merge into trunk
Proposed by Rohan Nayani(Open ERP)
Status: Merged
Merged at revision: 5036
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-770392-ron
Merge into: lp:openobject-addons
Diff against target: 338 lines (+37/-37)
2 files modified
product/product_demo.xml (+36/-36)
sale/company.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-770392-ron
Reviewer Review Type Date Requested Status
Rucha (Open ERP) (community) Approve
Rohan Nayani(Open ERP) (community) Needs Resubmitting
qdp (OpenERP) Pending
Review via email: mp+59213@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Rucha (Open ERP) (rpa-openerp) wrote :

Need to fix for those products for which supplier delay is greater than 7

review: Needs Fixing
Revision history for this message
Rohan Nayani(Open ERP) (ron-tinyerp) :
review: Needs Resubmitting
Revision history for this message
Rucha (Open ERP) (rpa-openerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'product/product_demo.xml'
2--- product/product_demo.xml 2011-01-14 00:11:01 +0000
3+++ product/product_demo.xml 2011-05-04 09:11:16 +0000
4@@ -129,7 +129,7 @@
5 <field name="standard_price">300.0</field>
6 <field name="uom_id" ref="product_uom_unit"/>
7 <field name="uom_po_id" ref="product_uom_unit"/>
8- <field name="sale_delay">2.0</field>
9+ <field name="sale_delay">7.0</field>
10 <field name="name">Basic PC</field>
11 <field name="type">product</field>
12 <field name="categ_id" ref="product_category_pc"/>
13@@ -154,7 +154,7 @@
14 <field name="standard_price">600.0</field>
15 <field name="uom_id" ref="product_uom_unit"/>
16 <field name="uom_po_id" ref="product_uom_unit"/>
17- <field name="sale_delay">3.0</field>
18+ <field name="sale_delay">7.0</field>
19 <field name="name">Medium PC</field>
20 <field name="type">product</field>
21 <field name="categ_id" ref="product_category_pc"/>
22@@ -178,7 +178,7 @@
23 <field name="standard_price">54.0</field>
24 <field name="uom_id" ref="product_uom_unit"/>
25 <field name="uom_po_id" ref="product_uom_unit"/>
26- <field name="sale_delay">1.0</field>
27+ <field name="sale_delay">7.0</field>
28 <field name="name">Mainboard ASUStek A7N8X</field>
29 <field name="type">product</field>
30 <field name="categ_id" ref="product_category_10"/>
31@@ -189,7 +189,7 @@
32 <field name="standard_price">180.0</field>
33 <field name="uom_id" ref="product_uom_unit"/>
34 <field name="uom_po_id" ref="product_uom_unit"/>
35- <field name="sale_delay">1.0</field>
36+ <field name="sale_delay">7.0</field>
37 <field name="name">Mainboard ASUStek A7V8X-X</field>
38 <field name="type">product</field>
39 <field name="categ_id" ref="product_category_10"/>
40@@ -201,7 +201,7 @@
41 <field name="standard_price">50.0</field>
42 <field name="uom_id" ref="product_uom_unit"/>
43 <field name="uom_po_id" ref="product_uom_unit"/>
44- <field name="sale_delay">1.0</field>
45+ <field name="sale_delay">7.0</field>
46 <field name="name">Processor AMD Athlon XP 1800+</field>
47 <field name="type">product</field>
48 <field name="categ_id" ref="product_category_10"/>
49@@ -212,7 +212,7 @@
50 <field name="standard_price">100.0</field>
51 <field name="uom_id" ref="product_uom_unit"/>
52 <field name="uom_po_id" ref="product_uom_unit"/>
53- <field name="sale_delay">1.0</field>
54+ <field name="sale_delay">7.0</field>
55 <field name="name">Processor AMD Athlon XP 2200+</field>
56 <field name="type">product</field>
57 <field name="categ_id" ref="product_category_10"/>
58@@ -223,7 +223,7 @@
59 <field name="standard_price">40.0</field>
60 <field name="uom_id" ref="product_uom_unit"/>
61 <field name="uom_po_id" ref="product_uom_unit"/>
62- <field name="sale_delay">1.0</field>
63+ <field name="sale_delay">7.0</field>
64 <field name="name">HDD Seagate 7200.8 80GB</field>
65 <field name="type">product</field>
66 <field name="categ_id" ref="product_category_10"/>
67@@ -234,7 +234,7 @@
68 <field name="standard_price">60.0</field>
69 <field name="uom_id" ref="product_uom_unit"/>
70 <field name="uom_po_id" ref="product_uom_unit"/>
71- <field name="sale_delay">1.0</field>
72+ <field name="sale_delay">7.0</field>
73 <field name="name">HDD Seagate 7200.8 120GB</field>
74 <field name="type">product</field>
75 <field name="categ_id" ref="product_category_10"/>
76@@ -246,7 +246,7 @@
77 <field name="uom_id" ref="product_uom_unit"/>
78 <field name="uom_po_id" ref="product_uom_unit"/>
79 <field name="procure_method">make_to_order</field>
80- <field name="sale_delay">1.0</field>
81+ <field name="sale_delay">7.0</field>
82 <field name="name">HDD Seagate 7200.8 160GB</field>
83 <field name="type">product</field>
84 <field name="categ_id" ref="product_category_10"/>
85@@ -257,7 +257,7 @@
86 <field name="standard_price">5.0</field>
87 <field name="uom_id" ref="product_uom_unit"/>
88 <field name="uom_po_id" ref="product_uom_unit"/>
89- <field name="sale_delay">1.0</field>
90+ <field name="sale_delay">7.0</field>
91 <field name="name">Regular case fan 80mm</field>
92 <field name="type">product</field>
93 <field name="categ_id" ref="product_category_10"/>
94@@ -268,7 +268,7 @@
95 <field name="standard_price">10.0</field>
96 <field name="uom_id" ref="product_uom_unit"/>
97 <field name="uom_po_id" ref="product_uom_unit"/>
98- <field name="sale_delay">1.0</field>
99+ <field name="sale_delay">7.0</field>
100 <field name="name">Silent fan</field>
101 <field name="type">product</field>
102 <field name="categ_id" ref="cat1"/>
103@@ -280,7 +280,7 @@
104 <field name="standard_price">200.0</field>
105 <field name="uom_id" ref="product_uom_unit"/>
106 <field name="uom_po_id" ref="product_uom_unit"/>
107- <field name="sale_delay">1.0</field>
108+ <field name="sale_delay">7.0</field>
109 <field name="name">Regular processor config</field>
110 <field name="procure_method">make_to_order</field>
111 <field name="type">product</field>
112@@ -292,7 +292,7 @@
113 <field name="standard_price">40.0</field>
114 <field name="uom_id" ref="product_uom_unit"/>
115 <field name="uom_po_id" ref="product_uom_unit"/>
116- <field name="sale_delay">1.0</field>
117+ <field name="sale_delay">7.0</field>
118 <field name="name">DDR 256MB PC400</field>
119 <field name="type">product</field>
120 <field name="categ_id" ref="product_category_pc"/>
121@@ -303,7 +303,7 @@
122 <field name="standard_price">60.0</field>
123 <field name="uom_id" ref="product_uom_unit"/>
124 <field name="uom_po_id" ref="product_uom_unit"/>
125- <field name="sale_delay">1.0</field>
126+ <field name="sale_delay">7.0</field>
127 <field name="name">DDR 512MB PC400</field>
128 <field name="type">product</field>
129 <field name="categ_id" ref="product_category_10"/>
130@@ -316,7 +316,7 @@
131 <field name="uom_id" ref="product_uom_unit"/>
132 <field name="uom_po_id" ref="product_uom_unit"/>
133 <field name="procure_method">make_to_order</field>
134- <field name="sale_delay">1.0</field>
135+ <field name="sale_delay">7.0</field>
136 <field name="name">High speed processor config</field>
137 <field name="type">product</field>
138 <field name="categ_id" ref="product_category_10"/>
139@@ -327,7 +327,7 @@
140 <field name="standard_price">25.0</field>
141 <field name="uom_id" ref="product_uom_unit"/>
142 <field name="uom_po_id" ref="product_uom_unit"/>
143- <field name="sale_delay">1.0</field>
144+ <field name="sale_delay">7.0</field>
145 <field name="name">ATX Mid-size Tower</field>
146 <field name="type">product</field>
147 <field name="categ_id" ref="product_category_10"/>
148@@ -340,7 +340,7 @@
149 <field name="uom_id" ref="product_uom_unit"/>
150 <field name="uom_po_id" ref="product_uom_unit"/>
151 <field name="procure_method">make_to_order</field>
152- <field name="sale_delay">1.0</field>
153+ <field name="sale_delay">7.0</field>
154 <field name="name">HDD on demand</field>
155 <field name="type">product</field>
156 <field eval="False" name="sale_ok"/>
157@@ -449,7 +449,7 @@
158 <field name="uom_id" ref="product_uom_meter"/>
159 <field name="uom_po_id" ref="product_uom_meter"/>
160 <field name="name">Wood 2mm</field>
161- <field eval="10" name="seller_delay"/>
162+ <field eval="2" name="seller_delay"/>
163 <field eval="7.0" name="sale_delay"/>
164 <field name="type">product</field>
165 <field name="categ_id" ref="product_category_rawmaterial0"/>
166@@ -515,7 +515,7 @@
167 <field name="uom_id" ref="product_uom_unit"/>
168 <field name="uom_po_id" ref="product_uom_unit"/>
169 <field name="name">Rear Panel SHE100</field>
170- <field eval="5" name="seller_delay"/>
171+ <field eval="2" name="seller_delay"/>
172 <field name="type">product</field>
173 <field name="categ_id" ref="product_category_misc0"/>
174 </record>
175@@ -528,7 +528,7 @@
176 <field name="uom_id" ref="product_uom_unit"/>
177 <field name="uom_po_id" ref="product_uom_unit"/>
178 <field name="name">Rear Panel SHE200</field>
179- <field eval="5" name="seller_delay"/>
180+ <field eval="2" name="seller_delay"/>
181 <field name="type">product</field>
182 <field name="categ_id" ref="product_category_misc0"/>
183 </record>
184@@ -541,7 +541,7 @@
185 <field name="uom_id" ref="product_uom_unit"/>
186 <field name="uom_po_id" ref="product_uom_unit"/>
187 <field name="name">Side Panel</field>
188- <field eval="5" name="seller_delay"/>
189+ <field eval="2" name="seller_delay"/>
190 <field name="type">product</field>
191 <field name="categ_id" ref="product_category_misc0"/>
192 </record>
193@@ -554,7 +554,7 @@
194 <field name="uom_id" ref="product_uom_unit"/>
195 <field name="uom_po_id" ref="product_uom_unit"/>
196 <field name="name">Rack 100cm</field>
197- <field eval="8" name="seller_delay"/>
198+ <field eval="2" name="seller_delay"/>
199 <field name="type">product</field>
200 <field name="categ_id" ref="product_category_misc0"/>
201 </record>
202@@ -567,7 +567,7 @@
203 <field name="uom_id" ref="product_uom_unit"/>
204 <field name="uom_po_id" ref="product_uom_unit"/>
205 <field name="name">Rack 200cm</field>
206- <field eval="8" name="seller_delay"/>
207+ <field eval="2" name="seller_delay"/>
208 <field name="type">product</field>
209 <field name="categ_id" ref="product_category_misc0"/>
210 </record>
211@@ -593,7 +593,7 @@
212 <field name="uom_id" ref="product_uom_unit"/>
213 <field name="uom_po_id" ref="product_uom_unit"/>
214 <field name="name">Wood Lintel 4m</field>
215- <field eval="10" name="seller_delay"/>
216+ <field eval="2" name="seller_delay"/>
217 <field name="type">product</field>
218 <field name="categ_id" ref="product_category_misc0"/>
219 </record>
220@@ -605,7 +605,7 @@
221 <field name="uom_id" ref="product_uom_unit"/>
222 <field name="uom_po_id" ref="product_uom_unit"/>
223 <field name="name">Metal Cleats</field>
224- <field eval="20" name="seller_delay"/>
225+ <field eval="2" name="seller_delay"/>
226 <field name="type">product</field>
227 <field name="categ_id" ref="product_category_misc0"/>
228 </record>
229@@ -736,21 +736,21 @@
230 <field name="qty">1</field>
231 <field name="min_qty">1</field>
232 <field name="product_id" ref="product_product_20"/>
233- <field name="delay">10</field>
234+ <field name="delay">5</field>
235 </record>
236 <record id="supplierinfo15" model="product.supplierinfo">
237 <field name="name" ref="base.res_partner_4"/>
238 <field name="qty">1</field>
239 <field name="min_qty">1</field>
240 <field name="product_id" ref="product_product_21"/>
241- <field name="delay">10</field>
242+ <field name="delay">5</field>
243 </record>
244 <record id="supplierinfo16" model="product.supplierinfo">
245 <field name="name" ref="base.res_partner_4"/>
246 <field name="qty">1</field>
247 <field name="min_qty">1</field>
248 <field name="product_id" ref="product_product_22"/>
249- <field name="delay">10</field>
250+ <field name="delay">5</field>
251 </record>
252 <record id="supplierinfo17" model="product.supplierinfo">
253 <field name="name" ref="base.res_partner_seagate"/>
254@@ -758,7 +758,7 @@
255 <field name="min_qty">1</field>
256 <field name="sequence">5</field>
257 <field name="product_id" ref="product_product_hdd1"/>
258- <field name="delay">10</field>
259+ <field name="delay">5</field>
260 </record>
261 <record id="supplierinfo18" model="product.supplierinfo">
262 <field name="name" ref="base.res_partner_seagate"/>
263@@ -766,7 +766,7 @@
264 <field name="min_qty">1</field>
265 <field name="sequence">5</field>
266 <field name="product_id" ref="product_product_hdd2"/>
267- <field name="delay">10</field>
268+ <field name="delay">5</field>
269 </record>
270 <record id="supplierinfo19" model="product.supplierinfo">
271 <field name="name" ref="base.res_partner_4"/>
272@@ -774,7 +774,7 @@
273 <field name="min_qty">1</field>
274 <field name="sequence">5</field>
275 <field name="product_id" ref="product_product_hdd3"/>
276- <field name="delay">10</field>
277+ <field name="delay">5</field>
278 </record>
279
280 <!--
281@@ -783,7 +783,7 @@
282
283 <record id="product_supplierinfo_0" model="product.supplierinfo">
284 <field name="product_id" ref="product_product_rearpanelarm0"/>
285- <field name="delay">10</field>
286+ <field name="delay">5</field>
287 <field name="min_qty">1</field>
288 <field name="name" ref="base.res_partner_woodywoodpecker0"/>
289 </record>
290@@ -815,7 +815,7 @@
291
292 <record id="product_supplierinfo_4" model="product.supplierinfo">
293 <field name="product_id" ref="product_product_shelfofcm0"/>
294- <field name="delay">8</field>
295+ <field name="delay">5</field>
296 <field name="min_qty">1</field>
297 <field name="name" ref="base.res_partner_woodywoodpecker0"/>
298 </record>
299@@ -823,7 +823,7 @@
300
301 <record id="product_supplierinfo_5" model="product.supplierinfo">
302 <field name="product_id" ref="product_product_shelfofcm1"/>
303- <field name="delay">8</field>
304+ <field name="delay">5</field>
305 <field name="min_qty">1</field>
306 <field name="name" ref="base.res_partner_woodywoodpecker0"/>
307 </record>
308@@ -839,7 +839,7 @@
309
310 <record id="product_supplierinfo_7" model="product.supplierinfo">
311 <field name="product_id" ref="product_product_woodlintelm0"/>
312- <field name="delay">10</field>
313+ <field name="delay">5</field>
314 <field name="min_qty">1</field>
315 <field name="name" ref="base.res_partner_woodywoodpecker0"/>
316 </record>
317@@ -847,7 +847,7 @@
318
319 <record id="product_supplierinfo_8" model="product.supplierinfo">
320 <field name="product_id" ref="product_product_metalcleats0"/>
321- <field name="delay">20</field>
322+ <field name="delay">5</field>
323 <field name="min_qty">1</field>
324 <field name="name" ref="base.res_partner_woodywoodpecker0"/>
325 </record>
326
327=== modified file 'sale/company.py'
328--- sale/company.py 2011-01-14 00:11:01 +0000
329+++ sale/company.py 2011-05-04 09:11:16 +0000
330@@ -29,7 +29,7 @@
331 "for security purpose"),
332 }
333 _defaults = {
334- 'security_lead': 5.0,
335+ 'security_lead': 1.0,
336 }
337
338 company()

Subscribers

People subscribed via source and target branches

to all changes: