odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

delivery, invoice_onshipping wizard: there was a bug when a carrier was defined on a shipping w/o delivery grid 

bzr revid: bch-502563aff7df27b6ba141d424a7a7bf41a6006ed
This commit is contained in:
bch 2007-04-24 14:28:34 +00:00
parent 3ddb5fabfc
commit 821d591125
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/delivery/wizard/delivery_invoice_onshipping.py
View File

@ -95,6 +95,8 @@ def _create_invoice(self, cr, uid, data, context):
if not picking.carrier_id:
continue
grid_id = pool.get('delivery.carrier').grid_get(cr, uid, [picking.carrier_id.id], picking.address_id.id, context)
if not grid_id:
raise wizard.except_wizard('Warning', 'The carrier %s (id: %d) as no delivery grid.'% (picking.carrier_id.name, picking.carrier_id.id) )
price = pool.get('delivery.grid').get_price_from_picking(cr, uid, grid_id,
invoice.amount_untaxed, picking.weight,
picking.volume, context) or 0.0