diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index e1696820634..35b3ed481e9 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -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={}):
diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index efc82ae4141..5f066b23bb0 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -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):
diff --git a/addons/delivery/wizard/delivery_sale_order_view.xml b/addons/delivery/wizard/delivery_sale_order_view.xml
index 8cb10748432..6b6ffcd13cc 100644
--- a/addons/delivery/wizard/delivery_sale_order_view.xml
+++ b/addons/delivery/wizard/delivery_sale_order_view.xml
@@ -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>