Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-915404-mma into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #915404 in OpenERP Addons: "delivery price does not take into account the
"free if more than" amount"
https://bugs.launchpad.net/openobject-addons/+bug/915404
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-915404-mma/+merge/88838
Hello,
delivery:I Have a remove a line_data which is over-write when create
a grid line and added normal_price in demo data for avoid a Warring message
like No price available.
Thanks.
MMA
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-915404-mma/+merge/88838
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-915404-mma.
=== modified file 'delivery/delivery.py'
--- delivery/delivery.py 2012-01-06 13:11:37 +0000
+++ delivery/delivery.py 2012-01-17 11:22:26 +0000
@@ -124,9 +124,8 @@
grid_line_pool.unlink(cr, uid, lines, context=context)
#create the grid lines
- line_data = None
if record.free_if_more_than:
- line_data = {
+ data = {
'grid_id': grid_id and grid_id[0],
'name': _('Free if more than %.2f') % record.amount,
'type': 'price',
@@ -135,6 +134,7 @@
'standard_price': 0.0,
'list_price': 0.0,
}
+ grid_line_pool.create(cr, uid, data, context=context)
if record.normal_price:
line_data = {
'grid_id': grid_id and grid_id[0],
@@ -145,7 +145,6 @@
'standard_price': record.normal_price,
'list_price': record.normal_price,
}
- if line_data:
grid_line_pool.create(cr, uid, line_data, context=context)
return True
=== modified file 'delivery/delivery_demo.xml'
--- delivery/delivery_demo.xml 2012-01-05 17:13:15 +0000
+++ delivery/delivery_demo.xml 2012-01-17 11:22:26 +0000
@@ -31,6 +31,7 @@
<record id="free_delivery_carrier" model="delivery.carrier">
<field name="name">Free delivery charges</field>
+ <field name="normal_price">10</field>
<field name="free_if_more_than">True</field>
<field name="amount">1000</field>
<field name="partner_id" ref="delivery_partner"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
