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

[FIX] delivery: modifications on delivery cost wizard for task 584 

bzr revid: mso@mso-20100426053713-6fms6tta3ogb3gv2
This commit is contained in:
mso 2010-04-26 11:07:13 +05:30
parent dd8501d463
commit 90cd229cbb
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/delivery/delivery.py
View File

@ -36,7 +36,7 @@ class delivery_carrier(osv.osv):
res = super(delivery_carrier, self).name_get(cr, uid, ids, context=context)
else:
order = self.pool.get('sale.order').browse(cr, uid, [order_id])[0]
currency = order.partner_id.property_product_pricelist.currency_id.name or ''
currency = order.pricelist_id.currency_id.name or ''
res = [(r['id'], r['name']+' ('+(str(r['price']))+' '+currency+')') for r in self.read(cr, uid, ids, ['name', 'price'], context)]
return res
def get_price(self, cr, uid, ids, field_name, arg=None, context={}):

6
addons/delivery/wizard/delivery_sale_order.py
View File

@ -50,7 +50,11 @@ class make_delivery(osv.osv_memory):
res = super(make_delivery, self).default_get(cr, uid, fields, context=context)
order_obj = self.pool.get('sale.order')
for order in order_obj.browse(cr, uid, context.get('active_ids', [])):
res.update({'carrier_id': order.partner_id.property_delivery_carrier.id})
carrier = order.carrier_id.id
if not carrier:
carrier = order.partner_id.property_delivery_carrier.id
res.update({'carrier_id': carrier})
return res
def view_init(self, cr , uid , fields, context=None):

4
addons/delivery/wizard/delivery_sale_order_view.xml
View File

@ -17,8 +17,8 @@
<group col="2" colspan="4">
<button icon='gtk-cancel' special="cancel"
string="Cancel" />
<button name="delivery_set" string="Add Delivery Costs"
colspan="1" type="object" icon="gtk-ok" />
<button name="delivery_set" string="Apply"
colspan="1" type="object" icon="gtk-apply" />
</group>
</form>
</field>