[FIX] Fix bug with demo data from delivery module. We create a grid, but without specify to "use_detailed_pricelist"

bzr revid: jke@openerp.com-20140130214944-c5fg5mp8bitt86uy
This commit is contained in:
jke-openerp
2014-01-30 22:49:44 +01:00
parent 1fb3cccef4
commit f1204ee9c3
3 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -204,7 +204,7 @@ class delivery_grid(osv.osv):
def get_price_from_picking(self, cr, uid, id, total, weight, volume, context=None):
grid = self.browse(cr, uid, id, context=context)
price = 0.0
ok = False
ok = False
price_dict = {'price': total, 'volume':volume, 'weight': weight, 'wv':volume*weight}
for line in grid.line_ids:
test = eval(line.type+line.operator+str(line.max_value), price_dict)
@@ -215,7 +215,7 @@ class delivery_grid(osv.osv):
price = line.list_price
ok = True
break
if not ok:
if not ok:
raise osv.except_osv(_('No price available!'), _('No line matched this product or order in the chosen delivery grid.'))
return price
+1
View File
@@ -35,6 +35,7 @@
<field name="normal_price">20</field>
<field name="partner_id" ref="res_partner_23"/>
<field name="product_id" ref="product_product_delivery"/>
<field name="use_detailed_pricelist" eval="True"/>
</record>
<record id="free_delivery_carrier" model="delivery.carrier">
@@ -11,7 +11,6 @@ class Ecommerce(Ecommerce):
def payment(self, **post):
cr, uid, context = request.cr, request.uid, request.context
order = self.get_order()
carrier_id = post.get('carrier_id')
if order and carrier_id: