Launchpad automatic translations update.

[odoo/odoo.git] / addons / delivery / delivery.py

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 4ac69d9..aceee36 100644 (file)
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -27,26 +27,30 @@ class delivery_carrier(osv.osv):
     _name = "delivery.carrier"
     _description = "Carrier"
 
-    def name_get(self, cr, uid, ids, context={}):
+    def name_get(self, cr, uid, ids, context=None):
         if not len(ids):
             return []
+        if context is None:
+            context = {}
         order_id = context.get('order_id',False)
         if not order_id:
             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]
+            order = self.pool.get('sale.order').browse(cr, uid, order_id, context=context)
             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={}):
+    def get_price(self, cr, uid, ids, field_name, arg=None, context=None):
         res={}
+        if context is None:
+            context = {}
         sale_obj=self.pool.get('sale.order')
         grid_obj=self.pool.get('delivery.grid')
-        for carrier in self.browse(cr,uid,ids,context):
+        for carrier in self.browse(cr, uid, ids, context=context):
             order_id=context.get('order_id',False)
             price=False
             if order_id:
-              order = sale_obj.browse(cr, uid, [order_id])[0]
+              order = sale_obj.browse(cr, uid, order_id, context=context)
               carrier_grid=self.grid_get(cr,uid,[carrier.id],order.partner_shipping_id.id,context)
               if carrier_grid:
                   price=grid_obj.get_price(cr, uid, carrier_grid, order, time.strftime('%Y-%m-%d'), context)
@@ -65,9 +69,9 @@ class delivery_carrier(osv.osv):
     _defaults = {
         'active': lambda *args:1
     }
-    def grid_get(self, cr, uid, ids, contact_id, context={}):
-        contact = self.pool.get('res.partner.address').browse(cr, uid, [contact_id])[0]
-        for carrier in self.browse(cr, uid, ids):
+    def grid_get(self, cr, uid, ids, contact_id, context=None):
+        contact = self.pool.get('res.partner.address').browse(cr, uid, contact_id, context=context)
+        for carrier in self.browse(cr, uid, ids, context=context):
             for grid in carrier.grids_id:
                 get_id = lambda x: x.id
                 country_ids = map(get_id, grid.country_ids)
@@ -104,7 +108,7 @@ class delivery_grid(osv.osv):
     }
     _order = 'sequence'
 
-    def get_price(self, cr, uid, id, order, dt, context):
+    def get_price(self, cr, uid, id, order, dt, context=None):
         total = 0
         weight = 0
         volume = 0
@@ -116,10 +120,10 @@ class delivery_grid(osv.osv):
             volume += (line.product_id.volume or 0.0) * line.product_uom_qty
 
 
-        return self.get_price_from_picking(cr, uid, id, total,weight, volume, context)
+        return self.get_price_from_picking(cr, uid, id, total,weight, volume, context=context)
 
-    def get_price_from_picking(self, cr, uid, id, total, weight, volume, context={}):
-        grid = self.browse(cr, uid, id, context)
+    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